commit 5e90f7c87c79859f6359c1ad078946e3dc0c5517 Author: XingQue Date: Sun Jun 14 02:38:05 2026 +0800 第一次提交：小程序前端最新版本 diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..115cc02 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,31 @@ +/* + * Eslint config file + * Documentation: https://eslint.org/docs/user-guide/configuring/ + * Install the Eslint extension before using this feature. + */ +module.exports = { + env: { + es6: true, + browser: true, + node: true, + }, + ecmaFeatures: { + modules: true, + }, + parserOptions: { + ecmaVersion: 2018, + sourceType: 'module', + }, + globals: { + wx: true, + App: true, + Page: true, + getCurrentPages: true, + getApp: true, + Component: true, + requirePlugin: true, + requireMiniProgram: true, + }, + // extends: 'eslint:recommended', + rules: {}, +} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e173d96 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +node_modules/ +miniprogram_npm/ +project.private.config.json +.DS_Store +*.log diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..35410ca --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/a_long_dianjing.iml b/.idea/a_long_dianjing.iml new file mode 100644 index 0000000..e2358d9 --- /dev/null +++ b/.idea/a_long_dianjing.iml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..863fa72 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..3351dc2 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 0000000..f8b4888 --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": null +} \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..f5d0a94 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\app.js", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/a_long_dianjing/FileContentIndex/adbed671-f010-4e25-b61e-f17273811071.vsidx b/.vs/a_long_dianjing/FileContentIndex/adbed671-f010-4e25-b61e-f17273811071.vsidx new file mode 100644 index 0000000..89c2332 Binary files /dev/null and b/.vs/a_long_dianjing/FileContentIndex/adbed671-f010-4e25-b61e-f17273811071.vsidx differ diff --git a/.vs/a_long_dianjing/v17/.wsuo b/.vs/a_long_dianjing/v17/.wsuo new file mode 100644 index 0000000..3263000 Binary files /dev/null and b/.vs/a_long_dianjing/v17/.wsuo differ diff --git a/.vs/a_long_dianjing/v17/DocumentLayout.json b/.vs/a_long_dianjing/v17/DocumentLayout.json new file mode 100644 index 0000000..c80c276 --- /dev/null +++ b/.vs/a_long_dianjing/v17/DocumentLayout.json @@ -0,0 +1,37 @@ +{ + "Version": 1, + "WorkspaceRootPath": "C:\\\u5FAE\u4FE1\u5F00\u53D1\u5DE5\u5177\\\u4EE3\u7801\\a_long_dianjing\\", + "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\\u5FAE\u4FE1\u5F00\u53D1\u5DE5\u5177\\\u4EE3\u7801\\a_long_dianjing\\app.js||{14D17961-FE51-464D-9111-C4AF11D7D99A}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:app.js||{14D17961-FE51-464D-9111-C4AF11D7D99A}" + } + ], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": 0, + "Children": [ + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "app.js", + "DocumentMoniker": "C:\\\u5FAE\u4FE1\u5F00\u53D1\u5DE5\u5177\\\u4EE3\u7801\\a_long_dianjing\\app.js", + "RelativeDocumentMoniker": "app.js", + "ToolTip": "C:\\\u5FAE\u4FE1\u5F00\u53D1\u5DE5\u5177\\\u4EE3\u7801\\a_long_dianjing\\app.js", + "RelativeToolTip": "app.js", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001646|", + "WhenOpened": "2026-01-30T05:12:55.655Z", + "EditorCaption": "" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000..1ff7040 Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..9eb715c --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 GoEasy + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/_init_.py b/_init_.py new file mode 100644 index 0000000..a0b11ba --- /dev/null +++ b/_init_.py @@ -0,0 +1,2 @@ +# 3. 在项目的 `__init__.py` 文件（与manage.py同级）中，添加两行代码 +# 文件路径：a_long_dianjing/__init__.py diff --git a/a_long_dianjing/__init__.py b/a_long_dianjing/__init__.py new file mode 100644 index 0000000..4743afc --- /dev/null +++ b/a_long_dianjing/__init__.py @@ -0,0 +1,8 @@ +""" +阿龙电竞 - Django项目初始化 +确保Celery在Django启动时自动加载 +""" + +from .celery import app as celery_app + +__all__ = ('celery_app',) \ No newline at end of file diff --git a/a_long_dianjing/__pycache__/__init__.cpython-312.pyc b/a_long_dianjing/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000..e4fa3a9 Binary files /dev/null and b/a_long_dianjing/__pycache__/__init__.cpython-312.pyc differ diff --git a/a_long_dianjing/__pycache__/__init__.cpython-313.pyc b/a_long_dianjing/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..da49ef0 Binary files /dev/null and b/a_long_dianjing/__pycache__/__init__.cpython-313.pyc differ diff --git a/a_long_dianjing/__pycache__/celery.cpython-312.pyc b/a_long_dianjing/__pycache__/celery.cpython-312.pyc new file mode 100644 index 0000000..2b4256a Binary files /dev/null and b/a_long_dianjing/__pycache__/celery.cpython-312.pyc differ diff --git a/a_long_dianjing/__pycache__/celery.cpython-313.pyc b/a_long_dianjing/__pycache__/celery.cpython-313.pyc new file mode 100644 index 0000000..3acab3a Binary files /dev/null and b/a_long_dianjing/__pycache__/celery.cpython-313.pyc differ diff --git a/a_long_dianjing/__pycache__/settings.cpython-313.pyc b/a_long_dianjing/__pycache__/settings.cpython-313.pyc new file mode 100644 index 0000000..66c3de3 Binary files /dev/null and b/a_long_dianjing/__pycache__/settings.cpython-313.pyc differ diff --git a/a_long_dianjing/__pycache__/urls.cpython-313.pyc b/a_long_dianjing/__pycache__/urls.cpython-313.pyc new file mode 100644 index 0000000..952e131 Binary files /dev/null and b/a_long_dianjing/__pycache__/urls.cpython-313.pyc differ diff --git a/a_long_dianjing/__pycache__/wsgi.cpython-313.pyc b/a_long_dianjing/__pycache__/wsgi.cpython-313.pyc new file mode 100644 index 0000000..8f16618 Binary files /dev/null and b/a_long_dianjing/__pycache__/wsgi.cpython-313.pyc differ diff --git a/a_long_dianjing/asgi.py b/a_long_dianjing/asgi.py new file mode 100644 index 0000000..58db31d --- /dev/null +++ b/a_long_dianjing/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for a_long_dianjing project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/6.0/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'a_long_dianjing.settings') + +application = get_asgi_application() diff --git a/a_long_dianjing/celery.py b/a_long_dianjing/celery.py new file mode 100644 index 0000000..2e75a1e --- /dev/null +++ b/a_long_dianjing/celery.py @@ -0,0 +1,115 @@ +""" +阿龙电竞 - Celery定时任务主配置 +生产环境就绪版本，支持精确延时任务和周期性任务 +""" + +import os +from celery import Celery +from celery.schedules import crontab + +# 设置Django默认设置模块 +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'a_long_dianjing.settings') + +# 创建Celery应用实例 +app = Celery('a_long_dianjing') + +# 从Django settings中加载Celery配置（CELERY_前缀） +app.config_from_object('django.conf:settings', namespace='CELERY') + +# 自动发现所有已注册app中的tasks.py文件 +app.autodiscover_tasks() + +# 配置周期性任务（Celery Beat Schedule） +app.conf.beat_schedule = { + # 🔥 核心任务：订单调度器（每2分钟运行） + 'dispatch_pending_orders': { + 'task': 'dingdan.tasks.dispatch_pending_orders', + 'schedule': crontab(minute='*/2'), + 'options': {'queue': 'order_tasks', 'priority': 5}, + }, + + # 🔥 补偿检查任务（每5分钟运行） + 'check_order_expire_task': { + 'task': 'dingdan.tasks.check_order_expire_task', + 'schedule': crontab(minute='*/5'), + 'options': {'queue': 'order_tasks', 'priority': 3}, + }, + # 1. 每日凌晨0点执行 - 清零任务 + 'daily_reset_task': { + 'task': 'yonghu.tasks.daily_reset_task', + 'schedule': crontab(hour=0, minute=0), # 每天0点 + 'options': { + 'queue': 'periodic_tasks', + 'priority': 5 + }, + 'args': (), + 'kwargs': {} + }, + + # 2. 每月1日凌晨0点执行 - 月度清零任务 + 'monthly_reset_task': { + 'task': 'yonghu.tasks.monthly_reset_task', + 'schedule': crontab(hour=0, minute=0, day_of_month=1), # 每月1日0点 + 'options': { + 'queue': 'periodic_tasks', + 'priority': 5 + }, + 'args': (), + 'kwargs': {} + }, + + # 3. 每5分钟检查一次待处理订单 - 作为补偿机制 + 'check_order_expire_task': { + 'task': 'dingdan.tasks.check_order_expire_task', + 'schedule': crontab(minute='*/5'), # 每5分钟 + 'options': { + 'queue': 'order_tasks', + 'priority': 3 + }, + 'args': (), + 'kwargs': {} + }, + + # 4. 每天凌晨0点5分清理收支记录 + 'daily_sz_reset_task': { + 'task': 'peizhi.tasks.daily_sz_reset_task', + 'schedule': crontab(hour=0, minute=5), # 每天0点5分 + 'options': { + 'queue': 'periodic_tasks', + 'priority': 4 + }, + 'args': (), + 'kwargs': {} + } +} + +# 时区设置 +app.conf.timezone = 'Asia/Shanghai' +app.conf.enable_utc = True + +# 队列路由配置 +app.conf.task_routes = { + 'dingdan.tasks.*': {'queue': 'order_tasks'}, + 'yonghu.tasks.*': {'queue': 'periodic_tasks'}, + 'peizhi.tasks.*': {'queue': 'periodic_tasks'}, +} + +# 任务序列化 +app.conf.accept_content = ['json'] +app.conf.task_serializer = 'json' +app.conf.result_serializer = 'json' + +# 任务超时设置 +app.conf.task_time_limit = 300 # 任务最大执行时间300秒 +app.conf.task_soft_time_limit = 240 # 软超时240秒 + +# Worker并发设置 +app.conf.worker_concurrency = 4 +app.conf.worker_prefetch_multiplier = 1 + +# 任务确认设置 +app.conf.task_acks_late = True +app.conf.worker_disable_rate_limits = True + +# 结果过期时间 +app.conf.result_expires = 3600 # 任务结果保留1小时 \ No newline at end of file diff --git a/a_long_dianjing/management/commands/sync_cross_order_status.py b/a_long_dianjing/management/commands/sync_cross_order_status.py new file mode 100644 index 0000000..f41e1b6 --- /dev/null +++ b/a_long_dianjing/management/commands/sync_cross_order_status.py @@ -0,0 +1,114 @@ +import time +import requests +from concurrent.futures import ThreadPoolExecutor, as_completed +from django.core.management.base import BaseCommand +from django.conf import settings +from dingdan.models import Dingdan +from peizhi.models import Club # 你的俱乐部模型，请确认类名 + + +class Command(BaseCommand): + help = '同步我方派单跨平台订单状态（仅进行中订单，失败直接跳过，不重试）' + + def add_arguments(self, parser): + parser.add_argument('--concurrency', type=int, default=3, help='并发数（默认3）') + parser.add_argument('--batch', type=int, default=0, help='处理前N单（0=全部）') + + def handle(self, *args, **options): + concurrency = options['concurrency'] + batch = options['batch'] + + # 查询待同步订单 + orders = Dingdan.objects.filter( + zhuangtai=2, + dispatch_type=1, + is_cross=1, + partner_club_id__isnull=False, + partner_order_id__isnull=False + ).only('dingdan_id', 'partner_order_id', 'partner_club_id', 'zhuangtai') + + total = orders.count() + self.stdout.write(f'待处理订单总数: {total}') + if batch > 0: + orders = orders[:batch] + self.stdout.write(f'本次仅处理前 {batch} 单') + + SYNC_TOKEN = getattr(settings, 'CROSS_PLATFORM_SYNC_TOKEN', 'xK9mP2vL8qW5rT7y') + session = requests.Session() + session.headers.update({'Content-Type': 'application/json'}) + + # 预加载域名映射 + domain_map = {} + for club in Club.objects.all(): + if club.partner_club_id and club.partner_domain: + domain_map[club.partner_club_id] = club.partner_domain + + updated = success = skip = fail = 0 + start = time.time() + + def process_one(order): + # 获取对方域名 + domain = domain_map.get(order.partner_club_id) + if not domain: + try: + club = Club.objects.filter(partner_club_id=order.partner_club_id).first() + if club and club.partner_domain: + domain = club.partner_domain + domain_map[order.partner_club_id] = domain + except Exception: + pass + if not domain: + return ('skip', '无域名') + + url = domain.rstrip('/') + '/houtai/kptxwztjb' + payload = { + 'token': SYNC_TOKEN, + 'partner_order_id': order.partner_order_id, + 'our_order_id': order.dingdan_id, + 'club_id': order.partner_club_id + } + + try: + resp = session.post(url, json=payload, timeout=5) + if resp.status_code == 200: + data = resp.json() + if data.get('code') == 0: + st = data['data']['status'] + if st in (5, 8): + order.zhuangtai = st + order.save(update_fields=['zhuangtai']) + return ('updated', st) + return ('success', st) + else: + return ('skip', data.get('msg', '对方业务错误')) + else: + # 429、404、500 等全部跳过 + return ('skip', f'HTTP {resp.status_code}') + except requests.exceptions.Timeout: + return ('skip', '超时') + except Exception as e: + return ('skip', str(e)) + + # 并发执行 + with ThreadPoolExecutor(max_workers=concurrency) as executor: + future_map = {executor.submit(process_one, o): o for o in orders} + for future in as_completed(future_map): + order = future_map[future] + try: + res, detail = future.result() + if res == 'updated': + updated += 1 + success += 1 + self.stdout.write(f'✅ 更新: {order.dingdan_id} -> {detail}') + elif res == 'success': + success += 1 + else: + skip += 1 + # 跳过的订单静默处理，不打印，以免刷屏 + except Exception as e: + skip += 1 + + elapsed = time.time() - start + self.stdout.write(self.style.SUCCESS( + f'完成: 成功{success}(更新{updated}), 跳过{skip}, 耗时{elapsed:.1f}s' + )) \ No newline at end of file diff --git a/a_long_dianjing/settings.py b/a_long_dianjing/settings.py new file mode 100644 index 0000000..8ecc838 --- /dev/null +++ b/a_long_dianjing/settings.py @@ -0,0 +1,461 @@ +""" +Django settings for a_long_dianjing project. +开发环境配置 - 参照旧项目结构精简 +""" +from pathlib import Path +from datetime import timedelta +import os + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +BASE_DIR = Path(__file__).resolve().parent.parent + +# Quick-start development settings - unsuitable for production +SECRET_KEY = '' # 开发环境可暂用，生产必须改 +DEBUG = True # 开发环境为 True +ALLOWED_HOSTS = ['localhost', '127.0.0.1'] # 根据开发前端地址可添加 + +# Application definition +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + # 第三方应用 (根据 requirements.txt 已安装的) + 'rest_framework', + 'rest_framework_simplejwt', + 'corsheaders', + 'django_celery_results', + # 你的自定义应用 (按已创建的拼音命名) + 'celery', + 'yonghu', + 'dingdan', + 'shangpin', + 'peizhi', + 'houtai', + # 'games', # 【待确认】你提到 games 还没创建，暂不添加 + 'utils', + 'shangdian', + 'dengji', +] + +MIDDLEWARE = [ + 'corsheaders.middleware.CorsMiddleware', # 跨域中间件放最前 + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', # 默认开启，如API无需可注释 + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + # 'guanapi.middleware.OpLogMiddleware', # 【待确认】这是旧项目的自定义中间件，新项目需要吗？ +] + +ROOT_URLCONF = 'a_long_dianjing.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [BASE_DIR / 'templates'], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'a_long_dianjing.wsgi.application' + +# Database +# 根据你提供的信息配置 (本地开发，端口3307) +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.mysql', + 'NAME': 'a_long_dianjing', # 你创建的数据库名 + 'USER': 'root', # 你的本地MySQL用户名 + 'PASSWORD': 'root', # 你的本地MySQL密码 + 'HOST': 'localhost', + 'PORT': '3307', # 注意端口是3307 + 'OPTIONS': { + 'charset': 'utf8mb4', + 'init_command': "SET time_zone='+08:00'", # 保持与旧项目一致 + } + } +} + +# Password validation +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + +# Internationalization +LANGUAGE_CODE = 'zh-Hans' # 使用中文 +TIME_ZONE = 'Asia/Shanghai' +USE_I18N = True +USE_TZ = False # 保持与旧项目一致，不使用UTC时区 + +# Static files (CSS, JavaScript, Images) +STATIC_URL = 'static/' +# 开发环境静态文件目录，可参照旧项目添加 MEDIA 配置 +# MEDIA_URL = 'media/' +# MEDIA_ROOT = BASE_DIR / 'media' + +# Default primary key field type +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' + +# ==================== 以下为第三方库及自定义配置 ==================== +# settings.py +# 修改SIMPLE_JWT配置 +SIMPLE_JWT = { + 'ACCESS_TOKEN_LIFETIME': timedelta(days=36500), + 'REFRESH_TOKEN_LIFETIME': timedelta(days=36500), + 'ROTATE_REFRESH_TOKENS': False, + 'BLACKLIST_AFTER_ROTATION': False, + 'UPDATE_LAST_LOGIN': False, + 'ALGORITHM': 'HS256', + 'SIGNING_KEY': SECRET_KEY, + 'VERIFYING_KEY': None, + 'AUDIENCE': None, + 'ISSUER': None, + 'JWK_URL': None, + 'LEEWAY': 0, + 'AUTH_HEADER_TYPES': ('Bearer',), + 'AUTH_HEADER_NAME': 'HTTP_AUTHORIZATION', + # 修改这里：使用yonghuid而不是id + 'USER_ID_FIELD': 'yonghuid', + 'USER_ID_CLAIM': 'yonghuid', + 'USER_AUTHENTICATION_RULE': 'rest_framework_simplejwt.authentication.default_user_authentication_rule', + 'AUTH_TOKEN_CLASSES': ('rest_framework_simplejwt.tokens.AccessToken',), + 'TOKEN_TYPE_CLAIM': 'token_type', + 'TOKEN_USER_CLASS': 'rest_framework_simplejwt.models.TokenUser', + 'JTI_CLAIM': 'jti', +} + +# 添加自定义认证后端 +AUTHENTICATION_BACKENDS = [ + 'django.contrib.auth.backends.ModelBackend', +] + +# 必须指定用户模型（即使它不继承AbstractBaseUser） +AUTH_USER_MODEL = 'yonghu.UserMain' + +# DRF配置（也非常简单） +REST_FRAMEWORK = { + 'DEFAULT_AUTHENTICATION_CLASSES': ( + 'rest_framework_simplejwt.authentication.JWTAuthentication', + ), + 'DEFAULT_PERMISSION_CLASSES': ( + 'rest_framework.permissions.IsAuthenticated', + ), + 'DEFAULT_THROTTLE_CLASSES': [ + 'rest_framework.throttling.AnonRateThrottle', # 匿名用户限制 + 'rest_framework.throttling.UserRateThrottle', # 登录用户限制 + ], + 'DEFAULT_THROTTLE_RATES': { + 'anon': '100/minute', # 匿名用户每分钟100次 + 'user': '1000/minute', # 登录用户每分钟1000次 + }, +} + + + + + + + + + + + + + + + + +# CORS settings +CORS_ALLOWED_ORIGINS = [ + "http://localhost:8080", # 假设前端开发服务器地址 + "http://127.0.0.1:8080", + "http://localhost:5174", +] +CORS_ALLOW_CREDENTIALS = True +CORS_ALLOW_METHODS = ( + "GET", + "POST", + "PUT", + "PATCH", + "DELETE", + "OPTIONS", +) +CORS_ALLOW_HEADERS = [ + "accept", + "accept-encoding", + "authorization", + "content-type", + "dnt", + "origin", + "user-agent", + "x-csrftoken", + "x-requested-with", +] + +# 【待确认】自定义用户模型，你需要在 yonghu/models.py 中创建 class Yonghu +#AUTH_USER_MODEL = 'yonghu.Yonghu' + + +# ==================== 跨平台订单互通配置 ==================== +# 接口认证令牌（双方约定，用于简单验证） +CROSS_PLATFORM_TOKEN = 'jdjdjshwjqk' + +# 对方平台接口基础URL（需根据实际部署修改） +PARTNER_BASE_URL = 'https://partner.com/api' + +# 对方平台各接口路径（可根据实际情况调整，但双方需保持一致） +PARTNER_SYNC_ORDER_URL = '/dingdan/partner_sync_order' # 接收派单 +PARTNER_CHECK_CLAIM_URL = '/dingdan/partner_check_claim' # 抢单询问 +PARTNER_NOTIFY_CLAIM_URL = '/dingdan/partner_notify_claim' # 抢单成功通知 +PARTNER_REFUND_NOTIFY_URL = '/dingdan/partner_refund_notify' # 退款通知 + +# 我方代表对方发单的商家ID（需在数据库中存在，且具有商家扩展表） +AGENT_SHANGJIA_ID = '9106027' + +# 用于验证的会员ID（根据业务约定） +CROSS_PLATFORM_MEMBER_ID = 'vip_2025' + +# 默认游戏类型ID（当对方未传递时使用） +CROSS_PLATFORM_GAME_TYPE_ID = 1 + +# 允许跨平台的商家ID列表（白名单） +CROSS_PLATFORM_WHITELIST = ['5438898'] + + + + + + + + + + + + + + + + +# OSS配置 + + +COS_SECRET_ID ='' +COS_SECRET_KEY ='' +COS_BUCKET = '' +COS_APPID = '' # 你的腾讯云APPID（julebu-1361527063中的数字部分） + + +COS_REGION = 'ap-shanghai' + + +COS_SCHEME = 'https' # 使用HTTPS +COS_DOMAIN = f'https://{COS_BUCKET}.cos.{COS_REGION}.myqcloud.com' +# settings.py - 在COS配置部分添加 +#COS_APPID = '1361527063' # 你的腾讯云APPID（julebu-1361527063中的数字部分） +COS_STS_DURATION = 7200 # STS临时凭证有效期（秒） + +# ==================== 业务相关配置 (值先空着，结构可保留) ==================== + + + +# 微信虚拟支付配置 +VP_OFFER_ID = '你的offer_id' # 虚拟支付应用ID +VP_APPKEY = '你的现网AppKey' # 正式环境密钥 +VP_APPKEY_SANDBOX = '你的沙箱AppKey' # 沙箱环境密钥 +VP_ENV = 1 # 1=沙箱(测试), 0=正式(上线改这里) + + +# 微信小程序配置 (开发环境可先留空或使用测试号) + +WEIXIN_APPID = '' # 你的小程序APPID +WEIXIN_SECRET = '' + + + + +WEIXIN_MCHID = '' # 商户号，支付功能需要 + + +WEIXIN_SHANGHUMIYAO = ''# 商户密钥，支付功能需要 +# 🆕【新增】服务号配置 +WEIXIN_OFFICIAL_APPID = '' # 服务号APPID +WEIXIN_OFFICIAL_SECRET = '填写你的服务号APPSECRET' # 服务号SECRET +WEIXIN_OFFICIAL_TOKEN = '填写你的Token' # 服务号Token +WEIXIN_OFFICIAL_ENCODING_AES_KEY = '填写你的EncodingAESKey' # 可选 +WEIXIN_TEMPLATE_ID = '' # 模板ID + + +# 罚款缴纳微信支付配置 +FAKUAN_PAY_DESCRIPTION = '罚款缴纳' # 支付描述 +FAKUAN_PAY_NOTIFY_URL = 'https://www.abas.asia/hqhd/yonghu/fk_huitiao' # 微信支付回调地址（根据实际域名调整） + +# 🆕【新增】模板消息配置 +WEIXIN_TEMPLATE_MAX_PER_MINUTE = 950 # 每分钟最大发送量（留50缓冲） +WEIXIN_TEMPLATE_BATCH_SIZE = 100 # 每批发送数量 + +WEIXIN_NOTIFY_URL = 'http:api' # 支付回调地址，如：http://你的域名/api/pay/callback/ +# settings.py 或相应配置文件中 +WEIXIN_PAY_DESCRIPTION = "网络服务" # 支付描述 +# 押金充值相关配置 +YAJIN_PAY_DESCRIPTION = "打手押金充值" # 押金支付描述 +YAJIN_PAY_NOTIFY_URL = "http://你的域名/api/shangpin/yajinhuitiao/" # 押金支付回调地址 + +# 积分充值相关配置 +JIFEN_PAY_DESCRIPTION = "打手积分补充" # 积分支付描述 +JIFEN_PAY_NOTIFY_URL = "http://你的域名/api/shangpin/jifenhuitiao/" # 积分支付回调地址 + +# 会员充值相关配置 +HUIYUAN_PAY_DESCRIPTION = "打手会员充值" # 会员支付描述 +HUIYUAN_PAY_NOTIFY_URL = "http://你的域名/api/shangpin/huiyuanhuitiao/" # 会员支付回调地址 + + +# 考核支付配置 +KAOHE_PAY_DESCRIPTION = '考核金牌-缴纳考核费' +KAOHE_PAY_NOTIFY_URL = 'https://您的域名/hqhd/yonghu/kh_huitiao' # 替换为实际回调地址 +KAOHE_PAY_DEFAULT_FEE = 5.00 # 未配置费用时的默认金额 + + +# settings.py +SHANGJIA_CZ_PREFIX = "CzSJ" # 商家充值订单前缀 +SHANGJIA_CZ_PAY_DESCRIPTION = "阿龙电竞-商家余额充值" +SHANGJIA_CZ_PAY_NOTIFY_URL = "https://yourdomain.com/shangpin/sjhuitiao" +SHANGJIA_CZ_MIN_AMOUNT = 1 +SHANGJIA_CZ_MAX_AMOUNT = 10000 + +# 订单ID前缀配置 +ORDER_PREFIX = { + 'yajin': 'CzYJ', # 押金订单前缀 + 'jifen': 'CzJF', # 积分订单前缀 + 'huiyuan': 'CzHY', # 会员订单前缀 +} + + + + + +# 腾讯云即时通讯 (IM) - 开发环境可暂不配置 +TENCENT_IM_CONFIG = { + 'SDK_APP_ID': 0, # 整数 + 'SECRET_KEY': '', +} + +# 阿里云短信 - 开发环境可暂不配置 +ALIYUN_SMS_CONFIG = { + 'ACCESS_KEY_ID': '', + 'ACCESS_KEY_SECRET': '', + 'SIGN_NAME': '', + 'TEMPLATE_CODE': '', + 'REGION_ID': 'cn-hangzhou', +} + +# HashID (用于加密ID，旧项目有，新项目需要吗？) +# HASHID_FIELD_SALT = 'a_long_dianjing_2025_salt' # 【待确认】请设置你的盐值 + + + # settings.py 尾部添加 +# settings.py +# settings.py +# settings.py 中添加配置 +GOEASY_APPKEY = '' # 你的AppKey +GOEASY_SECRET = '' # 从GoEasy控制台获取 +GOEASY_REST_URL = 'https://rest-hz.goeasy.io/v2/im/message' # 正式环境 + + + + + + +# settings.py +# H5静态页面域名配置 +H5_DOMAIN = 'https://h5.yourdomain.com' # 生产环境 +# H5_DOMAIN = 'https://test-h5.yourdomain.com' # 测试环境 + + + + +# 特殊管事ID列表（yonghuid），这些管事的首次分红金额从 UserGuanshi.fenhong_yici 字段获取 +SPECIAL_GUANSHI_IDS = [ + '1000001', + '1000002', + # ... 按需添加 +] + +# ========== 管理员批量链接白名单 ========== +ADMIN_BATCH_LINK_ALLOWED_PHONES = [ + '13800138000', + '13912345678', +] + +BATCH_LINK_DEFAULT_COUNT = 100 +BATCH_LINK_MAX_COUNT = 200 + + + + + +# settings.py + +# settings.py +WECHAT_PAY_V3_CONFIG = { + 'MCHID': '', # 商户号 + 'APPID': '', # 小程序APPID + 'API_V3_KEY': '', # APIv3密钥（32字节） + 'PRIVATE_KEY_PATH': '/opt/1panel/apps/openresty/openresty/www/sites/119.28.221.247.1199/huizhifuzhengshu/apiclient_key.pem', # 商户私钥文件路径 + 'CERT_SERIAL_NO': '', # 商户证书序列号 + 'PLATFORM_CERT_DIR': '/opt/1panel/apps/openresty/openresty/www/sites/119.28.221.247.1199/huizhifuzhengshu/pub_key.pem', # 存放微信平台证书公钥的目录（文件名：序列号.pem） + 'NOTIFY_URL': 'https://ios808.top/hqhd/yonghu/tixiancallback', # 回调地址 + 'TRANSFER_SCENE_ID': '', # 替换为你的实际场景ID +} + + + + +CROSS_PLATFORM_SYNC_TOKEN = 'xK9mP2vL8qW5rT7y' + +# 提现收款链路日志（输出到 stderr，gunicorn/1panel 可抓取） +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'handlers': { + 'tixian_shenhe_console': { + 'class': 'logging.StreamHandler', + 'formatter': 'verbose', + }, + }, + 'formatters': { + 'verbose': { + 'format': '[{asctime}] {levelname} {name} {message}', + 'style': '{', + }, + }, + 'loggers': { + 'yonghu.tixian_shenhe': { + 'handlers': ['tixian_shenhe_console'], + 'level': 'INFO', + 'propagate': False, + }, + }, +} \ No newline at end of file diff --git a/a_long_dianjing/urls.py b/a_long_dianjing/urls.py new file mode 100644 index 0000000..3b65b21 --- /dev/null +++ b/a_long_dianjing/urls.py @@ -0,0 +1,60 @@ +""" +URL configuration for a_long_dianjing project. + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/6.0/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +'''from django.contrib import admin +from django.urls import path + +urlpatterns = [ + path('admin/', admin.site.urls), +]''' + +# a_long_dianjing/urls.py +""" +项目根路由配置 - 按照生产环境格式，连接所有APP路由 +注意：本项目使用MinIO模拟OSS，文件上传不经过Django MEDIA_URL，所以不需要static(settings.MEDIA_URL)配置 +""" + +from django.contrib import admin +from django.urls import path, include + +urlpatterns = [ + # Django管理后台 + path('admin/', admin.site.urls), + + # 用户相关路由 + path('yonghu/', include('yonghu.urls')), + + # 订单相关路由 + path('dingdan/', include('dingdan.urls')), + + # 商品/陪玩服务相关路由 + path('shangpin/', include('shangpin.urls')), + + + # 配置相关路由（系统配置） + path('peizhi/', include('peizhi.urls')), + + path('houtai/', include('houtai.urls')), + path('shangdian/', include('shangdian.urls')), + path('dengji/', include('dengji.urls')), + +] + +# 重要说明： +# 1. 本项目使用MinIO（模拟OSS）作为对象存储，文件上传通过MinIO的S3接口直接处理 +# 2. 文件存储不经过Django的MEDIA_URL，所以不需要配置 static(settings.MEDIA_URL, ...) +# 3. 未来迁移到腾讯云COS/阿里云OSS时，也通过django-storages直接处理，不经过Django静态文件服务 +# 4. 所有文件访问将通过MinIO/COS的CDN域名直接访问，不需要Django路由转发 diff --git a/a_long_dianjing/wsgi.py b/a_long_dianjing/wsgi.py new file mode 100644 index 0000000..8d00672 --- /dev/null +++ b/a_long_dianjing/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for a_long_dianjing project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/6.0/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'a_long_dianjing.settings') + +application = get_wsgi_application() diff --git a/app.js b/app.js new file mode 100644 index 0000000..cba1fee --- /dev/null +++ b/app.js @@ -0,0 +1,325 @@ +// app.js - 优化生产版本（修复重连机制和用户ID问题） +import GoEasy from './static/lib/goeasy-2.13.24.esm.min'; +const ChatCore = require('./utils/chat-core'); +import { check } from './utils/phone-auth'; + + +// ===== 角色 → 默认首页（与 custom-tab-bar 完全一致） ===== +const roleDefaultPage = { + normal: '/pages/index/index', + dashou: '/pages/dashouduan/dashouduan', + shangjia: '/pages/shangjiaduan/shangjiaduan', // 商家首页也是商城 + guanshi: '/pages/guanshiduan/guanshiduan', + zuzhang: '/pages/zuzhangduan/zuzhangduan', + kaoheguan: '/pages/kaoheguan/kaoheguan' +}; + +App({ + globalData: { + + hasShownPopupOnColdStart: false, + + apiBaseUrl: 'https://6ccy.top/hqhd', + ossImageUrl: '', + morentouxiang: '', + dashouguize: '', + + shangpinliebiao: [], + shangpinzhuanqu: [], + shangpinleixing: [], + shangpinlunbo: [], + shangpingonggao: '', + lunbozhanwei: '/images/lunbozhanwei.jpg', + + dingdanTiaoshu: { + daifuwu: 0, + fuwuzhong: 0, + yiwancheng: 0, + yituikuan: 0 + }, + + dashouqun: '', + dashouqunid: '', + guanshiqun: '', + guanshiqunid: '', + + appId:'wx2517043ca3f39677', + + shangjiastatus: 0, + dashoustatus: 0, + guanshistatus: 0, + dashouNicheng: '', + zhanghaoStatus: null, + dashouzhuangtai: null, + yongjin: null, + zonge: null, + yajin: null, + chenghao: '', + jinfen: null, + clumber: [{ + huiyuanid: '', + huiyuanming: '', + daoqi: '' + }], + chengjiaoliang: null, + zaixianZhuangtai: null, + + guanshi: { + nicheng: '', + uid: '', + touxiang: '', + gszhstatus: '', + yaoqingzongshu: 0, + fenyongzonge: '0.00', + fenyongtixian: '0.00' + }, + + shangjia: { + sjzhzhuangtai: '', + sjyue: '', + fadanzong: null, + tuikuanzong: null, + riliushui: '', + yueliushui: '' + }, + + liaotian_liebiao: [], + xshenfen: 1, + + goEasyConfig: null, + kefuConfig: { + link: '', + enterpriseId: '' + }, + + cosConfig: { + bucket: '', + region: 'ap-shanghai', + uploadPathPrefix: 'order/' + }, + + goEasyConnection: { + status: 'disconnected', + userId: '', + identityType: '', + lastConnectTime: 0, + autoReconnect: true, + reconnectAttempts: 0, + maxReconnectAttempts: 5, + heartbeatInterval: null, + cacheKeys: { + savedConnection: 'savedGoEasyConnection', + userId: 'goEasyUserId', + identityType: 'currentGoEasyIdentity', + connectTime: 'goEasyConnectTime' + }, + config: { + heartbeatInterval: 20000, + reconnectDelay: 3000, + offlineTimeout: 30000, + cacheValidityHours: 12 + } + }, + + messageManager: { + unreadTotal: 0, + unreadMap: {}, + latestMessages: [], + notificationQueue: [], + notificationVisible: false, + lastNotificationTime: 0, + notificationCooldown: 3000, + tabBarIndex: 2, + showTabBarBadge: true, + customTabBar: true, + tabBarBadgeText: 0, + soundEnabled: true, + vibrationEnabled: true, + doNotDisturb: false, + doNotDisturbStart: '22:00', + doNotDisturbEnd: '08:00', + notificationStyle: { + position: 'top', + duration: 3000, + backgroundColor: '#00f7ff', + textColor: '#ffffff', + borderRadius: '16rpx', + boxShadow: '0 10rpx 30rpx rgba(0, 247, 255, 0.3)' + }, + currentNotification: null, + cacheKeys: { + messageSettings: 'messageSettings', + unreadTotal: 'messageUnreadTotal', + latestMessages: 'latestMessages', + notificationMuted: 'notificationMuted' + } + }, + + pageState: { + currentPage: '', + isInChatPage: false, + currentChatId: '', + lastPageUpdate: 0 + }, + + eventListeners: {}, + debugMode: false, + currentUser: null, + currentRole: 'normal' // 当前角色，默认老板 + }, + + // ========== 仅修改 onLaunch，其余未动 ========== + async onLaunch() { + // ---------- ① 立即隐藏“返回首页”按钮 ---------- + wx.hideHomeButton(); + wx.onAppRoute(() => { + wx.hideHomeButton(); + }); + // 🆕 手机号认证检查 + + + // ---------- ② 恢复角色并跳转（不依赖网络） ---------- + const savedRole = wx.getStorageSync('currentRole') || 'normal'; + this.globalData.currentRole = savedRole; + + const targetPage = roleDefaultPage[savedRole] || '/pages/index/index'; + if (savedRole !== 'normal' || targetPage !== '/pages/index/index') { + setTimeout(() => { + wx.reLaunch({ url: targetPage }); + }, 0); + } + + // ---------- ③ 后台静默获取配置，成功后再初始化 GoEasy/IM ---------- + this.fetchDynamicConfig() + .then(config => { + this.applyDynamicConfig(config); + this.initGoEasyWithConfig(); + ChatCore.initGlobalMessageSystem(this); + this.initCurrentUser(); + + const saved = this.getSavedConnection(); + console.log('【app.js启动】缓存身份:', saved ? saved.identityType : '无', + 'userId:', saved ? saved.userId : '无'); + setTimeout(() => { + this.ensureConnection(); + }, 300); + }) + .catch(error => { + console.error('获取动态配置失败:', error); + + // 兜底初始化，防止后续调用报错 + this.initGoEasyWithConfig(); + ChatCore.initGlobalMessageSystem(this); + this.initCurrentUser(); + }); + + + // ---------- ④ 所有初始化完成后，最后进行手机号认证检查 ---------- + try { + const needAuth = await check(); // 你已经顶部 import 了 + if (needAuth) { + wx.reLaunch({ url: '/pages/phone-auth/phone-auth' }); + return; + } + } catch (e) {} + + }, + + + + + // 以下三个方法完全保持原样 + fetchDynamicConfig() { + return new Promise((resolve, reject) => { + wx.request({ + url: this.globalData.apiBaseUrl + '/peizhi/qdpzhq', + method: 'POST', + header: { 'content-type': 'application/json' }, + success: (res) => { + if (res.statusCode === 200 && res.data && res.data.code === 0) { + resolve(res.data.data); + } else { + reject(new Error(res.data?.msg || '接口返回错误')); + } + }, + fail: reject + }); + }); + }, + + applyDynamicConfig(config) { + if (config.cos) { + this.globalData.ossImageUrl = config.cos.ossImageUrl || ''; + this.globalData.cosConfig = { + bucket: config.cos.bucket || '', + region: config.cos.region || 'ap-shanghai', + uploadPathPrefix: config.cos.uploadPathPrefix || 'order/' + }; + } + if (config.goEasy) { + this.globalData.goEasyConfig = { + host: config.goEasy.host || 'hangzhou.goeasy.io', + appkey: config.goEasy.appkey || '' + }; + } + if (config.otherConfig) { + this.globalData.morentouxiang = config.otherConfig.morentouxiang || ''; + this.globalData.dashouguize = config.otherConfig.dashouguize || ''; + } + if (config.kefu) { + this.globalData.kefuConfig = { + link: config.kefu.link || '', + enterpriseId: config.kefu.enterpriseId || '' + }; + } + }, + + initGoEasyWithConfig() { + const cfg = this.globalData.goEasyConfig; + if (!cfg || !cfg.appkey) { + console.error('GoEasy appkey 未配置，无法初始化'); + return; + } + wx.goEasy = GoEasy.getInstance({ + host: cfg.host || 'hangzhou.goeasy.io', + appkey: cfg.appkey, + modules: ['im', 'pubsub'] + }); + wx.GoEasy = GoEasy; + }, + + initCurrentUser() { + const uid = wx.getStorageSync('uid'); + if (uid) { + this.globalData.currentUser = { + id: uid, + name: '用户' + uid.substring(0, 6), + avatar: this.globalData.ossImageUrl + this.globalData.morentouxiang + }; + } + }, + + emitEvent(eventName, data) { + if (this.globalData.eventListeners[eventName]) { + this.globalData.eventListeners[eventName].forEach(callback => { + try { callback(data); } catch (error) { console.error(error); } + }); + } + }, + + on(eventName, callback) { + if (!this.globalData.eventListeners[eventName]) { + this.globalData.eventListeners[eventName] = []; + } + this.globalData.eventListeners[eventName].push(callback); + }, + + off(eventName, callback) { + if (this.globalData.eventListeners[eventName]) { + const index = this.globalData.eventListeners[eventName].indexOf(callback); + if (index > -1) { + this.globalData.eventListeners[eventName].splice(index, 1); + } + } + } +}); \ No newline at end of file diff --git a/app.json b/app.json new file mode 100644 index 0000000..927550b --- /dev/null +++ b/app.json @@ -0,0 +1,107 @@ +{ + "pages": [ + "pages/index/index", + "pages/fenlei/fenlei", + "pages/xuanren/xuanren", + "pages/xiaoxi/xiaoxi", + "pages/wode/wode", + "pages/shangpinxiangqing/shangpinxiangqing", + "pages/tijiao/tijiao", + "pages/xiugai/xiugai", + "pages/dashouduan/dashouduan", + "pages/shangjiaduan/shangjiaduan", + "pages/guanshiduan/guanshiduan", + "pages/dingdan/dingdan", + "pages/dingdanxiangqing/dingdanxiangqing", + "pages/dashouguize/dashouguize", + "pages/dashouxiugai/dashouxiugai", + "pages/dashoupaihang/dashoupaihang", + "pages/dashouchongzhi/dashouchongzhi", + "pages/dashouxiaoxi/dashouxiaoxi", + "pages/dashoudingdan/dashoudingdan", + "pages/jiedan/jiedan", + "pages/tixian/tixian", + "pages/yaoqingdashou/yaoqingdashou", + "pages/wodedashou/wodedashou", + "pages/czjilu/czjilu", + "pages/guanshipaihang/guanshipaihang", + "pages/sjpaidan/sjpaidan", + "pages/sjdingdan/sjdingdan", + "pages/sjxiaoxi/sjxiaoxi", + "pages/sjpaihang/sjpaihang", + "pages/sjchongzhi/sjchongzhi", + "pages/sjddxq/sjddxq", + "pages/dsddxq/dsddxq", + "pages/liaotian/liaotian", + "pages/jisufd/jisufd", + "pages/jiedanchi/jiedanchi", + "pages/haibao/haibao", + "pages/jinpaids/jinpaids", + "pages/zuzhangduan/zuzhangduan", + "pages/guanzhual/guanzhual", + "pages/zzfhjilu/zzfhjilu", + "pages/yqguanshi/yqguanshi", + "components/global-notification/global-notification", + "components/popup-notice/popup-notice", + "pages/tixian/components/mode1/mode1", + "pages/tixian/components/mode2/mode2", + + "pages/jiedanchi2/jiedanchi2", + "pages/qunliaotian/qunliaotian", + "pages/kefuliaotian/kefuliaotian", + "pages/renzheng/renzheng", + + "components/order-card/order-card", + "components/order-sender/order-sender", + "pages/cfss/cfss/cfss", + "pages/cfss/components/fakuan-list/fakuan-list", + "pages/cfss/components/jifen-list/jifen-list", + "pages/cfss/components/fakuan-pay/fakuan-pay", + "pages/phone-auth/phone-auth", + "components/chenghao-tag/chenghao-tag", + "pages/kaoheguan/kaoheguan", + "pages/kaohe_dafen/kaohe_dafen", + "pages/kaohe_jilu/kaohe_jilu", + "pages/kaohe_zhongxin/kaohe_zhongxin", + "pages/kaohe_jinpai/kaohe_jinpai" + + ], + + "usingComponents": { + "popup-notice": "/components/popup-notice/popup-notice", + "custom-tab-bar": "/custom-tab-bar/index" + }, + + "window": { + "navigationBarTextStyle": "black", + "navigationStyle": "default", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#fff", + "navigationBarTitleText": "二H电竞" + }, + "tabBar": { + "custom": true, + "list": [ + + + { + "pagePath": "pages/jiedanchi/jiedanchi", + "text": "接单池", + "iconPath": "/images/jiedanchi.png", + "selectedIconPath": "/images/jiedanchi.png" + }, + { + "pagePath": "pages/jiedanchi2/jiedanchi2", + "text": "接单池", + "iconPath": "/images/jiedanchi.png", + "selectedIconPath": "/images/jiedanchi.png" + } + + ] + }, + + + "style": "v2", + "sitemapLocation": "sitemap.json", + "lazyCodeLoading": "requiredComponents" +} \ No newline at end of file diff --git a/app.wxss b/app.wxss new file mode 100644 index 0000000..06c6fc9 --- /dev/null +++ b/app.wxss @@ -0,0 +1,10 @@ +/**app.wxss**/ +.container { + height: 100%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: space-between; + padding: 200rpx 0; + box-sizing: border-box; +} diff --git a/components/chenghao-tag/chenghao-tag.js b/components/chenghao-tag/chenghao-tag.js new file mode 100644 index 0000000..ae79133 --- /dev/null +++ b/components/chenghao-tag/chenghao-tag.js @@ -0,0 +1,73 @@ +// components/chenghao-tag/chenghao-tag.js +const app = getApp(); + +Component({ + properties: { + mingcheng: { type: String, value: '' }, + texiaoJson: { type: Object, value: {} } + }, + data: { + // 默认值：宽152，高52，六边形，无背景图，无动画，白色字 + width: 152, + height: 52, + shapeClass: 'liubianxing', // 保证至少不是矩形 + animationClass: '', + bgStyle: '', + textColor: '#FFFFFF', + textSize: 22, + imageUrl: '' + }, + lifetimes: { + attached() { + const cfg = this.properties.texiaoJson || {}; + + // 1. 尺寸（稍大一些，一行能放3~4个） + const width = cfg.width || 152; + const height = cfg.height || 52; + + // 2. 背景处理：优先背景图，否则用渐变/纯色 + let bgStyle = ''; + let imageUrl = ''; + if (cfg.image_url) { + const ossImageUrl = app.globalData.ossImageUrl || ''; + imageUrl = cfg.image_url.startsWith('http') + ? cfg.image_url + : ossImageUrl + cfg.image_url; + } else if (cfg.bg_gradient) { + bgStyle = `background: ${cfg.bg_gradient};`; + } else if (cfg.bg_color) { + bgStyle = `background: ${cfg.bg_color};`; + } else { + // 默认金橙渐变 + bgStyle = `background: linear-gradient(135deg, #FFD700, #FF8C00);`; + } + + // 3. 形状（后端传入 shape 字段，默认 liubianxing） + const shapeClass = cfg.shape || 'liubianxing'; + + // 4. 动画 + const animationClass = cfg.animation || ''; + + // 5. 文字 + const textColor = cfg.text_color || '#FFFFFF'; + const textSize = cfg.text_size || 22; + + this.setData({ + width, height, + bgStyle, imageUrl, + shapeClass, animationClass, + textColor, textSize + }); + } + }, + methods: { + // 背景图加载失败时回退为纯色背景 + onImageError() { + this.setData({ imageUrl: '' }); + // 如果 bgStyle 为空，给个默认背景 + if (!this.data.bgStyle) { + this.setData({ bgStyle: 'background: linear-gradient(135deg, #FFD700, #FF8C00);' }); + } + } + } +}); \ No newline at end of file diff --git a/components/chenghao-tag/chenghao-tag.json b/components/chenghao-tag/chenghao-tag.json new file mode 100644 index 0000000..62389a9 --- /dev/null +++ b/components/chenghao-tag/chenghao-tag.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} + } \ No newline at end of file diff --git a/components/chenghao-tag/chenghao-tag.wxml b/components/chenghao-tag/chenghao-tag.wxml new file mode 100644 index 0000000..e9c44f3 --- /dev/null +++ b/components/chenghao-tag/chenghao-tag.wxml @@ -0,0 +1,20 @@ + + + +

+ + + {{mingcheng}} + \ No newline at end of file diff --git a/components/chenghao-tag/chenghao-tag.wxss b/components/chenghao-tag/chenghao-tag.wxss new file mode 100644 index 0000000..d142188 --- /dev/null +++ b/components/chenghao-tag/chenghao-tag.wxss @@ -0,0 +1,90 @@ +/* components/chenghao-tag/chenghao-tag.wxss */ + +/* ========== 根容器 ========== */ +.tag-root { + display: inline-flex; + align-items: center; + justify-content: center; + position: relative; + border-radius: 4rpx; + overflow: hidden; + flex-shrink: 0; + margin: 4rpx; + box-sizing: border-box; + } + + /* ========== 背景图 ========== */ + .tag-bg-image { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 0; + border-radius: inherit; + } + + /* ========== 文字层 ========== */ + .tag-text { + position: relative; + z-index: 2; + font-weight: bold; + white-space: nowrap; + text-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.5); + padding: 0 10rpx; + } + + /* ========== 多边形形状 ========== */ + .tag-root.liubianxing { + clip-path: polygon(12% 0%, 88% 0%, 100% 50%, 88% 100%, 12% 100%, 0% 50%); + } + .tag-root.lingxing { + clip-path: polygon(50% 0%, 85% 12%, 100% 50%, 85% 88%, 50% 100%, 15% 88%, 0% 50%, 15% 12%); + } + .tag-root.wujiaoxing { + clip-path: polygon(50% 0%, 61% 35%, 98% 35%, 68% 57%, 79% 91%, 50% 70%, 21% 91%, 32% 57%, 2% 35%, 39% 35%); + } + .tag-root.dunpai { + clip-path: polygon(18% 0%, 82% 0%, 100% 18%, 95% 50%, 100% 82%, 82% 100%, 18% 100%, 0% 82%, 5% 50%, 0% 18%); + } + .tag-root.jiantou { + clip-path: polygon(0% 0%, 85% 0%, 100% 50%, 85% 100%, 0% 100%, 12% 50%); + } + + /* ========== 动画 ========== */ + /* 流光扫描 */ + .tag-root.shine::after { + content: ''; + position: absolute; + top: 0; + left: -100%; + width: 60%; + height: 100%; + background: linear-gradient(90deg, transparent, rgba(255,255,255,0.5), transparent); + transform: skewX(-20deg); + animation: shine-anim 2s infinite; + z-index: 1; + pointer-events: none; + } + @keyframes shine-anim { + 0% { left: -100%; } + 100% { left: 200%; } + } + + /* 呼吸光晕 */ + .tag-root.pulse { + animation: pulse-anim 1.5s ease-in-out infinite; + } + @keyframes pulse-anim { + 0%, 100% { filter: brightness(1); transform: scale(1); } + 50% { filter: brightness(1.2); transform: scale(1.04); } + } + + /* 外发光闪烁 */ + .tag-root.glow { + animation: glow-anim 2s ease-in-out infinite; + } + @keyframes glow-anim { + 0%, 100% { box-shadow: 0 0 8rpx rgba(255, 215, 0, 0.4); } + 50% { box-shadow: 0 0 20rpx rgba(255, 215, 0, 0.8), 0 0 40rpx rgba(255, 215, 0, 0.4); } + } \ No newline at end of file diff --git a/components/global-notification/global-notification.js b/components/global-notification/global-notification.js new file mode 100644 index 0000000..bd88ab6 --- /dev/null +++ b/components/global-notification/global-notification.js @@ -0,0 +1,366 @@ +Component({ + properties: { + position: { + type: String, + value: 'top' + }, + duration: { + type: Number, + value: 3000 + }, + showProgress: { + type: Boolean, + value: true + }, + showMuteButton: { + type: Boolean, + value: true + }, + showTime: { + type: Boolean, + value: true + }, + swipeToClose: { + type: Boolean, + value: true + }, + swipeThreshold: { + type: Number, + value: 50 + } + }, + + data: { + show: false, + title: '', + message: '', + avatar: '', + notificationData: null, + progress: 100, + progressInterval: null, + positionClass: 'top', + + // 滑动相关 + touchStartY: 0, + touchStartX: 0, + currentY: 0, + currentX: 0, + isSwiping: false, + swipingClass: '', + swipeStyle: '', + swipeDistance: 0, + + // 静音状态 + isMuted: false, + + // 自动隐藏计时器 + autoHideTimeout: null + }, + + lifetimes: { + attached() { + this.loadMuteSetting(); + this.setData({ + positionClass: this.properties.position + }); + this.setupDirectEventListeners(); + }, + + detached() { + this.clearTimers(); + } + }, + + methods: { + setupDirectEventListeners() { + const app = getApp(); + if (app) { + const self = this; + const globalNotification = { + show: (data) => { + if (self && self.showNotification) { + self.showNotification(data); + } + }, + hide: () => { + if (self && self.hideNotification) { + self.hideNotification(); + } + }, + isMuted: () => { + return self.data.isMuted; + } + }; + app.globalData.globalNotification = globalNotification; + } + }, + + loadMuteSetting() { + try { + const isMuted = wx.getStorageSync('notificationMuted') || false; + this.setData({ isMuted }); + } catch (error) { + console.warn('加载静音设置失败:', error); + } + }, + + saveMuteSetting(isMuted) { + try { + wx.setStorageSync('notificationMuted', isMuted); + } catch (error) { + console.warn('保存静音设置失败:', error); + } + }, + + showNotification(data) { + if (!data) return; + if (this.data.isMuted) return; + + this.clearTimers(); + + const app = getApp(); + let avatar = data.avatar; + if (!avatar && app && app.globalData) { + avatar = app.globalData.ossImageUrl + app.globalData.morentouxiang; + } + + this.setData({ + show: true, + title: data.senderName || '新消息', + message: data.content || '[消息内容]', + avatar: avatar, + notificationData: data, + progress: 100, + swipingClass: '', + swipeStyle: '' + }); + + if (this.properties.showProgress) { + this.startProgressBar(this.properties.duration); + } + + this.data.autoHideTimeout = setTimeout(() => { + this.hideNotification(); + }, this.properties.duration); + }, + + hideNotification() { + this.clearTimers(); + this.setData({ + show: false, + progress: 100, + swipingClass: '', + swipeStyle: '' + }); + this.triggerEvent('hide'); + }, + + startProgressBar(duration) { + const interval = 100; + const steps = duration / interval; + const stepValue = 100 / steps; + + let currentProgress = 100; + this.data.progressInterval = setInterval(() => { + currentProgress -= stepValue; + if (currentProgress <= 0) { + currentProgress = 0; + this.setData({ progress: currentProgress }); + clearInterval(this.data.progressInterval); + } else { + this.setData({ progress: currentProgress }); + } + }, interval); + }, + + clearTimers() { + if (this.data.autoHideTimeout) { + clearTimeout(this.data.autoHideTimeout); + this.data.autoHideTimeout = null; + } + if (this.data.progressInterval) { + clearInterval(this.data.progressInterval); + this.data.progressInterval = null; + } + }, + + onTouchStart(e) { + if (!this.properties.swipeToClose) return; + const touch = e.touches[0]; + this.setData({ + touchStartY: touch.clientY, + touchStartX: touch.clientX, + currentY: touch.clientY, + currentX: touch.clientX, + isSwiping: false + }); + this.clearTimers(); + }, + + onTouchMove(e) { + if (!this.properties.swipeToClose) return; + const touch = e.touches[0]; + const deltaY = touch.clientY - this.data.touchStartY; + const deltaX = touch.clientX - this.data.touchStartX; + const absDeltaY = Math.abs(deltaY); + const absDeltaX = Math.abs(deltaX); + + if (absDeltaY > 10 && absDeltaY > absDeltaX) { + this.setData({ + isSwiping: true, + currentY: touch.clientY, + swipingClass: deltaY < 0 ? 'swiping-up' : 'swiping', + swipeDistance: Math.abs(deltaY), + swipeStyle: `--swipe-distance: ${Math.abs(deltaY)}rpx;` + }); + e.stopPropagation(); + } + }, + + onTouchEnd(e) { + if (!this.properties.swipeToClose || !this.data.isSwiping) { + this.restartAutoHide(); + return; + } + const deltaY = this.data.currentY - this.data.touchStartY; + const absDeltaY = Math.abs(deltaY); + if (absDeltaY > this.properties.swipeThreshold) { + this.hideNotification(); + } else { + this.setData({ + swipingClass: '', + swipeStyle: 'transition: transform 0.3s ease; transform: translateY(0);' + }); + setTimeout(() => { + this.setData({ + swipingClass: '', + swipeStyle: '' + }); + }, 300); + this.restartAutoHide(); + } + this.setData({ isSwiping: false }); + }, + + restartAutoHide() { + const remainingTime = (this.data.progress / 100) * this.properties.duration; + if (remainingTime > 0) { + this.data.autoHideTimeout = setTimeout(() => { + this.hideNotification(); + }, remainingTime); + } + }, + + onTap() { + const { notificationData } = this.data; + if (!notificationData) return; + this.triggerEvent('tap', notificationData); + this.hideNotification(); + this.navigateToChatPage(notificationData); + }, + + onClose(e) { + e.stopPropagation(); + this.triggerEvent('close'); + this.hideNotification(); + }, + + onMute(e) { + e.stopPropagation(); + const newMutedState = !this.data.isMuted; + this.setData({ isMuted: newMutedState }); + this.saveMuteSetting(newMutedState); + + const app = getApp(); + if (app && app.toggleDoNotDisturb) { + app.toggleDoNotDisturb(newMutedState); + } + this.triggerEvent('mute', { muted: newMutedState }); + wx.showToast({ + title: newMutedState ? '已开启免打扰' : '已关闭免打扰', + icon: 'success', + duration: 1500 + }); + + if (newMutedState) { + this.hideNotification(); + } + }, + + formatTime(timestamp) { + if (!timestamp) return ''; + const date = new Date(timestamp); + const now = new Date(); + const diff = now - date; + if (diff < 60 * 1000) return '刚刚'; + if (diff < 60 * 60 * 1000) return Math.floor(diff / (60 * 1000)) + '分钟前'; + if (date.toDateString() === now.toDateString()) { + return date.getHours().toString().padStart(2, '0') + ':' + date.getMinutes().toString().padStart(2, '0'); + } + const yesterday = new Date(now); + yesterday.setDate(yesterday.getDate() - 1); + if (date.toDateString() === yesterday.toDateString()) { + return '昨天 ' + date.getHours().toString().padStart(2, '0') + ':' + date.getMinutes().toString().padStart(2, '0'); + } + return (date.getMonth() + 1) + '月' + date.getDate() + '日'; + }, + + navigateToChatPage(data) { + if (!data || !data.message) { + console.warn('通知数据无效，无法跳转'); + return; + } + + const msg = data.message; + let path = ''; + let queryParam = null; + + // 根据 notificationType 或消息字段判断 + if (data.notificationType === 'cs' || msg.teamId) { + // 客服消息 + const teamId = data.teamId || msg.teamId; + path = '/pages/kefuliaotian/kefuliaotian'; + queryParam = { teamId: teamId }; + } else if (data.notificationType === 'group' || msg.groupId) { + // 群聊消息 + const groupId = data.groupId || msg.groupId; + const orderId = data.orderId || msg.orderId || ''; + const groupName = data.groupName || '订单群聊'; + const groupAvatar = data.groupAvatar || ''; + const isCross = data.isCross || msg.isCross || 0; + path = '/pages/qunliaotian/qunliaotian'; + queryParam = { + groupId, + orderId, + groupName, + groupAvatar, + isCross + }; + } else { + // 默认私聊 + const toUserId = data.senderId || msg.senderId; + const toName = data.senderName || '用户'; + const toAvatar = data.avatar || ''; + path = '/pages/liaotian/liaotian'; + queryParam = { + toUserId, + toName, + toAvatar + }; + } + + if (path && queryParam) { + const encoded = encodeURIComponent(JSON.stringify(queryParam)); + wx.navigateTo({ + url: `${path}?data=${encoded}`, + fail: (err) => { + console.error('通知跳转失败:', err); + wx.switchTab({ url: '/pages/xiaoxi/xiaoxi' }); + } + }); + } else { + wx.switchTab({ url: '/pages/xiaoxi/xiaoxi' }); + } + } + } + }); \ No newline at end of file diff --git a/components/global-notification/global-notification.json b/components/global-notification/global-notification.json new file mode 100644 index 0000000..7e37c03 --- /dev/null +++ b/components/global-notification/global-notification.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/global-notification/global-notification.wxml b/components/global-notification/global-notification.wxml new file mode 100644 index 0000000..d76b58c --- /dev/null +++ b/components/global-notification/global-notification.wxml @@ -0,0 +1,49 @@ + + + + + + + + + + +

+ + + + {{title}} + {{message}} + + {{formatTime(notificationData ? notificationData.timestamp : '')}} + + + + + + + + × + + + + + + {{isMuted ? '🔕' : '🔔'}} + + + + + + + + + + \ No newline at end of file diff --git a/components/global-notification/global-notification.wxss b/components/global-notification/global-notification.wxss new file mode 100644 index 0000000..fc67be6 --- /dev/null +++ b/components/global-notification/global-notification.wxss @@ -0,0 +1,215 @@ +.global-notification { + position: fixed; + left: 20rpx; + right: 20rpx; + top: 0rpx; + z-index: 99999; + opacity: 0; + transform: translateY(-120%); + transition: all 0.4s cubic-bezier(0.68, -0.55, 0.265, 1.55); + pointer-events: none; + overflow: hidden; + border-radius: 24rpx; + background: linear-gradient(135deg, + rgba(41, 47, 61, 0.98) 0%, + rgba(31, 36, 48, 0.98) 100%); + backdrop-filter: blur(30rpx) saturate(180%); + -webkit-backdrop-filter: blur(30rpx) saturate(180%); + border: 1rpx solid rgba(255, 255, 255, 0.08); + box-shadow: + 0 20rpx 60rpx rgba(0, 0, 0, 0.4), + 0 0 0 1rpx rgba(255, 255, 255, 0.03), + inset 0 1rpx 0 rgba(255, 255, 255, 0.1); + min-height: 140rpx; + touch-action: pan-y; +} + +.global-notification.show { + opacity: 1; + transform: translateY(0); + pointer-events: auto; +} + +.notification-swipe-indicator { + position: absolute; + top: 0; + left: 0; + right: 0; + height: 4rpx; + display: flex; + justify-content: center; + align-items: center; + z-index: 10; +} + +.swipe-line { + width: 40rpx; + height: 4rpx; + background: rgba(255, 255, 255, 0.3); + border-radius: 2rpx; + transition: all 0.3s; +} + +.notification-swipe-indicator.active .swipe-line { + background: rgba(255, 255, 255, 0.6); + transform: scaleX(1.2); +} + +.notification-content { + display: flex; + align-items: center; + padding: 32rpx; + min-height: 140rpx; + position: relative; +} + +.notification-avatar { + width: 88rpx; + height: 88rpx; + border-radius: 44rpx; + margin-right: 24rpx; + flex-shrink: 0; + border: 3rpx solid rgba(212, 175, 55, 0.6); + box-shadow: + 0 8rpx 24rpx rgba(212, 175, 55, 0.2), + inset 0 1rpx 0 rgba(255, 255, 255, 0.3); + background-color: rgba(0, 0, 0, 0.2); +} + +.notification-body { + flex: 1; + min-width: 0; + display: flex; + flex-direction: column; + justify-content: center; +} + +.notification-title { + font-size: 34rpx; + font-weight: 600; + margin-bottom: 8rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + background: linear-gradient(135deg, #D4AF37 0%, #FFD700 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + background-clip: text; + text-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.3); +} + +.notification-message { + font-size: 28rpx; + line-height: 1.4; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + color: rgba(255, 255, 255, 0.95); + text-shadow: 0 1rpx 2rpx rgba(0, 0, 0, 0.5); +} + +.notification-time { + font-size: 24rpx; + color: rgba(255, 255, 255, 0.5); + margin-top: 4rpx; + font-weight: 300; +} + +.notification-actions { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + margin-left: 20rpx; + gap: 16rpx; +} + +.notification-close, +.notification-mute { + width: 56rpx; + height: 56rpx; + display: flex; + align-items: center; + justify-content: center; + border-radius: 28rpx; + background: rgba(255, 255, 255, 0.08); + border: 1rpx solid rgba(255, 255, 255, 0.1); + transition: all 0.3s; + flex-shrink: 0; + box-shadow: + 0 4rpx 12rpx rgba(0, 0, 0, 0.2), + inset 0 1rpx 0 rgba(255, 255, 255, 0.05); +} + +.notification-close:active, +.notification-mute:active { + background: rgba(255, 255, 255, 0.15); + transform: scale(0.92); +} + +.close-icon { + font-size: 32rpx; + font-weight: 300; + color: rgba(255, 255, 255, 0.9); + line-height: 1; +} + +.mute-icon { + font-size: 28rpx; + line-height: 0; + color: rgba(255, 255, 255, 0.9); +} + +.notification-mute.muted .mute-icon { + color: #D4AF37; +} + +.notification-progress { + height: 6rpx; + background: rgba(255, 255, 255, 0.05); + overflow: hidden; + border-radius: 0 0 24rpx 24rpx; +} + +.progress-bar { + height: 100%; + width: 100%; + background: linear-gradient(90deg, + #D4AF37 0%, + #FFD700 50%, + #D4AF37 100%); + background-size: 200% 100%; + transition: width 0.1s linear; + box-shadow: 0 0 20rpx rgba(212, 175, 55, 0.4); + animation: progressShine 2s linear infinite; +} + +@keyframes progressShine { + 0% { background-position: 200% 0; } + 100% { background-position: -200% 0; } +} + +.progress-bar.warning { + background: linear-gradient(90deg, + #ff3b30 0%, + #ff6b6b 50%, + #ff3b30 100%); + animation: progressShine 1s linear infinite; +} + +.global-notification.swiping { + opacity: 0.7; + transform: translateY(calc(var(--swipe-distance, 0) * -1)); +} + +.global-notification.swiping-up { + opacity: 0.3; + transform: translateY(calc(var(--swipe-distance, 0) * -1)); +} + +.global-notification:active:not(.swiping) { + transform: scale(0.995) translateY(0); + transition: transform 0.1s; +} \ No newline at end of file diff --git a/components/navigation-bar/navigation-bar.js b/components/navigation-bar/navigation-bar.js new file mode 100644 index 0000000..eb1770e --- /dev/null +++ b/components/navigation-bar/navigation-bar.js @@ -0,0 +1,102 @@ +Component({ + options: { + multipleSlots: true // 在组件定义时的选项中启用多slot支持 + }, + /** + * 组件的属性列表 + */ + properties: { + extClass: { + type: String, + value: '' + }, + title: { + type: String, + value: '' + }, + background: { + type: String, + value: '' + }, + color: { + type: String, + value: '' + }, + back: { + type: Boolean, + value: true + }, + loading: { + type: Boolean, + value: false + }, + homeButton: { + type: Boolean, + value: false, + }, + animated: { + // 显示隐藏的时候opacity动画效果 + type: Boolean, + value: true + }, + show: { + // 显示隐藏导航，隐藏的时候navigation-bar的高度占位还在 + type: Boolean, + value: true, + observer: '_showChange' + }, + // back为true的时候，返回的页面深度 + delta: { + type: Number, + value: 1 + }, + }, + /** + * 组件的初始数据 + */ + data: { + displayStyle: '' + }, + lifetimes: { + attached() { + const rect = wx.getMenuButtonBoundingClientRect() + const platform = (wx.getDeviceInfo() || wx.getSystemInfoSync()).platform + const isAndroid = platform === 'android' + const isDevtools = platform === 'devtools' + const { windowWidth, safeArea: { top = 0, bottom = 0 } = {} } = wx.getWindowInfo() || wx.getSystemInfoSync() + this.setData({ + ios: !isAndroid, + innerPaddingRight: `padding-right: ${windowWidth - rect.left}px`, + leftWidth: `width: ${windowWidth - rect.left}px`, + safeAreaTop: isDevtools || isAndroid ? `height: calc(var(--height) + ${top}px); padding-top: ${top}px` : `` + }) + }, + }, + /** + * 组件的方法列表 + */ + methods: { + _showChange(show) { + const animated = this.data.animated + let displayStyle = '' + if (animated) { + displayStyle = `opacity: ${show ? '1' : '0' + };transition:opacity 0.5s;` + } else { + displayStyle = `display: ${show ? '' : 'none'}` + } + this.setData({ + displayStyle + }) + }, + back() { + const data = this.data + if (data.delta) { + wx.navigateBack({ + delta: data.delta + }) + } + this.triggerEvent('back', { delta: data.delta }, {}) + } + }, +}) diff --git a/components/navigation-bar/navigation-bar.json b/components/navigation-bar/navigation-bar.json new file mode 100644 index 0000000..4a20f17 --- /dev/null +++ b/components/navigation-bar/navigation-bar.json @@ -0,0 +1,5 @@ +{ + "component": true, + "styleIsolation": "apply-shared", + "usingComponents": {} +} \ No newline at end of file diff --git a/components/navigation-bar/navigation-bar.wxml b/components/navigation-bar/navigation-bar.wxml new file mode 100644 index 0000000..2bfe519 --- /dev/null +++ b/components/navigation-bar/navigation-bar.wxml @@ -0,0 +1,64 @@ + diff --git a/components/navigation-bar/navigation-bar.wxss b/components/navigation-bar/navigation-bar.wxss new file mode 100644 index 0000000..8bd379e --- /dev/null +++ b/components/navigation-bar/navigation-bar.wxss @@ -0,0 +1,96 @@ +.weui-navigation-bar { + --weui-FG-0:rgba(0,0,0,.9); + --height: 44px; + --left: 16px; +} +.weui-navigation-bar .android { + --height: 48px; +} + +.weui-navigation-bar { + overflow: hidden; + color: var(--weui-FG-0); + flex: none; +} + +.weui-navigation-bar__inner { + position: relative; + top: 0; + left: 0; + height: calc(var(--height) + env(safe-area-inset-top)); + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + padding-top: env(safe-area-inset-top); + width: 100%; + box-sizing: border-box; +} + +.weui-navigation-bar__left { + position: relative; + padding-left: var(--left); + display: flex; + flex-direction: row; + align-items: flex-start; + height: 100%; + box-sizing: border-box; +} + +.weui-navigation-bar__btn_goback_wrapper { + padding: 11px 18px 11px 16px; + margin: -11px -18px -11px -16px; +} + +.weui-navigation-bar__btn_goback_wrapper.weui-active { + opacity: 0.5; +} + +.weui-navigation-bar__btn_goback { + font-size: 12px; + width: 12px; + height: 24px; + -webkit-mask: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E") no-repeat 50% 50%; + mask: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E") no-repeat 50% 50%; + -webkit-mask-size: cover; + mask-size: cover; + background-color: var(--weui-FG-0); +} + +.weui-navigation-bar__center { + font-size: 17px; + text-align: center; + position: relative; + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + font-weight: bold; + flex: 1; + height: 100%; +} + +.weui-navigation-bar__loading { + margin-right: 4px; + align-items: center; +} + +.weui-loading { + font-size: 16px; + width: 16px; + height: 16px; + display: block; + background: transparent url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='80px' height='80px' viewBox='0 0 80 80' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Ctitle%3Eloading%3C/title%3E%3Cdefs%3E%3ClinearGradient x1='94.0869141%25' y1='0%25' x2='94.0869141%25' y2='90.559082%25' id='linearGradient-1'%3E%3Cstop stop-color='%23606060' stop-opacity='0' offset='0%25'%3E%3C/stop%3E%3Cstop stop-color='%23606060' stop-opacity='0.3' offset='100%25'%3E%3C/stop%3E%3C/linearGradient%3E%3ClinearGradient x1='100%25' y1='8.67370605%25' x2='100%25' y2='90.6286621%25' id='linearGradient-2'%3E%3Cstop stop-color='%23606060' offset='0%25'%3E%3C/stop%3E%3Cstop stop-color='%23606060' stop-opacity='0.3' offset='100%25'%3E%3C/stop%3E%3C/linearGradient%3E%3C/defs%3E%3Cg stroke='none' stroke-width='1' fill='none' fill-rule='evenodd' opacity='0.9'%3E%3Cg%3E%3Cpath d='M40,0 C62.09139,0 80,17.90861 80,40 C80,62.09139 62.09139,80 40,80 L40,73 C58.2253967,73 73,58.2253967 73,40 C73,21.7746033 58.2253967,7 40,7 L40,0 Z' fill='url(%23linearGradient-1)'%3E%3C/path%3E%3Cpath d='M40,0 L40,7 C21.7746033,7 7,21.7746033 7,40 C7,58.2253967 21.7746033,73 40,73 L40,80 C17.90861,80 0,62.09139 0,40 C0,17.90861 17.90861,0 40,0 Z' fill='url(%23linearGradient-2)'%3E%3C/path%3E%3Ccircle id='Oval' fill='%23606060' cx='40.5' cy='3.5' r='3.5'%3E%3C/circle%3E%3C/g%3E%3C/g%3E%3C/svg%3E%0A") no-repeat; + background-size: 100%; + margin-left: 0; + animation: loading linear infinite 1s; +} + +@keyframes loading { + from { + transform: rotate(0); + } + to { + transform: rotate(360deg); + } +} diff --git a/components/order-card/order-card.js b/components/order-card/order-card.js new file mode 100644 index 0000000..b94bb6c --- /dev/null +++ b/components/order-card/order-card.js @@ -0,0 +1,102 @@ +const app = getApp(); + +Component({ + properties: { + orderId: { type: String, value: '' } + }, + + data: { + order: null, + loading: false, + errorMsg: '', + // 跨平台字段 + isCross: false, // 是否跨平台订单 + dispatchType: 0, // 1-我方派单，2-对方派单 + partnerClubId: '', // 对方俱乐部ID + }, + + lifetimes: { + attached() { + if (this.properties.orderId) { + this.fetchOrderDetail(); + } + } + }, + + methods: { + // 获取订单详情（含跨平台字段） + fetchOrderDetail() { + if (!this.properties.orderId) return; + this.setData({ loading: true, errorMsg: '' }); + const baseUrl = app.globalData.apiBaseUrl; + wx.request({ + url: `${baseUrl}/dingdan/order_detail/`, // 需后端返回 is_cross, dispatch_type, partner_club_id + method: 'POST', + data: { order_id: this.properties.orderId }, + header: { 'content-type': 'application/json' }, + success: (res) => { + if (res.statusCode === 200 && res.data && res.data.code === 0) { + const order = res.data.data; + // 处理图片URL + if (order.tupian && !order.tupian.startsWith('http')) { + order.tupian = app.globalData.ossImageUrl + order.tupian; + } + this.setData({ + order, + loading: false, + isCross: order.is_cross === 1, + dispatchType: order.dispatch_type || 0, + partnerClubId: order.partner_club_id || '', + }); + // 通知父页面状态 + this.triggerEvent('statusready', { + isCross: this.data.isCross, + dispatchType: this.data.dispatchType, + partnerClubId: this.data.partnerClubId + }); + } else { + this.setData({ errorMsg: res.data?.msg || '获取订单失败', loading: false }); + } + }, + fail: () => { + this.setData({ errorMsg: '网络请求失败', loading: false }); + } + }); + }, + + // 发送订单卡片消息（原有） + sendOrderMessage() { + if (!this.data.order) return; + this.triggerEvent('sendorder', { order: this.data.order }); + }, + + // 跨平台消息转发（供父页面调用） + forwardMessage(payload) { + const that = this; + const baseUrl = app.globalData.apiBaseUrl; + return new Promise((resolve, reject) => { + wx.request({ + url: `${baseUrl}/dingdan/kptxxts`, + method: 'POST', + data: { + order_id: that.properties.orderId, + message_type: payload.type || 'text', + content: payload.content || '', + image_url: payload.imageUrl || '', // 图片等 + }, + header: { 'content-type': 'application/json' }, + success: (res) => { + if (res.statusCode === 200 && res.data && res.data.code === 0) { + resolve(res.data); + } else { + reject(res.data); + } + }, + fail: (err) => { + reject(err); + } + }); + }); + } + } +}); \ No newline at end of file diff --git a/components/order-card/order-card.json b/components/order-card/order-card.json new file mode 100644 index 0000000..7e37c03 --- /dev/null +++ b/components/order-card/order-card.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/order-card/order-card.wxml b/components/order-card/order-card.wxml new file mode 100644 index 0000000..c87ad17 --- /dev/null +++ b/components/order-card/order-card.wxml @@ -0,0 +1,20 @@ + + + 关联订单 + {{order.dingdan_id}} + + 跨平台 + + +

+ + {{order.jieshao || '暂无介绍'}} + ¥{{order.jine}} + + 发送 + + {{errorMsg}} + + + 加载订单信息... + \ No newline at end of file diff --git a/components/order-card/order-card.wxss b/components/order-card/order-card.wxss new file mode 100644 index 0000000..62c2737 --- /dev/null +++ b/components/order-card/order-card.wxss @@ -0,0 +1,39 @@ +.order-card { + background: #fff; + margin: 15rpx 20rpx; + border-radius: 12rpx; + overflow: hidden; + box-shadow: 0 2rpx 10rpx rgba(0,0,0,0.05); +} +.card-header { + display: flex; + align-items: center; + padding: 16rpx 20rpx; + border-bottom: 1rpx solid #f0f0f0; +} +.card-title { font-size: 26rpx; color: #666; } +.card-id { font-size: 24rpx; color: #999; margin-left: 15rpx; } +.cross-tag { + margin-left: auto; + background: #ff9900; + color: #fff; + font-size: 20rpx; + padding: 2rpx 12rpx; + border-radius: 8rpx; +} +.card-body { + display: flex; + align-items: center; + padding: 20rpx; +} +.card-img { width: 100rpx; height: 100rpx; border-radius: 8rpx; margin-right: 15rpx; } +.card-info { flex: 1; } +.card-jieshao { font-size: 28rpx; color: #333; } +.card-jine { font-size: 26rpx; color: #e74c3c; } +.card-send-btn { + width: 80rpx; height: 50rpx; line-height: 50rpx; + text-align: center; background: #07c160; color: #fff; + border-radius: 8rpx; font-size: 24rpx; +} +.card-error { padding: 20rpx; color: #e74c3c; text-align: center; } +.loading-text { display: block; padding: 20rpx; text-align: center; color: #999; } \ No newline at end of file diff --git a/components/order-sender/order-sender.js b/components/order-sender/order-sender.js new file mode 100644 index 0000000..f4c9444 --- /dev/null +++ b/components/order-sender/order-sender.js @@ -0,0 +1,16 @@ +const app = getApp(); + +Component({ + properties: { + visible: Boolean, + showDetail: { type: Boolean, value: false } + }, + + data: {}, + + methods: { + close() { + this.triggerEvent('close'); + } + } +}); \ No newline at end of file diff --git a/components/order-sender/order-sender.json b/components/order-sender/order-sender.json new file mode 100644 index 0000000..62389a9 --- /dev/null +++ b/components/order-sender/order-sender.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} + } \ No newline at end of file diff --git a/components/order-sender/order-sender.wxml b/components/order-sender/order-sender.wxml new file mode 100644 index 0000000..ae53ed5 --- /dev/null +++ b/components/order-sender/order-sender.wxml @@ -0,0 +1,12 @@ + + + + + 📋 + 此功能暂未开放 + 敬请期待 + + \ No newline at end of file diff --git a/components/order-sender/order-sender.wxss b/components/order-sender/order-sender.wxss new file mode 100644 index 0000000..c0ffc48 --- /dev/null +++ b/components/order-sender/order-sender.wxss @@ -0,0 +1,45 @@ +.order-sender-mask { + position: fixed; top: 0; left: 0; right: 0; bottom: 0; + background: rgba(0,0,0,0.5); + z-index: 2000; + } + .order-sender { + position: fixed; bottom: 0; left: 0; right: 0; + height: 360rpx; + background: #fff; + border-radius: 24rpx 24rpx 0 0; + z-index: 2001; + transform: translateY(100%); + transition: 0.25s; + display: flex; + flex-direction: column; + } + .order-sender.show { transform: translateY(0); } + + .header { + display: flex; justify-content: space-between; + padding: 24rpx 30rpx; + border-bottom: 1rpx solid #f0f0f0; + } + .title { font-size: 32rpx; font-weight: 600; } + .close { font-size: 44rpx; color: #999; padding: 0 12rpx; } + + .content { + flex: 1; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding-bottom: 40rpx; + } + .icon { font-size: 80rpx; margin-bottom: 20rpx; } + .notice { + font-size: 34rpx; + font-weight: 600; + color: #333; + margin-bottom: 10rpx; + } + .sub { + font-size: 24rpx; + color: #999; + } \ No newline at end of file diff --git a/components/popup-notice/popup-notice.js b/components/popup-notice/popup-notice.js new file mode 100644 index 0000000..64589db --- /dev/null +++ b/components/popup-notice/popup-notice.js @@ -0,0 +1,324 @@ +// components/popup-notice/popup-notice.js +import PopupService from '../../services/popupService.js'; + +Component({ + data: { + // 原有全屏弹窗数据 + visible: false, + title: '', + images: [], + processedImages: [], + hasImages: false, + hasTextOnly: false, + textContent: '', + duration: 0, + remainingSeconds: 0, + muteChecked: false, + showMuteCheckbox: false, + isFullscreen: false, + timer: null, + + // 悬浮窗相关数据 + isMinimized: false, + floatX: 20, + floatY: 200, + savedRemainingSeconds: 0, + floatAvatarUrl: '', + + // 🆕 自定义预览数据 + showCustomPreview: false, // 是否显示自定义预览遮罩 + previewUrls: [], // 当前预览的图片URL列表 + currentPreviewIndex: 0, // 当前预览图片索引 + }, + + lifetimes: { + detached() { + this.clearTimer(); + } + }, + + methods: { + // ========== 原有所有方法（完全不变，一字不漏） ========== + async show(config, onCloseCallback) { + const { title, images, duration, showMuteCheckbox, serverTime } = config; + this.onCloseCallback = onCloseCallback; + + let safeImages = JSON.parse(JSON.stringify(images || [])); + const hasImages = safeImages.length > 0; + let hasTextOnly = false, textContent = ''; + if (!hasImages) { + hasTextOnly = true; + textContent = config.text || '暂无内容'; + } + + this.setData({ + visible: true, + isMinimized: false, + title: title || '', + images: safeImages, + hasImages, + hasTextOnly, + textContent, + duration: duration || 0, + remainingSeconds: duration || 0, + muteChecked: false, + showMuteCheckbox: showMuteCheckbox || false, + isFullscreen: false, + processedImages: [], + }); + + if (duration > 0) { + this.startCountdown(); + } + + if (hasImages) { + const processed = []; + const screenWidth = wx.getSystemInfoSync().windowWidth; + const containerWidth = screenWidth * 0.9; + const imageWidth = containerWidth - 60; + for (let i = 0; i < safeImages.length; i++) { + const img = safeImages[i]; + const fullUrl = this.getFullImageUrl(img.url); + let imageHeight = 200; + try { + const res = await this.getImageInfoPromise(fullUrl); + const realHeight = (imageWidth * res.height) / res.width; + imageHeight = realHeight; + } catch (e) { + console.error('获取图片信息失败', fullUrl, e); + } + processed.push({ + url: fullUrl, + text: img.text, + height: imageHeight, + }); + } + this.setData({ processedImages: processed }); + } + }, + + getImageInfoPromise(url) { + return new Promise((resolve, reject) => { + wx.getImageInfo({ + src: url, + success: resolve, + fail: reject, + }); + }); + }, + + hide(muteToday = false) { + this.clearTimer(); + this.setData({ + visible: false, + isMinimized: false + }); + if (this.onCloseCallback) { + this.onCloseCallback({ muteToday }); + } + }, + + startCountdown() { + this.clearTimer(); + this.timer = setInterval(() => { + let sec = this.data.remainingSeconds; + if (sec <= 1) { + this.clearTimer(); + this.setData({ remainingSeconds: 0 }); + } else { + this.setData({ remainingSeconds: sec - 1 }); + } + }, 1000); + }, + + clearTimer() { + if (this.timer) { + clearInterval(this.timer); + this.timer = null; + } + }, + + onCloseTap() { + if (this.data.remainingSeconds > 0) { + wx.showToast({ + title: `请阅读${this.data.remainingSeconds}秒后再关闭`, + icon: 'none' + }); + return; + } + if (this.data.showMuteCheckbox && this.data.muteChecked) { + wx.showModal({ + title: '提示', + content: '今天将不再收到本页面的任何公告，确认吗？', + success: (res) => { + if (res.confirm) this.hide(true); + }, + }); + } else { + this.hide(false); + } + }, + + onMuteChange(e) { + this.setData({ muteChecked: e.detail.value.length > 0 }); + }, + + // 🆕 替换原有的 onPreviewImage，改用自定义预览（不触发 onShow） + onCustomPreview(e) { + const index = e.currentTarget.dataset.index; + const urls = this.data.processedImages.map(img => img.url); + this.setData({ + showCustomPreview: true, + previewUrls: urls, + currentPreviewIndex: index !== undefined ? index : 0 + }); + }, + + // 🆕 关闭自定义预览 + onCloseCustomPreview() { + this.setData({ + showCustomPreview: false, + previewUrls: [], + currentPreviewIndex: 0 + }); + }, + + // 🆕 swiper 切换事件 + onPreviewSwiperChange(e) { + this.setData({ + currentPreviewIndex: e.detail.current + }); + }, + + // 保留原 onPreviewImage 方法以防外部调用，但不再使用 + onPreviewImage(e) { + // 重定向到自定义预览 + this.onCustomPreview(e); + }, + + onImageError(e) { + console.error('图片加载失败:', e.currentTarget.dataset.url); + }, + + toggleFullscreen() { + this.setData({ isFullscreen: !this.data.isFullscreen }); + }, + + getFullImageUrl(relativeUrl) { + if (!relativeUrl) return ''; + if (relativeUrl.startsWith('http')) return relativeUrl; + const app = getApp(); + let base = app.globalData.ossImageUrl || ''; + base = base.replace(/\/+$/, ''); + const clean = relativeUrl.replace(/^\/+/, ''); + return base ? base + '/' + clean : clean; + }, + + preventMove() {}, + + onMinimize() { + const remaining = this.data.remainingSeconds; + this.clearTimer(); + + const app = getApp(); + let avatarUrl = ''; + if (app.globalData.morentouxiang) { + avatarUrl = app.globalData.morentouxiang; + } else { + avatarUrl = '/images/default-avatar.png'; + } + + if (avatarUrl && !avatarUrl.startsWith('http')) { + const ossBase = app.globalData.ossImageUrl || ''; + avatarUrl = ossBase.replace(/\/+$/, '') + '/' + avatarUrl.replace(/^\/+/, ''); + } + + this.setData({ + visible: false, + isMinimized: true, + savedRemainingSeconds: remaining, + floatX: 20, + floatY: 200, + floatAvatarUrl: avatarUrl + }); + }, + + onFloatChange(e) { + this.setData({ + floatX: e.detail.x, + floatY: e.detail.y + }); + }, + + onFloatTap() { + this.setData({ + visible: true, + isMinimized: false, + remainingSeconds: this.data.savedRemainingSeconds + }); + + if (this.data.duration > 0 && this.data.savedRemainingSeconds > 0) { + this.startCountdown(); + } + }, + + onFloatAvatarError() { + this.setData({ + floatAvatarUrl: '/images/avatar-placeholder.png' + }); + }, + + cleanup() { + this.clearTimer(); + this.setData({ + visible: false, + isMinimized: false + }); + PopupService.reset(); + }, + + onFloatTouchStart(e) { + const touch = e.touches[0]; + this.touchStartX = touch.clientX; + this.touchStartY = touch.clientY; + this.startFloatX = this.data.floatX; + this.startFloatY = this.data.floatY; + this.hasMoved = false; + return false; + }, + + onFloatTouchMove(e) { + const touch = e.touches[0]; + const deltaX = touch.clientX - this.touchStartX; + const deltaY = touch.clientY - this.touchStartY; + + if (Math.abs(deltaX) > 5 || Math.abs(deltaY) > 5) { + this.hasMoved = true; + } + + let newX = this.startFloatX + deltaX; + let newY = this.startFloatY + deltaY; + + const systemInfo = wx.getSystemInfoSync(); + const screenWidth = systemInfo.windowWidth; + const screenHeight = systemInfo.windowHeight; + const estimatedSize = 60; + + newX = Math.max(0, Math.min(newX, screenWidth - estimatedSize)); + newY = Math.max(0, Math.min(newY, screenHeight - estimatedSize)); + this.setData({ floatX: newX, floatY: newY }); + + return false; + }, + + onFloatTouchEnd(e) { + if (!this.hasMoved) { + this.onFloatTap(); + } + return false; + }, + + // 🆕 阻止事件冒泡（用于预览遮罩内部点击不关闭） + stopPropagation() {} + } + }); \ No newline at end of file diff --git a/components/popup-notice/popup-notice.json b/components/popup-notice/popup-notice.json new file mode 100644 index 0000000..62389a9 --- /dev/null +++ b/components/popup-notice/popup-notice.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} + } \ No newline at end of file diff --git a/components/popup-notice/popup-notice.wxml b/components/popup-notice/popup-notice.wxml new file mode 100644 index 0000000..8e682cb --- /dev/null +++ b/components/popup-notice/popup-notice.wxml @@ -0,0 +1,110 @@ + + + + + + + +

+ + + + + + {{currentPreviewIndex + 1}} / {{previewUrls.length}} + × + + + +

+ + + \ No newline at end of file diff --git a/components/popup-notice/popup-notice.wxss b/components/popup-notice/popup-notice.wxss new file mode 100644 index 0000000..ee4873b --- /dev/null +++ b/components/popup-notice/popup-notice.wxss @@ -0,0 +1,295 @@ +/* components/popup-notice/popup-notice.wxss */ + +/* ========== 全屏弹窗样式（原有，完全不变） ========== */ +.popup-mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.6); + display: flex; + align-items: center; + justify-content: center; + z-index: 10000; +} + +.popup-container { + width: 90%; + height: 85vh; + background: white; + border-radius: 32rpx; + display: flex; + flex-direction: column; + overflow: hidden; + position: relative; +} + +.popup-container.fullscreen { + width: 100%; + height: 100%; + border-radius: 0; +} + +.action-buttons { + position: absolute; + top: 20rpx; + right: 20rpx; + display: flex; + gap: 16rpx; + z-index: 10; +} + +.minimize-btn, +.fullscreen-btn { + width: 60rpx; + height: 60rpx; + background: rgba(0, 0, 0, 0.4); + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + backdrop-filter: blur(4rpx); + transition: all 0.2s; +} + +.minimize-btn:active, +.fullscreen-btn:active { + background: rgba(0, 0, 0, 0.6); + transform: scale(0.9); +} + +.btn-icon { + font-size: 36rpx; + color: white; + font-weight: bold; + line-height: 1; +} + +.popup-title { + font-size: 40rpx; + font-weight: bold; + color: #000; + text-align: center; + padding: 30rpx 30rpx 20rpx; + border-bottom: 2rpx solid #eee; + background: white; +} + +.scroll-wrapper { + flex: 1; + overflow: hidden; + width: 100%; +} + +.scroll-view { + height: 100%; + width: 100%; + padding: 0; +} + +.text-content { + font-size: 36rpx; + font-weight: bold; + color: #000; + line-height: 1.6; + padding: 30rpx; + text-align: left; +} + +.image-block { + display: flex; + flex-direction: column; + width: 100%; + margin: 0; + padding: 0; +} + +.block-text { + font-size: 36rpx; + font-weight: bold; + color: #000; + padding: 16rpx 30rpx 4rpx 30rpx; + text-align: left; + line-height: 1.4; +} + +.image-padding { + padding: 0 30rpx; + box-sizing: border-box; + width: 100%; +} + +.block-image { + width: 100%; + display: block; + background: #f5f5f5; + border-radius: 16rpx; +} + +.bottom-fixed { + background: white; + border-top: 1rpx solid #eee; + padding: 20rpx 0 30rpx 0; + width: 100%; + box-sizing: border-box; +} + +.countdown-tip { + text-align: center; + font-size: 28rpx; + color: #ff6600; + margin-bottom: 20rpx; +} + +.mute-row { + display: flex; + justify-content: center; + margin-bottom: 20rpx; +} + +.mute-label { + font-size: 28rpx; + color: #555; + margin-left: 12rpx; +} + +/* 🔥 关闭按钮（替换原有 button，增加扫光） */ +.close-btn { + width: 600rpx; + height: 100rpx; + background: #1a1a1a; + border-radius: 60rpx; + display: flex; + align-items: center; + justify-content: center; + position: relative; + overflow: hidden; + margin: 0 auto; +} + +.close-btn:active { + opacity: 0.85; + transform: scale(0.98); +} + +.close-btn-disabled { + opacity: 0.6; + pointer-events: none; +} + +.close-btn-text { + color: white; + font-size: 40rpx; + font-weight: bold; + position: relative; + z-index: 2; +} + +.close-btn-sweep { + position: absolute; + top: 0; + left: -100%; + width: 100%; + height: 100%; + background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.5), transparent); + transform: skewX(-20deg); + animation: sweep 2.5s infinite ease-in-out; + z-index: 1; + pointer-events: none; +} + +@keyframes sweep { + 0% { left: -100%; } + 40% { left: 100%; } + 100% { left: 100%; } +} + +/* ========== 悬浮窗样式（纯圆形，适配自定义触摸拖动） ========== */ +.floating-avatar-wrapper { + position: fixed; + width: 120rpx; + height: 120rpx; + z-index: 10001; + transform: translateZ(0); + will-change: left, top; + display: flex; + align-items: center; + justify-content: center; +} + +.floating-avatar { + width: 120rpx; + height: 120rpx; + border-radius: 50%; + box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.3); + border: 2rpx solid rgba(255, 215, 0, 0.6); + background: #f0f0f0; + display: block; + transform: translateZ(0); +} + +/* 以下原有 movable-view 相关样式已弃用，但保留以维持代码完整（用户要求不删代码） */ +.floating-area { + display: none; +} +.floating-view { + display: none; +} +.float-avatar-wrapper { + display: none; +} +.float-text { + display: none; +} + +/* ========== 自定义图片预览遮罩样式（全屏，不触发 onShow） ========== */ +.custom-preview-mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.95); + z-index: 100000; + display: flex; + flex-direction: column; +} + +.preview-header { + height: 100rpx; + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 30rpx; + color: white; + font-size: 32rpx; + background: rgba(0, 0, 0, 0.3); +} + +.preview-index { + color: white; +} + +.preview-close { + width: 60rpx; + height: 60rpx; + display: flex; + align-items: center; + justify-content: center; + font-size: 48rpx; + color: white; + background: rgba(255, 255, 255, 0.2); + border-radius: 50%; +} + +.preview-swiper { + flex: 1; + width: 100%; + height: 100%; +} + +.preview-image { + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/config/roles.js b/config/roles.js new file mode 100644 index 0000000..95c04dc --- /dev/null +++ b/config/roles.js @@ -0,0 +1,144 @@ +/* + * 角色配置表 —— 用于动态切换底部 TabBar 展示内容 + * 每个角色的 tabList 数组元素顺序决定 TabBar 显示顺序 + * 字段说明： + * pagePath : 页面路径（以 pages/ 开头） + * text : TabBar 文字 + * iconPath : 未选中图标（相对路径） + * selectedIconPath: 选中图标 + */ +const roles = { + // 普通老板（默认） + normal: { + name: '普通老板', + defaultPage: 'pages/index/index', + tabList: [ + { + pagePath: 'pages/index/index', + text: '商城', + iconPath: '/images/zhuye.png', + selectedIconPath: '/images/zhuye.png' + }, + { + pagePath: 'pages/fenlei/fenlei', + text: '分类', + iconPath: '/images/fenlei.png', + selectedIconPath: '/images/fenlei.png' + }, + { + pagePath: 'pages/xiaoxi/xiaoxi', + text: '消息', + iconPath: '/images/xiaoxi.png', + selectedIconPath: '/images/xiaoxi.png' + }, + { + pagePath: 'pages/wode/wode', + text: '我的', + iconPath: '/images/wode.png', + selectedIconPath: '/images/wode.png' + } + ] + }, + // 打手 + dashou: { + name: '打手', + defaultPage: 'pages/jiedanchi/jiedanchi', + tabList: [ + { + pagePath: 'pages/jiedanchi/jiedanchi', + text: '接单池', + iconPath: '/images/jiedanchi.png', + selectedIconPath: '/images/jiedanchi.png' + }, + { + pagePath: 'pages/xiaoxi/xiaoxi', + text: '消息', + iconPath: '/images/xiaoxi.png', + selectedIconPath: '/images/xiaoxi.png' + }, + { + pagePath: 'pages/dashoudingdan/dashoudingdan', + text: '订单', + iconPath: '/images/dashoudingdan_icon.png', // 请替换为实际图标 + selectedIconPath: '/images/dashoudingdan_icon.png' + }, + { + pagePath: 'pages/dashouduan/dashouduan', + text: '我的', + iconPath: '/images/dashouduan_icon.png', + selectedIconPath: '/images/dashouduan_icon.png' + } + ] + }, + // 商家 + shangjia: { + name: '商家', + defaultPage: 'pages/index/index', + tabList: [ + { + pagePath: 'pages/index/index', + text: '首页', + iconPath: '/images/zhuye.png', + selectedIconPath: '/images/zhuye.png' + }, + { + pagePath: 'pages/sjdingdan/sjdingdan', + text: '订单', + iconPath: '/images/sjdingdan_icon.png', // 请替换为实际图标 + selectedIconPath: '/images/sjdingdan_icon.png' + }, + { + pagePath: 'pages/xiaoxi/xiaoxi', + text: '消息', + iconPath: '/images/xiaoxi.png', + selectedIconPath: '/images/xiaoxi.png' + }, + { + pagePath: 'pages/shangjiaduan/shangjiaduan', + text: '我的', + iconPath: '/images/shangjiaduan_icon.png', + selectedIconPath: '/images/shangjiaduan_icon.png' + } + ] + }, + // 管事 + guanshi: { + name: '管事', + defaultPage: 'pages/guanshiduan/guanshiduan', + tabList: [ + { + pagePath: 'pages/xiaoxi/xiaoxi', + text: '消息', + iconPath: '/images/xiaoxi.png', + selectedIconPath: '/images/xiaoxi.png' + }, + { + pagePath: 'pages/guanshiduan/guanshiduan', + text: '我的', + iconPath: '/images/guanshiduan_icon.png', + selectedIconPath: '/images/guanshiduan_icon.png' + } + ] + }, + // 组长 + zuzhang: { + name: '组长', + defaultPage: 'pages/zuzhangduan/zuzhangduan', + tabList: [ + { + pagePath: 'pages/xiaoxi/xiaoxi', + text: '消息', + iconPath: '/images/xiaoxi.png', + selectedIconPath: '/images/xiaoxi.png' + }, + { + pagePath: 'pages/zuzhangduan/zuzhangduan', + text: '我的', + iconPath: '/images/zuzhangduan_icon.png', + selectedIconPath: '/images/zuzhangduan_icon.png' + } + ] + } + }; + + module.exports = { roles }; \ No newline at end of file diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js new file mode 100644 index 0000000..53ab079 --- /dev/null +++ b/custom-tab-bar/index.js @@ -0,0 +1,194 @@ +// custom-tab-bar/index.js +const app = getApp(); + +const roleCfg = { + normal: { + name: '点单老板', + defaultPage: '/pages/index/index', + tabList: [ + { pagePath: 'pages/index/index', text: '商城', iconPath: '/images/zhuye.png', selectedIconPath: '/images/zhuye.png' }, + { pagePath: 'pages/fenlei/fenlei', text: '分类', iconPath: '/images/fenlei.png', selectedIconPath: '/images/fenlei.png' }, + { pagePath: 'pages/xiaoxi/xiaoxi', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' }, + { pagePath: 'pages/wode/wode', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' } + ] + }, + dashou: { + name: '打手', + defaultPage: '/pages/jiedan/jiedan', + tabList: [ + { pagePath: 'pages/jiedan/jiedan', text: '接单池', iconPath: '/images/jiedanchi.png', selectedIconPath: '/images/jiedanchi.png' }, + { pagePath: 'pages/dashoudingdan/dashoudingdan', text: '订单', iconPath: '/images/dingdan.png', selectedIconPath: '/images/dingdan.png' }, + { pagePath: 'pages/xiaoxi/xiaoxi', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' }, + { pagePath: 'pages/dashouduan/dashouduan', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' } + ] + }, + shangjia: { + name: '商家', + defaultPage: 'pages/sjdingdan/sjdingdan', + tabList: [ + { pagePath: 'pages/sjdingdan/sjdingdan', text: '订单', iconPath: '/images/dingdan.png', selectedIconPath: '/images/dingdan.png' }, + { pagePath: 'pages/xiaoxi/xiaoxi', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' }, + { pagePath: 'pages/shangjiaduan/shangjiaduan', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' } + ] + }, + guanshi: { + name: '管事', + defaultPage: '/pages/guanshiduan/guanshiduan', + tabList: [ + { pagePath: 'pages/xiaoxi/xiaoxi', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' }, + { pagePath: 'pages/guanshiduan/guanshiduan', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' } + ] + }, + zuzhang: { + name: '组长', + defaultPage: '/pages/zuzhangduan/zuzhangduan', + tabList: [ + { pagePath: 'pages/xiaoxi/xiaoxi', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' }, + { pagePath: 'pages/zuzhangduan/zuzhangduan', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' } + ] + }, + kaoheguan: { + name: '考核官', + defaultPage: '/pages/kaoheguan/kaoheguan', + tabList: [ + { pagePath: 'pages/xiaoxi/xiaoxi', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' }, + { pagePath: 'pages/kaoheguan/kaoheguan', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' } + ] + } +}; + +Component({ + data: { + selectedIndex: 0, + tabList: [], + currentRole: 'normal', + showRolePicker: false, + availableRoles: [], + badgeText: '' + }, + lifetimes: { + attached() { + this.refresh(); + this._badgeListener = (data) => { + if (data.badgeText !== undefined) { + this.setData({ badgeText: data.badgeText }); + } + }; + app.on('tabBarBadgeChanged', this._badgeListener); + }, + detached() { + if (this._badgeListener) { + app.off('tabBarBadgeChanged', this._badgeListener); + } + } + }, + pageLifetimes: { + show() { + this.refresh(); + const globalBadge = app.globalData.messageManager?.tabBarBadgeText || ''; + if (this.data.badgeText !== globalBadge) { + this.setData({ badgeText: globalBadge }); + } + this._syncUnreadWithDebounce(); + } + }, + methods: { + _syncUnreadWithDebounce() { + if (this._syncTimer) clearTimeout(this._syncTimer); + this._syncTimer = setTimeout(() => { + if (app && app.loadConversations) { + app.loadConversations(); + } + }, 300); + }, + + refresh() { + const role = app.globalData.currentRole || 'normal'; + let cfg = roleCfg[role]; + if (!cfg) return; + + // 打手身份下，如果 isJinpai=1，悄悄把“我的”页面换成金牌页面 + if (role === 'dashou') { + const isJinpai = wx.getStorageSync('isJinpai') === 1; + if (isJinpai) { + cfg = { + ...cfg, + tabList: cfg.tabList.map(item => { + if (item.pagePath === 'pages/dashouduan/dashouduan') { + return { ...item, pagePath: 'pages/jinpaids/jinpaids' }; + } + return { ...item }; + }) + }; + } + } + + const list = cfg.tabList.map((v, i) => ({ ...v, index: i })); + const pages = getCurrentPages(); + const curRoute = pages.length ? pages[pages.length - 1].route : ''; + let idx = list.findIndex(t => t.pagePath === curRoute); + if (idx === -1) idx = 0; + const avail = this._getAvail(); + this.setData({ currentRole: role, tabList: list, selectedIndex: idx, availableRoles: avail }); + }, + + _getAvail() { + const arr = [{ key: 'normal', name: '点单老板' }]; + if (wx.getStorageSync('dashoustatus') === 1) arr.push({ key: 'dashou', name: '打手' }); + if (wx.getStorageSync('shangjiastatus') === 1) arr.push({ key: 'shangjia', name: '商家' }); + if (wx.getStorageSync('guanshistatus') === 1) arr.push({ key: 'guanshi', name: '管事' }); + if (wx.getStorageSync('zuzhangstatus') === 1) arr.push({ key: 'zuzhang', name: '组长' }); + if (wx.getStorageSync('kaoheguanstatus') === 1) arr.push({ key: 'kaoheguan', name: '考核官' }); + return arr; + }, + + toggleRolePicker() { + this.setData({ showRolePicker: !this.data.showRolePicker }); + }, + + async selectRole(e) { + const newRole = e.currentTarget.dataset.role; + if (newRole === this.data.currentRole) { + this.setData({ showRolePicker: false }); + return; + } + + this.setData({ showRolePicker: false }); + + // 1. 立即更新角色并保存 + app.globalData.currentRole = newRole; + wx.setStorageSync('currentRole', newRole); + + // 2. 🔥 确定跳转页面：所有角色都去“我的”页面 + let targetPage = ''; + if (newRole === 'dashou') { + // 打手需要根据金牌状态决定跳转 + const isJinpai = wx.getStorageSync('isJinpai') === 1; + targetPage = isJinpai ? '/pages/jinpaids/jinpaids' : '/pages/dashouduan/dashouduan'; + } else { + // 其他角色直接取 tabList 最后一个页面 + const cfg = roleCfg[newRole]; + if (cfg && cfg.tabList.length > 0) { + targetPage = '/' + cfg.tabList[cfg.tabList.length - 1].pagePath; + } + } + + // 3. 跳转 + if (targetPage) { + wx.reLaunch({ url: targetPage }); + } + + // 4. 后台异步切换连接 + app.switchRoleAndReconnect(newRole).catch(err => { + console.error('后台切换连接失败:', err); + }); + }, + + switchTab(e) { + const path = e.currentTarget.dataset.path; + const idx = e.currentTarget.dataset.index; + if (idx === this.data.selectedIndex) return; + wx.redirectTo({ url: '/' + path }); + } + } +}); \ No newline at end of file diff --git a/custom-tab-bar/index.json b/custom-tab-bar/index.json new file mode 100644 index 0000000..62389a9 --- /dev/null +++ b/custom-tab-bar/index.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} + } \ No newline at end of file diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml new file mode 100644 index 0000000..93b07a6 --- /dev/null +++ b/custom-tab-bar/index.wxml @@ -0,0 +1,42 @@ + + + + +

+ 切换 + + + + + + + + + {{badgeText}} + +

+ {{item.text}} + + + + + + + + + + 切换身份 + ✕ + + + + {{item.name}} + ✓ + + + + \ No newline at end of file diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss new file mode 100644 index 0000000..7a957fa --- /dev/null +++ b/custom-tab-bar/index.wxss @@ -0,0 +1,165 @@ +/* custom-tab-bar/index.wxss - 角标浮于右上角，可超出胶囊 */ + +.custom-tab-bar { + position: fixed; + bottom: 0; left: 0; right: 0; + z-index: 9999; + display: flex; + justify-content: center; + align-items: flex-end; + padding-bottom: env(safe-area-inset-bottom); + background: transparent; + } + + .bar-row { + display: flex; + align-items: center; + margin-bottom: 15rpx; + padding: 0 20rpx; + width: 100%; + box-sizing: border-box; + } + + /* 左侧椭圆身份按钮 */ + .role-switch-btn { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + width: 110rpx; + height: 100rpx; + border-radius: 50rpx; + background: #000000; + border: 1px solid rgba(255,255,255,0.15); + box-shadow: 0 4rpx 16rpx rgba(0,0,0,0.8); + margin-right: 20rpx; + flex-shrink: 0; + } + .role-switch-icon { + width: 40rpx; + height: 40rpx; + margin-bottom: 2rpx; + } + + .role-switch-text { + font-size: 22rpx; + font-weight: 600; + color: #00f7ff; + letter-spacing: 1rpx; + } + + /* 纯黑闪光胶囊，移除overflow保证角标可见 */ + .tab-capsule { + flex: 1; + display: flex; + align-items: center; + justify-content: space-around; + height: 100rpx; + background: #000000; + border-radius: 50rpx; + border: 1px solid rgba(255,255,255,0.15); + box-shadow: 0 4rpx 16rpx rgba(0,0,0,0.8); + padding: 0 20rpx; + position: relative; + } + .tab-capsule::before { + content: ''; + position: absolute; + top: 0; left: -100%; + width: 60%; height: 100%; + background: linear-gradient(90deg, transparent 0%, rgba(255,255,255,0.25) 20%, rgba(255,255,255,0.35) 50%, rgba(255,255,255,0.25) 80%, transparent 100%); + animation: shine 3s infinite; + z-index: 1; + } + @keyframes shine { + 0% { left: -100%; } + 25% { left: 150%; } + 100% { left: 150%; } + } + + .tab-item { + position: relative; /* 角标的定位参考 */ + z-index: 2; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + min-width: 70rpx; + } + .tab-icon { + width: 44rpx; + height: 44rpx; + margin-bottom: 4rpx; + filter: brightness(0) invert(1); + opacity: 0.9; + } + .tab-text { + font-size: 20rpx; + color: #aaa; + z-index: 2; + } + .active .tab-icon { + opacity: 1; + filter: brightness(0) invert(1) drop-shadow(0 0 8rpx #00aaff); + } + .active .tab-text { + color: #00aaff; + font-weight: 500; + } + + /* 🔴 角标容器：绝对定位到图标右上角，允许超出 */ + .badge-container { + position: absolute; + top: -10rpx; /* 往上提，更接近图标右上角 */ + right: -15rpx; /* 往右伸，超出tab-item */ + z-index: 100; + pointer-events: none; /* 不阻挡点击 */ + } + .tab-badge { + min-width: 36rpx; + height: 36rpx; + line-height: 36rpx; + padding: 0 10rpx; + background: #ff3b30; + color: #fff; + font-size: 22rpx; + font-weight: bold; + border-radius: 36rpx; + text-align: center; + box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.3); + border: 1rpx solid rgba(255,255,255,0.4); + } + + /* 弹窗部分保持不变 */ + .picker-mask { + position: fixed; top: 0; left: 0; right: 0; bottom: 0; + background: rgba(0,0,0,0.6); + z-index: 10000; + } + .picker-panel { + position: fixed; bottom: 0; left: 0; right: 0; + background: #000000; + border-radius: 30rpx 30rpx 0 0; + z-index: 10001; + max-height: 70vh; + overflow-y: auto; + } + .picker-header { + display: flex; justify-content: space-between; align-items: center; + padding: 30rpx 40rpx 20rpx; + border-bottom: 1px solid rgba(255,255,255,0.1); + } + .picker-title { font-size: 32rpx; color: #00f7ff; } + .picker-close { font-size: 36rpx; color: #aaa; padding: 0 10rpx; } + .role-option { + display: flex; justify-content: space-between; align-items: center; + padding: 28rpx 40rpx; + border-bottom: 1px solid rgba(255,255,255,0.05); + color: #ccc; font-size: 28rpx; + } + .role-option.active { color: #00f7ff; } + .check-mark { font-size: 32rpx; color: #00f7ff; } + + page { + padding-bottom: 100rpx; + } \ No newline at end of file diff --git a/dengji/__init__.py b/dengji/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dengji/__pycache__/__init__.cpython-313.pyc b/dengji/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..e680c88 Binary files /dev/null and b/dengji/__pycache__/__init__.cpython-313.pyc differ diff --git a/dengji/__pycache__/apps.cpython-313.pyc b/dengji/__pycache__/apps.cpython-313.pyc new file mode 100644 index 0000000..0ece0ff Binary files /dev/null and b/dengji/__pycache__/apps.cpython-313.pyc differ diff --git a/dengji/admin.py b/dengji/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/dengji/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/dengji/apps.py b/dengji/apps.py new file mode 100644 index 0000000..71c37fe --- /dev/null +++ b/dengji/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class DengjiConfig(AppConfig): + default_auto_field = "django.db.models.BigAutoField" + name = "dengji" diff --git a/dengji/migrations/__init__.py b/dengji/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dengji/models.py b/dengji/models.py new file mode 100644 index 0000000..a3e6f3d --- /dev/null +++ b/dengji/models.py @@ -0,0 +1,235 @@ +from django.db import models +from django.conf import settings + +from dingdan.models import Dingdan + + +# ==================== 板块表 ==================== +class Bankuai(models.Model): + bankuai_id = models.AutoField(primary_key=True, verbose_name='板块ID') + mingcheng = models.CharField(max_length=50, unique=True, db_index=True, verbose_name='板块名称') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + + class Meta: + db_table = 'bankuai' + verbose_name = '板块' + verbose_name_plural = verbose_name + + def __str__(self): + return self.mingcheng + + +# ==================== 打手订单表现记录 ==================== +class DashouBiaoxian(models.Model): + dingdan = models.ForeignKey('dingdan.Dingdan', to_field='dingdan_id', on_delete=models.CASCADE, related_name='biaoxian', verbose_name='关联订单', db_index=True) + + dashou_id = models.CharField(max_length=32, db_index=True, verbose_name='打手ID') + bankuai = models.ForeignKey(Bankuai, on_delete=models.PROTECT, to_field='bankuai_id', verbose_name='所属板块', db_index=True,null=True) + shangxian_sudu = models.PositiveSmallIntegerField(null=True, blank=True, verbose_name='上线速度评价(1-5)') + fuwu_taidu = models.PositiveSmallIntegerField(null=True, blank=True, verbose_name='服务态度评价(1-5)') + fanche_cishu = models.PositiveIntegerField(null=True, blank=True, verbose_name='翻车次数') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + jiedan_time = models.DateTimeField(null=True, blank=True, verbose_name='接单时间') + tijiao_time = models.DateTimeField(null=True, blank=True, verbose_name='提交时间') + + class Meta: + db_table = 'dashou_biaoxian' + verbose_name = '打手订单表现' + verbose_name_plural = verbose_name + indexes = [models.Index(fields=['dashou_id', 'bankuai', 'create_time'])] + + +# ==================== 经验变动记录 ==================== +class JingyanJilu(models.Model): + yonghu_id = models.CharField(max_length=7, db_index=True, verbose_name='用户ID') + yonghu_leixing = models.CharField(max_length=10, choices=[('dashou','打手'),('boss','老板'),('shangjia','商家'),('guanshi','管事'),('zuzhang','组长')], verbose_name='用户类型') + bankuai = models.ForeignKey(Bankuai, on_delete=models.PROTECT, to_field='bankuai_id', verbose_name='所属板块', db_index=True) + sudu_jingyan = models.DecimalField(max_digits=8, decimal_places=2, default=0, verbose_name='上线速度经验') + shili_jingyan = models.DecimalField(max_digits=8, decimal_places=2, default=0, verbose_name='打手实力经验') + taidu_jingyan = models.DecimalField(max_digits=8, decimal_places=2, default=0, verbose_name='服务态度经验') + zonghe_jingyan = models.DecimalField(max_digits=8, decimal_places=2, default=0, verbose_name='综合经验') + dingdan_id = models.CharField(max_length=32, null=True, blank=True, db_index=True, verbose_name='关联订单ID') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + + + class Meta: + db_table = 'jingyan_jilu' + verbose_name = '经验变动记录' + verbose_name_plural = verbose_name + indexes = [models.Index(fields=['yonghu_id', 'bankuai', 'create_time'])] + + +# ==================== 称号主表 ==================== +class Chenghao(models.Model): + mingcheng = models.CharField(max_length=50, unique=True, verbose_name='称号名称') + leixing = models.CharField(max_length=10, choices=[('dashou','打手'),('boss','老板'),('shangjia','商家'),('guanshi','管事'),('zuzhang','组长')], verbose_name='称号类型') + bankuai = models.ForeignKey(Bankuai, on_delete=models.PROTECT, to_field='bankuai_id', null=True, blank=True, verbose_name='所属板块(空=全板块通用)') + tubiao_url = models.CharField(max_length=200, null=True, blank=True, verbose_name='称号图标相对URL') + texiao_miaoshu = models.TextField(null=True, blank=True, verbose_name='特效描述(JSON)') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + kaohe_guize = models.TextField(null=True, blank=True, verbose_name='考核规则') # 新增 + kaioi_jinpai = models.BooleanField(default=False, verbose_name='是否同时开启金牌') + + class Meta: + db_table = 'chenghao' + verbose_name = '称号' + verbose_name_plural = verbose_name + indexes = [models.Index(fields=['leixing', 'bankuai'])] + + +# ==================== 用户 - 称号关联 ==================== +class YonghuChenghao(models.Model): + yonghu = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='chenghao_list', verbose_name='用户', db_index=True) + chenghao = models.ForeignKey(Chenghao, on_delete=models.CASCADE, verbose_name='称号') + huode_time = models.DateTimeField(auto_now_add=True, verbose_name='获得时间') + + class Meta: + db_table = 'yonghu_chenghao' + verbose_name = '用户称号关联' + verbose_name_plural = verbose_name + unique_together = ('yonghu', 'chenghao') + # 修复：只索引本表字段 + indexes = [models.Index(fields=['yonghu', 'chenghao'])] + + + + + +class DingdanBiaoqian(models.Model): + """订单需求标签关联表""" + dingdan = models.ForeignKey( + Dingdan, + to_field='dingdan_id', # 关联到字符串字段 dingdan_id + on_delete=models.CASCADE, + verbose_name='订单', + db_index=True + ) + chenghao = models.ForeignKey('dengji.Chenghao', on_delete=models.CASCADE, verbose_name='标签') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + + class Meta: + db_table = 'dingdan_biaoqian' + verbose_name = '订单需求标签' + verbose_name_plural = verbose_name + unique_together = ('dingdan', 'chenghao') + indexes = [models.Index(fields=['dingdan'])] + + + + + +class ShenheJilu(models.Model): + """审核记录表""" + shenqingren_id = models.CharField(max_length=7, verbose_name='申请人用户ID') + shenheguan_id = models.CharField(max_length=7, null = True,verbose_name='审核官用户ID') + zhuangtai = models.IntegerField(choices=[(0, '审核中'), (1, '通过'), (2, '未通过'), (3, '待审核')], default=0, verbose_name='审核状态') + bankuai = models.ForeignKey(Bankuai, on_delete=models.PROTECT, to_field='bankuai_id', null=True, blank=True, verbose_name='审核板块') + chenghao = models.ForeignKey(Chenghao, on_delete=models.PROTECT, null=True, blank=True, verbose_name='审核标签') + cishu = models.IntegerField(default=1, verbose_name='第几次审核') + jiaofei_jine = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='缴纳费用') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + jilu_id = models.CharField(max_length=32, unique=True, db_index=True, verbose_name='记录ID') # 新增 + guize_neirong = models.TextField(null=True, blank=True, verbose_name='规则内容') + shenheguan_youxi_id = models.CharField(max_length=50, null=True, blank=True, verbose_name='审核官游戏ID') + dashou_youxi_id = models.CharField(max_length=50, null=True, blank=True, verbose_name='打手游戏ID') + dashou_beizhu = models.TextField(null=True, blank=True, verbose_name='打手备注') + + class Meta: + db_table = 'shenhe_jilu' + verbose_name = '审核记录' + verbose_name_plural = verbose_name + indexes = [ + models.Index(fields=['shenqingren_id', 'zhuangtai']), + models.Index(fields=['shenheguan_id']), + ] + +class KaoheJiluFeiyong(models.Model): + """每次考核记录实际缴纳的费用明细""" + jilu = models.ForeignKey(ShenheJilu, on_delete=models.CASCADE, to_field='jilu_id', verbose_name='考核记录') + cishu = models.IntegerField(verbose_name='第几次考核') + jine = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='缴纳金额') + + class Meta: + db_table = 'kaohe_jilu_feiyong' + verbose_name = '考核记录费用' + verbose_name_plural = verbose_name + unique_together = ('jilu', 'cishu') + + + +class KaohePayTemp(models.Model): + """考核支付临时上下文（仅用于支付成功后回调取参，不删除数据）""" + dingdan_id = models.CharField(max_length=50, unique=True, db_index=True, verbose_name='订单ID') + yonghuid = models.CharField(max_length=7, db_index=True, verbose_name='用户ID') + tag_id = models.IntegerField(verbose_name='标签ID') + game_nick = models.CharField(max_length=100, verbose_name='游戏昵称') + remark = models.TextField(blank=True, verbose_name='备注') + reapply = models.BooleanField(default=False, verbose_name='是否再次申请') + jilu_id = models.CharField(max_length=32, null=True, blank=True, verbose_name='原记录ID(再次申请时)') + shenheguan_id = models.CharField(max_length=7, blank=True, verbose_name='指定考核官ID') + cishu = models.IntegerField(verbose_name='本次考核次数(预计算)') + fee = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='本次费用(分账单位)') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + + class Meta: + db_table = 'kaohe_pay_temp' + verbose_name = '考核支付临时表' + verbose_name_plural = verbose_name + +class KaoheCishuFeiyong(models.Model): + """各标签各考核次数所需缴纳金额""" + chenghao = models.ForeignKey(Chenghao, on_delete=models.CASCADE, verbose_name='标签') + cishu = models.IntegerField(verbose_name='第几次考核') + feiyong = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='需缴纳金额') + + class Meta: + db_table = 'kaohe_cishu_feiyong' + verbose_name = '考核次数费用' + verbose_name_plural = verbose_name + unique_together = ('chenghao', 'cishu') + indexes = [models.Index(fields=['chenghao', 'cishu'])] + + +class KaoheJujueJilu(models.Model): + """考核拒绝原因记录""" + jilu = models.ForeignKey(ShenheJilu, on_delete=models.CASCADE, to_field='jilu_id', verbose_name='审核记录') + cishu = models.IntegerField(verbose_name='对应次数') + shenheguan_id = models.CharField(max_length=7, verbose_name='考核官用户ID') + yuanyin = models.TextField(verbose_name='拒绝原因') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + + class Meta: + db_table = 'kaohe_jujue_jilu' + verbose_name = '拒绝原因记录' + verbose_name_plural = verbose_name + indexes = [models.Index(fields=['jilu_id', 'cishu'])] + + + +class KaoheguanBankuai(models.Model): + """考核官与板块多对多关联表""" + kaoheguan_id = models.CharField(max_length=7, db_index=True, verbose_name='考核官用户ID') + bankuai = models.ForeignKey(Bankuai, on_delete=models.CASCADE, to_field='bankuai_id', verbose_name='所属板块') + + class Meta: + db_table = 'kaoheguan_bankuai' + verbose_name = '考核官板块关联' + verbose_name_plural = verbose_name + unique_together = ('kaoheguan_id', 'bankuai') + indexes = [models.Index(fields=['kaoheguan_id'])] + + + + + +class ShenheGuize(models.Model): + """审核规则表""" + guize_id = models.AutoField(primary_key=True, verbose_name='规则ID') + neirong = models.TextField(verbose_name='规则内容') + + class Meta: + db_table = 'shenhe_guize' + verbose_name = '审核规则' + verbose_name_plural = verbose_name \ No newline at end of file diff --git a/dengji/services.py b/dengji/services.py new file mode 100644 index 0000000..30ffcca --- /dev/null +++ b/dengji/services.py @@ -0,0 +1,87 @@ +# dengji/services.py +import logging +from django.db import transaction, IntegrityError +from django.utils import timezone +from .models import DashouBiaoxian + +logger = logging.getLogger('dengji') + +def record_dashou_biaoxian(dingdan_id, dashou_id, xingwei, **kwargs): + """ + 统一记录打手订单表现 + :param dingdan_id: 订单ID + :param dashou_id: 打手ID + :param xingwei: 行为类型 1-抢单 2-提交订单 3-结算 + :param kwargs: 可选字段(与模型字段同名): + jiedan_time, tijiao_time, + bankuai, shangxian_sudu, fuwu_taidu, fanche_cishu + 注意：不管是哪种行为，dingdan_id 和 dashou_id 都是必传的， + 如果没传时间且业务需要时间，则自动取当前时间。 + """ + try: + # ----- 抢单：创建记录 ----- + if xingwei == 1: + jiedan_time = kwargs.get('jiedan_time') or timezone.now() + bankuai = kwargs.get('bankuai') # 可为 None + + # 避免重复创建（同一订单只会有一条表现记录） + obj, created = DashouBiaoxian.objects.get_or_create( + dingdan_id=dingdan_id, + dashou_id=dashou_id, + defaults={ + 'bankuai': bankuai, + 'jiedan_time': jiedan_time, + } + ) + if not created: + logger.info(f"表现记录已存在，跳过创建: dingdan={dingdan_id}, dashou={dashou_id}") + else: + logger.info(f"创建抢单表现记录: dingdan={dingdan_id}, dashou={dashou_id}") + + # ----- 提交订单：更新提交时间 ----- + elif xingwei == 2: + tijiao_time = kwargs.get('tijiao_time') or timezone.now() + # 只更新已存在的记录，找不到就直接跳过 + updated = DashouBiaoxian.objects.filter( + dingdan_id=dingdan_id, + dashou_id=dashou_id + ).update(tijiao_time=tijiao_time) + if updated: + logger.info(f"更新提交时间: dingdan={dingdan_id}, dashou={dashou_id}") + else: + logger.info(f"无对应记录，跳过提交时间更新: dingdan={dingdan_id}, dashou={dashou_id}") + + # ----- 结算：更新评价信息 ----- + elif xingwei == 3: + # 构建要更新的字段，只更新 kwargs 中传入的非 None 字段 + update_fields = {} + for field in ['shangxian_sudu', 'fuwu_taidu', 'fanche_cishu']: + val = kwargs.get(field) + if val is not None: + update_fields[field] = val + # 如果还传了板块也可以更新 + bankuai = kwargs.get('bankuai') + if bankuai is not None: + update_fields['bankuai'] = bankuai + + if update_fields: + updated = DashouBiaoxian.objects.filter( + dingdan_id=dingdan_id, + dashou_id=dashou_id + ).update(**update_fields) + if updated: + logger.info(f"更新评价信息: dingdan={dingdan_id}, dashou={dashou_id}, fields={update_fields}") + else: + logger.info(f"无对应记录，跳过评价更新: dingdan={dingdan_id}, dashou={dashou_id}") + else: + logger.info(f"结算时未传入任何评价字段，跳过更新") + + else: + logger.warning(f"未知的行为类型: {xingwei}") + + except IntegrityError as e: + # 唯一约束冲突（get_or_create 理论上已处理，但并发时仍可能撞上） + logger.warning(f"表现记录写入冲突，可能并发创建: {e}") + except Exception as e: + # 无论发生什么错误，都不影响主流程 + logger.error(f"记录打手表现异常: dingdan={dingdan_id}, dashou={dashou_id}, xingwei={xingwei}, error={e}", exc_info=True) \ No newline at end of file diff --git a/dengji/tests.py b/dengji/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/dengji/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/dengji/urls.py b/dengji/urls.py new file mode 100644 index 0000000..dfe1a45 --- /dev/null +++ b/dengji/urls.py @@ -0,0 +1,22 @@ +from django.urls import path +from .views import DashouBiaoqianView, BankuaiBiaoqianView, KaoheguanRegisterView, \ + KaoheguanRefreshView, ShenheDatingModuleView, ShenheDatingDataView, ShenheQiangdanView, ShenheCaozuoView, \ + ShenheXiangqingView, KaoheJinpaiTagsView, KaoheJiluView, KaoheFreeApplyView, KaoheJiluListView + +urlpatterns = [ + path('dsbqhq', DashouBiaoqianView.as_view(), name='打手标签获取'), + # 其他已有路由保持不变 + path('bkqhbq', BankuaiBiaoqianView.as_view(), name='抢单页面获取标签'), + path('khgzc', KaoheguanRegisterView.as_view(), name='审核官注册'), + path('khgsx', KaoheguanRefreshView.as_view(), name='审核官刷新'), + path('shdthqmk', ShenheDatingModuleView.as_view(), name='审核官获取板块'), + path('hqshsj', ShenheDatingDataView.as_view(), name='审核官获取待审核列表'), + path('shqd', ShenheQiangdanView.as_view(), name='审核官接待审核'), + path('hqkhxq', ShenheXiangqingView.as_view(), name='获取审核内容'), + path('khgxgkh', ShenheCaozuoView.as_view(), name='修改审核状态'), + + path('dskhhq', KaoheJinpaiTagsView.as_view(), name='考核金牌页面标签'), + path('dskhjl', KaoheJiluView.as_view(), name='打手考核记录'), + path('dssqkh', KaoheFreeApplyView.as_view(), name='免费考核申请接口'), + path('khghqkhjl', KaoheJiluListView.as_view(), name='考核官获取考核记录'), +] \ No newline at end of file diff --git a/dengji/utils.py b/dengji/utils.py new file mode 100644 index 0000000..51a85fa --- /dev/null +++ b/dengji/utils.py @@ -0,0 +1,403 @@ +# dingdan/utils.py +from .models import DingdanBiaoqian +from yonghu.models import UserMain +from dengji.models import YonghuChenghao + +def check_dashou_biaoqian_required(order_id, dashou_yonghuid): + """ + 检查打手是否满足订单的标签需求。 + - 如果订单没有需求标签，直接放行。 + - 如果有，则要求打手至少拥有其中一个标签。 + 返回 (allowed: bool, message: str) + """ + try: + # 1. 获取订单的需求标签ID集合 + required_ids = set( + DingdanBiaoqian.objects.filter(dingdan_id=order_id) + .values_list('chenghao_id', flat=True) + ) + if not required_ids: + return True, '' + + # 2. 找到打手对应的用户记录 + try: + user = UserMain.objects.get(yonghuid=dashou_yonghuid) + except UserMain.DoesNotExist: + return False, '用户信息异常' + + # 3. 获取打手已拥有的标签ID集合（只取打手类型） + owned_ids = set( + YonghuChenghao.objects.filter( + yonghu=user, + chenghao__leixing='dashou' + ).values_list('chenghao_id', flat=True) + ) + + if not owned_ids: + return False, '您未拥有任何打手标签，无法抢此订单' + + # 4. 交集判断 + if required_ids.intersection(owned_ids): + return True, '' + else: + return False, '您的标签不符合此订单要求，无法抢单' + + except Exception as e: + # 标签校验失败不影响主流程，记录日志并保守放行（也可保守拒绝，按需求选择） + import logging + logger = logging.getLogger('dingdan') + logger.error(f"标签校验异常: {e}", exc_info=True) + # 安全起见，如果校验出错，选择拒绝，避免越权 + return False, '订单标签校验异常，请稍后重试' + + + + + + + +# dengji/utils.py +from .models import Chenghao, KaoheCishuFeiyong, ShenheJilu, KaoheJiluFeiyong, YonghuChenghao, KaoheguanBankuai +from yonghu.models import UserMain, UserShenheguan, UserDashou +from django.db import models +from decimal import Decimal +from django.db.models import Q, Max +import time +import random +import logging +from django.db.models import F, Max +logger = logging.getLogger('dengji') + + + +def get_tag_fee(chenghao, cishu): + """ + 获取标签在指定考核次数下的费用。 + - 若有对应次数的配置，直接返回。 + - 若没有该次数，取该标签下已有最大次数的费用（作为后续次数的价格）。 + - 若该标签完全没有费用记录，返回 0.00（免费）。 + """ + fee_obj = KaoheCishuFeiyong.objects.filter(chenghao=chenghao, cishu=cishu).first() + if fee_obj: + return fee_obj.feiyong + + max_obj = KaoheCishuFeiyong.objects.filter(chenghao=chenghao).order_by('-cishu').first() + if max_obj: + return max_obj.feiyong + + return Decimal('0.00') + + +def generate_unique_jilu_id(): + """ + 生成唯一的审核记录 ID，格式：SH + 时间戳(10位) + 随机数(4位) + 循环检查数据库避免重复，最多尝试 10 次。 + """ + for _ in range(10): + timestamp = str(int(time.time() * 1000))[-10:] + random_part = str(random.randint(1000, 9999)) + jilu_id = f'SH{timestamp}{random_part}' + if not ShenheJilu.objects.filter(jilu_id=jilu_id).exists(): + return jilu_id + raise Exception('无法生成唯一记录ID，请稍后重试') + + +def validate_shenheguan(shenheguan_id, bankuai, fee, applicant_user): + """ + 校验指定考核官是否合法 + - 考核官必须存在且未被禁用 + - 必须属于对应板块 + - 必须处于空闲状态 + - 若费用>0，则要求已认证 + 返回 (valid, error_msg) + """ + if not shenheguan_id: + return True, '' + try: + kg = UserShenheguan.objects.select_related('user').get( + user__yonghuid=shenheguan_id, + zhuangtai=1 + ) + except UserShenheguan.DoesNotExist: + return False, '考核官不存在或已被禁用' + + # 板块权限 + if not KaoheguanBankuai.objects.filter(kaoheguan_id=shenheguan_id, bankuai=bankuai).exists(): + return False, '该考核官不属于此板块' + + # 空闲状态 + if kg.shenhe_zhuangtai != 0: + return False, '该考核官当前忙碌，无法指定' + + # 费用>0需要认证 + if float(fee) > 0 and not kg.is_renzheng: + return False, '费用大于0时只能指定已认证的考核官' + + return True, '' + + +def create_shenhe_jilu(user, tag_id, game_nick, remark, reapply, jilu_id=None, shenheguan_id=''): + """ + 创建或更新审核记录。 + - 首次申请：创建新记录，生成唯一 jilu_id。 + - 再次申请：基于原记录（必须状态为未通过）更新次数、累加总费用、更新备注和游戏昵称， + 保留审核官信息，状态重置为待审核。不创建新记录。 + - 每次申请均创建一条费用明细记录（KaoheJiluFeiyong），记录本次缴费。 + - 若原记录有考核官，则将其状态改为审核中。 + - 新增 shenheguan_id 参数：指定考核官ID，仅在原记录无考核官时可传入。 + 返回 (success, message, record) + """ + try: + # 1. 校验标签存在 + try: + chenghao = Chenghao.objects.get(id=tag_id) + except Chenghao.DoesNotExist: + return False, '标签不存在', None + + # 2. 判断用户是否已拥有该标签 + if YonghuChenghao.objects.filter(yonghu=user, chenghao=chenghao).exists(): + return False, '您已拥有该标签，无需重复考核', None + + # 3. 检查是否有进行中的审核记录（待审核、审核中） + has_pending = ShenheJilu.objects.filter( + shenqingren_id=user.yonghuid, + chenghao=chenghao, + zhuangtai__in=[0, 3] + ).exists() + if has_pending: + return False, '您有未完成的考核申请，请等待结果', None + + last_record = None + current_fee = Decimal('0.00') + + # 4. 处理再次申请 + if reapply and jilu_id: + # 查询原记录（未通过状态） + last_record = ShenheJilu.objects.filter( + jilu_id=jilu_id, + shenqingren_id=user.yonghuid, + zhuangtai=2 + ).first() + if not last_record: + return False, '原记录不存在或状态不是未通过', None + + new_cishu = last_record.cishu + 1 + current_fee = get_tag_fee(chenghao, new_cishu) + + # 确定最终状态：有考核官 = 审核中(0)，否则待审核(3) + final_kg_id = last_record.shenheguan_id # 保留原来的 + if shenheguan_id and not last_record.shenheguan_id: + final_kg_id = shenheguan_id # 新指定 + + final_zhuangtai = 0 if final_kg_id else 3 # 有考核官就是审核中 + if final_zhuangtai == 3: + final_kg_id = None + + # 原子化更新 + ShenheJilu.objects.filter(pk=last_record.pk).update( + cishu=new_cishu, + jiaofei_jine=F('jiaofei_jine') + current_fee, + dashou_youxi_id=game_nick, + dashou_beizhu=remark, + guize_neirong=chenghao.kaohe_guize or '', + zhuangtai=final_zhuangtai, + shenheguan_id=final_kg_id, + ) + last_record.refresh_from_db() + record = last_record + + # 如果原考核官被替换或清除，释放旧考核官 + if last_record.shenheguan_id != final_kg_id: + if last_record.shenheguan_id: + UserShenheguan.objects.filter( + user__yonghuid=last_record.shenheguan_id + ).update(shenhe_zhuangtai=0) + else: + # 首次申请 + max_cishu = ShenheJilu.objects.filter( + shenqingren_id=user.yonghuid, + chenghao=chenghao, + zhuangtai__in=[1, 2] + ).aggregate(max=Max('cishu'))['max'] or 0 + new_cishu = max_cishu + 1 + current_fee = get_tag_fee(chenghao, new_cishu) + + bankuai = chenghao.bankuai + rule_text = chenghao.kaohe_guize or '' + new_jilu_id = generate_unique_jilu_id() + + initial_zhuangtai = 0 if shenheguan_id else 3 # 指定→审核中，否则待审核 + record = ShenheJilu.objects.create( + jilu_id=new_jilu_id, + shenqingren_id=user.yonghuid, + zhuangtai=initial_zhuangtai, + bankuai=bankuai, + chenghao=chenghao, + cishu=new_cishu, + jiaofei_jine=current_fee, + dashou_youxi_id=game_nick, + dashou_beizhu=remark, + guize_neirong=rule_text, + shenheguan_id=shenheguan_id if shenheguan_id else None, + ) + + # 5. 创建费用明细（防重复） + KaoheJiluFeiyong.objects.get_or_create( + jilu=record, + cishu=record.cishu, + defaults={'jine': current_fee} + ) + + # 6. 更新考核官统计（仅当状态为审核中且有考核官） + if record.zhuangtai == 0 and record.shenheguan_id: + UserShenheguan.objects.filter( + user__yonghuid=record.shenheguan_id + ).update( + shenhe_zongshu=F('shenhe_zongshu') + 1, + shenhe_zhuangtai=1 + ) + + return True, '申请成功', record + + except Exception as e: + logger.error(f"创建审核记录异常: {e}", exc_info=True) + return False, '系统异常', None + + +def create_shenhe_jilu_from_temp(user, temp_data): + """ + 根据临时表数据创建审核记录（专供支付回调使用） + 参数 temp_data 是 KaohePayTemp 对象 + 返回 (success, message, record) + """ + from .models import ShenheJilu, KaoheJiluFeiyong, Chenghao, YonghuChenghao + from django.db.models import F + import logging + logger = logging.getLogger('dengji') + + try: + logger.info(f"开始从临时表创建审核记录: 用户={user.yonghuid}, 订单={temp_data.dingdan_id}") + + chenghao = Chenghao.objects.get(id=temp_data.tag_id) + logger.info(f"获取标签成功: {chenghao.mingcheng}") + + # 检查是否已拥有标签 + if YonghuChenghao.objects.filter(yonghu=user, chenghao=chenghao).exists(): + logger.warning(f"用户 {user.yonghuid} 已拥有标签 {chenghao.mingcheng}") + return False, '您已拥有该标签，无需重复考核', None + + # 检查是否有进行中的审核 + if ShenheJilu.objects.filter( + shenqingren_id=user.yonghuid, + chenghao=chenghao, + zhuangtai__in=[0, 3] + ).exists(): + logger.warning(f"用户 {user.yonghuid} 有未完成的考核申请") + return False, '您有未完成的考核申请，请等待结果', None + + # 使用临时表中预计算好的次数和费用 + new_cishu = temp_data.cishu + current_fee = temp_data.fee + reapply = temp_data.reapply + jilu_id = temp_data.jilu_id + shenheguan_id = temp_data.shenheguan_id + + logger.info( + f"临时表数据: cishu={new_cishu}, fee={current_fee}, reapply={reapply}, jilu_id={jilu_id}, shenheguan_id={shenheguan_id}") + + # 再次申请校验 + if reapply: + if not jilu_id: + logger.error("再次申请但未提供原记录ID") + return False, '再次申请必须提供原记录ID', None + last = ShenheJilu.objects.filter( + jilu_id=jilu_id, + shenqingren_id=user.yonghuid, + zhuangtai=2 + ).first() + if not last: + logger.error(f"原记录不存在或状态不是未通过: jilu_id={jilu_id}") + return False, '原记录不存在或状态不是未通过', None + if new_cishu != last.cishu + 1: + logger.error(f"考核次数不一致: 临时表={new_cishu}, 原记录次数={last.cishu}") + return False, '考核次数不一致', None + logger.info(f"再次申请校验通过，原记录ID: {jilu_id}") + + # 创建或更新审核记录 + if reapply and jilu_id: + # 更新原记录 + final_kg_id = last.shenheguan_id + if shenheguan_id and not last.shenheguan_id: + final_kg_id = shenheguan_id + final_zhuangtai = 0 if final_kg_id else 3 + if final_zhuangtai == 3: + final_kg_id = None + + ShenheJilu.objects.filter(pk=last.pk).update( + cishu=new_cishu, + jiaofei_jine=F('jiaofei_jine') + current_fee, + dashou_youxi_id=temp_data.game_nick, + dashou_beizhu=temp_data.remark, + guize_neirong=chenghao.kaohe_guize or '', + zhuangtai=final_zhuangtai, + shenheguan_id=final_kg_id, + ) + last.refresh_from_db() + record = last + + # 释放旧考核官 + if last.shenheguan_id != final_kg_id and last.shenheguan_id: + UserShenheguan.objects.filter(user__yonghuid=last.shenheguan_id).update(shenhe_zhuangtai=0) + logger.info(f"释放旧考核官: {last.shenheguan_id}") + + logger.info(f"更新审核记录成功: jilu_id={record.jilu_id}, 新次数={new_cishu}") + else: + # 首次申请 + bankuai = chenghao.bankuai + rule_text = chenghao.kaohe_guize or '' + new_jilu_id = generate_unique_jilu_id() + initial_zhuangtai = 0 if shenheguan_id else 3 + + record = ShenheJilu.objects.create( + jilu_id=new_jilu_id, + shenqingren_id=user.yonghuid, + zhuangtai=initial_zhuangtai, + bankuai=bankuai, + chenghao=chenghao, + cishu=new_cishu, + jiaofei_jine=current_fee, + dashou_youxi_id=temp_data.game_nick, + dashou_beizhu=temp_data.remark, + guize_neirong=rule_text, + shenheguan_id=shenheguan_id if shenheguan_id else None, + ) + logger.info(f"创建审核记录成功: jilu_id={new_jilu_id}, 状态={initial_zhuangtai}") + + # 记录费用明细 + fee_detail, created = KaoheJiluFeiyong.objects.get_or_create( + jilu=record, + cishu=record.cishu, + defaults={'jine': current_fee} + ) + if created: + logger.info(f"创建费用明细成功: 记录ID={record.jilu_id}, 金额={current_fee}") + else: + logger.warning(f"费用明细已存在: 记录ID={record.jilu_id}, 次数={record.cishu}") + + # 更新考核官状态 + if record.zhuangtai == 0 and record.shenheguan_id: + UserShenheguan.objects.filter(user__yonghuid=record.shenheguan_id).update( + shenhe_zongshu=F('shenhe_zongshu') + 1, + shenhe_zhuangtai=1 + ) + logger.info(f"更新考核官状态: {record.shenheguan_id}, 审核总数+1, 状态=忙碌") + + logger.info(f"从临时表创建审核记录完成: jilu_id={record.jilu_id}") + return True, '申请成功', record + + except Chenghao.DoesNotExist: + logger.error(f"标签不存在: tag_id={temp_data.tag_id}") + return False, '标签不存在', None + except Exception as e: + logger.error(f"从临时表创建审核记录异常: {str(e)}", exc_info=True) + return False, '系统异常', None \ No newline at end of file diff --git a/dengji/views.py b/dengji/views.py new file mode 100644 index 0000000..e1631a4 --- /dev/null +++ b/dengji/views.py @@ -0,0 +1,975 @@ +# dengji/views.py +import logging +import json +from rest_framework.views import APIView +from rest_framework.permissions import IsAuthenticated +from rest_framework.response import Response + +from shangpin.models import ShangpinLeixing +from .models import YonghuChenghao, Chenghao, KaoheCishuFeiyong, KaoheJujueJilu +from .utils import get_tag_fee, create_shenhe_jilu + +logger = logging.getLogger('dengji') + + +class DashouBiaoqianView(APIView): + """获取当前打手所有称号标签""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + yonghu = request.user + # 查询用户的所有称号关联，一次连表取出 + relations = YonghuChenghao.objects.filter( + yonghu=yonghu + ).select_related('chenghao') + + chenghao_list = [] + for rel in relations: + ch = rel.chenghao + # 解析特效描述 JSON（前端需要对象） + texiao_json = {} + if ch.texiao_miaoshu: + try: + texiao_json = json.loads(ch.texiao_miaoshu) + except json.JSONDecodeError: + texiao_json = {} + chenghao_list.append({ + 'mingcheng': ch.mingcheng, + 'tubiao_url': ch.tubiao_url or '', + 'texiao_json': texiao_json, + }) + + return Response({ + 'code': 0, + 'msg': '成功', + 'data': {'chenghao_list': chenghao_list} + }) + except Exception as e: + logger.error(f"获取打手标签失败: {e}", exc_info=True) + return Response({'code': 1, 'msg': '服务器错误', 'data': None}) + + + +from shangpin.models import ShangpinLeixing +from .models import YonghuChenghao, Chenghao +class BankuaiBiaoqianView(APIView): + """获取商品类型所属板块的所有标签""" + permission_classes = [IsAuthenticated] + + def post(self, request): + leixing_id = request.data.get('leixing_id') + if not leixing_id: + return Response({'code': 1, 'msg': '缺少leixing_id'}) + + try: + leixing = ShangpinLeixing.objects.select_related('bankuai').get(id=leixing_id) + except ShangpinLeixing.DoesNotExist: + return Response({'code': 2, 'msg': '商品类型不存在'}) + + bankuai = leixing.bankuai + if not bankuai: + return Response({'code': 0, 'data': {'biaoqian_list': []}}) + + # 获取该板块下所有类型的标签（leixing可以为dashou/shangjia等，这里先返回所有） + chenghao_list = Chenghao.objects.filter(bankuai=bankuai) + data = [] + for ch in chenghao_list: + texiao_json = {} + if ch.texiao_miaoshu: + try: + texiao_json = json.loads(ch.texiao_miaoshu) + except: + pass + data.append({ + 'id': ch.id, + 'mingcheng': ch.mingcheng, + 'texiao_json': texiao_json + }) + return Response({'code': 0, 'data': {'biaoqian_list': data}}) + + + + + +# dengji/views.py +import logging +from rest_framework.views import APIView +from rest_framework.permissions import IsAuthenticated +from rest_framework.response import Response +from .models import KaoheguanBankuai, Bankuai +from django.db import transaction +from yonghu.models import UserShenheguan, UserMain, UserDashou + +logger = logging.getLogger('dengji') + +# 硬编码邀请码 +KAOHEGUAN_INVITE_CODE = 'KHG2026VIP' + +class KaoheguanRegisterView(APIView): + """ + 考核官注册接口 + POST /dengji/khgzc + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + yonghu = request.user + invite_code = request.data.get('inviteCode', '').strip() + + if not invite_code: + return Response({'code': 400, 'msg': '邀请码不能为空'}) + if invite_code != KAOHEGUAN_INVITE_CODE: + return Response({'code': 400, 'msg': '邀请码错误'}) + + kg = UserShenheguan.objects.filter(user=yonghu).first() + if kg: + if kg.zhuangtai == 1: + return Response({'code': 200, 'msg': '您已是考核官', 'data': self._build_data(kg)}) + else: + return Response({'code': 400, 'msg': '账号已被封禁'}) + + with transaction.atomic(): + kg = UserShenheguan.objects.create( + user=yonghu, + zhuangtai=1, + shenhe_zhuangtai=0, + shenhe_zongshu=0, + tongguo_zongshu=0, + yue=0.00, + zonge=0.00 + ) + return Response({'code': 200, 'msg': '注册成功', 'data': self._build_data(kg)}) + + except Exception as e: + logger.error(f"考核官注册失败: {e}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}) + + def _build_data(self, kg): + bankuai_qs = KaoheguanBankuai.objects.filter(kaoheguan_id=kg.user.yonghuid).select_related('bankuai') + bankuai_list = [{'bankuai_id': b.bankuai.bankuai_id, 'mingcheng': b.bankuai.mingcheng} for b in bankuai_qs] + return { + 'zhuangtai': kg.zhuangtai, + 'shenhe_zongshu': kg.shenhe_zongshu, + 'tongguo_zongshu': kg.tongguo_zongshu, + 'yue': str(kg.yue), + 'zonge': str(kg.zonge), + 'shenhe_zhuangtai': kg.shenhe_zhuangtai, + 'bankuai_list': bankuai_list, + 'kaoheguanstatus': 1 + } + + + + + +class KaoheguanRefreshView(APIView): + """ + 考核官数据刷新接口 + POST /dengji/khgsx + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + yonghu = request.user + kg = UserShenheguan.objects.filter(user=yonghu).first() + if not kg: + return Response({'code': 400, 'msg': '您还未注册考核官'}) + + if kg.zhuangtai != 1: + return Response({'code': 200, 'data': {'zhuangtai': kg.zhuangtai, 'kaoheguanstatus': 0}}) + + # 查询所属板块 + bankuai_qs = KaoheguanBankuai.objects.filter(kaoheguan_id=kg.user.yonghuid).select_related('bankuai') + bankuai_list = [{'bankuai_id': b.bankuai.bankuai_id, 'mingcheng': b.bankuai.mingcheng} for b in bankuai_qs] + + # 统计待审核 / 审核中的记录数量 + pending_count = ShenheJilu.objects.filter( + shenheguan_id=yonghu.yonghuid, + zhuangtai=0 # 审核中 + ).count() + + data = { + 'zhuangtai': kg.zhuangtai, + 'shenhe_zongshu': kg.shenhe_zongshu, + 'tongguo_zongshu': kg.tongguo_zongshu, + 'yue': str(kg.yue), + 'zonge': str(kg.zonge), + 'shenhe_zhuangtai': kg.shenhe_zhuangtai, + 'bankuai_list': bankuai_list, + 'kaoheguanstatus': 1, + 'is_renzheng': kg.is_renzheng, # 🆕 是否认证 + 'pending_shenhe_count': pending_count # 🆕 审核中数量 + } + return Response({'code': 200, 'data': data}) + + except Exception as e: + logger.error(f"考核官刷新失败: {e}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}) + + +import json +from django.db import transaction, IntegrityError +from rest_framework.views import APIView +from rest_framework.permissions import IsAuthenticated +from rest_framework.response import Response + +from .models import Bankuai, ShenheJilu, KaoheguanBankuai, Chenghao + +class ShenheDatingModuleView(APIView): + """审核大厅获取模块列表（板块 + 待审核数量 + 是否关联）""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + yonghu = request.user + related_ids = set(KaoheguanBankuai.objects.filter(kaoheguan_id=yonghu.yonghuid) + .values_list('bankuai_id', flat=True)) + + bankuai_list = [] + for bk in Bankuai.objects.all(): + count = ShenheJilu.objects.filter(bankuai=bk, zhuangtai=3, shenheguan_id__isnull=True).count() + bankuai_list.append({ + 'bankuai_id': bk.bankuai_id, + 'mingcheng': bk.mingcheng, + 'count': count, + 'is_related': bk.bankuai_id in related_ids + }) + + return Response({'code': 0, 'data': {'modules': bankuai_list}}) + except Exception as e: + return Response({'code': 500, 'msg': str(e)}, status=500) + + +class ShenheDatingDataView(APIView): + """获取审核大厅待审核记录列表""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + data = request.data + bankuai_id = data.get('bankuai_id') + page = int(data.get('page', 1)) + page_size = int(data.get('page_size', 5)) + + query = ShenheJilu.objects.filter(zhuangtai=3, shenheguan_id__isnull=True) + if bankuai_id: + query = query.filter(bankuai_id=bankuai_id) + + total = query.count() + offset = (page - 1) * page_size + jilu_list = query.select_related('bankuai', 'chenghao').order_by('-create_time')[ + offset:offset + page_size] + + records = [] + for jl in jilu_list: + user = UserMain.objects.filter(yonghuid=jl.shenqingren_id).first() + avatar = user.avatar if user else '' + texiao_json = {} + if jl.chenghao and jl.chenghao.texiao_miaoshu: + try: + texiao_json = json.loads(jl.chenghao.texiao_miaoshu) + except: + pass + + # 新增字段：本次考核费用 + kaohe_feiyong = float(jl.jiaofei_jine) if jl.jiaofei_jine is not None else 0.0 + + records.append({ + 'jilu_id': jl.jilu_id, + 'shenqingren_id': jl.shenqingren_id, + 'shenqingren_avatar': avatar, + 'dashou_youxi_id': jl.dashou_youxi_id or '', + 'dashou_beizhu': jl.dashou_beizhu or '', + 'bankuai_id': jl.bankuai.bankuai_id if jl.bankuai else None, + 'bankuai_mingcheng': jl.bankuai.mingcheng if jl.bankuai else '', + 'chenghao_id': jl.chenghao_id, + 'chenghao_mingcheng': jl.chenghao.mingcheng if jl.chenghao else '', + 'chenghao_texiao_json': texiao_json, + 'guize_neirong': jl.guize_neirong or '', + 'kaohe_feiyong': kaohe_feiyong, # 新增 + 'create_time': jl.create_time.strftime('%Y-%m-%d %H:%M:%S') if jl.create_time else '', + }) + + has_more = (page * page_size) < total + return Response({'code': 0, 'data': {'list': records, 'has_more': has_more, 'total': total}}) + except Exception as e: + return Response({'code': 500, 'msg': str(e)}, status=500) + +class ShenheQiangdanView(APIView): + """ + 审核官抢单（接审核任务） + 校验：身份、账号封禁、已有进行中审核、记录状态、不能审核自己、板块权限 + 成功后更新考核官扩展表：审核总数+1，审核状态设为“审核中” + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + yonghu = request.user + jilu_id = request.data.get('jilu_id') + if not jilu_id: + return Response({'code': 400, 'msg': '记录ID不能为空'}) + + # 1. 检查考核官身份及账号是否被禁用 + kg = UserShenheguan.objects.filter(user=yonghu, zhuangtai=1).first() + if not kg: + return Response({'code': 403, 'msg': '您不是考核官或账号已被禁用'}) + + # 2. 检查是否有正在审核中的记录（zhuangtai=0），防止同时审核多个 + ongoing = ShenheJilu.objects.filter( + shenheguan_id=yonghu.yonghuid, zhuangtai=0 + ).exists() + if ongoing: + return Response({'code': 400, 'msg': '您有正在审核中的任务，请完成后再接新任务'}) + + with transaction.atomic(): + # 3. 行锁抢单：仅当状态为待审核(3)且无审核官时才能抢 + jilu = ShenheJilu.objects.select_for_update().filter( + jilu_id=jilu_id, + zhuangtai=3, + shenheguan_id__isnull=True + ).first() + if not jilu: + return Response({'code': 400, 'msg': '该审核任务已被接走、状态变更或不存在'}) + + # 4. 不能审核自己 + if jilu.shenqingren_id == yonghu.yonghuid: + return Response({'code': 400, 'msg': '不能审核自己提交的申请'}) + + # 5. 板块权限：考核官必须属于该板块 + is_related = KaoheguanBankuai.objects.filter( + kaoheguan_id=yonghu.yonghuid, + bankuai=jilu.bankuai + ).exists() + if not is_related: + return Response({'code': 400, 'msg': '您不属于该板块，无法审核'}) + + # 新增：6. 费用>0时，要求考核官已认证 + if jilu.jiaofei_jine and float(jilu.jiaofei_jine) > 0: + if not kg.is_renzheng: + return Response({'code': 400, 'msg': '本考核需要认证考核官接单，您尚未认证'}) + + # 7. 更新审核记录：分配给当前考核官，状态变为审核中 + jilu.zhuangtai = 0 # 审核中 + jilu.shenheguan_id = yonghu.yonghuid + jilu.save() + + # 8. 更新考核官扩展表：审核总数 +1，审核状态置为审核中（1） + UserShenheguan.objects.filter(user=yonghu).update( + shenhe_zongshu=F('shenhe_zongshu') + 1, + shenhe_zhuangtai=1 + ) + + return Response({ + 'code': 0, + 'msg': '抢单成功，请前往游戏内审核，审核完成后请到考核打分页面进行评定。', + 'data': {'bankuai_id': jilu.bankuai.bankuai_id} + }) + + except Exception as e: + logger.error(f"审核官抢单异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}, status=500) + + + + + + +import json +import logging +from decimal import Decimal + +from django.db import transaction, models +from django.db.models import F, Q, OuterRef, Subquery, Count, Max +from rest_framework.views import APIView +from rest_framework.permissions import IsAuthenticated +from rest_framework.response import Response + +class ShenheXiangqingView(APIView): + """获取当前考核官审核中的记录详情（新增待收考核费字段）""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + yonghu = request.user + kg = UserShenheguan.objects.filter(user=yonghu, zhuangtai=1).first() + if not kg: + return Response({'code': 403, 'msg': '您不是考核官或账号异常'}) + + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 10)) + + # 查询当前考核官名下状态为“审核中”的记录 + base_query = ShenheJilu.objects.filter( + shenheguan_id=yonghu.yonghuid, + zhuangtai=0 + ).select_related('bankuai', 'chenghao') + total = base_query.count() + offset = (page - 1) * page_size + jilu_list = base_query[offset:offset + page_size] + + records = [] + for jl in jilu_list: + user = UserMain.objects.filter(yonghuid=jl.shenqingren_id).first() + avatar = user.avatar if user else '' + texiao_json = {} + if jl.chenghao and jl.chenghao.texiao_miaoshu: + try: + texiao_json = json.loads(jl.chenghao.texiao_miaoshu) + except: + pass + + # 是否开启金牌 + is_jinpai = jl.chenghao.kaioi_jinpai if jl.chenghao else False + + # 本次待收考核费（基于记录中的当前次数，从费用明细表查询） + daishou_fei = 0.00 + fee_detail = KaoheJiluFeiyong.objects.filter( + jilu=jl, + cishu=jl.cishu + ).first() + if fee_detail: + daishou_fei = float(fee_detail.jine) + else: + # 兜底：若明细表无记录，尝试用通用费用表计算 + daishou_fei = 0.00 + + # 上次失败原因 + last_fail_reason = '' + last_fail = KaoheJujueJilu.objects.filter( + jilu=jl, + cishu=jl.cishu - 1 + ).order_by('-create_time').first() + if last_fail: + last_fail_reason = last_fail.yuanyin + + records.append({ + 'jilu_id': jl.jilu_id, + 'shenqingren_id': jl.shenqingren_id, + 'shenqingren_avatar': avatar, + 'bankuai_mingcheng': jl.bankuai.mingcheng if jl.bankuai else '', + 'chenghao_mingcheng': jl.chenghao.mingcheng if jl.chenghao else '', + 'chenghao_texiao_json': texiao_json, + 'guize_neirong': jl.guize_neirong or '', + 'dashou_beizhu': jl.dashou_beizhu or '', + 'dashou_youxi_id': jl.dashou_youxi_id or '', + 'shenheguan_youxi_id': jl.shenheguan_youxi_id or '', + 'cishu': jl.cishu, + 'daishou_fei': daishou_fei, # 新增：待收考核费 + 'last_fail_reason': last_fail_reason, + 'is_jinpai': is_jinpai, + 'create_time': jl.create_time.strftime('%Y-%m-%d %H:%M:%S') if jl.create_time else '', + }) + + has_more = (page * page_size) < total + return Response({'code': 0, 'data': {'list': records, 'has_more': has_more, 'total': total}}) + except Exception as e: + return Response({'code': 500, 'msg': str(e)}, status=500) + +class ShenheCaozuoView(APIView): + """ + 考核官执行操作（同意/拒绝/转移/修改昵称），并更新考核官收益 + - 只有“同意”或“拒绝”才增加余额和总额，金额严格从 KaoheJiluFeiyong 表获取 + - 查不到费用则加 0 元，绝不影响流程 + - 转移、修改昵称等操作不涉及收益 + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + yonghu = request.user + # 1. 验证考核官身份及账号状态 + kg = UserShenheguan.objects.filter(user=yonghu, zhuangtai=1).first() + if not kg: + return Response({'code': 403, 'msg': '账号异常，无法操作'}) + + jilu_id = request.data.get('jilu_id') + caozuo = request.data.get('caozuo') # agree / reject / transfer / modify_nick + if not jilu_id or not caozuo: + return Response({'code': 400, 'msg': '缺少必要参数'}) + + with transaction.atomic(): + # 2. 锁定审核记录，确保属于当前考核官且状态为审核中(0) + jilu = ShenheJilu.objects.select_for_update().filter( + jilu_id=jilu_id, + shenheguan_id=yonghu.yonghuid, + zhuangtai=0 + ).first() + if not jilu: + return Response({'code': 400, 'msg': '该记录不存在或不属于您'}) + + # 3. 本次操作产生的收入（仅通过/拒绝时有意义） + daishou_fei = 0.00 + + # 4. 根据操作类型执行对应业务逻辑 + if caozuo == 'agree': + # --- 通过考核 --- + # 查询本次考核应得的费用（基于记录ID和当前次数） + fee_detail = KaoheJiluFeiyong.objects.filter( + jilu=jilu, + cishu=jilu.cishu + ).first() + if fee_detail: + daishou_fei = float(fee_detail.jine) + # 找不到就保持 0，绝不使用任何默认值 + + jilu.zhuangtai = 1 + jilu.save() + + # 授予标签 + if jilu.chenghao: + yh = UserMain.objects.get(yonghuid=jilu.shenqingren_id) + if not YonghuChenghao.objects.filter(yonghu=yh, chenghao=jilu.chenghao).exists(): + YonghuChenghao.objects.create(yonghu=yh, chenghao=jilu.chenghao) + # 如果标签开启了金牌，同步更新打手称号 + if jilu.chenghao.kaioi_jinpai: + dashou_prof = UserDashou.objects.filter(user=yh).first() + if dashou_prof: + dashou_prof.chenghao = '金牌选手' + dashou_prof.save() + + elif caozuo == 'reject': + # --- 拒绝考核 --- + yuanyin = request.data.get('yuanyin', '') + if not yuanyin.strip(): + return Response({'code': 400, 'msg': '请填写拒绝原因'}) + + # 查询本次考核应得的费用（拒绝时同样获得收入） + fee_detail = KaoheJiluFeiyong.objects.filter( + jilu=jilu, + cishu=jilu.cishu + ).first() + if fee_detail: + daishou_fei = float(fee_detail.jine) + # 找不到就保持 0 + + jilu.zhuangtai = 2 + jilu.save() + # 记录拒绝原因 + KaoheJujueJilu.objects.create( + jilu=jilu, + cishu=jilu.cishu, + shenheguan_id=yonghu.yonghuid, + yuanyin=yuanyin + ) + + # 新增：不合格时，如果考核官未认证，则清空考核官ID和游戏昵称 + if not kg.is_renzheng: + jilu.shenheguan_id = None + jilu.shenheguan_youxi_id = '' + jilu.save(update_fields=['shenheguan_id', 'shenheguan_youxi_id']) + + elif caozuo == 'transfer': + # 转移考核官：清空考核官信息，状态回退为待审核 + jilu.shenheguan_id = None + jilu.shenheguan_youxi_id = None + jilu.zhuangtai = 3 + jilu.save() + # 转移不更新收益，直接返回 + + + elif caozuo == 'modify_nick': + # 修改考核官游戏昵称 + youxi_id = request.data.get('youxi_id', '').strip() + if not youxi_id: + return Response({'code': 400, 'msg': '请输入游戏昵称'}) + jilu.shenheguan_youxi_id = youxi_id + jilu.save() + return Response({'code': 0, 'msg': '修改成功'}) + + else: + return Response({'code': 400, 'msg': '无效的操作类型'}) + + # 5. 更新考核官收益（仅“通过”或“拒绝”时执行） + if caozuo in ('transfer'): + update_fields = { + + 'shenhe_zhuangtai': 0, # 设为空闲 + } + UserShenheguan.objects.filter(user=yonghu).update(**update_fields) + if caozuo in ('agree', 'reject'): + update_fields = { + 'yue': F('yue') + Decimal(str(daishou_fei)), + 'zonge': F('zonge') + Decimal(str(daishou_fei)), + 'shenhe_zhuangtai': 0, # 设为空闲 + } + # 只有同意时才增加“通过总数” + if caozuo == 'agree': + update_fields['tongguo_zongshu'] = F('tongguo_zongshu') + 1 + + # 审核总数不再增加 + UserShenheguan.objects.filter(user=yonghu).update(**update_fields) + + return Response({'code': 0, 'msg': '操作成功'}) + + except Exception as e: + logger.error(f"考核操作异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}, status=500) + + + + + +# dengji/views.py +class KaoheJinpaiTagsView(APIView): + """获取考核金牌页面的标签和板块信息""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + user = request.user + # 获取用户已拥有的标签名称集合 + owned_names = set( + YonghuChenghao.objects.filter(yonghu=user, chenghao__leixing='dashou') + .values_list('chenghao__mingcheng', flat=True) + ) + + # 板块列表 + plate_list = [] + for bk in Bankuai.objects.all(): + tags = Chenghao.objects.filter(bankuai=bk, leixing='dashou') + tag_list = [] + for tag in tags: + # 费用列表 + fee_objs = KaoheCishuFeiyong.objects.filter(chenghao=tag).order_by('cishu') + fee_list = [{'cishu': f.cishu, 'feiyong': float(f.feiyong)} for f in fee_objs] + + # 若没有记录，补充默认费用 + if not fee_list: + fee_list = [{'cishu': 1, 'feiyong': 5.00}] + + tag_list.append({ + 'id': tag.id, + 'name': tag.mingcheng, + 'texiao_json': json.loads(tag.texiao_miaoshu) if tag.texiao_miaoshu else {}, + 'jinpai': tag.kaioi_jinpai, + 'rule': tag.kaohe_guize or '', + 'fee_list': fee_list, + 'owned': tag.mingcheng in owned_names, + }) + + if tag_list: + plate_list.append({ + 'bankuai_id': bk.bankuai_id, + 'mingcheng': bk.mingcheng, + 'tags': tag_list + }) + + # 新增：返回所有在职考核官信息（用于指定考核官） + kaoheguan_list = [] + for kg in UserShenheguan.objects.filter(zhuangtai=1).select_related('user'): + uid = kg.user.yonghuid + avatar = kg.user.avatar or '' + # 获取考核官的打手昵称（从打手扩展表） + dashou_nick = '' + dashou_prof = UserDashou.objects.filter(user=kg.user).first() + if dashou_prof: + dashou_nick = dashou_prof.nicheng or '' + kaoheguan_list.append({ + 'yonghuid': uid, + 'avatar': avatar, + 'dashou_nick': dashou_nick, + 'is_renzheng': kg.is_renzheng, + 'shenhe_zhuangtai': kg.shenhe_zhuangtai, + }) + + return Response({ + 'code': 0, + 'data': { + 'plate_list': plate_list, + 'my_tags': list(owned_names), + 'kaoheguan_list': kaoheguan_list, # 新增 + } + }) + except Exception as e: + return Response({'code': 500, 'msg': str(e)}, status=500) + +# dengji/utils.py +from .models import Chenghao, KaoheCishuFeiyong, ShenheJilu, KaoheJiluFeiyong, YonghuChenghao +from yonghu.models import UserMain +from django.db import models +class KaoheJiluView(APIView): + """获取打手本人的考核记录（支持筛选状态）""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + user = request.user + status = request.data.get('status', 'pending') # pending / passed + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 5)) + + if status == 'pending': + # 进行中/未通过：审核中(0)、待审核(3)、未通过(2) + query = ShenheJilu.objects.filter( + shenqingren_id=user.yonghuid, + zhuangtai__in=[0, 2, 3] + ) + else: + query = ShenheJilu.objects.filter( + shenqingren_id=user.yonghuid, + zhuangtai=1 # 已通过 + ) + + total = query.count() + records = query.order_by('-create_time')[(page-1)*page_size : page*page_size] + + data = [] + for jl in records: + # 汇总缴纳总额 + total_fee = KaoheJiluFeiyong.objects.filter(jilu=jl).aggregate( + total=models.Sum('jine') + )['total'] or 0.00 + + # 上次拒绝原因（最近一条） + last_fail = KaoheJujueJilu.objects.filter(jilu=jl).order_by('-create_time').first() + fail_reason = last_fail.yuanyin if last_fail else '' + + # 考核官头像 + kg_user = UserMain.objects.filter(yonghuid=jl.shenheguan_id).first() + kg_avatar = kg_user.avatar if kg_user else '' + + data.append({ + 'jilu_id': jl.jilu_id, + 'chenghao_name': jl.chenghao.mingcheng if jl.chenghao else '', + 'bankuai_name': jl.bankuai.mingcheng if jl.bankuai else '', + 'zhuangtai': jl.zhuangtai, + 'statusText': dict(ShenheJilu._meta.get_field('zhuangtai').choices).get(jl.zhuangtai, '未知'), + 'statusColor': {0: '#FFA500', 1: '#27ae60', 2: '#e74c3c', 3: '#3498db'}.get(jl.zhuangtai, '#888'), + 'shenheguan_id': jl.shenheguan_id, + 'shenheguan_avatar': kg_avatar, + 'dashou_youxi_id': jl.dashou_youxi_id, + 'dashou_beizhu': jl.dashou_beizhu, + 'cishu': jl.cishu, + 'total_fee': float(total_fee), + 'last_fail_reason': fail_reason, + 'create_time': jl.create_time.strftime('%Y-%m-%d %H:%M:%S'), + # 为再次申请预留标签对象数据（前端可能用到） + 'tag_obj': { + 'id': jl.chenghao_id, + 'name': jl.chenghao.mingcheng if jl.chenghao else '', + # 其他字段按需，但申请时会重新拉取 + } if jl.chenghao else None, + }) + + has_more = (page * page_size) < total + return Response({ + 'code': 0, + 'data': {'list': data, 'has_more': has_more, 'total': total} + }) + except Exception as e: + return Response({'code': 500, 'msg': str(e)}, status=500) + + +from .utils import validate_shenheguan +class KaoheFreeApplyView(APIView): + """免费申请考核（首次/再次，费用为0时调用）""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + user = request.user + tag_id = request.data.get('tag_id') + game_nick = request.data.get('game_nick', '').strip() + remark = request.data.get('remark', '').strip() + reapply = request.data.get('reapply', False) + jilu_id = request.data.get('jilu_id') if reapply else None + shenheguan_id = request.data.get('shenheguan_id', '').strip() # 新增 + + if not tag_id or not game_nick: + return Response({'code': 400, 'msg': '标签ID和游戏昵称必填'}) + + # 校验费用是否为0 + try: + chenghao = Chenghao.objects.get(id=tag_id) + except Chenghao.DoesNotExist: + return Response({'code': 400, 'msg': '标签不存在'}) + + # 计算本次次数 + if reapply and jilu_id: + last_record = ShenheJilu.objects.filter( + jilu_id=jilu_id, shenqingren_id=user.yonghuid, zhuangtai=2 + ).first() + if not last_record: + return Response({'code': 400, 'msg': '原记录不存在或状态不是未通过'}) + new_cishu = last_record.cishu + 1 + else: + max_cishu = ShenheJilu.objects.filter( + shenqingren_id=user.yonghuid, chenghao=chenghao, zhuangtai__in=[1,2] + ).aggregate(max=models.Max('cishu'))['max'] or 0 + new_cishu = max_cishu + 1 + + fee = get_tag_fee(chenghao, new_cishu) + if fee > 0: + return Response({'code': 400, 'msg': '您有未通过的记录请查看并重考'}) + + # 新增：如果指定了考核官，进行合法性校验 + if shenheguan_id: + valid, err = validate_shenheguan(shenheguan_id, chenghao.bankuai, fee, user) + if not valid: + return Response({'code': 400, 'msg': err}) + + # 调用公共创建逻辑 + success, msg, record = create_shenhe_jilu( + user, tag_id, game_nick, remark, reapply, jilu_id, + shenheguan_id=shenheguan_id # 新增参数 + ) + if success: + return Response({'code': 0, 'msg': msg, 'data': {'jilu_id': record.jilu_id}}) + else: + return Response({'code': 400, 'msg': msg}) + except Exception as e: + return Response({'code': 500, 'msg': str(e)}, status=500) + + + + +class KaoheJiluListView(APIView): + """ + 获取当前考核官的历史审核记录 + 路径：POST /dengji/khghqkhjl + 权限：JWT Token (考核官) + 参数： + bankuai_id : int (可选，0或空表示全部) + status : int (可选，0-全部 1-审核中 2-已通过 3-未通过) + page : int (默认1) + page_size : int (默认5) + 返回： + list, has_more, total + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + yonghu = request.user + # 1. 验证考核官身份及账号状态 + kg = UserShenheguan.objects.filter(user=yonghu, zhuangtai=1).first() + if not kg: + return Response({'code': 403, 'msg': '您不是考核官或账号异常'}) + + # 2. 获取参数 + bankuai_id = request.data.get('bankuai_id') + status = int(request.data.get('status', 0)) # 0全部 1审核中 2已通过 3未通过 + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 5)) + + # 3. 构建查询条件：只查当前考核官审核的记录 + base_query = ShenheJilu.objects.filter(shenheguan_id=yonghu.yonghuid) + + # 板块筛选 + if bankuai_id and int(bankuai_id) > 0: + base_query = base_query.filter(bankuai_id=int(bankuai_id)) + + # 状态筛选（前端传的状态映射到后端zhuangtai字段） + status_map = { + 0: None, # 全部不筛选 + 1: 0, # 审核中 + 2: 1, # 已通过 + 3: 2, # 未通过 + } + if status_map.get(status) is not None: + base_query = base_query.filter(zhuangtai=status_map[status]) + + # 4. 计数与分页 + total = base_query.count() + offset = (page - 1) * page_size + jilu_list = base_query.order_by('-create_time')[offset:offset + page_size] + + # 5. 预取关联数据，减少查询次数 + jilu_list = jilu_list.select_related('bankuai', 'chenghao') + # 为每条记录预取费用明细和拒绝记录（通过 related_name 或手动过滤） + # 由于 KaoheJiluFeiyong 和 KaoheJujueJilu 通过外键指向 ShenheJilu (to_field='jilu_id')， + # 可以使用 prefetch_related + jilu_ids = [j.jilu_id for j in jilu_list] + fee_dict = {} + reject_dict = {} + if jilu_ids: + # 批量获取所有费用明细 + fee_qs = KaoheJiluFeiyong.objects.filter(jilu_id__in=jilu_ids).order_by('cishu') + for fee in fee_qs: + if fee.jilu_id not in fee_dict: + fee_dict[fee.jilu_id] = [] + fee_dict[fee.jilu_id].append({'cishu': fee.cishu, 'jine': float(fee.jine)}) + + # 批量获取所有拒绝记录 + reject_qs = KaoheJujueJilu.objects.filter(jilu_id__in=jilu_ids).order_by('cishu') + for rej in reject_qs: + if rej.jilu_id not in reject_dict: + reject_dict[rej.jilu_id] = [] + reject_dict[rej.jilu_id].append({ + 'cishu': rej.cishu, + 'yuanyin': rej.yuanyin, + 'create_time': rej.create_time.strftime('%Y-%m-%d %H:%M:%S') if rej.create_time else '' + }) + + # 6. 批量获取申请人信息（昵称和头像） + applicant_ids = {j.shenqingren_id for j in jilu_list} + user_map = {} + if applicant_ids: + users = UserMain.objects.filter(yonghuid__in=applicant_ids).select_related('dashou_profile') + for u in users: + avatar = u.avatar or '' + nicheng = '' + try: + # 打手扩展表可能有 nicheng + nicheng = u.dashou_profile.nicheng if u.dashou_profile else '' + except UserDashou.DoesNotExist: + pass + user_map[u.yonghuid] = { + 'avatar': avatar, + 'nicheng': nicheng or f'用户{u.yonghuid}' + } + + # 7. 组装数据 + records = [] + for jl in jilu_list: + user_info = user_map.get(jl.shenqingren_id, {'avatar': '', 'nicheng': '未知'}) + # 标签特效JSON + texiao_json = {} + if jl.chenghao and jl.chenghao.texiao_miaoshu: + try: + texiao_json = json.loads(jl.chenghao.texiao_miaoshu) + except: + pass + + # 汇总总缴纳费用 + fee_items = fee_dict.get(jl.jilu_id, []) + total_fee = sum(item['jine'] for item in fee_items) + + records.append({ + 'jilu_id': jl.jilu_id, + 'shenqingren_id': jl.shenqingren_id, + 'shenqingren_avatar': user_info['avatar'], + 'shenqingren_nicheng': user_info['nicheng'], + 'bankuai_mingcheng': jl.bankuai.mingcheng if jl.bankuai else '', + 'chenghao_mingcheng': jl.chenghao.mingcheng if jl.chenghao else '', + 'chenghao_texiao_json': texiao_json, + 'zhuangtai': jl.zhuangtai, # 0审核中 1通过 2未通过 3待审核 + 'cishu': jl.cishu, + 'total_fee': total_fee, + 'dashou_youxi_id': jl.dashou_youxi_id or '', + 'dashou_beizhu': jl.dashou_beizhu or '', + 'shenheguan_youxi_id': jl.shenheguan_youxi_id or '', + 'guize_neirong': jl.guize_neirong or '', + 'create_time': jl.create_time.strftime('%Y-%m-%d %H:%M:%S') if jl.create_time else '', + 'update_time': jl.update_time.strftime('%Y-%m-%d %H:%M:%S') if jl.update_time else '', + 'fee_list': fee_items, + 'reject_list': reject_dict.get(jl.jilu_id, []), + }) + + has_more = (page * page_size) < total + return Response({ + 'code': 0, + 'data': { + 'list': records, + 'has_more': has_more, + 'total': total + } + }) + + except Exception as e: + logger.error(f"获取考核记录异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}, status=500) \ No newline at end of file diff --git a/dingdan/__init__.py b/dingdan/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dingdan/__pycache__/__init__.cpython-313.pyc b/dingdan/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..7cb2d10 Binary files /dev/null and b/dingdan/__pycache__/__init__.cpython-313.pyc differ diff --git a/dingdan/__pycache__/admin.cpython-313.pyc b/dingdan/__pycache__/admin.cpython-313.pyc new file mode 100644 index 0000000..0364cf6 Binary files /dev/null and b/dingdan/__pycache__/admin.cpython-313.pyc differ diff --git a/dingdan/__pycache__/apps.cpython-313.pyc b/dingdan/__pycache__/apps.cpython-313.pyc new file mode 100644 index 0000000..d83aac8 Binary files /dev/null and b/dingdan/__pycache__/apps.cpython-313.pyc differ diff --git a/dingdan/__pycache__/models.cpython-312.pyc b/dingdan/__pycache__/models.cpython-312.pyc new file mode 100644 index 0000000..3901c34 Binary files /dev/null and b/dingdan/__pycache__/models.cpython-312.pyc differ diff --git a/dingdan/__pycache__/models.cpython-313.pyc b/dingdan/__pycache__/models.cpython-313.pyc new file mode 100644 index 0000000..73341ca Binary files /dev/null and b/dingdan/__pycache__/models.cpython-313.pyc differ diff --git a/dingdan/__pycache__/signals.cpython-313.pyc b/dingdan/__pycache__/signals.cpython-313.pyc new file mode 100644 index 0000000..a7e929b Binary files /dev/null and b/dingdan/__pycache__/signals.cpython-313.pyc differ diff --git a/dingdan/__pycache__/tasks.cpython-313.pyc b/dingdan/__pycache__/tasks.cpython-313.pyc new file mode 100644 index 0000000..6af6038 Binary files /dev/null and b/dingdan/__pycache__/tasks.cpython-313.pyc differ diff --git a/dingdan/__pycache__/urls.cpython-313.pyc b/dingdan/__pycache__/urls.cpython-313.pyc new file mode 100644 index 0000000..f9cd542 Binary files /dev/null and b/dingdan/__pycache__/urls.cpython-313.pyc differ diff --git a/dingdan/__pycache__/utils.cpython-312.pyc b/dingdan/__pycache__/utils.cpython-312.pyc new file mode 100644 index 0000000..dbe1e3c Binary files /dev/null and b/dingdan/__pycache__/utils.cpython-312.pyc differ diff --git a/dingdan/__pycache__/utils.cpython-313.pyc b/dingdan/__pycache__/utils.cpython-313.pyc new file mode 100644 index 0000000..3907b24 Binary files /dev/null and b/dingdan/__pycache__/utils.cpython-313.pyc differ diff --git a/dingdan/__pycache__/views.cpython-313.pyc b/dingdan/__pycache__/views.cpython-313.pyc new file mode 100644 index 0000000..71b453c Binary files /dev/null and b/dingdan/__pycache__/views.cpython-313.pyc differ diff --git a/dingdan/admin.py b/dingdan/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/dingdan/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/dingdan/apps.py b/dingdan/apps.py new file mode 100644 index 0000000..0a14712 --- /dev/null +++ b/dingdan/apps.py @@ -0,0 +1,10 @@ +from django.apps import AppConfig + + +class DingdanConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'dingdan' + + def ready(self): + # 导入信号处理，确保信号被注册 + import dingdan.signals \ No newline at end of file diff --git a/dingdan/cross_platform_tasks.py b/dingdan/cross_platform_tasks.py new file mode 100644 index 0000000..396dfe7 --- /dev/null +++ b/dingdan/cross_platform_tasks.py @@ -0,0 +1,43 @@ +# dingdan/cross_platform_tasks.py + +#不在使用 + + +import logging +import requests +from django.conf import settings + +logger = logging.getLogger(__name__) + +def send_partner_sync_order(partner_order_id, jine, dashou_fencheng, jieshao, beizhu, create_time,nicheng): + """ + 异步发送派单通知给对方平台（使用简单线程，非Celery） + 注意：此函数应在线程中调用，避免阻塞主请求。 + 生产环境建议使用Celery，此处提供线程兼容版本。 + """ + url = f"{settings.PARTNER_BASE_URL}/dingdan/partner_sync_order" + payload = { + 'token': settings.CROSS_PLATFORM_TOKEN, + 'partner_order_id': partner_order_id, + 'jine': jine, + 'dashou_fencheng': dashou_fencheng, + 'jieshao': jieshao, + 'beizhu': beizhu, + 'create_time': create_time, + 'nicheng': nicheng, + } + try: + response = requests.post(url, json=payload, timeout=5) + if response.status_code == 200: + data = response.json() + if data.get('code') == 0: + logger.info(f"跨平台派单同步成功: {partner_order_id}") + # 可在此处保存对方返回的 local_order_id 到本地订单（如果需要） + # local_order_id = data['data'].get('local_order_id') + # Dingdan.objects.filter(dingdan_id=partner_order_id).update(partner_order_id=local_order_id) + else: + logger.error(f"跨平台派单同步业务失败: {data}") + else: + logger.error(f"跨平台派单同步HTTP失败: {response.status_code}") + except Exception as e: + logger.error(f"跨平台派单同步异常: {str(e)}", exc_info=True) \ No newline at end of file diff --git a/dingdan/migrations/0001_initial.py b/dingdan/migrations/0001_initial.py new file mode 100644 index 0000000..2830185 --- /dev/null +++ b/dingdan/migrations/0001_initial.py @@ -0,0 +1,186 @@ +# Generated by Django 6.0 on 2025-12-20 23:54 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [] + + operations = [ + migrations.CreateModel( + name="Dingdan", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "dingdan_id", + models.CharField(max_length=32, unique=True, verbose_name="订单ID"), + ), + ( + "zhuangtai", + models.IntegerField( + blank=True, default=1, null=True, verbose_name="订单状态" + ), + ), + ( + "fadan_pingtai", + models.IntegerField(blank=True, null=True, verbose_name="发单平台"), + ), + ( + "jine", + models.DecimalField( + blank=True, + decimal_places=2, + max_digits=10, + null=True, + verbose_name="订单金额", + ), + ), + ( + "dashou_fencheng", + models.DecimalField( + blank=True, + decimal_places=2, + max_digits=10, + null=True, + verbose_name="打手分成", + ), + ), + ( + "jiedan_dashou_id", + models.CharField( + blank=True, max_length=32, null=True, verbose_name="接单打手ID" + ), + ), + ( + "zhiding_id", + models.CharField( + blank=True, max_length=32, null=True, verbose_name="指定ID" + ), + ), + ( + "shangpin_id", + models.IntegerField(blank=True, null=True, verbose_name="商品ID"), + ), + ( + "jieshao", + models.TextField(blank=True, null=True, verbose_name="订单介绍"), + ), + ( + "beizhu", + models.TextField(blank=True, null=True, verbose_name="订单备注"), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ( + "update_time", + models.DateTimeField(auto_now=True, verbose_name="更新时间"), + ), + ], + options={ + "verbose_name": "订单", + "verbose_name_plural": "订单", + "db_table": "dingdan", + "indexes": [ + models.Index( + fields=["zhuangtai"], name="dingdan_zhuangt_2febe8_idx" + ), + models.Index( + fields=["dingdan_id"], name="dingdan_dingdan_83dcb6_idx" + ), + models.Index( + fields=["jiedan_dashou_id"], name="dingdan_jiedan__921bfa_idx" + ), + ], + }, + ), + migrations.CreateModel( + name="DingdanPingtai", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "laoban_id", + models.CharField( + blank=True, max_length=32, null=True, verbose_name="老板ID" + ), + ), + ( + "laoban_pingjia", + models.TextField(blank=True, null=True, verbose_name="老板评价"), + ), + ( + "dingdan", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name="pingtai_kuozhan", + to="dingdan.dingdan", + verbose_name="订单", + ), + ), + ], + options={ + "verbose_name": "平台订单扩展", + "verbose_name_plural": "平台订单扩展", + "db_table": "dingdan_pingtai", + }, + ), + migrations.CreateModel( + name="DingdanShangjia", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "shangjia_id", + models.CharField( + blank=True, max_length=32, null=True, verbose_name="商家ID" + ), + ), + ( + "shangjia_pingjia", + models.TextField(blank=True, null=True, verbose_name="商家评价"), + ), + ( + "dingdan", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name="shangjia_kuozhan", + to="dingdan.dingdan", + verbose_name="订单", + ), + ), + ], + options={ + "verbose_name": "商家订单扩展", + "verbose_name_plural": "商家订单扩展", + "db_table": "dingdan_shangjia", + }, + ), + ] diff --git a/dingdan/migrations/0002_dingdan_huiyuan_id_dingdan_yaoqiuleixing_and_more.py b/dingdan/migrations/0002_dingdan_huiyuan_id_dingdan_yaoqiuleixing_and_more.py new file mode 100644 index 0000000..9ae6e37 --- /dev/null +++ b/dingdan/migrations/0002_dingdan_huiyuan_id_dingdan_yaoqiuleixing_and_more.py @@ -0,0 +1,38 @@ +# Generated by Django 6.0 on 2025-12-23 21:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0001_initial"), + ] + + operations = [ + migrations.AddField( + model_name="dingdan", + name="huiyuan_id", + field=models.CharField( + blank=True, max_length=6, null=True, verbose_name="会员ID" + ), + ), + migrations.AddField( + model_name="dingdan", + name="yaoqiuleixing", + field=models.PositiveIntegerField( + blank=True, null=True, verbose_name="抢单要求类型" + ), + ), + migrations.AddField( + model_name="dingdan", + name="yongjin", + field=models.DecimalField( + blank=True, + decimal_places=2, + max_digits=10, + null=True, + verbose_name="佣金要求", + ), + ), + ] diff --git a/dingdan/migrations/0003_lilubiao.py b/dingdan/migrations/0003_lilubiao.py new file mode 100644 index 0000000..2578a70 --- /dev/null +++ b/dingdan/migrations/0003_lilubiao.py @@ -0,0 +1,55 @@ +# Generated by Django 6.0 on 2025-12-23 21:44 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0002_dingdan_huiyuan_id_dingdan_yaoqiuleixing_and_more"), + ] + + operations = [ + migrations.CreateModel( + name="Lilubiao", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "lilu", + models.DecimalField( + decimal_places=4, + max_digits=5, + null=True, + verbose_name="平台分成利率，1是平台,2是商家", + ), + ), + ( + "fadanpingtai", + models.CharField( + max_length=10, + null=True, + verbose_name="订单所属平台，（商家或平台）", + ), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ( + "update_time", + models.DateTimeField(auto_now=True, verbose_name="更新时间"), + ), + ], + options={ + "db_table": "lilubiao", + }, + ), + ] diff --git a/dingdan/migrations/0004_dingdan_nicheng.py b/dingdan/migrations/0004_dingdan_nicheng.py new file mode 100644 index 0000000..3b1b0d0 --- /dev/null +++ b/dingdan/migrations/0004_dingdan_nicheng.py @@ -0,0 +1,20 @@ +# Generated by Django 6.0 on 2025-12-24 23:35 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0003_lilubiao"), + ] + + operations = [ + migrations.AddField( + model_name="dingdan", + name="nicheng", + field=models.CharField( + blank=True, max_length=50, null=True, verbose_name="游戏昵称" + ), + ), + ] diff --git a/dingdan/migrations/0005_dingdan_tupian.py b/dingdan/migrations/0005_dingdan_tupian.py new file mode 100644 index 0000000..00833c9 --- /dev/null +++ b/dingdan/migrations/0005_dingdan_tupian.py @@ -0,0 +1,20 @@ +# Generated by Django 6.0 on 2025-12-25 22:52 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0004_dingdan_nicheng"), + ] + + operations = [ + migrations.AddField( + model_name="dingdan", + name="tupian", + field=models.CharField( + blank=True, max_length=500, null=True, verbose_name="商品图片URL" + ), + ), + ] diff --git a/dingdan/migrations/0006_dingdan_dashou_liuyan_dingdan_leixing_id_and_more.py b/dingdan/migrations/0006_dingdan_dashou_liuyan_dingdan_leixing_id_and_more.py new file mode 100644 index 0000000..8021048 --- /dev/null +++ b/dingdan/migrations/0006_dingdan_dashou_liuyan_dingdan_leixing_id_and_more.py @@ -0,0 +1,157 @@ +# Generated by Django 6.0 on 2025-12-26 17:26 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0005_dingdan_tupian"), + ] + + operations = [ + migrations.AddField( + model_name="dingdan", + name="dashou_liuyan", + field=models.TextField(blank=True, null=True, verbose_name="打手留言"), + ), + migrations.AddField( + model_name="dingdan", + name="leixing_id", + field=models.PositiveIntegerField( + blank=True, null=True, verbose_name="商品类型ID" + ), + ), + migrations.AlterField( + model_name="dingdan", + name="dingdan_id", + field=models.CharField( + db_index=True, max_length=32, unique=True, verbose_name="订单ID" + ), + ), + migrations.AlterField( + model_name="dingdan", + name="jiedan_dashou_id", + field=models.CharField( + blank=True, + db_index=True, + max_length=32, + null=True, + verbose_name="接单打手ID", + ), + ), + migrations.AlterField( + model_name="dingdan", + name="zhuangtai", + field=models.IntegerField( + blank=True, db_index=True, default=1, null=True, verbose_name="订单状态" + ), + ), + migrations.CreateModel( + name="Dashoutupian", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "dingdan_id", + models.CharField( + db_index=True, max_length=32, null=True, verbose_name="订单ID" + ), + ), + ( + "dashou", + models.CharField( + blank=True, + db_index=True, + max_length=32, + null=True, + verbose_name="接单打手ID", + ), + ), + ( + "tupian", + models.CharField( + blank=True, + max_length=500, + null=True, + verbose_name="打手提交图片URL", + ), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ( + "update_time", + models.DateTimeField(auto_now=True, verbose_name="更新时间"), + ), + ], + options={ + "db_table": "dashoutupian", + "indexes": [ + models.Index( + fields=["dashou"], name="dashoutupia_dashou_7de8bd_idx" + ), + models.Index( + fields=["dingdan_id"], name="dashoutupia_dingdan_97c685_idx" + ), + ], + }, + ), + migrations.CreateModel( + name="Pingfen", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "dashou", + models.CharField( + blank=True, + db_index=True, + max_length=32, + null=True, + verbose_name="接单打手ID", + ), + ), + ( + "zongfen", + models.PositiveIntegerField(default=0, verbose_name="总分"), + ), + ( + "cishu", + models.PositiveIntegerField(default=0, verbose_name="评分次数"), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ( + "update_time", + models.DateTimeField(auto_now=True, verbose_name="更新时间"), + ), + ], + options={ + "verbose_name": "评分表", + "db_table": "pingfenbiao", + "indexes": [ + models.Index( + fields=["dashou"], name="pingfenbiao_dashou_f62f10_idx" + ) + ], + }, + ), + ] diff --git a/dingdan/migrations/0007_chufajilu_tuikuanjilu_dingdanshangjia_bhliyou_and_more.py b/dingdan/migrations/0007_chufajilu_tuikuanjilu_dingdanshangjia_bhliyou_and_more.py new file mode 100644 index 0000000..52bf9e8 --- /dev/null +++ b/dingdan/migrations/0007_chufajilu_tuikuanjilu_dingdanshangjia_bhliyou_and_more.py @@ -0,0 +1,280 @@ +# Generated by Django 6.0 on 2025-12-30 15:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0006_dingdan_dashou_liuyan_dingdan_leixing_id_and_more"), + ] + + operations = [ + migrations.CreateModel( + name="Chufajilu", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "dashouid", + models.CharField( + db_index=True, + max_length=7, + null=True, + verbose_name="被罚打手ID", + ), + ), + ( + "qingqiuid", + models.CharField( + db_index=True, + max_length=7, + null=True, + verbose_name="请求处罚ID", + ), + ), + ( + "chuliid", + models.CharField( + db_index=True, + max_length=7, + null=True, + verbose_name="处理处罚ID", + ), + ), + ( + "cfliyou", + models.TextField(blank=True, null=True, verbose_name="处罚理由"), + ), + ( + "sqzhuangtai", + models.IntegerField( + blank=True, + default=0, + null=True, + verbose_name="处罚申请状态:0待处理,1成功,2驳回", + ), + ), + ( + "bhliyou", + models.TextField( + blank=True, null=True, verbose_name="驳回处罚理由" + ), + ), + ("jifen", models.IntegerField(default=0, verbose_name="扣除打手积分")), + ( + "dingdan_id", + models.CharField( + db_index=True, max_length=32, null=True, verbose_name="订单ID" + ), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ( + "update_time", + models.DateTimeField(auto_now=True, verbose_name="更新时间"), + ), + ], + options={ + "db_table": "chufajilu", + }, + ), + migrations.CreateModel( + name="Tuikuanjilu", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "dingdan_id", + models.CharField(max_length=32, unique=True, verbose_name="订单ID"), + ), + ( + "dashouid", + models.CharField( + max_length=7, null=True, verbose_name="接单打手ID" + ), + ), + ( + "qingqiuid", + models.CharField( + max_length=7, null=True, verbose_name="请求用户ID" + ), + ), + ( + "chuliid", + models.CharField( + db_index=True, max_length=7, null=True, verbose_name="处理人ID" + ), + ), + ( + "cfliyou", + models.TextField(blank=True, null=True, verbose_name="理由"), + ), + ( + "sqzhuangtai", + models.IntegerField( + blank=True, + db_index=True, + default=0, + null=True, + verbose_name="处罚申请状态:0待处理,1成功,2驳回", + ), + ), + ( + "bhliyou", + models.TextField(blank=True, null=True, verbose_name="驳回理由"), + ), + ( + "jine", + models.DecimalField( + blank=True, + decimal_places=2, + max_digits=10, + null=True, + verbose_name="订单金额", + ), + ), + ( + "dashou_fencheng", + models.DecimalField( + blank=True, + decimal_places=2, + max_digits=10, + null=True, + verbose_name="打手分成", + ), + ), + ( + "jieshao", + models.TextField(blank=True, null=True, verbose_name="订单介绍"), + ), + ( + "beizhu", + models.TextField(blank=True, null=True, verbose_name="订单备注"), + ), + ( + "nicheng", + models.CharField( + blank=True, max_length=50, null=True, verbose_name="游戏昵称" + ), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ( + "update_time", + models.DateTimeField(auto_now=True, verbose_name="更新时间"), + ), + ], + options={ + "db_table": "tuikuanjilu", + }, + ), + migrations.AddField( + model_name="dingdanshangjia", + name="bhliyou", + field=models.TextField( + blank=True, null=True, verbose_name="驳回商家处罚理由" + ), + ), + migrations.AddField( + model_name="dingdanshangjia", + name="cfliyou", + field=models.TextField(blank=True, null=True, verbose_name="商家处罚理由"), + ), + migrations.AddField( + model_name="dingdanshangjia", + name="sqzhuangtai", + field=models.IntegerField( + blank=True, + default=0, + null=True, + verbose_name="处罚申请状态:0待处理,1成功,2驳回", + ), + ), + migrations.AlterField( + model_name="dingdanpingtai", + name="laoban_id", + field=models.CharField( + blank=True, + db_index=True, + max_length=32, + null=True, + verbose_name="老板ID", + ), + ), + migrations.AlterField( + model_name="dingdanshangjia", + name="shangjia_id", + field=models.CharField( + blank=True, + db_index=True, + max_length=32, + null=True, + verbose_name="商家ID", + ), + ), + migrations.AddIndex( + model_name="dingdanpingtai", + index=models.Index( + fields=["laoban_id"], name="dingdan_pin_laoban__d55e6f_idx" + ), + ), + migrations.AddIndex( + model_name="dingdanshangjia", + index=models.Index( + fields=["shangjia_id"], name="dingdan_sha_shangji_64d28b_idx" + ), + ), + migrations.AddIndex( + model_name="chufajilu", + index=models.Index( + fields=["dashouid"], name="chufajilu_dashoui_07aac0_idx" + ), + ), + migrations.AddIndex( + model_name="chufajilu", + index=models.Index( + fields=["qingqiuid"], name="chufajilu_qingqiu_ac160e_idx" + ), + ), + migrations.AddIndex( + model_name="chufajilu", + index=models.Index(fields=["chuliid"], name="chufajilu_chuliid_cd63ac_idx"), + ), + migrations.AddIndex( + model_name="chufajilu", + index=models.Index( + fields=["dingdan_id"], name="chufajilu_dingdan_b8f0c2_idx" + ), + ), + migrations.AddIndex( + model_name="tuikuanjilu", + index=models.Index( + fields=["chuliid"], name="tuikuanjilu_chuliid_0b0f16_idx" + ), + ), + migrations.AddIndex( + model_name="tuikuanjilu", + index=models.Index( + fields=["sqzhuangtai"], name="tuikuanjilu_sqzhuan_d89dc9_idx" + ), + ), + ] diff --git a/dingdan/migrations/0008_ptliushui_rename_cfliyou_tuikuanjilu_liyou_and_more.py b/dingdan/migrations/0008_ptliushui_rename_cfliyou_tuikuanjilu_liyou_and_more.py new file mode 100644 index 0000000..54edc2e --- /dev/null +++ b/dingdan/migrations/0008_ptliushui_rename_cfliyou_tuikuanjilu_liyou_and_more.py @@ -0,0 +1,122 @@ +# Generated by Django 6.0 on 2025-12-30 17:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0007_chufajilu_tuikuanjilu_dingdanshangjia_bhliyou_and_more"), + ] + + operations = [ + migrations.CreateModel( + name="Ptliushui", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "zonge", + models.DecimalField( + blank=True, + decimal_places=2, + max_digits=10, + null=True, + verbose_name="收取总金额", + ), + ), + ( + "zhichuzonge", + models.DecimalField( + blank=True, + decimal_places=2, + max_digits=10, + null=True, + verbose_name="支出总金额", + ), + ), + ( + "zongshouyi", + models.DecimalField( + blank=True, + decimal_places=2, + max_digits=10, + null=True, + verbose_name="总收益", + ), + ), + ( + "rizonge", + models.DecimalField( + blank=True, + decimal_places=2, + max_digits=10, + null=True, + verbose_name="日收取", + ), + ), + ( + "rizhichu", + models.DecimalField( + blank=True, + decimal_places=2, + max_digits=10, + null=True, + verbose_name="日支出", + ), + ), + ( + "rishouyi", + models.DecimalField( + blank=True, + decimal_places=2, + max_digits=10, + null=True, + verbose_name="日收益", + ), + ), + ( + "zongshoucishu", + models.IntegerField(default=0, verbose_name="总收取次数"), + ), + ( + "rishoucishu", + models.IntegerField(default=0, verbose_name="日收取次数"), + ), + ( + "zongzhichucishu", + models.IntegerField(default=0, verbose_name="总支出次数"), + ), + ( + "rizhichucishu", + models.IntegerField(default=0, verbose_name="日支出次数"), + ), + ], + options={ + "db_table": "ptliushui", + }, + ), + migrations.RenameField( + model_name="tuikuanjilu", + old_name="cfliyou", + new_name="liyou", + ), + migrations.AlterField( + model_name="tuikuanjilu", + name="sqzhuangtai", + field=models.IntegerField( + blank=True, + db_index=True, + default=0, + null=True, + verbose_name="申请状态:0待处理,1成功,2驳回", + ), + ), + ] diff --git a/dingdan/migrations/0009_dingdan_liaotian_pindao.py b/dingdan/migrations/0009_dingdan_liaotian_pindao.py new file mode 100644 index 0000000..6bd4ba2 --- /dev/null +++ b/dingdan/migrations/0009_dingdan_liaotian_pindao.py @@ -0,0 +1,20 @@ +# Generated by Django 6.0 on 2025-12-31 11:12 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0008_ptliushui_rename_cfliyou_tuikuanjilu_liyou_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="dingdan", + name="liaotian_pindao", + field=models.CharField( + blank=True, max_length=255, null=True, verbose_name="聊天频道名" + ), + ), + ] diff --git a/dingdan/migrations/0010_remove_dingdan_liaotian_pindao_dingdan_user1_id_and_more.py b/dingdan/migrations/0010_remove_dingdan_liaotian_pindao_dingdan_user1_id_and_more.py new file mode 100644 index 0000000..1b3d875 --- /dev/null +++ b/dingdan/migrations/0010_remove_dingdan_liaotian_pindao_dingdan_user1_id_and_more.py @@ -0,0 +1,89 @@ +# Generated by Django 6.0 on 2025-12-31 15:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0009_dingdan_liaotian_pindao"), + ] + + operations = [ + migrations.RemoveField( + model_name="dingdan", + name="liaotian_pindao", + ), + migrations.AddField( + model_name="dingdan", + name="user1_id", + field=models.CharField( + db_index=True, max_length=30, null=True, verbose_name="用户1标识" + ), + ), + migrations.AddField( + model_name="dingdan", + name="user2_id", + field=models.CharField( + db_index=True, max_length=30, null=True, verbose_name="用户2打手标识" + ), + ), + migrations.CreateModel( + name="Liaotian", + fields=[ + ( + "id", + models.BigAutoField( + primary_key=True, serialize=False, verbose_name="主键ID" + ), + ), + ( + "user1_id", + models.CharField( + db_index=True, max_length=30, verbose_name="用户1标识" + ), + ), + ( + "user2_id", + models.CharField( + db_index=True, max_length=30, verbose_name="用户2标识" + ), + ), + ( + "dingdan_id", + models.CharField(max_length=32, unique=True, verbose_name="订单ID"), + ), + ( + "zhuangtai", + models.IntegerField( + choices=[(1, "开启中"), (0, "已关闭")], + db_index=True, + default=1, + verbose_name="聊天状态", + ), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ( + "update_time", + models.DateTimeField(auto_now=True, verbose_name="更新时间"), + ), + ], + options={ + "db_table": "liaotian", + "indexes": [ + models.Index( + fields=["user1_id"], name="liaotian_user1_i_6be6cd_idx" + ), + models.Index( + fields=["user2_id"], name="liaotian_user2_i_9f61a4_idx" + ), + models.Index( + fields=["zhuangtai"], name="liaotian_zhuangt_5e8be5_idx" + ), + ], + }, + ), + ] diff --git a/dingdan/migrations/0011_dingdanshangjia_sjnicheng.py b/dingdan/migrations/0011_dingdanshangjia_sjnicheng.py new file mode 100644 index 0000000..61eaea2 --- /dev/null +++ b/dingdan/migrations/0011_dingdanshangjia_sjnicheng.py @@ -0,0 +1,18 @@ +# Generated by Django 6.0 on 2026-01-01 00:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0010_remove_dingdan_liaotian_pindao_dingdan_user1_id_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="dingdanshangjia", + name="sjnicheng", + field=models.CharField(max_length=50, null=True, verbose_name="商家昵称"), + ), + ] diff --git a/dingdan/migrations/0012_dingdan_auto_expire_at_dingdan_auto_task_id_and_more.py b/dingdan/migrations/0012_dingdan_auto_expire_at_dingdan_auto_task_id_and_more.py new file mode 100644 index 0000000..413bf2d --- /dev/null +++ b/dingdan/migrations/0012_dingdan_auto_expire_at_dingdan_auto_task_id_and_more.py @@ -0,0 +1,41 @@ +# Generated by Django 4.2.27 on 2026-01-20 15:52 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0011_dingdanshangjia_sjnicheng"), + ] + + operations = [ + migrations.AddField( + model_name="dingdan", + name="auto_expire_at", + field=models.DateTimeField( + blank=True, null=True, verbose_name="计划过期时间" + ), + ), + migrations.AddField( + model_name="dingdan", + name="auto_task_id", + field=models.CharField( + blank=True, default="", max_length=255, verbose_name="延时任务ID" + ), + ), + migrations.AddField( + model_name="dingdan", + name="pending_dispatch", + field=models.BooleanField( + db_index=True, default=False, verbose_name="待调度标记" + ), + ), + migrations.AddField( + model_name="dingdan", + name="status_8_time", + field=models.DateTimeField( + blank=True, null=True, verbose_name="状态变为8的时间" + ), + ), + ] diff --git a/dingdan/migrations/0013_alter_chufajilu_chuliid.py b/dingdan/migrations/0013_alter_chufajilu_chuliid.py new file mode 100644 index 0000000..5466ff9 --- /dev/null +++ b/dingdan/migrations/0013_alter_chufajilu_chuliid.py @@ -0,0 +1,20 @@ +# Generated by Django 4.2.27 on 2026-01-21 11:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0012_dingdan_auto_expire_at_dingdan_auto_task_id_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="chufajilu", + name="chuliid", + field=models.CharField( + db_index=True, max_length=11, null=True, verbose_name="处理处罚ID" + ), + ), + ] diff --git a/dingdan/migrations/0014_chufajilu_ssliyou_alter_chufajilu_sqzhuangtai_and_more.py b/dingdan/migrations/0014_chufajilu_ssliyou_alter_chufajilu_sqzhuangtai_and_more.py new file mode 100644 index 0000000..6bcfe0a --- /dev/null +++ b/dingdan/migrations/0014_chufajilu_ssliyou_alter_chufajilu_sqzhuangtai_and_more.py @@ -0,0 +1,96 @@ +# Generated by Django 4.2.27 on 2026-02-06 15:49 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0013_alter_chufajilu_chuliid"), + ] + + operations = [ + migrations.AddField( + model_name="chufajilu", + name="ssliyou", + field=models.TextField(blank=True, null=True, verbose_name="打手申诉理由"), + ), + migrations.AlterField( + model_name="chufajilu", + name="sqzhuangtai", + field=models.IntegerField( + blank=True, + default=0, + null=True, + verbose_name="处罚申请状态:0待处理,1成功,2驳回，3申诉", + ), + ), + migrations.AlterField( + model_name="lilubiao", + name="lilu", + field=models.DecimalField( + decimal_places=4, + max_digits=5, + null=True, + verbose_name="平台分成利率，1是平台,3是商家", + ), + ), + migrations.CreateModel( + name="Chufatupian", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "dingdan_id", + models.CharField( + db_index=True, max_length=32, null=True, verbose_name="订单ID" + ), + ), + ( + "yonghuid", + models.CharField( + blank=True, + db_index=True, + max_length=32, + null=True, + verbose_name="用户ID", + ), + ), + ( + "tupian", + models.CharField( + blank=True, + max_length=500, + null=True, + verbose_name="证据图片URL", + ), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ( + "update_time", + models.DateTimeField(auto_now=True, verbose_name="更新时间"), + ), + ], + options={ + "db_table": "chufatupian", + "indexes": [ + models.Index( + fields=["yonghuid"], name="chufatupian_yonghui_71e585_idx" + ), + models.Index( + fields=["dingdan_id"], name="chufatupian_dingdan_ce0dd4_idx" + ), + ], + }, + ), + ] diff --git a/dingdan/migrations/0015_dingdan_tkly.py b/dingdan/migrations/0015_dingdan_tkly.py new file mode 100644 index 0000000..100d464 --- /dev/null +++ b/dingdan/migrations/0015_dingdan_tkly.py @@ -0,0 +1,20 @@ +# Generated by Django 4.2.27 on 2026-02-13 22:46 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0014_chufajilu_ssliyou_alter_chufajilu_sqzhuangtai_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="dingdan", + name="tkly", + field=models.CharField( + blank=True, max_length=500, null=True, verbose_name="退款/拒绝理由" + ), + ), + ] diff --git a/dingdan/migrations/0016_dingdan_is_cross_dingdan_partner_order_id.py b/dingdan/migrations/0016_dingdan_is_cross_dingdan_partner_order_id.py new file mode 100644 index 0000000..39b946b --- /dev/null +++ b/dingdan/migrations/0016_dingdan_is_cross_dingdan_partner_order_id.py @@ -0,0 +1,31 @@ +# Generated by Django 4.2.27 on 2026-02-19 00:03 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0015_dingdan_tkly"), + ] + + operations = [ + migrations.AddField( + model_name="dingdan", + name="is_cross", + field=models.IntegerField( + default=0, verbose_name="是否跨平台订单(0否,1是)" + ), + ), + migrations.AddField( + model_name="dingdan", + name="partner_order_id", + field=models.CharField( + blank=True, + db_index=True, + max_length=32, + null=True, + verbose_name="对方平台订单ID", + ), + ), + ] diff --git a/dingdan/migrations/0017_dingdan_clkf_dingdan_dingdan_clkf_6793b1_idx.py b/dingdan/migrations/0017_dingdan_clkf_dingdan_dingdan_clkf_6793b1_idx.py new file mode 100644 index 0000000..551bd20 --- /dev/null +++ b/dingdan/migrations/0017_dingdan_clkf_dingdan_dingdan_clkf_6793b1_idx.py @@ -0,0 +1,24 @@ +# Generated by Django 4.2.27 on 2026-02-19 23:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0016_dingdan_is_cross_dingdan_partner_order_id"), + ] + + operations = [ + migrations.AddField( + model_name="dingdan", + name="clkf", + field=models.CharField( + db_index=True, max_length=20, null=True, verbose_name="处理客服" + ), + ), + migrations.AddIndex( + model_name="dingdan", + index=models.Index(fields=["clkf"], name="dingdan_clkf_6793b1_idx"), + ), + ] diff --git a/dingdan/migrations/0018_dingdanpingtai_jjjs_biaoshi.py b/dingdan/migrations/0018_dingdanpingtai_jjjs_biaoshi.py new file mode 100644 index 0000000..16741b3 --- /dev/null +++ b/dingdan/migrations/0018_dingdanpingtai_jjjs_biaoshi.py @@ -0,0 +1,20 @@ +# Generated by Django 4.2.27 on 2026-02-20 17:23 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0017_dingdan_clkf_dingdan_dingdan_clkf_6793b1_idx"), + ] + + operations = [ + migrations.AddField( + model_name="dingdanpingtai", + name="jjjs_biaoshi", + field=models.IntegerField( + default=0, verbose_name="拒绝结算标记(1表示拒绝结算)" + ), + ), + ] diff --git a/dingdan/migrations/0019_dingdan_wechat_transaction_id_and_more.py b/dingdan/migrations/0019_dingdan_wechat_transaction_id_and_more.py new file mode 100644 index 0000000..2da9b7f --- /dev/null +++ b/dingdan/migrations/0019_dingdan_wechat_transaction_id_and_more.py @@ -0,0 +1,30 @@ +# Generated by Django 4.2.27 on 2026-03-01 23:48 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0018_dingdanpingtai_jjjs_biaoshi"), + ] + + operations = [ + migrations.AddField( + model_name="dingdan", + name="wechat_transaction_id", + field=models.CharField( + blank=True, + db_index=True, + max_length=64, + null=True, + verbose_name="微信支付订单号", + ), + ), + migrations.AddIndex( + model_name="dingdan", + index=models.Index( + fields=["wechat_transaction_id"], name="dingdan_wechat__278b79_idx" + ), + ), + ] diff --git a/dingdan/migrations/0020_dingdan_dispatch_type_dingdan_partner_club_id.py b/dingdan/migrations/0020_dingdan_dispatch_type_dingdan_partner_club_id.py new file mode 100644 index 0000000..e220e27 --- /dev/null +++ b/dingdan/migrations/0020_dingdan_dispatch_type_dingdan_partner_club_id.py @@ -0,0 +1,33 @@ +# Generated by Django 4.2.27 on 2026-03-30 12:18 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0019_dingdan_wechat_transaction_id_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="dingdan", + name="dispatch_type", + field=models.IntegerField( + choices=[(1, "我方派单"), (2, "对方派单")], + default=0, + verbose_name="派发情况", + ), + ), + migrations.AddField( + model_name="dingdan", + name="partner_club_id", + field=models.CharField( + blank=True, + db_index=True, + max_length=6, + null=True, + verbose_name="对方俱乐部ID", + ), + ), + ] diff --git a/dingdan/migrations/0021_presettlement_orderdashouhistory_and_more.py b/dingdan/migrations/0021_presettlement_orderdashouhistory_and_more.py new file mode 100644 index 0000000..7b429d1 --- /dev/null +++ b/dingdan/migrations/0021_presettlement_orderdashouhistory_and_more.py @@ -0,0 +1,257 @@ +# Generated by Django 4.2.27 on 2026-04-01 00:39 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0020_dingdan_dispatch_type_dingdan_partner_club_id"), + ] + + operations = [ + migrations.CreateModel( + name="PreSettlement", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "dingdan_id", + models.CharField( + db_index=True, + max_length=32, + unique=True, + verbose_name="我方订单ID", + ), + ), + ( + "partner_order_id", + models.CharField( + db_index=True, max_length=32, verbose_name="对方订单ID" + ), + ), + ( + "partner_club_id", + models.CharField( + db_index=True, max_length=6, verbose_name="对方俱乐部ID" + ), + ), + ( + "dashou_id", + models.CharField( + db_index=True, max_length=7, verbose_name="接单打手ID" + ), + ), + ( + "amount", + models.DecimalField( + decimal_places=2, max_digits=10, verbose_name="打手应分金额" + ), + ), + ( + "order_amount", + models.DecimalField( + decimal_places=2, + default=0.0, + max_digits=10, + verbose_name="订单原金额", + ), + ), + ( + "status", + models.SmallIntegerField( + choices=[(0, "待结算"), (1, "已结算"), (2, "已拒绝")], + default=0, + verbose_name="结算状态", + ), + ), + ( + "process_time", + models.DateTimeField( + blank=True, null=True, verbose_name="处理时间" + ), + ), + ( + "operator", + models.CharField( + blank=True, default="", max_length=32, verbose_name="操作人" + ), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ( + "update_time", + models.DateTimeField(auto_now=True, verbose_name="更新时间"), + ), + ], + options={ + "verbose_name": "预结算表", + "verbose_name_plural": "预结算表", + "db_table": "pre_settlement", + "indexes": [ + models.Index( + fields=["dingdan_id"], name="pre_settlem_dingdan_4f3541_idx" + ), + models.Index( + fields=["partner_order_id"], + name="pre_settlem_partner_45b29e_idx", + ), + models.Index( + fields=["partner_club_id"], + name="pre_settlem_partner_d2c44c_idx", + ), + models.Index( + fields=["dashou_id"], name="pre_settlem_dashou__d5fe7c_idx" + ), + models.Index( + fields=["status"], name="pre_settlem_status_0aa711_idx" + ), + ], + }, + ), + migrations.CreateModel( + name="OrderDashouHistory", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "dingdan_id", + models.CharField( + db_index=True, max_length=32, verbose_name="订单ID" + ), + ), + ( + "dashou_id", + models.CharField( + db_index=True, max_length=7, verbose_name="打手ID" + ), + ), + ( + "times", + models.PositiveSmallIntegerField( + verbose_name="第几次接单（从1开始）" + ), + ), + ( + "operator", + models.CharField(max_length=11, verbose_name="操作客服ID"), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ], + options={ + "verbose_name": "订单打手变更历史", + "verbose_name_plural": "订单打手变更历史", + "db_table": "order_dashou_history", + "indexes": [ + models.Index( + fields=["dingdan_id"], name="order_dasho_dingdan_1e79ab_idx" + ), + models.Index( + fields=["dashou_id"], name="order_dasho_dashou__0a637c_idx" + ), + ], + }, + ), + migrations.CreateModel( + name="CrossPlatformOrderData", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "dingdan_id", + models.CharField( + db_index=True, + max_length=32, + unique=True, + verbose_name="我方订单ID", + ), + ), + ( + "partner_order_id", + models.CharField( + db_index=True, max_length=32, verbose_name="对方平台订单ID" + ), + ), + ( + "partner_club_id", + models.CharField( + db_index=True, max_length=6, verbose_name="对方俱乐部ID" + ), + ), + ( + "partner_order_status", + models.IntegerField(default=0, verbose_name="对方平台订单状态"), + ), + ( + "partner_dashou_id", + models.CharField( + blank=True, + default="", + max_length=32, + verbose_name="对方平台接单打手ID", + ), + ), + ( + "partner_amount", + models.DecimalField( + decimal_places=2, + default=0.0, + max_digits=10, + verbose_name="对方平台订单金额", + ), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ( + "update_time", + models.DateTimeField(auto_now=True, verbose_name="更新时间"), + ), + ], + options={ + "verbose_name": "跨平台订单扩展", + "verbose_name_plural": "跨平台订单扩展", + "db_table": "cross_platform_order_data", + "indexes": [ + models.Index( + fields=["dingdan_id"], name="cross_platf_dingdan_498d08_idx" + ), + models.Index( + fields=["partner_order_id"], + name="cross_platf_partner_5d5615_idx", + ), + models.Index( + fields=["partner_club_id"], + name="cross_platf_partner_1054e1_idx", + ), + ], + }, + ), + ] diff --git a/dingdan/migrations/0022_alter_presettlement_dingdan_id_and_more.py b/dingdan/migrations/0022_alter_presettlement_dingdan_id_and_more.py new file mode 100644 index 0000000..1b94e84 --- /dev/null +++ b/dingdan/migrations/0022_alter_presettlement_dingdan_id_and_more.py @@ -0,0 +1,24 @@ +# Generated by Django 4.2.27 on 2026-04-06 23:26 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0021_presettlement_orderdashouhistory_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="presettlement", + name="dingdan_id", + field=models.CharField( + db_index=True, max_length=32, verbose_name="我方订单ID" + ), + ), + migrations.AlterUniqueTogether( + name="presettlement", + unique_together={("dingdan_id", "dashou_id")}, + ), + ] diff --git a/dingdan/migrations/0023_alter_lilubiao_fadanpingtai.py b/dingdan/migrations/0023_alter_lilubiao_fadanpingtai.py new file mode 100644 index 0000000..15749ff --- /dev/null +++ b/dingdan/migrations/0023_alter_lilubiao_fadanpingtai.py @@ -0,0 +1,22 @@ +# Generated by Django 4.2.27 on 2026-04-10 18:05 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0022_alter_presettlement_dingdan_id_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="lilubiao", + name="fadanpingtai", + field=models.CharField( + max_length=10, + null=True, + verbose_name="利率类型,平台分成利率，1是平台订单打手分成,3是商家订单打手分成，5：打手提现佣金抽成6：管事提现抽成，8：组长提现抽成", + ), + ), + ] diff --git a/dingdan/migrations/0024_dingdan_guanshi_fencheng.py b/dingdan/migrations/0024_dingdan_guanshi_fencheng.py new file mode 100644 index 0000000..c294cc0 --- /dev/null +++ b/dingdan/migrations/0024_dingdan_guanshi_fencheng.py @@ -0,0 +1,25 @@ +# Generated by Django 4.2.27 on 2026-06-07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("dingdan", "0023_alter_lilubiao_fadanpingtai"), + ] + + operations = [ + migrations.AddField( + model_name="dingdan", + name="guanshi_fencheng", + field=models.DecimalField( + blank=True, + decimal_places=2, + default=0, + max_digits=10, + null=True, + verbose_name="管事分成", + ), + ), + ] diff --git a/dingdan/migrations/__init__.py b/dingdan/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dingdan/migrations/__pycache__/0001_initial.cpython-313.pyc b/dingdan/migrations/__pycache__/0001_initial.cpython-313.pyc new file mode 100644 index 0000000..8e28b1e Binary files /dev/null and b/dingdan/migrations/__pycache__/0001_initial.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0002_dingdan_huiyuan_id_dingdan_yaoqiuleixing_and_more.cpython-313.pyc b/dingdan/migrations/__pycache__/0002_dingdan_huiyuan_id_dingdan_yaoqiuleixing_and_more.cpython-313.pyc new file mode 100644 index 0000000..78b5808 Binary files /dev/null and b/dingdan/migrations/__pycache__/0002_dingdan_huiyuan_id_dingdan_yaoqiuleixing_and_more.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0003_lilubiao.cpython-313.pyc b/dingdan/migrations/__pycache__/0003_lilubiao.cpython-313.pyc new file mode 100644 index 0000000..d4ea504 Binary files /dev/null and b/dingdan/migrations/__pycache__/0003_lilubiao.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0004_dingdan_nicheng.cpython-313.pyc b/dingdan/migrations/__pycache__/0004_dingdan_nicheng.cpython-313.pyc new file mode 100644 index 0000000..4e2e517 Binary files /dev/null and b/dingdan/migrations/__pycache__/0004_dingdan_nicheng.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0005_dingdan_tupian.cpython-313.pyc b/dingdan/migrations/__pycache__/0005_dingdan_tupian.cpython-313.pyc new file mode 100644 index 0000000..b1f398c Binary files /dev/null and b/dingdan/migrations/__pycache__/0005_dingdan_tupian.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0006_dingdan_dashou_liuyan_dingdan_leixing_id_and_more.cpython-313.pyc b/dingdan/migrations/__pycache__/0006_dingdan_dashou_liuyan_dingdan_leixing_id_and_more.cpython-313.pyc new file mode 100644 index 0000000..8ebc0e2 Binary files /dev/null and b/dingdan/migrations/__pycache__/0006_dingdan_dashou_liuyan_dingdan_leixing_id_and_more.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0007_chufajilu_tuikuanjilu_dingdanshangjia_bhliyou_and_more.cpython-313.pyc b/dingdan/migrations/__pycache__/0007_chufajilu_tuikuanjilu_dingdanshangjia_bhliyou_and_more.cpython-313.pyc new file mode 100644 index 0000000..b4ca80b Binary files /dev/null and b/dingdan/migrations/__pycache__/0007_chufajilu_tuikuanjilu_dingdanshangjia_bhliyou_and_more.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0008_ptliushui_rename_cfliyou_tuikuanjilu_liyou_and_more.cpython-313.pyc b/dingdan/migrations/__pycache__/0008_ptliushui_rename_cfliyou_tuikuanjilu_liyou_and_more.cpython-313.pyc new file mode 100644 index 0000000..fdc9a7e Binary files /dev/null and b/dingdan/migrations/__pycache__/0008_ptliushui_rename_cfliyou_tuikuanjilu_liyou_and_more.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0009_dingdan_liaotian_pindao.cpython-313.pyc b/dingdan/migrations/__pycache__/0009_dingdan_liaotian_pindao.cpython-313.pyc new file mode 100644 index 0000000..da6959a Binary files /dev/null and b/dingdan/migrations/__pycache__/0009_dingdan_liaotian_pindao.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0010_remove_dingdan_liaotian_pindao_dingdan_user1_id_and_more.cpython-313.pyc b/dingdan/migrations/__pycache__/0010_remove_dingdan_liaotian_pindao_dingdan_user1_id_and_more.cpython-313.pyc new file mode 100644 index 0000000..4343ecb Binary files /dev/null and b/dingdan/migrations/__pycache__/0010_remove_dingdan_liaotian_pindao_dingdan_user1_id_and_more.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0011_dingdanshangjia_sjnicheng.cpython-313.pyc b/dingdan/migrations/__pycache__/0011_dingdanshangjia_sjnicheng.cpython-313.pyc new file mode 100644 index 0000000..ecaf9c0 Binary files /dev/null and b/dingdan/migrations/__pycache__/0011_dingdanshangjia_sjnicheng.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0012_dingdan_auto_expire_at_dingdan_auto_task_id_and_more.cpython-313.pyc b/dingdan/migrations/__pycache__/0012_dingdan_auto_expire_at_dingdan_auto_task_id_and_more.cpython-313.pyc new file mode 100644 index 0000000..087b808 Binary files /dev/null and b/dingdan/migrations/__pycache__/0012_dingdan_auto_expire_at_dingdan_auto_task_id_and_more.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0013_alter_chufajilu_chuliid.cpython-313.pyc b/dingdan/migrations/__pycache__/0013_alter_chufajilu_chuliid.cpython-313.pyc new file mode 100644 index 0000000..5975a57 Binary files /dev/null and b/dingdan/migrations/__pycache__/0013_alter_chufajilu_chuliid.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0014_chufajilu_ssliyou_alter_chufajilu_sqzhuangtai_and_more.cpython-313.pyc b/dingdan/migrations/__pycache__/0014_chufajilu_ssliyou_alter_chufajilu_sqzhuangtai_and_more.cpython-313.pyc new file mode 100644 index 0000000..60a058e Binary files /dev/null and b/dingdan/migrations/__pycache__/0014_chufajilu_ssliyou_alter_chufajilu_sqzhuangtai_and_more.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0015_dingdan_tkly.cpython-313.pyc b/dingdan/migrations/__pycache__/0015_dingdan_tkly.cpython-313.pyc new file mode 100644 index 0000000..5915a87 Binary files /dev/null and b/dingdan/migrations/__pycache__/0015_dingdan_tkly.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0016_dingdan_is_cross_dingdan_partner_order_id.cpython-313.pyc b/dingdan/migrations/__pycache__/0016_dingdan_is_cross_dingdan_partner_order_id.cpython-313.pyc new file mode 100644 index 0000000..b65d3f1 Binary files /dev/null and b/dingdan/migrations/__pycache__/0016_dingdan_is_cross_dingdan_partner_order_id.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0017_dingdan_clkf_dingdan_dingdan_clkf_6793b1_idx.cpython-313.pyc b/dingdan/migrations/__pycache__/0017_dingdan_clkf_dingdan_dingdan_clkf_6793b1_idx.cpython-313.pyc new file mode 100644 index 0000000..b576337 Binary files /dev/null and b/dingdan/migrations/__pycache__/0017_dingdan_clkf_dingdan_dingdan_clkf_6793b1_idx.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0018_dingdanpingtai_jjjs_biaoshi.cpython-313.pyc b/dingdan/migrations/__pycache__/0018_dingdanpingtai_jjjs_biaoshi.cpython-313.pyc new file mode 100644 index 0000000..fd6ba33 Binary files /dev/null and b/dingdan/migrations/__pycache__/0018_dingdanpingtai_jjjs_biaoshi.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0019_dingdan_wechat_transaction_id_and_more.cpython-313.pyc b/dingdan/migrations/__pycache__/0019_dingdan_wechat_transaction_id_and_more.cpython-313.pyc new file mode 100644 index 0000000..713b6df Binary files /dev/null and b/dingdan/migrations/__pycache__/0019_dingdan_wechat_transaction_id_and_more.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0020_dingdan_dispatch_type_dingdan_partner_club_id.cpython-313.pyc b/dingdan/migrations/__pycache__/0020_dingdan_dispatch_type_dingdan_partner_club_id.cpython-313.pyc new file mode 100644 index 0000000..bb4406c Binary files /dev/null and b/dingdan/migrations/__pycache__/0020_dingdan_dispatch_type_dingdan_partner_club_id.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0021_presettlement_orderdashouhistory_and_more.cpython-313.pyc b/dingdan/migrations/__pycache__/0021_presettlement_orderdashouhistory_and_more.cpython-313.pyc new file mode 100644 index 0000000..b24821c Binary files /dev/null and b/dingdan/migrations/__pycache__/0021_presettlement_orderdashouhistory_and_more.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0022_alter_presettlement_dingdan_id_and_more.cpython-313.pyc b/dingdan/migrations/__pycache__/0022_alter_presettlement_dingdan_id_and_more.cpython-313.pyc new file mode 100644 index 0000000..8e3a1d4 Binary files /dev/null and b/dingdan/migrations/__pycache__/0022_alter_presettlement_dingdan_id_and_more.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/0023_alter_lilubiao_fadanpingtai.cpython-313.pyc b/dingdan/migrations/__pycache__/0023_alter_lilubiao_fadanpingtai.cpython-313.pyc new file mode 100644 index 0000000..b75a9a0 Binary files /dev/null and b/dingdan/migrations/__pycache__/0023_alter_lilubiao_fadanpingtai.cpython-313.pyc differ diff --git a/dingdan/migrations/__pycache__/__init__.cpython-313.pyc b/dingdan/migrations/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..66c98a9 Binary files /dev/null and b/dingdan/migrations/__pycache__/__init__.cpython-313.pyc differ diff --git a/dingdan/models.py b/dingdan/models.py new file mode 100644 index 0000000..df26364 --- /dev/null +++ b/dingdan/models.py @@ -0,0 +1,589 @@ +from django.db import models + +class Dingdan(models.Model): + """订单主表""" + # 核心编号：唯一且不可为空[citation:3][citation:9] + dingdan_id = models.CharField(max_length=32, unique=True,db_index=True, verbose_name='订单ID') + # 状态与平台：用整数表示，具体含义由业务逻辑定义 + zhuangtai = models.IntegerField(default=1, null=True, blank=True,db_index=True, verbose_name='订单状态') + fadan_pingtai = models.IntegerField(null=True, blank=True, verbose_name='发单平台') + # 金额相关 + jine = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='订单金额') + dashou_fencheng = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='打手分成') + guanshi_fencheng = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, default=0, verbose_name='管事分成') + # 用户与商品关联ID + jiedan_dashou_id = models.CharField(max_length=32, null=True, db_index=True,blank=True, verbose_name='接单打手ID') + dashou_liuyan = models.TextField(null=True, blank=True, verbose_name='打手留言') + zhiding_id = models.CharField(max_length=32, null=True, blank=True, verbose_name='指定ID') + shangpin_id = models.IntegerField(null=True, blank=True, verbose_name='商品ID') + leixing_id = models.PositiveIntegerField(null=True, blank=True, verbose_name='商品类型ID') # 直接存数字 + tupian = models.CharField(max_length=500, null=True, blank=True, verbose_name='商品图片URL') + + yaoqiuleixing = models.PositiveIntegerField(null=True, blank=True, verbose_name='抢单要求类型') + huiyuan_id = models.CharField(max_length=6, null=True, blank=True, verbose_name='会员ID') + yongjin = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='佣金要求') + # 订单描述信息 + jieshao = models.TextField(null=True, blank=True, verbose_name='订单介绍') + beizhu = models.TextField(null=True, blank=True, verbose_name='订单备注') + tkly = models.CharField(max_length=500, blank=True, null=True, verbose_name='退款/拒绝理由') + # 新增字段：游戏昵称（前端提交的游戏昵称） + nicheng = models.CharField(max_length=50, null=True, blank=True, verbose_name='游戏昵称') + user1_id = models.CharField(max_length=30,null=True, db_index=True, verbose_name='用户1标识') + user2_id = models.CharField(max_length=30, null=True,db_index=True, verbose_name='用户2打手标识') + #liaotian_pindao = models.CharField(max_length=255, blank=True, null=True, verbose_name='聊天频道名') + # 时间戳 + + auto_task_id = models.CharField('延时任务ID', max_length=255, blank=True, default='') + auto_expire_at = models.DateTimeField('计划过期时间', null=True, blank=True) + pending_dispatch = models.BooleanField('待调度标记', default=False, db_index=True) + status_8_time = models.DateTimeField('状态变为8的时间', null=True, blank=True) + + + partner_order_id = models.CharField(max_length=32, null=True, blank=True, db_index=True,verbose_name='对方平台订单ID') + is_cross = models.IntegerField(default=0, verbose_name='是否跨平台订单(0否,1是)') + + dispatch_type = models.IntegerField(default=0, choices=[(1, '我方派单'), (2, '对方派单')], verbose_name='派发情况') + # 🔥 新增：对方俱乐部ID + partner_club_id = models.CharField(max_length=6, null=True, blank=True, db_index=True, verbose_name='对方俱乐部ID') + + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + + clkf = models.CharField(max_length=20, null=True, db_index=True, verbose_name='处理客服') + wechat_transaction_id = models.CharField( + max_length=64, + blank=True, + null=True, + db_index=True, + verbose_name='微信支付订单号' + ) + + class Meta: + db_table = 'dingdan' + verbose_name = '订单' + verbose_name_plural = '订单' + # 为高频查询字段添加索引 + indexes = [ + models.Index(fields=['zhuangtai']), + models.Index(fields=['dingdan_id']), + models.Index(fields=['jiedan_dashou_id']), + models.Index(fields=['clkf']), + # 🆕 为新增字段添加索引（可选） + models.Index(fields=['wechat_transaction_id']), + + ] + + def __str__(self): + return self.dingdan_id + +class DingdanPingtai(models.Model): + """平台订单扩展表 (当 fadan_pingtai=1 时使用)""" + dingdan = models.OneToOneField(Dingdan, on_delete=models.CASCADE, related_name='pingtai_kuozhan', verbose_name='订单') + laoban_id = models.CharField(max_length=32, null=True, blank=True, db_index=True,verbose_name='老板ID') + laoban_pingjia = models.TextField(null=True, blank=True, verbose_name='老板评价') + jjjs_biaoshi = models.IntegerField(default=0, verbose_name='拒绝结算标记(1表示拒绝结算)') + + # ========== 新增字段 ========== + pingtai_shouyi = models.DecimalField(max_digits=10,decimal_places=2,null=True,blank=True,default=0.00,verbose_name='平台收益') + dianpu_shouyi = models.DecimalField(max_digits=10,decimal_places=2, null=True,blank=True,default=0.00,verbose_name='店铺收益') + dianpu_id = models.PositiveIntegerField(null=True,blank=True,db_index=True,verbose_name='所属店铺ID') + + # ---------- 上级分红快照 ---------- + shangji_dianpu_id = models.PositiveIntegerField(null=True, blank=True, db_index=True, + verbose_name='该订单的上级店铺ID') + shangji_fenhong = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, default=0.00, + verbose_name='上级分红金额') + + # ============================= + + + class Meta: + db_table = 'dingdan_pingtai' + verbose_name = '平台订单扩展' + verbose_name_plural = '平台订单扩展' + indexes = [ + models.Index(fields=['laoban_id']), + models.Index(fields=['dianpu_id']), # 为新字段加索引 + + + ] + + def __str__(self): + return f"平台扩展-{self.dingdan.dingdan_id}" + +class DingdanShangjia(models.Model): + """商家发单扩展表 (当 fadan_pingtai=2 时使用)""" + dingdan = models.OneToOneField(Dingdan, on_delete=models.CASCADE, related_name='shangjia_kuozhan', verbose_name='订单') + shangjia_id = models.CharField(max_length=32, null=True, blank=True,db_index=True, verbose_name='商家ID') + shangjia_pingjia = models.TextField(null=True, blank=True, verbose_name='商家评价') + cfliyou = models.TextField(null=True, blank=True, verbose_name='商家处罚理由') + sqzhuangtai =models.IntegerField(default=0, null=True, blank=True, verbose_name='处罚申请状态:0待处理,1成功,2驳回') + bhliyou = models.TextField(null=True, blank=True, verbose_name='驳回商家处罚理由') + sjnicheng =models.CharField(max_length=50,null=True, verbose_name='商家昵称') + partner_yonghu_id = models.CharField(max_length=32, blank=True, null=True, verbose_name='对方平台用户ID') + + # 在 dingdan/models.py 的 DingdanShangjia 类中添加 + shangyige_dingdan_id = models.CharField( + max_length=32, + null=True, + blank=True, + verbose_name='上一个订单ID' + ) + + class Meta: + db_table = 'dingdan_shangjia' + verbose_name = '商家订单扩展' + verbose_name_plural = '商家订单扩展' + indexes = [ + models.Index(fields=['shangjia_id']), + + ] + + def __str__(self): + return f"商家扩展-{self.dingdan.dingdan_id}" + + + + + + + + + + + + +class DingdanPeihu(models.Model): + """陪护订单表（一个订单最多2个陪护）""" + # 关联订单（一对一，陪护订单依附于原订单） + dingdan_id = models.CharField(max_length=32, unique=True, db_index=True, verbose_name='订单ID') + # 主打手ID（冗余，方便查询，必须与订单的 jiedan_dashou_id 一致） + zhudashou_id = models.CharField(max_length=32, db_index=True, verbose_name='主打手ID') + # 实际接单陪护 + peihu1_id = models.CharField(max_length=32, null=True, blank=True, db_index=True, verbose_name='陪护1打手ID') + peihu2_id = models.CharField(max_length=32, null=True, blank=True, db_index=True, verbose_name='陪护2打手ID') + # 订单状态（1=待抢单,2=已抢待确认,3=进行中,4=已完成,5=已取消,7=指定状态...） + zhuangtai = models.IntegerField(default=1, verbose_name='陪护订单状态') + # 需求配置 + peihu_xuqiu_shuliang = models.IntegerField(default=1, verbose_name='陪护需求数量') + yongjin_yaoqiu = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='抢单佣金要求') + # 等级需求（关联称号ID，可空表示无限制） + peihu1_dengji_xuqiu = models.PositiveIntegerField(null=True, blank=True, verbose_name='陪护1等级需求(称号ID)') + peihu2_dengji_xuqiu = models.PositiveIntegerField(null=True, blank=True, verbose_name='陪护2等级需求(称号ID)') + # 处罚与分红比例（格式："1/5" 或 "2/5"） + peihu1_zhadan_danze = models.CharField(max_length=10, null=True, blank=True, verbose_name='陪护1炸单担责比例') + peihu2_zhadan_danze = models.CharField(max_length=10, null=True, blank=True, verbose_name='陪护2炸单担责比例') + peihu1_fenhong = models.CharField(max_length=10, null=True, blank=True, verbose_name='陪护1分红比例') + peihu2_fenhong = models.CharField(max_length=10, null=True, blank=True, verbose_name='陪护2分红比例') + # 指定陪护（可预设打手ID，可为空） + zhiding_peihu1 = models.CharField(max_length=32, null=True, blank=True, verbose_name='指定陪护1 ID') + zhiding_peihu2 = models.CharField(max_length=32, null=True, blank=True, verbose_name='指定陪护2 ID') + # 时间戳 + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + + class Meta: + db_table = 'dingdan_peihu' + verbose_name = '陪护订单' + verbose_name_plural = verbose_name + indexes = [ + models.Index(fields=['zhudashou_id']), + models.Index(fields=['peihu1_id']), + models.Index(fields=['peihu2_id']), + models.Index(fields=['zhuangtai']), + ] + + + + + +class CrossPlatformOrderData(models.Model): + """ + 跨平台订单扩展数据表 + 存储我方订单与对方平台订单的关联及对方订单状态 + """ + dingdan_id = models.CharField(max_length=32, unique=True, db_index=True, verbose_name='我方订单ID') + partner_order_id = models.CharField(max_length=32, db_index=True, verbose_name='对方平台订单ID') + partner_club_id = models.CharField(max_length=6, db_index=True, verbose_name='对方俱乐部ID') + partner_order_status = models.IntegerField(default=0, verbose_name='对方平台订单状态') # 对方订单当前状态码 + partner_dashou_id = models.CharField(max_length=32, blank=True, default='', verbose_name='对方平台接单打手ID') + partner_amount = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='对方平台订单金额') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + + class Meta: + db_table = 'cross_platform_order_data' + verbose_name = '跨平台订单扩展' + verbose_name_plural = '跨平台订单扩展' + indexes = [ + models.Index(fields=['dingdan_id']), + models.Index(fields=['partner_order_id']), + models.Index(fields=['partner_club_id']), + ] + + def __str__(self): + return f"{self.dingdan_id} -> {self.partner_order_id}" + + + +# 建议路径：dingdan/models.py 或独立 fadan/models.py +from django.db import models + +class Fadan(models.Model): + """罚单表——平台各类处罚信息""" + id = models.AutoField(primary_key=True, verbose_name='自增主键') + beichufa_id = models.CharField(max_length=20, db_index=True, verbose_name='被处罚用户ID') # 直接用yonghuid，后续可改为外键 + shenqing_chufa = models.CharField(max_length=20, blank=True, null=True, verbose_name='申请处罚者ID') + shenfen = models.IntegerField(choices=[(1, '打手'), (2, '管事'), (3, '商家'), (4, '组长')], default=1, verbose_name='被处罚者身份') + chufaliyou = models.TextField(blank=True, null=True, verbose_name='处罚理由') + fakuanjine = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='罚款金额') + guanliandingdan_id = models.CharField(max_length=32, blank=True, null=True, db_index=True, verbose_name='关联订单ID') + zhuangtai = models.IntegerField(choices=[(1, '待缴纳'), (2, '已缴纳'), (3, '申诉中'), (4, '已驳回')], default=1, db_index=True, verbose_name='罚单状态') + yingxiang_qiangdan = models.IntegerField(choices=[(1, '影响抢单'), (0, '不影响抢单')], default=1, db_index=True, verbose_name='是否影响抢单') + shensuliyou = models.TextField(blank=True, null=True, verbose_name='申诉理由') + tongyi_chufaliyou = models.TextField(blank=True, null=True, verbose_name='同意处罚理由') + bohuiliyou = models.TextField(blank=True, null=True, verbose_name='驳回理由') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + # ========== 新增字段 ========== + shenqingren_fenhong_jine = models.DecimalField( + max_digits=12, decimal_places=2, default=0.00, + verbose_name='申请人分红金额' + ) + # 在 Fadan 模型中添加 + partner_club_id = models.CharField(max_length=6, blank=True, null=True, db_index=True, verbose_name='对方俱乐部ID') + # 在 class Fadan 中添加 + shenqingren_shenfen = models.IntegerField( + choices=[(1, '客服'), (2, '售后'), (3, '管理员'),(4,'店铺'),(5,'商家')], # 按实际扩展 + default=1, + verbose_name='申请处罚人身份' + ) + chulizhe_shenfen = models.IntegerField( + choices=[(1, '客服'), (2, '售后'), (3, '管理员')], + default=2, + verbose_name='处理者身份' + ) + chulizhe = models.CharField(max_length=20, blank=True, null=True, verbose_name='处理者') + + class Meta: + db_table = 'fadan' + verbose_name = '罚单' + verbose_name_plural = '罚单' + indexes = [ + models.Index(fields=['beichufa_id', 'yingxiang_qiangdan', 'zhuangtai'], name='fadan_qiangdan_check'), + models.Index(fields=['guanliandingdan_id'], name='fadan_dingdan_idx'), + ] + + def __str__(self): + return f"{self.beichufa_id} - 罚款{self.fakuanjine}元 - 状态{self.zhuangtai}" + + +# 与 Fadan 放在同一个文件或独立的 fadan/models.py +class FadanFenhong(models.Model): + """罚款分红表——记录罚款产生的分红信息""" + id = models.AutoField(primary_key=True, verbose_name='自增主键') + fenhongzhe_id = models.CharField(max_length=20, db_index=True, verbose_name='分红者ID') + zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='分红总额') + ketixian_fenhong = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='可提现分红') + shenfen = models.IntegerField(choices=[(1, '商家'), (2, '客服'), (3, '平台管理者'),(4,'店铺'),(5, '售后')], default=1, verbose_name='分红者身份') + fenhong_cishu = models.IntegerField(default=0, verbose_name='分红次数') + # ✅ 新增字段：是否单独开启分红利率（若开启，则使用本记录的 yingde_lilv；否则使用全局配置） + is_individual_rate = models.BooleanField(default=False, verbose_name='是否单独开启分红利率') + yingde_lilv = models.DecimalField(max_digits=5, decimal_places=4, default=0.0000, verbose_name='分红应得利率') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + + class Meta: + db_table = 'fadan_fenhong' + verbose_name = '罚款分红' + verbose_name_plural = '罚款分红' + indexes = [ + models.Index(fields=['fenhongzhe_id'], name='fadan_fenhong_zhe_idx'), + models.Index(fields=['shenfen'], name='fadan_fenhong_sf_idx'), + ] + + def __str__(self): + return f"{self.fenhongzhe_id} - 分红{self.ketixian_fenhong}元" + + +class FadanFenhongLilv(models.Model): + shenfen = models.IntegerField(primary_key=True, choices=[(1, '客服'), (2, '售后'), (3, '管理员'), (4, '店铺'), (5, '商家')], verbose_name='申请处罚人身份') + lilv = models.DecimalField(max_digits=5, decimal_places=4, default=0.0000, verbose_name='分红费率') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + + class Meta: + db_table = 'fadan_fenhong_lilv' + verbose_name = '罚款分红费率配置' + verbose_name_plural = verbose_name + + def __str__(self): + return f"身份{self.shenfen} - 费率{self.lilv}" + + +# ==================== 罚款申诉图片表 ==================== +class FadanShensuTupian(models.Model): + """罚款申诉图片，关联罚单""" + fadan = models.ForeignKey(Fadan, on_delete=models.CASCADE, related_name='shensu_tupians', verbose_name='关联罚单') + beichufa_id = models.CharField(max_length=7, db_index=True, verbose_name='被处罚用户ID') # 冗余，便于直接按用户查 + tupian_url = models.CharField(max_length=500, verbose_name='图片相对URL') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + # 在 FadanShensuTupian 模型中添加 + yongtu = models.IntegerField( + choices=[(1, '处罚证据图片'), (2, '申诉图片')], + default=2, + verbose_name='图片用途' + ) + + class Meta: + db_table = 'fadan_shensu_tupian' + verbose_name = '罚款申诉图片' + verbose_name_plural = '罚款申诉图片' + indexes = [ + models.Index(fields=['fadan_id']), + models.Index(fields=['beichufa_id']), + ] + + + +# apps/dingdan/models.py 中添加 + +class PreSettlement(models.Model): + """ + 预结算表 + 用于记录对方平台派单订单的待结算款项，等待对方确认后才能真正入账 + """ + STATUS_CHOICES = ( + (0, '待结算'), + (1, '已结算'), + (2, '已拒绝'), + ) + # 我方订单ID + dingdan_id = models.CharField(max_length=32, db_index=True, verbose_name='我方订单ID') + # 对方订单ID + partner_order_id = models.CharField(max_length=32, db_index=True, verbose_name='对方订单ID') + # 对方俱乐部ID + partner_club_id = models.CharField(max_length=6, db_index=True, verbose_name='对方俱乐部ID') + # 接单打手ID + dashou_id = models.CharField(max_length=7, db_index=True, verbose_name='接单打手ID') + # 打手应分金额 + amount = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='打手应分金额') + # 订单金额（原金额，可选） + order_amount = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='订单原金额') + # 结算状态 + status = models.SmallIntegerField(choices=STATUS_CHOICES, default=0, verbose_name='结算状态') + # 处理时间（结算或拒绝的时间） + process_time = models.DateTimeField(null=True, blank=True, verbose_name='处理时间') + # 处理客服/对方操作人（可选） + operator = models.CharField(max_length=32, blank=True, default='', verbose_name='操作人') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + + class Meta: + db_table = 'pre_settlement' + verbose_name = '预结算表' + verbose_name_plural = verbose_name + # 添加这个联合唯一约束 + unique_together = [['dingdan_id', 'dashou_id']] + indexes = [ + models.Index(fields=['dingdan_id']), + models.Index(fields=['partner_order_id']), + models.Index(fields=['partner_club_id']), + models.Index(fields=['dashou_id']), + models.Index(fields=['status']), + ] + + def __str__(self): + return f"预结算-{self.dingdan_id} -> {self.partner_order_id}" + + +# apps/dingdan/models.py 中添加 + +class OrderDashouHistory(models.Model): + """ + 订单打手变更历史表 + 记录订单每次更换打手的操作 + """ + dingdan_id = models.CharField(max_length=32, db_index=True, verbose_name='订单ID') + dashou_id = models.CharField(max_length=7, db_index=True, verbose_name='打手ID') + times = models.PositiveSmallIntegerField(verbose_name='第几次接单（从1开始）') + operator = models.CharField(max_length=11, verbose_name='操作客服ID') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + + class Meta: + db_table = 'order_dashou_history' + verbose_name = '订单打手变更历史' + verbose_name_plural = '订单打手变更历史' + indexes = [ + models.Index(fields=['dingdan_id']), + models.Index(fields=['dashou_id']), + ] + + def __str__(self): + return f"{self.dingdan_id} -> {self.dashou_id} 第{self.times}次" + + +class Dashoutupian(models.Model): + dingdan_id = models.CharField(max_length=32,db_index=True, null=True, verbose_name='订单ID') + dashou = models.CharField(max_length=32, null=True, blank=True,db_index=True, verbose_name='接单打手ID') + tupian = models.CharField(max_length=500, null=True, blank=True, verbose_name='打手提交图片URL') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + class Meta: + db_table = 'dashoutupian' + + indexes = [ + models.Index(fields=['dashou']), + models.Index(fields=['dingdan_id']), + + ] + + + +class Pingfen(models.Model): + dashou = models.CharField(max_length=32, null=True, blank=True, db_index=True,verbose_name='接单打手ID') + zongfen = models.PositiveIntegerField(default=0, verbose_name='总分') + cishu = models.PositiveIntegerField(default=0, verbose_name='评分次数') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + + class Meta: + db_table = 'pingfenbiao' + verbose_name = '评分表' + indexes = [ + models.Index(fields=['dashou']), + ] + def __str__(self): + return f"{self.dashou} - 平均分: {self.pingjun_fen():.2f}" + + def pingjun_fen(self): + """计算平均分""" + if self.cishu > 0: + return float(self.zongfen) / self.cishu + return 0.0 + + + +class Lilubiao(models.Model): + lilu = models.DecimalField(max_digits=5, decimal_places=4,null=True, verbose_name='平台分成利率，1是平台,3是商家派单抽成，5是打手提现抽，6管事提现抽，8.组长提现抽9.审核官提现抽，10.商家提现抽，11打手保证金提现抽，12.押金分红,13.管事分红') + #sahngjialilu = models.DecimalField(max_digits=5, decimal_places=4,null=True, verbose_name='商家利率') + fadanpingtai = models.CharField(max_length=10,null=True,verbose_name='利率类型,平台分成利率，1是平台订单打手分成,3是商家订单打手分成，5：打手提现佣金抽成6：管事提现抽成，8：组长提现抽成') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + class Meta: + db_table = 'lilubiao' + + + + +class Chufajilu(models.Model): + dashouid = models.CharField(max_length=7, null=True, db_index=True, verbose_name='被罚打手ID') + qingqiuid = models.CharField(max_length=7, null=True, db_index=True, verbose_name='请求处罚ID') + chuliid = models.CharField(max_length=11, null=True, db_index=True, verbose_name='处理处罚ID') + cfliyou = models.TextField(null=True, blank=True, verbose_name='处罚理由') + sqzhuangtai = models.IntegerField(default=0, null=True, blank=True, verbose_name='处罚申请状态:0待处理,1成功,2驳回，3申诉') + bhliyou = models.TextField(null=True, blank=True, verbose_name='驳回处罚理由') + ssliyou = models.TextField(null=True, blank=True, verbose_name='打手申诉理由') + jifen = models.IntegerField(default=0, verbose_name='扣除打手积分') + dingdan_id = models.CharField(max_length=32,null=True,db_index=True, verbose_name='订单ID') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + class Meta: + db_table = 'chufajilu' + indexes = [ + models.Index(fields=['dashouid']), + models.Index(fields=['qingqiuid']), + models.Index(fields=['chuliid']), + models.Index(fields=['dingdan_id']), + ] + + +class Chufatupian(models.Model): + dingdan_id = models.CharField(max_length=32,db_index=True, null=True, verbose_name='订单ID') + yonghuid = models.CharField(max_length=32, null=True, blank=True,db_index=True, verbose_name='用户ID') + tupian = models.CharField(max_length=500, null=True, blank=True, verbose_name='证据图片URL') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + class Meta: + db_table = 'chufatupian' + + indexes = [ + models.Index(fields=['yonghuid']), + models.Index(fields=['dingdan_id']), + + ] + + +class Tuikuanjilu(models.Model): + dingdan_id = models.CharField(max_length=32, unique=True, verbose_name='订单ID') + dashouid = models.CharField(max_length=7, null=True, verbose_name='接单打手ID') + qingqiuid = models.CharField(max_length=7, null=True, verbose_name='请求用户ID') + chuliid = models.CharField(max_length=7, null=True, db_index=True, verbose_name='处理人ID') + liyou = models.TextField(null=True, blank=True, verbose_name='理由') + sqzhuangtai = models.IntegerField(default=0, null=True, blank=True,db_index=True, verbose_name='申请状态:0待处理,1成功,2驳回') + bhliyou = models.TextField(null=True, blank=True, verbose_name='驳回理由') + jine = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='订单金额') + dashou_fencheng = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='打手分成') + jieshao = models.TextField(null=True, blank=True, verbose_name='订单介绍') + beizhu = models.TextField(null=True, blank=True, verbose_name='订单备注') + # 新增字段：游戏昵称（前端提交的游戏昵称） + nicheng = models.CharField(max_length=50, null=True, blank=True, verbose_name='游戏昵称') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + class Meta: + db_table = 'tuikuanjilu' + indexes = [ + models.Index(fields=['chuliid']), + models.Index(fields=['sqzhuangtai']), + ] + + +class Ptliushui(models.Model): + zonge = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='收取总金额') + zhichuzonge = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='支出总金额') + zongshouyi = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='总收益') + rizonge = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='日收取') + rizhichu = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='日支出') + rishouyi = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='日收益') + zongshoucishu = models.IntegerField(default=0, verbose_name='总收取次数') + rishoucishu = models.IntegerField(default=0, verbose_name='日收取次数') + zongzhichucishu = models.IntegerField(default=0, verbose_name='总支出次数') + rizhichucishu = models.IntegerField(default=0, verbose_name='日支出次数') + class Meta: + db_table = 'ptliushui' + + +# models.py - ChatRelation 模型 + + + +class Liaotian(models.Model): + """聊天关系表 - 极简设计，不设置唯一约束""" + # 主键 + id = models.BigAutoField(primary_key=True, verbose_name='主键ID') + + # 聊天双方的用户标识（GoEasy的user_id） + user1_id = models.CharField(max_length=30, db_index=True, verbose_name='用户1标识') + user2_id = models.CharField(max_length=30, db_index=True, verbose_name='用户2标识') + + # 关联的订单（可以为空，但实际业务中应该关联） + dingdan_id = models.CharField(max_length=32, unique=True, verbose_name='订单ID') + # 状态与平台：用整数表示，具体含义由业务逻辑定义 + zhuangtai = models.IntegerField(default=1,db_index=True,choices=[(1, '开启中'), (0, '已关闭')],verbose_name='聊天状态') + # 时间戳 + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + + class Meta: + db_table = 'liaotian' + indexes = [ + models.Index(fields=['user1_id']), + models.Index(fields=['user2_id']), + models.Index(fields=['zhuangtai']), + ] + + def __str__(self): + return f'{self.user1_id} ↔ {self.user2_id} ({self.zhuangtai})' + + + diff --git a/dingdan/signals.py b/dingdan/signals.py new file mode 100644 index 0000000..c14aa5f --- /dev/null +++ b/dingdan/signals.py @@ -0,0 +1,272 @@ +""" +阿龙电竞 - 订单信号处理（优化版） +核心原则：绝对不影响订单提交的性能和稳定性 +设计理念：订单状态变化只记录，不执行，由接口或定时任务处理具体逻辑 +""" + +from django.db.models.signals import pre_save +from django.dispatch import receiver +from django.conf import settings +from django.utils import timezone +import logging +import threading +import time + +from dingdan.models import Dingdan + +# dingdan/signals.py +""" +阿龙电竞 - 订单信号处理器（生产稳定版） +经过验证，100%可靠 +""" + +import sys +import importlib +import logging +from django.db.models.signals import pre_save +from django.dispatch import receiver +from django.conf import settings +from django.utils import timezone + +logger = logging.getLogger(__name__) + + +# 🔧 关键修复：确保redis模块正确加载 +def ensure_redis_loaded(): + """确保redis模块正确加载，避免导入冲突""" + if 'redis' not in sys.modules: + # 如果redis模块未加载，尝试导入 + try: + import redis + #logger.debug("✅ Redis模块正常加载") + except ImportError: + #logger.warning("⚠️ Redis模块未安装，尝试自动安装") + import subprocess + subprocess.call([sys.executable, "-m", "pip", "install", "redis==4.5.4", "-q"]) + import redis + + # 确保redis.Redis属性存在 + import redis + if redis.Redis is None: + #logger.warning("⚠️ Redis.Redis属性为None，强制重新加载模块") + importlib.reload(redis) + + return redis + + +# 预加载redis模块 +ensure_redis_loaded() + + +@receiver(pre_save, sender='dingdan.Dingdan') +def handle_order_status_8(sender, instance, **kwargs): + """ + 订单状态变为8时，提交定时任务 + """ + # 跳过新增的订单 + if instance.pk is None: + return + + try: + # 动态导入，避免循环依赖 + from dingdan.models import Dingdan + + # 获取旧状态 + old = Dingdan.objects.filter(pk=instance.pk).values_list('zhuangtai', flat=True).first() + + # 状态从非8 变为 8 + if old != 8 and instance.zhuangtai == 8: + logger.info(f"📅 订单 {instance.dingdan_id} 状态变为8，提交定时任务") + + # 设置时间标记 + instance.status_8_time = timezone.now() + instance.pending_dispatch = True + + # 使用配置中的超时时间 + expire_seconds = getattr(settings, 'ORDER_EXPIRE_SECONDS', 48 * 60 * 60) + + # 提交Celery任务 + try: + from dingdan.tasks import process_expired_order + + task_result = process_expired_order.apply_async( + args=[instance.dingdan_id], + countdown=expire_seconds, + queue='order_tasks', + priority=9 + ) + + logger.info(f"✅ 任务提交成功，订单: {instance.dingdan_id}, 任务ID: {task_result.id}") + + # 保存任务信息 + instance.auto_task_id = task_result.id + instance.auto_expire_at = timezone.now() + timezone.timedelta(seconds=expire_seconds) + + except Exception as e: + logger.error(f"❌ 任务提交失败: {e}") + instance.pending_dispatch = True + instance.auto_task_id = f"failed_{timezone.now().timestamp()}" + + # 状态从 8 变为非8 + elif old == 8 and instance.zhuangtai != 8: + instance.status_8_time = None + instance.pending_dispatch = False + instance.auto_task_id = '' + logger.info(f"📅 订单 {instance.dingdan_id} 状态离开8") + + except Exception as e: + logger.error(f"信号处理失败: {e}") + + +logger = logging.getLogger(__name__) + +'''def try_start_celery_task_async(dingdan_id, countdown): + """ + 异步尝试启动Celery任务（在独立线程中运行） + 如果Redis不可用，立即失败，不影响主流程 + """ + def _async_task(): + try: + # 设置超时时间（500毫秒），避免长时间等待 + import socket + socket.setdefaulttimeout(0.5) + + from dingdan.tasks import process_expired_order + from celery.exceptions import TimeoutError + + # 尝试启动任务，设置极短的超时 + task = process_expired_order.apply_async( + args=[dingdan_id], + countdown=countdown, + queue='order_tasks', + priority=9, + expires=countdown + 3600 # 任务1小时后过期，避免堆积 + ) + + # 不等待任务结果，立即返回 + logger.info(f"订单 {dingdan_id} 异步任务已提交（任务ID: {task.id}）") + + except Exception as e: + # 记录警告，但不要影响主流程 + logger.warning(f"订单 {dingdan_id} 异步任务提交失败: {str(e)}") + # 这个失败不影响订单保存，系统有补偿机制 + + # 启动异步线程（后台运行，不阻塞主流程） + thread = threading.Thread(target=_async_task) + thread.daemon = True # 设置为守护线程，主线程退出时会自动结束 + thread.start() + +@receiver(pre_save, sender=Dingdan) +def handle_order_status_change_lightweight(sender, instance, **kwargs): + """ + 轻量级订单状态变化监听器 + 设计原则： + 1. 绝对不阻塞订单保存 + 2. 不依赖外部服务可用性 + 3. 只记录，不执行 + """ + try: + # 1. 快速检查：如果是新建订单，直接返回 + if instance.pk is None: + return + + # 2. 快速获取旧状态（使用数据库当前值，不加载完整对象） + try: + old_status = Dingdan.objects.filter(pk=instance.pk).values_list('zhuangtai', flat=True).first() + except Exception: + old_status = None + + # 3. 状态变化判断 + if old_status is None or old_status != instance.zhuangtai: + # 状态发生变化，记录到订单扩展字段或日志（但不要阻塞） + try: + # 这里只是示例，实际可以根据需要记录状态变化历史 + pass + except: + pass # 即使记录失败也不影响主流程 + + # 4. 特殊状态处理：状态变为8 + if old_status != 8 and instance.zhuangtai == 8: + # 4.1 立即记录日志（不等待） + logger.info(f"订单 {instance.dingdan_id} 状态变为8") + + # 4.2 异步尝试启动定时任务（不阻塞主流程） + # 使用线程池或直接新线程，确保不阻塞 + try: + # 启动异步线程尝试提交Celery任务 + if hasattr(settings, 'CELERY_BROKER_URL') and settings.CELERY_BROKER_URL: + # 在独立线程中尝试，完全不阻塞 + threading.Thread( + target=try_start_celery_task_async, + args=(instance.dingdan_id, settings.ORDER_EXPIRE_SECONDS), + daemon=True + ).start() + except Exception as e: + # 即使线程启动失败也不影响主流程 + logger.warning(f"启动异步任务线程失败: {str(e)}") + + # 5. 状态从8变为其他 + elif old_status == 8 and instance.zhuangtai != 8: + # 状态不再是8，记录日志即可 + # 定时任务执行时会检查状态，如果不是8会自动跳过 + logger.info(f"订单 {instance.dingdan_id} 状态从8变为{instance.zhuangtai}") + + except Exception as e: + # 捕获所有异常，确保不影响订单保存 + # 只记录错误，不抛出异常 + logger.error(f"信号处理异常（已捕获，不影响订单）: {str(e)}")''' + + +'''from django.db.models.signals import pre_save +from django.dispatch import receiver +from django.conf import settings +import logging + +from dingdan.models import Dingdan +from dingdan.tasks import process_expired_order + +logger = logging.getLogger(__name__) + +@receiver(pre_save, sender=Dingdan) +def handle_order_status_change(sender, instance, **kwargs): + """ + 监听订单状态变化 + 当状态变为8时：启动48小时延时任务 + 当状态从8变为其他时：任务执行时会自动跳过，无需取消 + """ + try: + # 如果是新建订单，没有旧记录，直接返回 + if instance.pk is None: + return + + # 获取数据库中旧的订单记录 + old_instance = Dingdan.objects.get(pk=instance.pk) + + # ============ 状态从非8变为8 ============ + if old_instance.zhuangtai != 8 and instance.zhuangtai == 8: + # 启动48小时后的延时任务（countdown单位：秒） + task = process_expired_order.apply_async( + args=[instance.dingdan_id], + countdown=settings.ORDER_EXPIRE_SECONDS, # 172800秒 = 48小时 + queue='order_tasks', + priority=9 # 高优先级 + ) + + logger.info( + f"订单 {instance.dingdan_id} 状态变为8，已启动48小时延时任务，" + f"任务ID: {task.id}" + ) + + # 记录任务启动成功（可选，可以存储到订单表或日志表） + + # ============ 状态从8变为其他 ============ + # 我们不需要取消任务，因为任务执行时会检查状态是否为8 + # 如果不是状态8，任务会自动跳过处理 + + except Dingdan.DoesNotExist: + # 新订单，无需处理 + pass + except Exception as e: + logger.error(f"处理订单状态变化信号失败，订单ID: {instance.dingdan_id if hasattr(instance, 'dingdan_id') else '未知'}, 错误: {str(e)}") + # 不抛出异常，避免影响订单保存的主流程 + # 信号处理失败不影响订单保存，有周期性检查作为备用方案''' \ No newline at end of file diff --git a/dingdan/tasks.py b/dingdan/tasks.py new file mode 100644 index 0000000..b284f78 --- /dev/null +++ b/dingdan/tasks.py @@ -0,0 +1,198 @@ +""" +阿龙电竞 - 订单定时任务 +处理订单超时自动确认等逻辑 +完整版本，包含所有必要的异常处理 +""" + +from celery import shared_task +from django.db import transaction +from django.db.models import F, Q +from django.conf import settings +from django.utils import timezone +from datetime import timedelta +from decimal import Decimal +import logging + +# 导入模型 - 确保路径正确 +from dingdan.models import Dingdan, DingdanShangjia +from yonghu.models import UserMain, UserDashou, UserShangjia +from utils.celery_utils import safe_decimal_operation, log_task_execution, rollback_on_failure + +logger = logging.getLogger(__name__) + +@shared_task(bind=True, max_retries=3, default_retry_delay=60) +@rollback_on_failure("处理超时订单") +def process_expired_order(self, dingdan_id): + """ + 处理单个超时订单（订单状态=8，超过48小时未处理） + 这个任务在订单状态变为8的48小时后执行 + :param dingdan_id: 订单ID + :return: 处理结果 + """ + try: + # 使用select_for_update锁定记录，防止并发修改 + with transaction.atomic(): + # 获取订单，同时锁定记录 + order = Dingdan.objects.select_for_update().get( + dingdan_id=dingdan_id + ) + + # 再次检查订单状态是否为8 + if order.zhuangtai != 8: + logger.info(f"订单{dingdan_id}状态已不是8（当前:{order.zhuangtai}），跳过处理") + return f"订单{dingdan_id}状态已变更，跳过处理" + + # 获取发单平台类型 + fadan_pingtai = order.fadan_pingtai + + # 获取打手ID和分成金额 + dashou_id = order.jiedan_dashou_id + dashou_fencheng = safe_decimal_operation(order.dashou_fencheng) + + # 1. 更新订单状态为3（已完成） + order.zhuangtai = 3 + order.save(update_fields=['zhuangtai']) + + # 2. 更新打手信息（如果存在） + updated_dashou = False + if dashou_id: + try: + # 查询打手用户主表 + dashou_user = UserMain.objects.filter(yonghuid=dashou_id).first() + if dashou_user: + # 获取打手扩展表 + dashou_profile = getattr(dashou_user, 'dashou_profile', None) + if dashou_profile: + # 使用F表达式原子更新 + UserDashou.objects.filter(pk=dashou_profile.pk).update( + chengjiaozongliang=F('chengjiaozongliang') + 1, + yue=F('yue') + dashou_fencheng, + zonge=F('zonge') + dashou_fencheng, + jinrishouyi=F('jinrishouyi') + dashou_fencheng, + jinyueshouyi=F('jinyueshouyi') + dashou_fencheng + ) + updated_dashou = True + logger.info(f"更新打手{dashou_id}信息成功") + except Exception as e: + logger.error(f"更新打手信息失败，打手ID: {dashou_id}, 错误: {str(e)}") + # 继续执行，不中断流程 + + # 3. 如果是商家发单，更新商家信息 + updated_shangjia = False + if fadan_pingtai == 2: # 商家发单 + try: + # 获取商家扩展信息 + shangjia_kuozhan = getattr(order, 'shangjia_kuozhan', None) + if shangjia_kuozhan: + shangjia_id = shangjia_kuozhan.shangjia_id + if shangjia_id: + # 查询商家用户 + shangjia_user = UserMain.objects.filter(yonghuid=shangjia_id).first() + if shangjia_user: + shangjia_profile = getattr(shangjia_user, 'shop_profile', None) + if shangjia_profile: + # 更新商家成交订单数量 + UserShangjia.objects.filter(pk=shangjia_profile.pk).update( + chengjiao=F('chengjiao') + 1 + ) + updated_shangjia = True + logger.info(f"更新商家{shangjia_id}信息成功") + except Exception as e: + logger.error(f"更新商家信息失败，订单ID: {dingdan_id}, 错误: {str(e)}") + # 继续执行，不中断流程 + + # 记录任务执行结果 + result_msg = f"订单{dingdan_id}自动结算完成" + if updated_dashou: + result_msg += "，打手信息已更新" + if updated_shangjia: + result_msg += "，商家信息已更新" + # 12. 更新平台收益流水（仅在平台发单时） + if fadan_pingtai == 1: + try: + from dingdan.utils import update_platform_profit # 导入函数 + update_platform_profit(dingdan_id) + except Exception as e: + # 平台收益更新失败不影响主流程，但记录日志 + logger.error(f"强制结单后更新平台收益失败: {str(e)}") + + log_task_execution(f"自动结算订单 {dingdan_id}", True, result_msg) + return result_msg + + except Dingdan.DoesNotExist: + error_msg = f"订单{dingdan_id}不存在" + logger.warning(error_msg) + return error_msg + except Exception as e: + error_msg = f"处理订单{dingdan_id}时发生错误: {str(e)}" + logger.error(error_msg) + + # 重试机制 + if self.request.retries < self.max_retries: + logger.info(f"订单{dingdan_id}处理失败，准备第{self.request.retries + 1}次重试") + raise self.retry(exc=e) + + log_task_execution(f"自动结算订单 {dingdan_id}", False, error_msg) + return error_msg + +@shared_task +@rollback_on_failure("批量检查超时订单") +def check_order_expire_task(): + """ + 批量检查超时订单（补偿机制） + 每5分钟执行一次，作为信号处理的备用方案 + 查找状态为8且创建时间超过72小时的订单（宽松时间，防止误处理） + """ + try: + # 计算更宽松的时间点：当前时间减去72小时（48+24小时） + # 这样避免误处理刚变为状态8的订单 + check_time = timezone.now() - timedelta(seconds=settings.ORDER_EXPIRE_SECONDS + 86400) # 48+24=72小时 + + # 查询状态为8且创建时间早于检查时间的订单 + expired_orders = Dingdan.objects.filter( + zhuangtai=8, + create_time__lt=check_time + ).values_list('dingdan_id', flat=True) + + expired_count = expired_orders.count() + + if expired_count == 0: + logger.info("补偿检查：无超时订单") + return {"success": True, "message": "无超时订单", "count": 0} + + # 分批处理超时订单（避免一次处理太多） + batch_size = 10 + processed_count = 0 + + for i in range(0, expired_count, batch_size): + batch = expired_orders[i:i+batch_size] + + # 异步处理每个超时订单 + for dingdan_id in batch: + process_expired_order.apply_async( + args=[dingdan_id], + queue='order_tasks', + priority=8 # 补偿任务的优先级低一些 + ) + processed_count += 1 + + result_msg = f"补偿检查：发现{expired_count}个可能超时的订单，已提交处理{processed_count}个" + log_task_execution("批量检查超时订单", True, result_msg) + + return { + "success": True, + "message": result_msg, + "total_count": expired_count, + "processed_count": processed_count + } + + except Exception as e: + error_msg = f"批量检查超时订单失败: {str(e)}" + logger.error(error_msg) + log_task_execution("批量检查超时订单", False, error_msg) + + return { + "success": False, + "message": error_msg, + "error": str(e) + } \ No newline at end of file diff --git a/dingdan/tests.py b/dingdan/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/dingdan/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/dingdan/tongzhi_tasks.py b/dingdan/tongzhi_tasks.py new file mode 100644 index 0000000..874c4b7 --- /dev/null +++ b/dingdan/tongzhi_tasks.py @@ -0,0 +1,71 @@ +# dingdan/tongzhi_tasks.py +import logging +from concurrent.futures import ThreadPoolExecutor, as_completed +from a_long_dianjing.celery_app import app +from yonghu.models import OfficialAccountUser +from utils.weixin_broadcast import WeixinBroadcastSender + +logger = logging.getLogger('weixin_broadcast') + + +@app.task(bind=True, max_retries=3, default_retry_delay=60) +def dingdan_guangbo(self, order_info): + """ + 异步并发广播订单模板消息给所有关注服务号的用户 + order_info 字典字段示例： + { + 'dingdan_id': 'PT123456', + 'game_type': '王者荣耀', + 'amount': '88.00', + 'order_desc': '星耀上王者' + } + """ + sender = WeixinBroadcastSender() + template_data = sender.build_order_message_data(order_info) + order_id = order_info.get('dingdan_id') + + # 查询所有已关注用户 + try: + openids = list( + OfficialAccountUser.objects + .filter(is_subscribed=True) + .values_list('official_openid', flat=True) + ) + except Exception as e: + logger.error(f'查询订阅用户失败: {e}') + raise self.retry(exc=e) + + if not openids: + return {'success': True, 'msg': '无订阅用户'} + + total = len(openids) + logger.info(f'📊 Celery 广播订单 {order_id} 开始，目标人数: {total}') + + success = 0 + fail = 0 + + # 20 个线程并发发送，微信接口耗时 200-500ms，1000 人约 15 秒完成 + with ThreadPoolExecutor(max_workers=20) as executor: + future_map = { + executor.submit(sender.send_to_user, openid, template_data, order_id): openid + for openid in openids + } + for future in as_completed(future_map): + openid = future_map[future] + try: + res = future.result(timeout=30) + if res.get('success'): + success += 1 + else: + fail += 1 + except Exception as e: + fail += 1 + logger.error(f'发送异常 {openid[:10]}...: {e}') + + logger.info(f'🏁 广播完成：成功 {success}，失败 {fail}，总计 {total}') + return { + 'success': True, + 'total': total, + 'success_count': success, + 'fail_count': fail + } \ No newline at end of file diff --git a/dingdan/urls.py b/dingdan/urls.py new file mode 100644 index 0000000..983d95e --- /dev/null +++ b/dingdan/urls.py @@ -0,0 +1,93 @@ +from django.urls import path +from django.views.decorators.csrf import csrf_exempt +from .views import CreateOrderView, WechatPayNotifyView, \ + PaymentFailView, PaymentVerifyView, DingdanHuoquView, DingdanXiangqingView, JiedanView, \ + ShangpinLeixingView, ShangjiaPaifaView, ShangjiaDingdanHuoquView, ShangjiaJiesuanView, \ + ShangjiaDingdanXiangqingView, ShangjiaChufaShenqingView, ShangjiaTuikuanShenqingView, \ + ShangjiaChexiaoView, DashouDingdanHuoquView, ShangpinLeixingHuoquView, QiangdanView, \ + DashouDingdanHuoquView1, DashouCOSZhengshuView, DashouTijiaoView, DashouDingdanXiangqingView, AdGetDingdanXiangQing, \ + AdTongYiTuiKuanPingTai, AdTongYiTuiKuanShangJia, AdQiangZhiJieDan, AdJuJueTuiKuan, AdGengHuanDaShou, \ + ShangjiaCOSZhengshuView, DashouHuoquLeixingView, AdJuJueJieSuan, AdZhuanYiDaTing, AdQuXiaoZhiDing, \ + PartnerNotifyClaimView, PartnerSyncOrderView, PartnerCheckClaimView, PartnerRefundNotifyView, DashouXiugaiView, \ + DaiLiQunLiaoXiaoXiView, VirtualCreateOrderView, VirtualPayNotifyView, VirtualPaymentVerifyView, \ + VirtualPaymentFailView, ShangjiaLianjieLiuYanZhuanFaView, DingdanXiangqingView2, JiedanView2, ZxsjghdsView, \ + ShangjiaFakuanApplyView, ShangjiaFakuaiXiugaiView + +urlpatterns = [ + path('xiadan', CreateOrderView.as_view(), name='下单订单生成接口'), + #path('pay-notify/', WechatPayNotifyView.as_view(), name='老板下单微信支付回调'), + path('pay-notify/', csrf_exempt(WechatPayNotifyView.as_view()), name='老板下单微信支付回调'), + path('shibai', PaymentFailView.as_view(), name='老板支付失败接口'), + path('fucha', PaymentVerifyView.as_view(), name='老板支付成功复查接口'), + path('dingdanhuoqu', DingdanHuoquView.as_view(), name='老板订单获取'), + path('dingdanxiangqing', DingdanXiangqingView.as_view(), name='老板订单详情获取'), + path('jiedan', JiedanView.as_view(), name='老板结单'), + path('sjspleixing', ShangpinLeixingView.as_view(), name='派单获取商品类型'), + path('sjpaifa', ShangjiaPaifaView.as_view(), name='商家发单'), + path('sjdingdanhq', ShangjiaDingdanHuoquView.as_view(), name='商家订单获取'), + path('sjddxq', ShangjiaDingdanXiangqingView.as_view(), name='商家订单详情获取'), + path('sjjiesuan', ShangjiaJiesuanView.as_view(), name='商家结单'), + path('sjchexiao', ShangjiaChexiaoView.as_view(), name='商家撤销订单'), + path('sjtkshenqing', ShangjiaTuikuanShenqingView.as_view(), name='商家退款申请'), + path('sjchufa', ShangjiaChufaShenqingView.as_view(), name='商家处罚打手申请'), + path('ddlxhq', ShangpinLeixingHuoquView.as_view(), name='打手抢单页商品类型获取'), + path('dshqdingdan', DashouDingdanHuoquView1.as_view(), name='打手订单列表页面获取'), + + # 获取订单列表 + path('ddhq', DashouDingdanHuoquView.as_view(), name='打手抢单页获取订单'), + path('qiangdan', QiangdanView.as_view(), name='打手抢单'), + path('dsscpz', DashouCOSZhengshuView.as_view(), name='打手上传图片OSS参数获取接口'), + # 打手提交订单完成接口 + path('dstijiao', DashouTijiaoView.as_view(), name='打手订单提交'), + # 打手订单详情获取接口 + path('dsddxq', DashouDingdanXiangqingView.as_view(), name='打手获取订单详情'), + path('adddxq', AdGetDingdanXiangQing.as_view(), name='管理员获取订单详情页面具体信息'), + path('adddpttk', AdTongYiTuiKuanPingTai.as_view(), name='同意平台订单退款'), + + # 商家订单退款接口（之前写的） + path('adddsjtk', AdTongYiTuiKuanShangJia.as_view(), name='同意商家退款'), + + # 强制结单接口 + path('adddqzjd', AdQiangZhiJieDan.as_view(), name='强制结单'), + + # 拒绝退款接口 + path('adddjj', AdJuJueTuiKuan.as_view(), name='拒绝退款'), + + # 更换打手接口 + path('adddgh', AdGengHuanDaShou.as_view(), name='管理更换打手'), + path('sjscpz', ShangjiaCOSZhengshuView.as_view(), name='商家上传证据图片获取密钥'), + path('dsqdhqddlx', DashouHuoquLeixingView.as_view(), name='打手抢单页面获取订单类型'), + + + path('adddjjjs', AdJuJueJieSuan.as_view(), name='管理员拒绝给打手钱'), + path('adddzydt', AdZhuanYiDaTing.as_view(), name='订单转移大厅'), + path('adddqxzd', AdQuXiaoZhiDing.as_view(), name='取消指定'), + + + path('partner_sync_order', csrf_exempt(PartnerSyncOrderView.as_view()), name='东道主派单接口'), + path('partner_check_claim', csrf_exempt(PartnerCheckClaimView.as_view()), name='对方抢单检查接口'), + + + path('partner_notify_claim', csrf_exempt(PartnerNotifyClaimView.as_view()), name='东道主订单被抢通知接口'), + path('partner_refund_notify', csrf_exempt(PartnerRefundNotifyView.as_view()), name='接受东道主退款通知'), + path('dsxiugaidd', DashouXiugaiView.as_view(), name='打手修改订单详情'), + + path('kptxxfs', DaiLiQunLiaoXiaoXiView.as_view(), name='前端聊天转发'), # 群聊消息代理发送 + + path('virtual_xiadan', VirtualCreateOrderView.as_view(),name='虚拟支付下单'), + path('virtual_notify', VirtualPayNotifyView.as_view(),name='虚拟支付下单回调'), + path('virtual_fucha', VirtualPaymentVerifyView.as_view(),name='虚拟支付下单成功复查'), + path('shibai', VirtualPaymentFailView.as_view(),name='虚拟支付下单失败'), # 或复用原 PaymentFailView + + path('sjljlbxxzf', ShangjiaLianjieLiuYanZhuanFaView.as_view(), name='商家链接老板聊天转发'), + + path('dingdanxiangqing2', DingdanXiangqingView2.as_view(), name='老板获取订单详情新街口'), + path('jiedan2', JiedanView2.as_view(), name='老板结单新街口'), + path('zxsjghds', ZxsjghdsView.as_view(), name='商家更换打手'), # 商家更换打手 + path('sjfksq', ShangjiaFakuanApplyView.as_view(), name='商家罚款'), + path('sjfkxgycx', ShangjiaFakuaiXiugaiView.as_view(), name='商家罚款和退款修改'), + + + + +] \ No newline at end of file diff --git a/dingdan/utils.py b/dingdan/utils.py new file mode 100644 index 0000000..14f4f18 --- /dev/null +++ b/dingdan/utils.py @@ -0,0 +1,441 @@ + +import threading +import requests + +from django.conf import settings +from peizhi.models import Club +from shangpin.models import ShangpinLeixing +from dingdan.models import Dingdan # 根据实际路径导入 + +import logging +from datetime import date + +from django.db import transaction +from django.db.models import F +from peizhi.models import DailyDispatchStat # 假设模型在 peizhi 应用中 + +logger = logging.getLogger(__name__) + +# 可选：线程池限制（避免大量线程同时创建，建议使用 Celery，这里简单用线程） +THREAD_POOL_SIZE = 10 +_semaphore = threading.Semaphore(THREAD_POOL_SIZE) + +def sync_order_to_partners(dingdan_id): + """ + 异步向所有开启互通的合作平台同步订单。 + 使用信号量限制并发线程数。 + """ + def _task(): + _semaphore.acquire() + try: + _sync_order_task(dingdan_id) + finally: + _semaphore.release() + + thread = threading.Thread(target=_task) + thread.daemon = True + thread.start() + +def _sync_order_task(dingdan_id): + """实际同步任务（在线程中执行）""" + try: + # 获取订单对象（只取必要字段，提升性能） + dingdan = Dingdan.objects.only( + 'dingdan_id', 'zhuangtai', 'jine', 'dashou_fencheng', 'jieshao', + 'beizhu', 'nicheng', 'leixing_id', 'yaoqiuleixing', 'huiyuan_id', + 'yongjin', 'zhiding_id', 'create_time' + ).get(dingdan_id=dingdan_id) + + # 基本条件判断 + if dingdan.zhuangtai != 1: + logger.info(f"订单 {dingdan_id} 状态 {dingdan.zhuangtai} 不是1，不同步") + return + if dingdan.zhiding_id: + logger.info(f"订单 {dingdan_id} 是指定单，不同步") + return + if dingdan.yaoqiuleixing != 1: + logger.info(f"订单 {dingdan_id} 抢单要求类型不是会员抢单，不同步") + return + if not dingdan.leixing_id: + logger.info(f"订单 {dingdan_id} 无商品类型，不同步") + return + try: + leixing = ShangpinLeixing.objects.get(id=dingdan.leixing_id) + if not leixing.is_cross_enabled: + logger.info(f"订单 {dingdan_id} 的商品类型未开启互通，不同步") + return + except ShangpinLeixing.DoesNotExist: + logger.info(f"订单 {dingdan_id} 的商品类型不存在，不同步") + return + + # 查询所有开启互通的俱乐部 + clubs = Club.objects.filter(is_interop_enabled=True).select_related() + if not clubs.exists(): + return + + # 为每个俱乐部发送订单 + for club in clubs: + _send_to_single_partner(dingdan, club) + + except Exception as e: + logger.error(f"同步订单任务异常: {e}", exc_info=True) + + + + + + +def _send_to_single_partner(dingdan, club): + """向单个俱乐部发送订单（带重试，幂等处理）""" + # 计算实际金额：订单打手分成 × 对方费率 + actual_amount = dingdan.dashou_fencheng * club.dashou_rate + actual_amount -= 1 + + # 构建请求数据 + payload = { + 'token': settings.CROSS_PLATFORM_TOKEN, + 'our_club_id': club.club_id, # 我方在对方系统中的标识（存储于对方表的 partner_club_id） + 'partner_club_id': club.partner_club_id, # 对方自己的俱乐部ID + 'partner_order_id': dingdan.dingdan_id, # 我方订单ID作为对方的外部订单号 + 'jine': str(actual_amount), # 对方平台应展示的订单金额 + 'dashou_fencheng': str(actual_amount), # 对方平台打手分成（与金额一致） + 'jieshao': dingdan.jieshao, + 'beizhu': dingdan.beizhu, + 'create_time': dingdan.create_time.isoformat(), + 'nicheng': dingdan.nicheng, + 'leixing_id': dingdan.leixing_id, # 我方商品类型ID，对方需要映射 + 'user_id': get_order_user_id(dingdan), # 对方平台下单用户ID（不带前缀） + } + + # 重试机制（最多3次，指数退避） + for attempt in range(1, 4): + try: + response = requests.post( + club.partner_domain + '/dingdan/partner_sync_order', + json=payload, + timeout=5 + ) + if response.status_code == 200: + data = response.json() + # 对方返回 code=0 表示成功（包括新建或已存在） + if data.get('code') == 0: + # 判断本次响应是新创建还是已存在 + status = data.get('data', {}).get('status', '') + if status == 'existed': + # 订单已经存在于对方系统，不重复统计 + logger.info(f"订单 {dingdan.dingdan_id} 在俱乐部 {club.club_id} 已存在，跳过统计") + else: + # 新创建成功，更新统计 + try: + update_daily_dispatch_stat( + direction=1, # 我方派单 + partner_club_id=club.partner_club_id, + dispatch_amount=actual_amount, + + ) + logger.info(f"成功同步订单 {dingdan.dingdan_id} 到俱乐部 {club.club_id}") + except Exception as e: + logger.error(f"更新派单统计失败: {e}", exc_info=True) + + # 标记订单为跨平台（仅当第一次成功时标记，避免重复标记） + if not dingdan.is_cross: + Dingdan.objects.filter(dingdan_id=dingdan.dingdan_id).update( + is_cross=1, + dispatch_type=1 # 我方派单 + ) + logger.info(f"订单 {dingdan.dingdan_id} 已标记为跨平台订单") + break + else: + # 对方返回业务错误（如映射不存在等），不重试 + logger.error(f"同步订单失败（业务）: {data}") + break + else: + logger.error(f"同步订单HTTP失败: {response.status_code}") + except Exception as e: + logger.error(f"同步订单异常（尝试 {attempt}/3）: {e}") + + if attempt < 3: + import time + time.sleep(2 ** attempt) # 指数退避 + else: + logger.error(f"同步订单 {dingdan.dingdan_id} 到俱乐部 {club.club_id} 最终失败") + + + + +# 获取下单方ID（根据订单类型） +def get_order_user_id(order): + from dingdan.models import DingdanPingtai, DingdanShangjia + if order.fadan_pingtai == 1: + try: + ext = DingdanPingtai.objects.get(dingdan=order) + return ext.laoban_id # 老板ID + except DingdanPingtai.DoesNotExist: + return None + elif order.fadan_pingtai == 2: + try: + ext = DingdanShangjia.objects.get(dingdan=order) + return ext.shangjia_id # 商家ID + except DingdanShangjia.DoesNotExist: + return None + return None + + + +# dingdan/utils/dispatch_stat.py +import logging + +import logging +from datetime import date +from decimal import Decimal +from django.db import transaction +from django.db.models import F +from peizhi.models import DailyDispatchStat # 请根据实际模型位置修改导入路径 + +logger = logging.getLogger(__name__) + + +def update_daily_dispatch_stat(direction, partner_club_id, + dispatch_amount=None, dispatch_count=1, + claimed_amount=None, claimed_count=1, + success_amount=None, success_count=1): + """ + 原子更新每日派单统计（支持派单、抢单、成交三种类型）。 + 只更新传递了非None参数的字段，未传递的字段保持不变。 + + 参数: + direction: 1=我方派单，2=对方派单 + partner_club_id: 对方俱乐部ID + dispatch_amount: 派单金额（Decimal），如果提供则累加到 dispatch_amount 和 dispatch_count + dispatch_count: 派单数量，默认为1，与 dispatch_amount 同时提供时生效 + claimed_amount: 抢单金额（Decimal），如果提供则累加到 claimed_amount 和 claimed_count + claimed_count: 抢单数量，默认为1，与 claimed_amount 同时提供时生效 + success_amount: 成交金额（Decimal），如果提供则累加到 success_amount 和 success_count + success_count: 成交数量，默认为1，与 success_amount 同时提供时生效 + """ + today = date.today() + year, month, day = today.year, today.month, today.day + + with transaction.atomic(): + # 使用 select_for_update 锁定行，避免并发累加冲突 + stat, created = DailyDispatchStat.objects.select_for_update().get_or_create( + date=today, + year=year, + month=month, + day=day, + direction=direction, + partner_club_id=partner_club_id, + defaults={ + 'dispatch_count': dispatch_count if dispatch_amount is not None else 0, + 'dispatch_amount': dispatch_amount or Decimal('0.00'), + 'claimed_count': claimed_count if claimed_amount is not None else 0, + 'claimed_amount': claimed_amount or Decimal('0.00'), + 'success_count': success_count if success_amount is not None else 0, + 'success_amount': success_amount or Decimal('0.00'), + } + ) + + if not created: + update_fields = [] + if dispatch_amount is not None: + stat.dispatch_count = F('dispatch_count') + dispatch_count + stat.dispatch_amount = F('dispatch_amount') + dispatch_amount + update_fields.extend(['dispatch_count', 'dispatch_amount']) + if claimed_amount is not None: + stat.claimed_count = F('claimed_count') + claimed_count + stat.claimed_amount = F('claimed_amount') + claimed_amount + update_fields.extend(['claimed_count', 'claimed_amount']) + if success_amount is not None: + stat.success_count = F('success_count') + success_count + stat.success_amount = F('success_amount') + success_amount + update_fields.extend(['success_count', 'success_amount']) + + if update_fields: + stat.save(update_fields=update_fields) + + logger.info(f"更新派单统计: 日期={today}, 方向={direction}, 俱乐部={partner_club_id}, " + f"派单+{dispatch_count if dispatch_amount else 0}单/{dispatch_amount or 0}, " + f"抢单+{claimed_count if claimed_amount else 0}单/{claimed_amount or 0}, " + f"成交+{success_count if success_amount else 0}单/{success_amount or 0}") + + + +from peizhi.models import DailyIncomeStat + +logger = logging.getLogger(__name__) + + +def update_daily_income(amount): + """ + 原子更新当日收入统计（金额累加，笔数加1）。 + 用于微信支付成功回调。 + + 参数: + amount: Decimal 本次收入金额 + """ + today = date.today() + year, month, day = today.year, today.month, today.day + + with transaction.atomic(): + stat, created = DailyIncomeStat.objects.select_for_update().get_or_create( + date=today, + defaults={ + 'year': year, + 'month': month, + 'day': day, + 'total_amount': amount, + 'total_count': 1 + } + ) + if not created: + # 原子累加 + stat.total_amount = F('total_amount') + amount + stat.total_count = F('total_count') + 1 + stat.save(update_fields=['total_amount', 'total_count']) + + logger.info( + f"每日收入更新: {today}, +{amount}元, 总金额={stat.total_amount if created else stat.total_amount + amount}, 总笔数={stat.total_count if created else stat.total_count + 1}") + + + +from peizhi.models import DailyPayoutStat + +logger = logging.getLogger(__name__) + +def update_daily_payout(amount): + """ + 原子更新当日出款统计（金额累加，笔数加1）。 + 用于提现成功、结算打款等场景。 + + 参数: + amount: Decimal 本次出款金额 + """ + today = date.today() + year, month, day = today.year, today.month, today.day + + with transaction.atomic(): + stat, created = DailyPayoutStat.objects.select_for_update().get_or_create( + date=today, + defaults={ + 'year': year, + 'month': month, + 'day': day, + 'total_amount': amount, + 'total_count': 1 + } + ) + if not created: + # 原子累加 + stat.total_amount = F('total_amount') + amount + stat.total_count = F('total_count') + 1 + stat.save(update_fields=['total_amount', 'total_count']) + + #logger.info(f"每日出款更新: {today}, +{amount}元, 总金额={stat.total_amount if created else stat.total_amount + amount}, 总笔数={stat.total_count if created else stat.total_count + 1}") + + +from decimal import Decimal + +from dingdan.models import Lilubiao + + +def calc_shangjia_order_fencheng(jine): + """ + 商家发单时计算打手/管事分成。 + 打手优先：打手+管事 > 订单金额时，管事分成为 0。 + """ + jine = Decimal(str(jine)) + try: + lilu_obj = Lilubiao.objects.get(fadanpingtai='3') + rate_dashou = Decimal(str(lilu_obj.lilu)) if lilu_obj.lilu and lilu_obj.lilu > 0 else Decimal('1') + except Lilubiao.DoesNotExist: + rate_dashou = Decimal('1') + + lilu_guanshi_obj = Lilubiao.objects.filter(fadanpingtai='13').first() + rate_guanshi = ( + Decimal(str(lilu_guanshi_obj.lilu)) + if lilu_guanshi_obj and lilu_guanshi_obj.lilu is not None + else Decimal('0') + ) + + dashou_fencheng = (jine * rate_dashou).quantize(Decimal('0.01')) + guanshi_raw = (jine * rate_guanshi).quantize(Decimal('0.01')) + + if dashou_fencheng + guanshi_raw > jine: + guanshi_fencheng = Decimal('0.00') + else: + guanshi_fencheng = guanshi_raw + + return dashou_fencheng, guanshi_fencheng + + +def settle_shangjia_order_guanshi_fenhong(order, dashou_id): + """ + 商家订单结单时结算管事分红（幂等，失败不抛异常阻断主流程）。 + """ + from shangpin.models import Gsfenhong + from yonghu.models import UserDashou, UserGuanshi + + if getattr(order, 'fadan_pingtai', None) != 2: + return + + guanshi_fencheng = order.guanshi_fencheng or Decimal('0') + if guanshi_fencheng <= 0: + return + + if Gsfenhong.objects.filter(dingdan_id=order.dingdan_id).exists(): + logger.info(f"商家订单管事分红已处理: {order.dingdan_id}") + return + + if not dashou_id: + return + + try: + dashou = UserDashou.objects.select_related('user').get(user__yonghuid=dashou_id) + except UserDashou.DoesNotExist: + logger.info(f"商家订单管事分红跳过: 打手{dashou_id}不存在") + return + + guanshi_id = dashou.yaoqingren + if not guanshi_id: + logger.info(f"商家订单管事分红跳过: 打手{dashou_id}无邀请管事") + return + + try: + with transaction.atomic(): + guanshi = UserGuanshi.objects.select_for_update().get(user__yonghuid=guanshi_id) + UserGuanshi.objects.filter(id=guanshi.id).update( + yue=F('yue') + guanshi_fencheng, + chongzhifenrun=F('chongzhifenrun') + guanshi_fencheng, + ) + + user_main = dashou.user + Gsfenhong.objects.create( + dingdan_id=order.dingdan_id, + guanshi=guanshi_id, + dashouid=dashou_id, + shuoming='商家订单分红', + fenhong=guanshi_fencheng, + avatar=user_main.avatar if user_main else None, + nicheng=dashou.nicheng or '未知打手', + fenhong_leixing=3, + ) + logger.info( + f"商家订单管事分红成功: 订单{order.dingdan_id}, 管事{guanshi_id}, " + f"打手{dashou_id}, 金额{guanshi_fencheng}元" + ) + except UserGuanshi.DoesNotExist: + logger.warning(f"商家订单管事分红跳过: 管事{guanshi_id}不存在") + return + except Exception as e: + logger.error(f"商家订单管事分红失败: {e}", exc_info=True) + return + + try: + from houtai.utils import update_guanshi_daily_by_action + update_guanshi_daily_by_action( + yonghuid=guanshi_id, + action=3, + amount=guanshi_fencheng, + ) + except Exception as e: + logger.error(f"商家订单管事日统计更新失败: {e}") \ No newline at end of file diff --git a/dingdan/views.py b/dingdan/views.py new file mode 100644 index 0000000..10cb6c9 --- /dev/null +++ b/dingdan/views.py @@ -0,0 +1,11602 @@ + +from tencentcloud.common.profile.client_profile import ClientProfile +from tencentcloud.common.profile.http_profile import HttpProfile + +from shangpin.models import Huiyuangoumai +from dingdan.models import Lilubiao, Pingfen, Chufajilu, Liaotian, Chufatupian + +from yonghu.models import UserShangjia +from houtai.utils import update_dashou_daily_by_action + +from decimal import Decimal +from houtai.utils import ( + update_shangjia_daily, + +) + +import logging +from rest_framework import permissions + +from dingdan.utils import sync_order_to_partners + +from django.db import transaction +from django.http import HttpResponse +from rest_framework.views import APIView + +from rest_framework.throttling import AnonRateThrottle +from rest_framework.permissions import AllowAny + +from peizhi.models import Szjilu + +logger = logging.getLogger(__name__) + +from shangdian.utils import calculate_pingtai_and_dianpu_shouyi, validate_shangpin_and_dianpu +from shangpin.utils import update_shangpin_daily_stat +from shangdian.utils import update_dianpu_daily_stat # 注意：您之前写的店铺统计方法名是 update_dianpu_daily_stat + + + + + + + +class CreateOrderView(APIView): + """ + 创建订单并调用微信支付接口 + """ + permission_classes = [permissions.IsAuthenticated] + + def post(self, request): + try: + # 1. 获取前端传递的字段 + shangpin_id = request.data.get('shangpin_id') + nicheng = request.data.get('nicheng', '').strip() + beizhu = request.data.get('beizhu', '').strip() + zhiding = request.data.get('zhiding', '').strip() + jine = request.data.get('jine', 0) + + # 2. 验证必填字段 + if not shangpin_id: + return Response({'code': 1, 'msg': '商品ID不能为空', 'data': None}) + + if not nicheng: + return Response({'code': 2, 'msg': '游戏昵称不能为空', 'data': None}) + + if len(nicheng) > 50: + return Response({'code': 3, 'msg': '游戏昵称过长', 'data': None}) + + # 3. 查询商品信息 + shangpin = Shangpin.objects.filter(id=shangpin_id).first() + if not shangpin: + return Response({'code': 4, 'msg': '商品不存在', 'data': None}) + + is_valid, err_msg, _ = validate_shangpin_and_dianpu(shangpin_id) + if not is_valid: + return Response({'code': 5, 'msg': err_msg, 'data': None}) + + # 检查库存 + if hasattr(shangpin, 'kucun') and shangpin.kucun <= 0: + return Response({'code': 5, 'msg': '商品库存不足', 'data': None}) + + # 获取商品价格 + shangpin_jiage = getattr(shangpin, 'jiage', 0) + if not shangpin_jiage: + return Response({'code': 6, 'msg': '商品价格异常', 'data': None}) + #获取商品图片 + shangpin_tupian = getattr(shangpin, 'tupian_url', None) + + # 4. 验证指定打手（如果存在） + zhiding_id_value = None + if zhiding: + # 查询主表中是否存在该打手 + zhiding_user = UserMain.objects.filter( + yonghuid=zhiding, + #user_type='dashou' + ).first() + + if not zhiding_user: + return Response({'code': 7, 'msg': '指定打手不存在', 'data': None}) + + # 查询打手扩展表 + dashou_profile = UserDashou.objects.filter(user=zhiding_user).first() + + if not dashou_profile: + return Response({'code': 8, 'msg': '指定用户不存在或已封禁', 'data': None}) + + # 检查在线状态 + if getattr(dashou_profile, 'zhanghaozhuangtai', 0) == 0: + return Response({'code': 8, 'msg': '指定用户不存在或已封禁', 'data': None}) + + zhiding_id_value = zhiding + + # 5. 生成订单ID + timestamp = int(time.time()) + timestamp_ns = int(time.time_ns() // 1000) % 1000000 + random_num = random.randint(0, 99) + dingdanid = f"PT{timestamp:011d}{timestamp_ns:06d}{random_num:02d}" + + # 6. 查询利率并计算分成 + # 查询打手利率（字符'1'） + dashou_lilu = Lilubiao.objects.filter(fadanpingtai='1').first() + + # 🔥 新增：判断是否使用商品配置的额外分成 + if shangpin.kaioi_ewai_dashou_fencheng and shangpin.ewai_dashou_fencheng is not None: + # 使用商品指定的额外分成金额 + dashou_fencheng = shangpin.ewai_dashou_fencheng + else: + # 按原有逻辑计算打手分成 + dashou_fencheng = Decimal(str(shangpin_jiage)) * Decimal(str(dashou_lilu.lilu)) + + + # 查询管事利率（字符'2'） + #guanshi_lilu = Lilubiao.objects.filter(fadanpingtai='2').first() + + if not dashou_lilu: #or not guanshi_lilu: + return Response({'code': 9, 'msg': '系统利率配置不完整', 'data': None}) + + + + # 计算打手分成 + #dashou_fencheng = Decimal(str(shangpin_jiage)) * Decimal(str(dashou_lilu.lilu)) + + + + + # 开始数据库事务 + with transaction.atomic(): + # 获取当前用户信息 + current_user = request.user + laoban_yonghuid = getattr(current_user, 'yonghuid', '') + user_openid = getattr(current_user, 'openid', '') + + if not user_openid: + return Response({'code': 10, 'msg': '用户openid不存在', 'data': None}) + + # 创建订单主表数据 + order_data = { + 'dingdan_id': dingdanid, + 'zhuangtai': 9, # 未付款状态 + 'jine': shangpin_jiage, + 'fadan_pingtai':1, + 'dashou_fencheng': dashou_fencheng, + 'zhiding_id': zhiding_id_value, + 'shangpin_id': shangpin_id, + 'yaoqiuleixing': getattr(shangpin, 'yaoqiuleixing', None), + 'huiyuan_id': getattr(shangpin, 'huiyuan_id', ''), + 'yongjin': getattr(shangpin, 'yongjin', 0), + 'jieshao': getattr(shangpin, 'jieshao', ''), + 'beizhu': beizhu, + 'nicheng': nicheng, + 'tupian':shangpin_tupian, + 'user1_id':f"Boss{request.user.yonghuid}", + 'leixing_id':shangpin.leixing_id + } + + # 创建订单记录 + dingdan = Dingdan.objects.create(**order_data) + + # CreateOrderView.post 事务内部，替换原有的扩展表创建代码 + + dianpu_id, pingtai_shouyi, dianpu_shouyi, shangji_dianpu_id, shangji_fenhong = calculate_pingtai_and_dianpu_shouyi( + shangpin_id=shangpin_id, + dingdan_jiage=shangpin_jiage, + dashou_fencheng=dashou_fencheng + ) + + pingtaikuozhan_data = { + 'dingdan': dingdan, + 'laoban_id': laoban_yonghuid, + 'pingtai_shouyi': pingtai_shouyi, + # ---------- 新增上级分红快照 ---------- + 'shangji_dianpu_id': shangji_dianpu_id, + 'shangji_fenhong': shangji_fenhong if shangji_fenhong else Decimal('0.00'), + } + if dianpu_id: + pingtaikuozhan_data['dianpu_id'] = dianpu_id + pingtaikuozhan_data['dianpu_shouyi'] = dianpu_shouyi + else: + pingtaikuozhan_data['dianpu_shouyi'] = Decimal('0.00') + + DingdanPingtai.objects.create(**pingtaikuozhan_data) + + + # 计算收益 + '''dianpu_id, pingtai_shouyi, dianpu_shouyi = calculate_pingtai_and_dianpu_shouyi( + shangpin_id=shangpin_id, + dingdan_jiage=shangpin_jiage, + dashou_fencheng=dashou_fencheng + ) + + # 构建扩展表数据，平台收益必定保存，店铺收益和店铺ID仅当dianpu_id存在时才赋值 + pingtaikuozhan_data = { + 'dingdan': dingdan, + 'laoban_id': laoban_yonghuid, + 'pingtai_shouyi': pingtai_shouyi, + } + if dianpu_id: + pingtaikuozhan_data['dianpu_id'] = dianpu_id + pingtaikuozhan_data['dianpu_shouyi'] = dianpu_shouyi + else: + # 无店铺时，店铺收益字段保持默认（0.00），也可显式设为0 + pingtaikuozhan_data['dianpu_shouyi'] = Decimal('0.00') + + DingdanPingtai.objects.create(**pingtaikuozhan_data)''' + + # 创建订单平台扩展表 + """pingtaikuozhan_data = { + 'dingdan': dingdan, + 'laoban_id': laoban_yonghuid, + } + DingdanPingtai.objects.create(**pingtaikuozhan_data)""" + + # 7. 生成微信支付参数（向微信官方发送请求） + pay_params = self.generate_wechat_pay_params( + dingdanid=dingdanid, + jine=shangpin_jiage, + beizhu=getattr(settings, 'WEIXIN_PAY_DESCRIPTION'), + user_ip=self.get_client_ip(request), + openid=user_openid + ) + + if not pay_params: + # 手动抛出异常触发事务回滚 + raise Exception('支付参数生成失败') + + # 8. 返回成功响应 + response_data = { + 'code': 0, + 'msg': '订单创建成功', + 'data': { + 'dingdanid': dingdanid, + 'payParams': pay_params + } + } + + return Response(response_data) + + except Exception as e: + # 这里会自动回滚事务 + return Response({'code': 99, 'msg': f'系统错误: {str(e)}', 'data': None}) + + def get_client_ip(self, request): + """获取客户端真实IP地址""" + x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR') + if x_forwarded_for: + ip = x_forwarded_for.split(',')[0] + else: + ip = request.META.get('REMOTE_ADDR') + return ip + + def generate_wechat_pay_params(self, dingdanid, jine, beizhu, user_ip, openid): + """ + 调用微信支付统一下单接口，生成支付参数 + 完全按照您提供的正确示例代码编写 + """ + try: + # 微信支付配置 + APPID = getattr(settings, 'WEIXIN_APPID', '') + MCHID = getattr(settings, 'WEIXIN_MCHID', '') + KEY = getattr(settings, 'WEIXIN_SHANGHUMIYAO', '') + NOTIFY_URL = getattr(settings, 'WEIXIN_NOTIFY_URL', '') + + if not all([APPID, MCHID, KEY, NOTIFY_URL]): + raise Exception('微信支付配置不完整') + + # 生成随机字符串 + import string + nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32)) + + # 金额（单位：分） + total_fee = int(float(jine) * 100) + + # 交易类型 + trade_type = 'JSAPI' + + # 生成签名 + sign_data = { + 'appid': APPID, + 'mch_id': MCHID, + 'nonce_str': nonce_str, + 'body': beizhu, + 'out_trade_no': dingdanid, + 'total_fee': total_fee, + 'spbill_create_ip': user_ip, + 'notify_url': NOTIFY_URL, + 'trade_type': trade_type, + 'openid': openid + } + + # 按照参数名ASCII码从小到大排序 + sorted_sign_data = sorted(sign_data.items(), key=lambda x: x[0]) + + # 拼接字符串 + sign_string = '&'.join([f"{key}={value}" for key, value in sorted_sign_data if value]) + sign_string += f'&key={KEY}' + + # MD5签名 + sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper() + + # 构造XML数据 + xml_data = f""" +{APPID} +{beizhu} +{MCHID} +{nonce_str} +{NOTIFY_URL} +{openid} +{dingdanid} +{user_ip} +{total_fee} +{trade_type} +{sign} +""" + + # 调用微信统一下单接口 + response = requests.post( + 'https://api.mch.weixin.qq.com/pay/unifiedorder', + data=xml_data.encode('utf-8'), + headers={'Content-Type': 'application/xml'}, + timeout=10 + ) + + # 解析返回的XML + root = ET.fromstring(response.content) + + return_code = root.find('return_code').text + result_code = root.find('result_code').text + + if return_code == 'SUCCESS' and result_code == 'SUCCESS': + prepay_id = root.find('prepay_id').text + + # 生成前端支付参数 + timestamp = str(int(time.time())) + nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32)) + package = f'prepay_id={prepay_id}' + + # 生成支付签名 + pay_sign_data = { + 'appId': APPID, + 'timeStamp': timestamp, + 'nonceStr': nonce_str, + 'package': package, + 'signType': 'MD5' + } + + sorted_pay_sign_data = sorted(pay_sign_data.items(), key=lambda x: x[0]) + pay_sign_string = '&'.join([f"{key}={value}" for key, value in sorted_pay_sign_data]) + pay_sign_string += f'&key={KEY}' + pay_sign = hashlib.md5(pay_sign_string.encode('utf-8')).hexdigest().upper() + + # 返回支付参数（格式与前端完全匹配） + result = { + 'timeStamp': timestamp, + 'nonceStr': nonce_str, + 'package': package, + 'signType': 'MD5', + 'paySign': pay_sign + } + + return result + else: + # 获取详细的错误信息 + err_code = root.find('err_code') + err_code_des = root.find('err_code_des') + return_msg = root.find('return_msg') + + error_details = f"return_code: {return_code}, " + if err_code is not None: + error_details += f"err_code: {err_code.text}, " + if err_code_des is not None: + error_details += f"err_code_des: {err_code_des.text}, " + if return_msg is not None: + error_details += f"return_msg: {return_msg.text}" + + raise Exception(f"微信支付下单失败: {error_details}") + + except Exception as e: + raise e + + + + + + +from dingdan.utils import update_daily_income +import logging +import traceback + +logger = logging.getLogger(__name__) + +class WechatPayNotifyView(APIView): + """微信支付回调接口 - 接收微信官方支付结果通知（含详细调试日志）""" + throttle_classes = [AnonRateThrottle] + permission_classes = [AllowAny] + + def post(self, request): + # 记录原始请求数据（调试用） + xml_data = request.body.decode('utf-8') + + # 最外层异常捕获，确保任何错误都能被记录并返回适当响应 + try: + # 1. 解析 XML + try: + root = ET.fromstring(xml_data) + except ET.ParseError as e: + logger.error(f"XML解析失败: {e}") + return self._gen_response_xml('FAIL', 'XML解析失败') + + # 2. 获取关键参数 + return_code = root.find('return_code').text if root.find('return_code') is not None else '' + result_code = root.find('result_code').text if root.find('result_code') is not None else '' + out_trade_no = root.find('out_trade_no').text if root.find('out_trade_no') is not None else '' + transaction_id = root.find('transaction_id').text if root.find('transaction_id') is not None else '' + + # 3. 签名验证 + if not self._verify_signature(xml_data): + logger.warning("签名验证失败") + return self._gen_response_xml('FAIL', '签名验证失败') + + # 4. 根据支付结果处理 + if return_code == 'SUCCESS' and result_code == 'SUCCESS': + self._handle_success(out_trade_no, transaction_id, root) + else: + logger.info(f"支付失败或异常，return_code={return_code}, result_code={result_code}") + self._handle_failure(out_trade_no) + + # 返回微信要求的成功响应（必须返回SUCCESS，即使内部处理失败也要返回，否则微信会重复通知） + return self._gen_response_xml('SUCCESS', 'OK') + + except Exception as e: + # 捕获任何未处理的异常，记录完整堆栈 + logger.error(f"回调处理发生未捕获异常: {str(e)}") + logger.error(traceback.format_exc()) + return self._gen_response_xml('FAIL', f'服务器内部错误: {str(e)}') + + def _verify_signature(self, xml_data): + """微信支付签名验证（MD5）""" + try: + root = ET.fromstring(xml_data) + sign = root.find('sign').text + # 构建待签名字符串（排除sign字段） + data = {child.tag: child.text for child in root if child.tag != 'sign'} + # 按key排序 + sorted_keys = sorted(data.keys()) + stringA = '&'.join([f"{k}={data[k]}" for k in sorted_keys]) + stringSignTemp = f"{stringA}&key={settings.WEIXIN_SHANGHUMIYAO}" + calc_sign = hashlib.md5(stringSignTemp.encode('utf-8')).hexdigest().upper() + logger.debug(f"计算签名: {calc_sign}, 微信签名: {sign}") + return calc_sign == sign + except Exception as e: + logger.error(f"签名验证过程异常: {e}") + logger.error(traceback.format_exc()) + return False + + def _gen_response_xml(self, return_code, return_msg): + """生成返回给微信的XML响应""" + xml = f""" + + +""" + logger.info(f"返回给微信的响应: {xml}") + return HttpResponse(xml, content_type='application/xml') + + @transaction.atomic + def _handle_success(self, out_trade_no, transaction_id, root): + """处理支付成功""" + logger.info(f"进入 _handle_success, out_trade_no={out_trade_no}, transaction_id={transaction_id}") + + # 锁定订单防止并发 + try: + dingdan = Dingdan.objects.select_for_update().filter(dingdan_id=out_trade_no).first() + except Exception as e: + logger.error(f"查询订单异常: {e}") + raise + + if not dingdan: + logger.error(f"订单不存在: {out_trade_no}") + return + + logger.info(f"订单当前状态: {dingdan.zhuangtai}") + + # 幂等处理：只有状态为9（未支付）才处理，已处理则跳过 + if dingdan.zhuangtai != 9: + logger.info(f"订单 {out_trade_no} 已处理过，状态={dingdan.zhuangtai}，跳过") + return + + # 保存微信交易号 + if transaction_id: + dingdan.wechat_transaction_id = transaction_id + logger.info(f"保存微信交易号: {transaction_id}") + else: + logger.warning("微信未返回transaction_id") + + # 更新订单状态 + if dingdan.zhiding_id and dingdan.zhiding_id.strip(): + dingdan.zhuangtai = 7 + logger.info("指定单，状态设为7") + else: + dingdan.zhuangtai = 1 + logger.info("普通单，状态设为1") + + dingdan.save() + + logger.info(f"订单状态已更新为 {dingdan.zhuangtai}") + + # 删除同一用户同一商品的其他未支付订单（改为逻辑删除，状态25） + try: + abandoned_count = Dingdan.objects.filter( + user1_id=dingdan.user1_id, + shangpin_id=dingdan.shangpin_id, + zhuangtai=9 + ).exclude(dingdan_id=out_trade_no).update(zhuangtai=25) + logger.info(f"将 {abandoned_count} 个未支付订单标记为已废弃(25)") + except Exception as e: + logger.error(f"标记其他未支付订单异常: {e}") + + # 更新老板扩展表 + try: + laoban_id = None + if hasattr(dingdan, 'pingtai_kuozhan'): + laoban_id = dingdan.pingtai_kuozhan.laoban_id + if laoban_id: + user_main = UserMain.objects.filter(yonghuid=laoban_id).first() + if user_main and hasattr(user_main, 'boss_profile'): + boss = user_main.boss_profile + boss.zonge = (boss.zonge or 0) + (dingdan.jine or 0) + boss.alldingdan = (boss.alldingdan or 0) + 1 + boss.save() + logger.info(f"更新老板 {laoban_id} 数据成功") + except Exception as e: + logger.error(f"更新老板数据异常: {e}") + + # 更新商品库存 + try: + if dingdan.shangpin_id: + Shangpin.objects.filter(id=dingdan.shangpin_id).update( + kucun=F('kucun') - 1 + ) + logger.info(f"商品 {dingdan.shangpin_id} 库存减1") + except Exception as e: + logger.error(f"更新商品库存异常: {e}") + + + + + # ========== 新增：商品和店铺每日统计 ========== + try: + # 商品每日统计（只要有商品ID就执行） + if dingdan.shangpin_id: + # 从扩展表获取已计算好的收益值（下单时已存储） + pingtai_shouyi = Decimal('0.00') + dianpu_shouyi = Decimal('0.00') + if hasattr(dingdan, 'pingtai_kuozhan'): + pingtai_shouyi = dingdan.pingtai_kuozhan.pingtai_shouyi or Decimal('0.00') + dianpu_shouyi = dingdan.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + + update_shangpin_daily_stat( + shangpin_id=dingdan.shangpin_id, + caozuo_leixing=1, # 1 = 下单 + dingdan_jiage=dingdan.jine, + pingtai_shouyi=pingtai_shouyi, + dianpu_zongshouyi=dianpu_shouyi + ) + logger.info(f"商品统计更新完成，商品ID: {dingdan.shangpin_id}") + + # 店铺每日统计（仅当存在店铺ID时执行） + dianpu_id = None + if hasattr(dingdan, 'pingtai_kuozhan'): + dianpu_id = dingdan.pingtai_kuozhan.dianpu_id + if dianpu_id: + dianpu_shouyi = dingdan.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + update_dianpu_daily_stat( + dianpu_id=dianpu_id, + caozuo_leixing=1, # 1 = 下单 + dingdan_jiage=dingdan.jine, + dianpu_shouyi=dianpu_shouyi + ) + logger.info(f"店铺统计更新完成，店铺ID: {dianpu_id}") + except Exception as e: + logger.error(f"商品/店铺统计更新失败: {e}") + logger.error(traceback.format_exc()) + # 统计失败不影响主流程 + # ============================================= + + + + + + + + + # 更新收支记录（总累计） + self._update_szjilu(dingdan.jine) + + # 更新每日收入统计 + update_daily_income(dingdan.jine) + + # 跨平台同步 + sync_order_to_partners(dingdan.dingdan_id) + + #🟢【7. 新增】支付成功后的广播通知（异步，不阻塞主流程） + from dingdan.tongzhi_tasks import dingdan_guangbo + + # 构建通知数据（你的 _get_game_type_name 方法保留在视图里直接用） + order_info = { + 'dingdan_id': dingdan.dingdan_id, + 'game_type': self._get_game_type_name(dingdan.leixing_id), + 'amount': str(dingdan.jine), + 'order_desc': (dingdan.jieshao or '')[:50], + } + dingdan_guangbo.delay(order_info) # 瞬间返回，不阻塞请求 + + # 异步广播通知 + #self._broadcast_async(dingdan) + + logger.info(f"订单 {out_trade_no} 支付成功处理完成") + + @transaction.atomic + def _handle_failure(self, out_trade_no): + """处理支付失败""" + logger.info(f"进入 _handle_failure, out_trade_no={out_trade_no}") + + try: + dingdan = Dingdan.objects.select_for_update().filter(dingdan_id=out_trade_no).first() + if not dingdan: + logger.warning(f"订单不存在: {out_trade_no}") + return + + logger.info(f"订单当前状态: {dingdan.zhuangtai}") + + # 仅当订单状态为9（未支付）时才标记失败，不直接删除 + if dingdan.zhuangtai == 9: + dingdan.zhuangtai = 14 # 自定义支付失败状态 + dingdan.save() + logger.info(f"订单 {out_trade_no} 支付失败，标记为14") + else: + logger.info(f"订单 {out_trade_no} 状态非9，不处理") + except Exception as e: + logger.error(f"处理支付失败异常: {e}") + logger.error(traceback.format_exc()) + + def _update_szjilu(self, jine): + """更新收支记录表（ID=1的记录）""" + try: + jine_decimal = Decimal(str(jine)) + with transaction.atomic(): + szjilu, created = Szjilu.objects.select_for_update().get_or_create( + id=1, + defaults={ + 'zongsy': Decimal('0.00'), + 'zongls': Decimal('0.00'), + 'zongzc': Decimal('0.00'), + 'jrzc': Decimal('0.00'), + 'jrls': Decimal('0.00') + } + ) + if created: + logger.info("创建ID=1的收支记录") + szjilu.zongsy += jine_decimal + szjilu.zongls += jine_decimal + szjilu.jrls += jine_decimal + szjilu.save() + logger.info(f"收支记录更新成功，增加金额: {jine}") + except Exception as e: + logger.error(f"更新收支记录失败: {e}") + + def _broadcast_async(self, dingdan): + """异步广播通知""" + try: + def task(): + try: + from utils.weixin_broadcast import WeixinBroadcastSender # 请根据实际路径修改 + order_info = { + 'dingdan_id': dingdan.dingdan_id, + 'game_type': self._get_game_type_name(dingdan.leixing_id), + 'amount': str(dingdan.jine), + 'order_desc': (dingdan.jieshao or '')[:50], + } + logger.info(f"准备广播订单: {order_info}") + sender = WeixinBroadcastSender() + result = sender.broadcast_order(order_info) + if result.get('success'): + logger.info(f"订单广播完成: {result.get('msg')}") + else: + logger.warning(f"订单广播异常: {result.get('msg')}") + except Exception as e: + logger.error(f"广播任务异常: {e}") + logger.error(traceback.format_exc()) + + thread = threading.Thread(target=task) + thread.daemon = True + thread.start() + logger.info("广播线程已启动") + except Exception as e: + logger.error(f"启动广播线程异常: {e}") + + def _get_game_type_name(self, leixing_id): + try: + from shangpin.models import ShangpinLeixing + gt = ShangpinLeixing.objects.filter(id=leixing_id).first() + return gt.jieshao if gt else '游戏订单' + except Exception as e: + logger.error(f"获取游戏类型名称异常: {e}") + return '游戏订单' + +# dingdan/views.py (PaymentFailView) + +class PaymentFailView(APIView): + """ + 前端支付失败接口 - 处理用户主动取消或支付失败 + 只允许删除状态为9（未支付）的订单 + """ + permission_classes = [permissions.IsAuthenticated] + + def post(self, request): + try: + dingdanid = request.data.get('dingdanid') + if not dingdanid: + return Response({'code': 1, 'msg': '订单ID不能为空', 'data': None}) + + with transaction.atomic(): + # 锁定订单防止并发 + dingdan = Dingdan.objects.select_for_update().filter(dingdan_id=dingdanid).first() + if not dingdan: + return Response({'code': 2, 'msg': '订单不存在', 'data': None}) + + # 只允许删除未支付订单（状态9） + if dingdan.zhuangtai != 9: + return Response({'code': 3, 'msg': '只能删除未支付的订单', 'data': None}) + + # 删除扩展表和主表 + DingdanPingtai.objects.filter(dingdan=dingdan).delete() + dingdan.delete() + + return Response({'code': 0, 'msg': '订单已删除', 'data': None}) + + except Exception as e: + return Response({'code': 99, 'msg': f'删除订单失败: {str(e)}', 'data': None}) + + + + + + +""" +虚拟支付视图（代币模式） +完全基于原有商户支付逻辑，仅替换支付参数生成和回调/查单方式 +数据库字段、状态流转、业务规则 100% 保持一致 +""" +import json +import hmac +import hashlib +import logging +import time +import random +from decimal import Decimal + +import requests +from django.conf import settings +from django.db import transaction +from rest_framework.views import APIView +from rest_framework.response import Response +from rest_framework import permissions +from rest_framework.parsers import JSONParser +from django.http import HttpResponse +import xmltodict +import threading + +from .models import Dingdan, DingdanPingtai, Lilubiao +from shangpin.models import Shangpin +from yonghu.models import UserMain, UserDashou, UserBoss +from peizhi.models import Szjilu +from .utils import update_daily_income, sync_order_to_partners + +logger = logging.getLogger(__name__) + + +class VirtualCreateOrderView(APIView): + """ + 虚拟代币支付创建订单 + 流程与原 CreateOrderView 完全一致，仅支付参数生成改为代币虚拟支付 + """ + permission_classes = [permissions.IsAuthenticated] + + def post(self, request): + try: + # 1. 获取前端参数 + shangpin_id = request.data.get('shangpin_id') + nicheng = request.data.get('nicheng', '').strip() + beizhu = request.data.get('beizhu', '').strip() + zhiding = request.data.get('zhiding', '').strip() + jine = request.data.get('jine', 0) + code = request.data.get('code') # 虚拟支付必须每单都用最新 code 换 session_key + + # 2. 临时关闭指定功能（与原逻辑一致） + if zhiding: + return Response({'code': 8, 'msg': '指定功能尚未开启，请不要填写指定打手ID', 'data': None}) + + # 3. 验证必填字段 + if not shangpin_id: + return Response({'code': 1, 'msg': '商品ID不能为空', 'data': None}) + if not nicheng: + return Response({'code': 2, 'msg': '游戏昵称不能为空', 'data': None}) + if len(nicheng) > 50: + return Response({'code': 3, 'msg': '游戏昵称过长', 'data': None}) + if not code: + return Response({'code': 10, 'msg': '缺少登录凭证code', 'data': None}) + + # 4. 查询商品信息 + shangpin = Shangpin.objects.filter(id=shangpin_id).first() + if not shangpin: + return Response({'code': 4, 'msg': '商品不存在', 'data': None}) + if hasattr(shangpin, 'kucun') and shangpin.kucun <= 0: + return Response({'code': 5, 'msg': '商品库存不足', 'data': None}) + + shangpin_jiage = getattr(shangpin, 'jiage', 0) + if not shangpin_jiage: + return Response({'code': 6, 'msg': '商品价格异常', 'data': None}) + shangpin_tupian = getattr(shangpin, 'tupian_url', None) + + # 5. 验证指定打手（如果存在）---- 虽然前面已禁止，保留原逻辑以备后续开启 + zhiding_id_value = None + if zhiding: + zhiding_user = UserMain.objects.filter(yonghuid=zhiding).first() + if not zhiding_user: + return Response({'code': 7, 'msg': '指定打手不存在', 'data': None}) + dashou_profile = UserDashou.objects.filter(user=zhiding_user).first() + if not dashou_profile: + return Response({'code': 8, 'msg': '指定用户不存在或已封禁', 'data': None}) + if getattr(dashou_profile, 'zhanghaozhuangtai', 0) == 0: + return Response({'code': 8, 'msg': '指定用户不存在或已封禁', 'data': None}) + zhiding_id_value = zhiding + + # 6. 生成订单ID（格式不变） + timestamp = int(time.time()) + timestamp_ns = int(time.time_ns() // 1000) % 1000000 + random_num = random.randint(0, 99) + dingdanid = f"PT{timestamp:011d}{timestamp_ns:06d}{random_num:02d}" + + # 7. 查询利率并计算分成（完全复用原代码） + dashou_lilu = Lilubiao.objects.filter(fadanpingtai='1').first() + if not dashou_lilu: + return Response({'code': 9, 'msg': '系统利率配置不完整', 'data': None}) + + if shangpin.kaioi_ewai_dashou_fencheng and shangpin.ewai_dashou_fencheng is not None: + dashou_fencheng = shangpin.ewai_dashou_fencheng + else: + dashou_fencheng = Decimal(str(shangpin_jiage)) * Decimal(str(dashou_lilu.lilu)) + + # 8. 强制刷新 session_key（虚拟支付签名所必需） + wx_resp = self._exchange_code_for_session_key(code) + if wx_resp is None: + return Response({'code': 11, 'msg': '微信认证失败', 'data': None}) + + session_key = wx_resp['session_key'] + user_openid = wx_resp['openid'] + logger.info(f"[VirtualCreate] session_key刷新成功，openid={user_openid}") + + # 更新用户 openid 和 session_key（保持数据库最新） + current_user = request.user + current_user.openid = user_openid + current_user.session_key = session_key + current_user.save(update_fields=['openid', 'session_key']) + + # 9. 数据库事务（与原代码完全一致） + with transaction.atomic(): + laoban_yonghuid = getattr(current_user, 'yonghuid', '') + + # 创建订单主表 + order_data = { + 'dingdan_id': dingdanid, + 'zhuangtai': 9, + 'jine': shangpin_jiage, + 'fadan_pingtai': 1, + 'dashou_fencheng': dashou_fencheng, + 'zhiding_id': zhiding_id_value, + 'shangpin_id': shangpin_id, + 'yaoqiuleixing': getattr(shangpin, 'yaoqiuleixing', None), + 'huiyuan_id': getattr(shangpin, 'huiyuan_id', ''), + 'yongjin': getattr(shangpin, 'yongjin', 0), + 'jieshao': getattr(shangpin, 'jieshao', ''), + 'beizhu': beizhu, + 'nicheng': nicheng, + 'tupian': shangpin_tupian, + 'user1_id': f"Boss{current_user.yonghuid}", + 'leixing_id': shangpin.leixing_id + } + dingdan = Dingdan.objects.create(**order_data) + + # 创建订单平台扩展表 + DingdanPingtai.objects.create( + dingdan=dingdan, + laoban_id=laoban_yonghuid, + ) + + # 生成代币虚拟支付参数 + pay_params = self.generate_virtual_pay_params( + dingdanid=dingdanid, + jine=shangpin_jiage, + openid=user_openid, + session_key=session_key, + beizhu=beizhu + ) + + if not pay_params: + raise Exception('虚拟支付参数生成失败') + + return Response({ + 'code': 0, + 'msg': '订单创建成功', + 'data': { + 'dingdanid': dingdanid, + 'payParams': pay_params + } + }) + + except Exception as e: + logger.error(f"虚拟支付下单失败: {e}", exc_info=True) + return Response({'code': 99, 'msg': '系统错误', 'data': None}) + + def _exchange_code_for_session_key(self, code): + """通过 jscode2session 换取 openid 和 session_key""" + url = 'https://api.weixin.qq.com/sns/jscode2session' + params = { + 'appid': settings.WEIXIN_APPID, + 'secret': settings.WEIXIN_SECRET, + 'js_code': code, + 'grant_type': 'authorization_code' + } + try: + resp = requests.get(url, params=params, timeout=5) + data = resp.json() + if 'openid' in data and 'session_key' in data: + return data + else: + logger.error(f"jscode2session 失败: {data}") + except Exception as e: + logger.error(f"换取 session_key 异常: {e}") + return None + + def generate_virtual_pay_params(self, dingdanid, jine, openid, session_key, beizhu=''): + """生成代币虚拟支付参数""" + env = settings.VP_ENV + appkey = settings.VP_APPKEY_SANDBOX if env == 1 else settings.VP_APPKEY + offer_id = settings.VP_OFFER_ID + product_id = 'coin_1' # 代币道具ID，已配置 + + # 代币购买数量 = 总价（分） + buy_quantity = int(float(jine) * 100) + + # 构建 signData（驼峰字段，代币模式不含 goodsPrice） + sign_data = { + "offerId": offer_id, + "env": env, + "openid": openid, + "outTradeNo": dingdanid, + "productId": product_id, + "buyQuantity": buy_quantity, + "attach": beizhu or '游戏陪玩订单', + "currencyType": "CNY", + "zoneId": "1" + } + sign_data_str = json.dumps(sign_data, separators=(',', ':'), ensure_ascii=False) + + # 签名计算 + uri = "requestVirtualPayment" + msg = uri + "&" + sign_data_str + pay_sig = hmac.new(appkey.encode('utf-8'), msg.encode('utf-8'), hashlib.sha256).hexdigest() + signature = hmac.new(session_key.encode('utf-8'), sign_data_str.encode('utf-8'), hashlib.sha256).hexdigest() + + return { + "signData": sign_data_str, + "paySig": pay_sig, + "signature": signature, + "mode": "short_series_coin" + } + + +class VirtualPayNotifyView(APIView): + """ + 虚拟支付回调接口 + 业务处理逻辑与原 WechatPayNotifyView 完全一致， + 仅 XML 解析和签名验证方式不同 + """ + permission_classes = [permissions.AllowAny] + + def post(self, request): + try: + # 1. 验证签名（虚拟支付回调使用 HMAC-SHA256） + body = request.body + signature = request.headers.get('Wechatpay-Signature') + if not self._verify_virtual_signature(body, signature): + logger.warning("虚拟支付回调签名验证失败") + return HttpResponse('FAIL', status=401) + + # 2. 解析 XML 通知 + data = xmltodict.parse(body.decode('utf-8')).get('xml', {}) + event = data.get('Event') + if event != 'xpay_goods_deliver_notify': + return HttpResponse('success') + + out_trade_no = data.get('OutTradeNo') + transaction_id = '' + wechat_pay_info = data.get('WeChatPayInfo', {}) + if isinstance(wechat_pay_info, dict): + transaction_id = wechat_pay_info.get('TransactionId', '') + + # 3. 执行支付成功处理（复用原 _handle_success 逻辑） + self._handle_success(out_trade_no, transaction_id) + return HttpResponse('success') + + except Exception as e: + logger.error(f"虚拟支付回调异常: {e}", exc_info=True) + return HttpResponse('success') + + def _verify_virtual_signature(self, body, signature): + """验证虚拟支付回调签名""" + if not signature: + return False + appkey = settings.VP_APPKEY_SANDBOX if settings.VP_ENV == 1 else settings.VP_APPKEY + calc_sign = hmac.new(appkey.encode('utf-8'), body, hashlib.sha256).hexdigest() + return hmac.compare_digest(calc_sign, signature) + + @transaction.atomic + def _handle_success(self, out_trade_no, transaction_id): + """支付成功处理（与原 WechatPayNotifyView._handle_success 完全相同）""" + logger.info(f"虚拟支付回调成功, out_trade_no={out_trade_no}, transaction_id={transaction_id}") + + try: + dingdan = Dingdan.objects.select_for_update().filter(dingdan_id=out_trade_no).first() + except Exception as e: + logger.error(f"查询订单异常: {e}") + raise + + if not dingdan: + logger.error(f"订单不存在: {out_trade_no}") + return + + # 幂等处理 + if dingdan.zhuangtai != 9: + logger.info(f"订单 {out_trade_no} 已处理过，状态={dingdan.zhuangtai}，跳过") + return + + # 保存交易号 + dingdan.wechat_transaction_id = transaction_id or 'virtual_' + out_trade_no + + # 更新状态 + if dingdan.zhiding_id and dingdan.zhiding_id.strip(): + dingdan.zhuangtai = 7 + else: + dingdan.zhuangtai = 1 + dingdan.save() + + # 废弃同商品其他未支付订单 + Dingdan.objects.filter( + user1_id=dingdan.user1_id, + shangpin_id=dingdan.shangpin_id, + zhuangtai=9 + ).exclude(dingdan_id=out_trade_no).update(zhuangtai=25) + + # 更新老板数据 + try: + laoban_id = dingdan.pingtai_kuozhan.laoban_id if hasattr(dingdan, 'pingtai_kuozhan') else None + if laoban_id: + user_main = UserMain.objects.filter(yonghuid=laoban_id).first() + if user_main and hasattr(user_main, 'boss_profile'): + boss = user_main.boss_profile + boss.zonge = (boss.zonge or 0) + (dingdan.jine or 0) + boss.alldingdan = (boss.alldingdan or 0) + 1 + boss.save() + except Exception as e: + logger.error(f"更新老板数据异常: {e}") + + # 更新商品库存 + if dingdan.shangpin_id: + Shangpin.objects.filter(id=dingdan.shangpin_id).update(kucun=F('kucun') - 1) + + # 更新收支记录 + self._update_szjilu(dingdan.jine) + update_daily_income(dingdan.jine) + sync_order_to_partners(dingdan.dingdan_id) + + # 异步广播 + self._broadcast_async(dingdan) + + logger.info(f"订单 {out_trade_no} 支付成功处理完成") + + def _update_szjilu(self, jine): + """更新收支记录表（与原逻辑一致）""" + try: + jine_decimal = Decimal(str(jine)) + with transaction.atomic(): + szjilu, created = Szjilu.objects.select_for_update().get_or_create( + id=1, + defaults={ + 'zongsy': Decimal('0.00'), 'zongls': Decimal('0.00'), + 'zongzc': Decimal('0.00'), 'jrzc': Decimal('0.00'), + 'jrls': Decimal('0.00') + } + ) + szjilu.zongsy += jine_decimal + szjilu.zongls += jine_decimal + szjilu.jrls += jine_decimal + szjilu.save() + except Exception as e: + logger.error(f"更新收支记录失败: {e}") + + def _broadcast_async(self, dingdan): + """异步广播（与原一致）""" + try: + def task(): + try: + from . import WeixinBroadcastSender + order_info = { + 'dingdan_id': dingdan.dingdan_id, + 'game_type': self._get_game_type_name(dingdan.leixing_id), + 'amount': str(dingdan.jine), + 'order_desc': (dingdan.jieshao or '')[:50], + } + sender = WeixinBroadcastSender() + sender.broadcast_order(order_info) + except Exception as e: + logger.error(f"广播任务异常: {e}") + + thread = threading.Thread(target=task) + thread.daemon = True + thread.start() + except Exception as e: + logger.error(f"启动广播线程异常: {e}") + + def _get_game_type_name(self, leixing_id): + try: + from shangpin.models import ShangpinLeixing + gt = ShangpinLeixing.objects.filter(id=leixing_id).first() + return gt.jieshao if gt else '游戏订单' + except Exception: + return '游戏订单' + + +class VirtualPaymentVerifyView(APIView): + """ + 虚拟支付复查接口 + 逻辑与原 PaymentVerifyView 完全一致，仅查单方式改为虚拟支付查单 API + """ + permission_classes = [permissions.IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + try: + dingdanid = request.data.get('dingdanid') + if not dingdanid: + return Response({'code': 1, 'msg': '订单ID不能为空'}) + + dingdan = Dingdan.objects.filter(dingdan_id=dingdanid).first() + if not dingdan: + return Response({'code': 2, 'msg': '订单不存在'}) + + current_user = request.user + user_identifier = f"Boss{current_user.yonghuid}" + if dingdan.user1_id != user_identifier: + return Response({'code': 403, 'msg': '无权访问'}) + + # 状态已是成功则直接返回 + if dingdan.zhuangtai in [1, 7]: + return Response({ + 'code': 0, + 'msg': '订单状态正常', + 'data': {'dingdanid': dingdanid, 'zhuangtai': dingdan.zhuangtai} + }) + + # 状态为未支付，主动查单 + if dingdan.zhuangtai == 9: + from django.core.cache import cache + lock_key = f"virtual_verify_lock_{dingdanid}" + if not cache.add(lock_key, "locked", timeout=10): + return Response({'code': 1, 'msg': '订单正在处理中，请稍后'}) + + try: + trade_state, transaction_id = self._query_virtual_payment(dingdanid) + if trade_state == 'SUCCESS': + self._process_payment_success(dingdan, transaction_id, current_user.yonghuid) + dingdan.refresh_from_db() + return Response({ + 'code': 0, + 'msg': '支付成功', + 'data': {'dingdanid': dingdanid, 'zhuangtai': dingdan.zhuangtai} + }) + elif trade_state in ['NOTPAY', 'USERPAYING']: + return Response({'code': 1, 'msg': '支付中', 'data': {'zhuangtai': 9}}) + else: + return Response({'code': 2, 'msg': '支付失败'}) + except Exception as e: + logger.error(f"查询虚拟支付异常: {e}") + return Response({'code': 1, 'msg': '查询失败，请稍后重试'}) + finally: + cache.delete(lock_key) + + # 其他异常状态 + status_msg = { + 2: '订单已取消', 3: '订单已完成', 4: '退款审核中', + 5: '已退款', 6: '退款失败', 8: '结算中', 0: '订单已作废' + } + return Response({'code': 3, 'msg': status_msg.get(dingdan.zhuangtai, '订单状态异常'), + 'data': {'zhuangtai': dingdan.zhuangtai}}) + + except Exception as e: + logger.error(f"复查接口异常: {e}", exc_info=True) + return Response({'code': 99, 'msg': '系统错误'}) + + @transaction.atomic + def _process_payment_success(self, dingdan, transaction_id, operator_id): + """支付成功原子操作，与旧流程完全一致""" + dingdan = Dingdan.objects.select_for_update().get(pk=dingdan.pk) + if dingdan.zhuangtai != 9: + return + + dingdan.zhuangtai = 7 if (dingdan.zhiding_id and dingdan.zhiding_id.strip()) else 1 + dingdan.wechat_transaction_id = transaction_id + dingdan.clkf = operator_id + dingdan.save() + + Dingdan.objects.filter( + user1_id=dingdan.user1_id, + shangpin_id=dingdan.shangpin_id, + zhuangtai=9 + ).exclude(dingdan_id=dingdan.dingdan_id).update(zhuangtai=25) + + laoban_id = dingdan.pingtai_kuozhan.laoban_id if hasattr(dingdan, 'pingtai_kuozhan') else None + if laoban_id: + user_main = UserMain.objects.filter(yonghuid=laoban_id).first() + if user_main and hasattr(user_main, 'boss_profile'): + boss = user_main.boss_profile + boss.zonge = (boss.zonge or 0) + (dingdan.jine or 0) + boss.alldingdan = (boss.alldingdan or 0) + 1 + boss.save() + + if dingdan.shangpin_id: + Shangpin.objects.filter(id=dingdan.shangpin_id).update(kucun=F('kucun') - 1) + + self._update_szjilu(dingdan.jine) + update_daily_income(dingdan.jine) + sync_order_to_partners(dingdan.dingdan_id) + + def _query_virtual_payment(self, out_trade_no): + """调用虚拟支付查单接口""" + uri = "/xpay/query_order" + appkey = settings.VP_APPKEY_SANDBOX if settings.VP_ENV == 1 else settings.VP_APPKEY + offer_id = settings.VP_OFFER_ID + openid = self.request.user.openid + + post_data = { + "offer_id": offer_id, + "openid": openid, + "out_trade_no": out_trade_no, + "env": settings.VP_ENV, + } + body = json.dumps(post_data, separators=(',', ':')) + msg = uri + "&" + body + pay_sig = hmac.new(appkey.encode(), msg.encode(), hashlib.sha256).hexdigest() + + headers = {'Content-Type': 'application/json'} + url = f"https://api.weixin.qq.com{uri}?pay_sig={pay_sig}" + resp = requests.post(url, data=body, headers=headers, timeout=10) + result = resp.json() + + if result.get('errcode') == 0: + order = result.get('order', {}) + state = order.get('state', 1) # 1=未支付, 2=已支付 + if state == 2: + return 'SUCCESS', order.get('transaction_id', '') + elif state == 1: + return 'USERPAYING', '' + else: + return 'CLOSED', '' + else: + raise Exception(f"虚拟支付查单失败: {result.get('errmsg')}") + + def _update_szjilu(self, jine): + """更新收支记录（同原）""" + try: + jine_decimal = Decimal(str(jine)) + with transaction.atomic(): + szjilu, created = Szjilu.objects.select_for_update().get_or_create( + id=1, + defaults={ + 'zongsy': Decimal('0.00'), 'zongls': Decimal('0.00'), + 'zongzc': Decimal('0.00'), 'jrzc': Decimal('0.00'), + 'jrls': Decimal('0.00') + } + ) + szjilu.zongsy += jine_decimal + szjilu.zongls += jine_decimal + szjilu.jrls += jine_decimal + szjilu.save() + except Exception as e: + logger.error(f"更新收支记录失败: {e}") + + +# 保留原有支付失败处理接口（若需要，可直接复用原 PaymentFailView） +# 这里提供一份与旧版一致的实现，确保前端调用 /dingdan/shibai 依旧可用 +class VirtualPaymentFailView(APIView): + """ + 支付失败处理（与旧 PaymentFailView 逻辑一致） + 仅删除状态为9的订单 + """ + permission_classes = [permissions.IsAuthenticated] + + def post(self, request): + try: + dingdanid = request.data.get('dingdanid') + if not dingdanid: + return Response({'code': 1, 'msg': '订单ID不能为空'}) + + with transaction.atomic(): + dingdan = Dingdan.objects.select_for_update().filter(dingdan_id=dingdanid).first() + if not dingdan: + return Response({'code': 2, 'msg': '订单不存在'}) + if dingdan.zhuangtai != 9: + return Response({'code': 3, 'msg': '只能删除未支付的订单'}) + + DingdanPingtai.objects.filter(dingdan=dingdan).delete() + dingdan.delete() + + return Response({'code': 0, 'msg': '订单已删除'}) + except Exception as e: + return Response({'code': 99, 'msg': f'删除订单失败: {str(e)}'}) + + + + + + + + +import json +import hmac +import hashlib +import logging +import time +import random +from decimal import Decimal + +import requests +from django.conf import settings +from django.db import transaction +from rest_framework.views import APIView +from rest_framework.response import Response +from rest_framework import permissions +from rest_framework.parsers import JSONParser +from django.http import HttpResponse +import xmltodict +import threading + +from .models import Dingdan, DingdanPingtai, Lilubiao +from shangpin.models import Shangpin +from yonghu.models import UserMain, UserDashou +from peizhi.models import Szjilu +from .utils import update_daily_income, sync_order_to_partners + +logger = logging.getLogger(__name__) + + +class VirtualCreateOrderView(APIView): + """ + 虚拟支付创建订单 + """ + permission_classes = [permissions.IsAuthenticated] + + def post(self, request): + try: + # 1. 获取参数 + shangpin_id = request.data.get('shangpin_id') + nicheng = request.data.get('nicheng', '').strip() + beizhu = request.data.get('beizhu', '').strip() + zhiding = request.data.get('zhiding', '').strip() + jine = request.data.get('jine', 0) + + if zhiding: + return Response({'code': 8, 'msg': '指定功能尚未开启', 'data': None}) + + if not shangpin_id: + return Response({'code': 1, 'msg': '商品ID不能为空', 'data': None}) + if not nicheng: + return Response({'code': 2, 'msg': '游戏昵称不能为空', 'data': None}) + + # 2. 查商品 + shangpin = Shangpin.objects.filter(id=shangpin_id).first() + if not shangpin: + return Response({'code': 4, 'msg': '商品不存在', 'data': None}) + if hasattr(shangpin, 'kucun') and shangpin.kucun <= 0: + return Response({'code': 5, 'msg': '商品库存不足', 'data': None}) + + shangpin_jiage = getattr(shangpin, 'jiage', 0) + if not shangpin_jiage: + return Response({'code': 6, 'msg': '商品价格异常', 'data': None}) + shangpin_tupian = getattr(shangpin, 'tupian_url', None) + + # 3. 生成订单ID + timestamp = int(time.time()) + timestamp_ns = int(time.time_ns() // 1000) % 1000000 + random_num = random.randint(0, 99) + dingdanid = f"PT{timestamp:011d}{timestamp_ns:06d}{random_num:02d}" + + # 4. 计算分成（保留原有逻辑） + dashou_lilu = Lilubiao.objects.filter(fadanpingtai='1').first() + if not dashou_lilu: + return Response({'code': 9, 'msg': '系统利率配置不完整', 'data': None}) + if shangpin.kaioi_ewai_dashou_fencheng and shangpin.ewai_dashou_fencheng is not None: + dashou_fencheng = shangpin.ewai_dashou_fencheng + else: + dashou_fencheng = Decimal(str(shangpin_jiage)) * Decimal(str(dashou_lilu.lilu)) + + with transaction.atomic(): + current_user = request.user + user_openid = getattr(current_user, 'openid', '') + if not user_openid: + return Response({'code': 10, 'msg': '用户openid不存在', 'data': None}) + + # 创建订单 + order_data = { + 'dingdan_id': dingdanid, + 'zhuangtai': 9, + 'jine': shangpin_jiage, + 'fadan_pingtai': 1, + 'dashou_fencheng': dashou_fencheng, + 'zhiding_id': None, + 'shangpin_id': shangpin_id, + 'yaoqiuleixing': getattr(shangpin, 'yaoqiuleixing', None), + 'huiyuan_id': getattr(shangpin, 'huiyuan_id', ''), + 'yongjin': getattr(shangpin, 'yongjin', 0), + 'jieshao': getattr(shangpin, 'jieshao', ''), + 'beizhu': beizhu, + 'nicheng': nicheng, + 'tupian': shangpin_tupian, + 'user1_id': f"Boss{current_user.yonghuid}", + 'leixing_id': shangpin.leixing_id + } + dingdan = Dingdan.objects.create(**order_data) + DingdanPingtai.objects.create( + dingdan=dingdan, + laoban_id=current_user.yonghuid, + ) + + # 获取或刷新 session_key + session_key = getattr(current_user, 'session_key', None) + if not session_key: + code = request.data.get('code') + if not code: + raise Exception('缺少登录凭证code') + wx_resp = self._exchange_code_for_session_key(code) + if wx_resp is None or wx_resp.get('openid') != user_openid: + raise Exception('微信认证失败') + session_key = wx_resp['session_key'] + current_user.session_key = session_key + current_user.save(update_fields=['session_key']) + + # 生成支付参数 + pay_params = self.generate_virtual_pay_params( + dingdanid=dingdanid, + jine=shangpin_jiage, + openid=user_openid, + session_key=session_key, + beizhu=beizhu + ) + + return Response({ + 'code': 0, + 'msg': '订单创建成功', + 'data': { + 'dingdanid': dingdanid, + 'payParams': pay_params + } + }) + + except Exception as e: + logger.error(f"虚拟支付下单失败: {e}", exc_info=True) + return Response({'code': 99, 'msg': f'系统错误', 'data': None}) + + def _exchange_code_for_session_key(self, code): + url = 'https://api.weixin.qq.com/sns/jscode2session' + params = { + 'appid': settings.WEIXIN_APPID, + 'secret': settings.WEIXIN_SECRET, + 'js_code': code, + 'grant_type': 'authorization_code' + } + try: + resp = requests.get(url, params=params, timeout=5) + data = resp.json() + if 'openid' in data and 'session_key' in data: + return data + except Exception as e: + logger.error(f"换取 session_key 失败: {e}") + return None + + def generate_virtual_pay_params(self, dingdanid, jine, openid, session_key, beizhu=''): + """生成虚拟支付签名参数""" + env = settings.VP_ENV + appkey = settings.VP_APPKEY_SANDBOX if env == 1 else settings.VP_APPKEY + offer_id = settings.VP_OFFER_ID + product_id = settings.VP_PRODUCT_ID + + # 金额转换：元 → 分 + goods_price_fen = int(float(jine) * 100) + + # signData —— 必须用驼峰字段！！！ + sign_data = { + "offerId": offer_id, + "env": env, + "openid": openid, + "outTradeNo": dingdanid, + "productId": product_id, + "buyQuantity": 1, # 数量固定为 1 + "goodsPrice": goods_price_fen, # 道具真实价格（分） + "attach": beizhu or '游戏陪玩订单', + "currencyType": "CNY", + "zoneId": "1" + } + sign_data_str = json.dumps(sign_data, separators=(',', ':'), ensure_ascii=False) + + # 签名 + uri = "requestVirtualPayment" + msg = uri + "&" + sign_data_str + pay_sig = hmac.new(appkey.encode('utf-8'), msg.encode('utf-8'), hashlib.sha256).hexdigest() + signature = hmac.new(session_key.encode('utf-8'), sign_data_str.encode('utf-8'), hashlib.sha256).hexdigest() + + # 返回给前端，这三个字段必须存在：signData、paySig、signature + return { + "signData": sign_data_str, + "paySig": pay_sig, + "signature": signature, + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +import string + +import xmltodict +import logging + +from django.db import transaction, models + +from rest_framework import permissions, status +from rest_framework.parsers import JSONParser + +from shangpin.models import Shangpin + + +logger = logging.getLogger(__name__) + + + +from django.core.cache import cache + +import json +import hmac +import hashlib +import logging +import time +import traceback +from decimal import Decimal + +import requests +from django.conf import settings +from django.db import transaction, models +from rest_framework import permissions +from rest_framework.response import Response +from rest_framework.views import APIView +from rest_framework.parsers import JSONParser + + + +logger = logging.getLogger(__name__) + + +class VirtualCreateOrderView(APIView): + """虚拟支付 - 创建订单（逻辑与旧下单 100% 相同）""" + permission_classes = [permissions.IsAuthenticated] + + def post(self, request): + try: + # 1. 获取参数 + shangpin_id = request.data.get('shangpin_id') + nicheng = request.data.get('nicheng', '').strip() + beizhu = request.data.get('beizhu', '').strip() + zhiding = request.data.get('zhiding', '').strip() + jine = request.data.get('jine', 0) + + # 2. 参数校验 + if not shangpin_id: + return Response({'code': 1, 'msg': '商品ID不能为空', 'data': None}) + if not nicheng: + return Response({'code': 2, 'msg': '游戏昵称不能为空', 'data': None}) + if len(nicheng) > 50: + return Response({'code': 3, 'msg': '游戏昵称过长', 'data': None}) + + # 3. 商品校验 + shangpin = Shangpin.objects.filter(id=shangpin_id).first() + if not shangpin: + return Response({'code': 4, 'msg': '商品不存在', 'data': None}) + + is_valid, err_msg, _ = validate_shangpin_and_dianpu(shangpin_id) + if not is_valid: + return Response({'code': 5, 'msg': err_msg, 'data': None}) + + if hasattr(shangpin, 'kucun') and shangpin.kucun <= 0: + return Response({'code': 5, 'msg': '商品库存不足', 'data': None}) + + shangpin_jiage = getattr(shangpin, 'jiage', 0) + if not shangpin_jiage: + return Response({'code': 6, 'msg': '商品价格异常', 'data': None}) + shangpin_tupian = getattr(shangpin, 'tupian_url', None) + + # 4. 指定打手校验（与你原有逻辑完全一致） + zhiding_id_value = None + if zhiding: + zhiding_user = UserMain.objects.filter(yonghuid=zhiding).first() + if not zhiding_user: + return Response({'code': 7, 'msg': '指定打手不存在', 'data': None}) + dashou_profile = UserDashou.objects.filter(user=zhiding_user).first() + if not dashou_profile: + return Response({'code': 8, 'msg': '指定用户不存在或已封禁', 'data': None}) + if getattr(dashou_profile, 'zhanghaozhuangtai', 0) == 0: + return Response({'code': 8, 'msg': '指定用户不存在或已封禁', 'data': None}) + zhiding_id_value = zhiding + + # 5. 生成订单ID（复用原格式） + timestamp = int(time.time()) + timestamp_ns = int(time.time_ns() // 1000) % 1000000 + random_num = random.randint(0, 99) + dingdanid = f"PT{timestamp:011d}{timestamp_ns:06d}{random_num:02d}" + + # 6. 分成计算（与原逻辑完全相同） + dashou_lilu = Lilubiao.objects.filter(fadanpingtai='1').first() + if not dashou_lilu: + return Response({'code': 9, 'msg': '系统利率配置不完整', 'data': None}) + + if shangpin.kaioi_ewai_dashou_fencheng and shangpin.ewai_dashou_fencheng is not None: + dashou_fencheng = shangpin.ewai_dashou_fencheng + else: + dashou_fencheng = Decimal(str(shangpin_jiage)) * Decimal(str(dashou_lilu.lilu)) + + # 7. 数据库事务（创建订单 + 扩展表 + 生成虚拟支付参数） + with transaction.atomic(): + current_user = request.user + laoban_yonghuid = getattr(current_user, 'yonghuid', '') + user_openid = getattr(current_user, 'openid', '') + + if not user_openid: + return Response({'code': 10, 'msg': '用户openid不存在', 'data': None}) + + # 订单主表数据（字段与原订单 100% 一致） + order_data = { + 'dingdan_id': dingdanid, + 'zhuangtai': 9, # 未支付 + 'jine': shangpin_jiage, + 'fadan_pingtai': 1, + 'dashou_fencheng': dashou_fencheng, + 'zhiding_id': zhiding_id_value, + 'shangpin_id': shangpin_id, + 'yaoqiuleixing': getattr(shangpin, 'yaoqiuleixing', None), + 'huiyuan_id': getattr(shangpin, 'huiyuan_id', ''), + 'yongjin': getattr(shangpin, 'yongjin', 0), + 'jieshao': getattr(shangpin, 'jieshao', ''), + 'beizhu': beizhu, + 'nicheng': nicheng, + 'tupian': shangpin_tupian, + 'user1_id': f"Boss{request.user.yonghuid}", + 'leixing_id': shangpin.leixing_id, + } + dingdan = Dingdan.objects.create(**order_data) + + # 扩展表（与原逻辑完全相同） + dianpu_id, pingtai_shouyi, dianpu_shouyi = calculate_pingtai_and_dianpu_shouyi( + shangpin_id=shangpin_id, + dingdan_jiage=shangpin_jiage, + dashou_fencheng=dashou_fencheng, + ) + pingtaikuozhan_data = { + 'dingdan': dingdan, + 'laoban_id': laoban_yonghuid, + 'pingtai_shouyi': pingtai_shouyi, + } + if dianpu_id: + pingtaikuozhan_data['dianpu_id'] = dianpu_id + pingtaikuozhan_data['dianpu_shouyi'] = dianpu_shouyi + else: + pingtaikuozhan_data['dianpu_shouyi'] = Decimal('0.00') + DingdanPingtai.objects.create(**pingtaikuozhan_data) + + # ★ 唯一改动：生成虚拟支付签名 + pay_params = self.generate_virtual_pay_params( + dingdanid=dingdanid, + jine=shangpin_jiage, + user_ip=self.get_client_ip(request), + openid=user_openid, + request=request, + beizhu=beizhu, + ) + + if not pay_params: + raise Exception('虚拟支付参数生成失败') + + return Response({ + 'code': 0, + 'msg': '订单创建成功', + 'data': { + 'dingdanid': dingdanid, + 'payParams': pay_params, # 结构适配 wx.requestVirtualPayment + } + }) + + except Exception as e: + logger.error(f"虚拟支付下单失败: {e}", exc_info=True) + return Response({'code': 99, 'msg': f'系统错误: {str(e)}', 'data': None}) + + def get_client_ip(self, request): + x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR') + if x_forwarded_for: + return x_forwarded_for.split(',')[0] + return request.META.get('REMOTE_ADDR', '127.0.0.1') + + def generate_virtual_pay_params(self, dingdanid, jine, user_ip, openid, request, beizhu=''): + """生成虚拟支付所需签名和参数（完全符合微信官方规范）""" + import random, string + + env = settings.VP_ENV + appkey = settings.VP_APPKEY_SANDBOX if env == 1 else settings.VP_APPKEY + offer_id = settings.VP_OFFER_ID + + # 获取 session_key（必须，请在 UserMain 模型中添加 session_key 字段，登录时存储） + current_user = request.user + session_key = getattr(current_user, 'session_key', None) + if not session_key: + raise Exception('用户session_key缺失，请确保登录时存储了session_key') + + total_fee = int(float(jine) * 100) # 金额：分 + + # 构建 signData（决定签名内容，字段顺序、JSON格式必须一致） + sign_data = { + "offer_id": offer_id, + "env": env, + "openid": openid, + "out_trade_no": dingdanid, + "product_id": "1", # 默认道具ID，可后续按商品配置 + "amount": total_fee, + "attach": beizhu or '游戏陪玩订单', + "user_ip": user_ip, + "currency_type": "CNY", + "zone_id": "1", + } + sign_data_str = json.dumps(sign_data, separators=(',', ':'), ensure_ascii=False) + + # 计算 pay_sig（支付签名） + uri = "requestVirtualPayment" + msg = uri + "&" + sign_data_str + pay_sig = hmac.new(appkey.encode('utf-8'), msg.encode('utf-8'), hashlib.sha256).hexdigest() + + # 计算 signature（用户态签名） + signature = hmac.new( + session_key.encode('utf-8'), + sign_data_str.encode('utf-8'), + hashlib.sha256 + ).hexdigest() + + return { + "offerId": offer_id, + "env": env, + "zoneId": "1", + "outTradeNo": dingdanid, + "productId": "1", + "amount": total_fee, # 单位：分 + "signData": sign_data_str, # JSON字符串 + "paySig": pay_sig, + "signature": signature, + } + + +class VirtualPayNotifyView(APIView): + """虚拟支付 - 支付成功推送处理（替代原 WechatPayNotifyView）""" + permission_classes = [permissions.AllowAny] + + def post(self, request): + try: + body = request.body.decode('utf-8') + # 微信推送可能是 XML，也可能是 JSON，这里按 XML 解析（兼容主流情况） + import xmltodict + data = xmltodict.parse(body)['xml'] + + event = data.get('Event') + if event != 'xpay_goods_deliver_notify': + return HttpResponse('success') + + out_trade_no = data.get('OutTradeNo') + wechat_pay_info = data.get('WeChatPayInfo', {}) + transaction_id = '' + if isinstance(wechat_pay_info, dict): + transaction_id = wechat_pay_info.get('TransactionId', '') + + self._handle_payment_success(out_trade_no, transaction_id) + return HttpResponse('success') + + except Exception as e: + logger.error(f"虚拟支付回调异常: {e}", exc_info=True) + # 即使出错也返回 success，防止微信重复推送 + return HttpResponse('success') + + @transaction.atomic + def _handle_payment_success(self, out_trade_no, transaction_id): + """支付成功处理，与原 WechatPayNotifyView._handle_success 完全相同""" + dingdan = Dingdan.objects.select_for_update().filter(dingdan_id=out_trade_no).first() + if not dingdan or dingdan.zhuangtai != 9: + logger.info(f"订单 {out_trade_no} 已处理或不存在，状态: {getattr(dingdan, 'zhuangtai', 'N/A')}") + return + + # 保存交易号 + dingdan.wechat_transaction_id = transaction_id or ('virtual_' + out_trade_no) + + # 状态更新 + if dingdan.zhiding_id and dingdan.zhiding_id.strip(): + dingdan.zhuangtai = 7 + else: + dingdan.zhuangtai = 1 + dingdan.save() + + # 废弃同一用户同一商品下其他未支付订单 + Dingdan.objects.filter( + user1_id=dingdan.user1_id, + shangpin_id=dingdan.shangpin_id, + zhuangtai=9, + ).exclude(dingdan_id=out_trade_no).update(zhuangtai=25) + + # 更新老板消费数据 + try: + laoban_id = dingdan.pingtai_kuozhan.laoban_id if hasattr(dingdan, 'pingtai_kuozhan') else None + if laoban_id: + user_main = UserMain.objects.filter(yonghuid=laoban_id).first() + if user_main and hasattr(user_main, 'boss_profile'): + boss = user_main.boss_profile + boss.zonge = (boss.zonge or 0) + (dingdan.jine or 0) + boss.alldingdan = (boss.alldingdan or 0) + 1 + boss.save() + except Exception as e: + logger.error(f"更新老板数据失败: {e}") + + # 更新商品库存 + if dingdan.shangpin_id: + Shangpin.objects.filter(id=dingdan.shangpin_id).update(kucun=F('kucun') - 1) + + # 商品/店铺每日统计 + try: + if dingdan.shangpin_id: + pingtai_shouyi = Decimal('0.00') + dianpu_shouyi = Decimal('0.00') + if hasattr(dingdan, 'pingtai_kuozhan'): + pingtai_shouyi = dingdan.pingtai_kuozhan.pingtai_shouyi or Decimal('0.00') + dianpu_shouyi = dingdan.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + + update_shangpin_daily_stat( + shangpin_id=dingdan.shangpin_id, + caozuo_leixing=1, + dingdan_jiage=dingdan.jine, + pingtai_shouyi=pingtai_shouyi, + dianpu_zongshouyi=dianpu_shouyi, + ) + dianpu_id = dingdan.pingtai_kuozhan.dianpu_id if hasattr(dingdan, 'pingtai_kuozhan') else None + if dianpu_id: + dianpu_shouyi = dingdan.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + update_dianpu_daily_stat( + dianpu_id=dianpu_id, + caozuo_leixing=1, + dingdan_jiage=dingdan.jine, + dianpu_shouyi=dianpu_shouyi, + ) + except Exception as e: + logger.error(f"统计更新失败: {e}") + + # 收支记录 + self._update_szjilu(dingdan.jine) + update_daily_income(dingdan.jine) + sync_order_to_partners(dingdan.dingdan_id) + + def _update_szjilu(self, jine): + try: + jine_decimal = Decimal(str(jine)) + with transaction.atomic(): + szjilu, created = Szjilu.objects.select_for_update().get_or_create( + id=1, + defaults={ + 'zongsy': Decimal('0.00'), + 'zongls': Decimal('0.00'), + 'zongzc': Decimal('0.00'), + 'jrzc': Decimal('0.00'), + 'jrls': Decimal('0.00'), + } + ) + szjilu.zongsy += jine_decimal + szjilu.zongls += jine_decimal + szjilu.jrls += jine_decimal + szjilu.save() + except Exception as e: + logger.error(f"收支记录更新失败: {e}") + + +class VirtualPaymentVerifyView(APIView): + """ + 虚拟支付 - 复查接口（支付成功后前端调用确认订单状态） + 与原 PaymentVerifyView 逻辑完全相同，仅查询支付状态的接口改为虚拟支付 + """ + permission_classes = [permissions.IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + try: + dingdanid = request.data.get('dingdanid') + if not dingdanid: + return Response({'code': 1, 'msg': '订单ID不能为空'}) + + dingdan = Dingdan.objects.filter(dingdan_id=dingdanid).first() + if not dingdan: + return Response({'code': 2, 'msg': '订单不存在'}) + + current_user = request.user + if dingdan.user1_id != f"Boss{current_user.yonghuid}": + return Response({'code': 403, 'msg': '无权访问'}) + + # 若状态已是已支付，直接返回 + if dingdan.zhuangtai in [1, 7]: + return Response({ + 'code': 0, + 'msg': '订单状态正常', + 'data': {'dingdanid': dingdanid, 'zhuangtai': dingdan.zhuangtai}, + }) + + if dingdan.zhuangtai == 9: + # 主动查询虚拟支付订单状态 + trade_state, transaction_id = self._query_virtual_payment(dingdanid) + if trade_state == 'SUCCESS': + self._process_payment_success(dingdan, transaction_id, current_user.yonghuid) + dingdan.refresh_from_db() + return Response({ + 'code': 0, + 'msg': '支付成功', + 'data': {'dingdanid': dingdanid, 'zhuangtai': dingdan.zhuangtai}, + }) + elif trade_state in ['NOTPAY', 'USERPAYING']: + return Response({'code': 1, 'msg': '支付中', 'data': {'zhuangtai': 9}}) + else: + return Response({'code': 2, 'msg': '支付失败'}) + else: + status_msg = { + 2: '订单已取消', 3: '订单已完成', 4: '退款审核中', + 5: '已退款', 6: '退款失败', 8: '结算中', 0: '订单已作废', + } + return Response({'code': 3, 'msg': status_msg.get(dingdan.zhuangtai, '订单状态异常')}) + + except Exception as e: + logger.error(f"复查异常: {e}", exc_info=True) + return Response({'code': 99, 'msg': f'系统错误: {str(e)}'}) + + def _query_virtual_payment(self, out_trade_no): + """调用 /xpay/query_order 查询虚拟支付订单状态""" + uri = "/xpay/query_order" + appkey = settings.VP_APPKEY_SANDBOX if settings.VP_ENV == 1 else settings.VP_APPKEY + offer_id = settings.VP_OFFER_ID + openid = self.request.user.openid + + post_data = { + "offer_id": offer_id, + "openid": openid, + "out_trade_no": out_trade_no, + "env": settings.VP_ENV, + } + body = json.dumps(post_data, separators=(',', ':')) + + # 计算签名 + msg = uri + "&" + body + pay_sig = hmac.new(appkey.encode(), msg.encode(), hashlib.sha256).hexdigest() + + headers = {'Content-Type': 'application/json'} + url = f"https://api.weixin.qq.com{uri}" + resp = requests.post(url, data=body, headers=headers, timeout=10) + result = resp.json() + + if result.get('errcode') == 0: + order = result.get('order', {}) + state = order.get('state', 1) + if state == 2: + return 'SUCCESS', order.get('transaction_id', '') + elif state == 1: + return 'USERPAYING', '' + else: + return 'CLOSED', '' + raise Exception(f"查单失败: {result.get('errmsg', '未知错误')}") + + @transaction.atomic + def _process_payment_success(self, dingdan, transaction_id, operator_id): + """与回调中的处理逻辑 100% 一致，保证事务原子性""" + dingdan = Dingdan.objects.select_for_update().get(pk=dingdan.pk) + if dingdan.zhuangtai != 9: + return + + dingdan.zhuangtai = 7 if (dingdan.zhiding_id and dingdan.zhiding_id.strip()) else 1 + dingdan.wechat_transaction_id = transaction_id or ('virtual_' + dingdan.dingdan_id) + dingdan.clkf = operator_id + dingdan.save() + + Dingdan.objects.filter( + user1_id=dingdan.user1_id, + shangpin_id=dingdan.shangpin_id, + zhuangtai=9, + ).exclude(dingdan_id=dingdan.dingdan_id).update(zhuangtai=25) + + laoban_id = dingdan.pingtai_kuozhan.laoban_id if hasattr(dingdan, 'pingtai_kuozhan') else None + if laoban_id: + user_main = UserMain.objects.filter(yonghuid=laoban_id).first() + if user_main and hasattr(user_main, 'boss_profile'): + boss = user_main.boss_profile + boss.zonge = (boss.zonge or 0) + (dingdan.jine or 0) + boss.alldingdan = (boss.alldingdan or 0) + 1 + boss.save() + + if dingdan.shangpin_id: + Shangpin.objects.filter(id=dingdan.shangpin_id).update(kucun=F('kucun') - 1) + + # 统计（完整移植原有逻辑） + try: + if dingdan.shangpin_id: + pingtai_shouyi = dingdan.pingtai_kuozhan.pingtai_shouyi or Decimal('0.00') + dianpu_shouyi = dingdan.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + update_shangpin_daily_stat( + shangpin_id=dingdan.shangpin_id, caozuo_leixing=1, + dingdan_jiage=dingdan.jine, pingtai_shouyi=pingtai_shouyi, + dianpu_zongshouyi=dianpu_shouyi, + ) + dianpu_id = dingdan.pingtai_kuozhan.dianpu_id if hasattr(dingdan, 'pingtai_kuozhan') else None + if dianpu_id: + dianpu_shouyi = dingdan.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + update_dianpu_daily_stat( + dianpu_id=dianpu_id, caozuo_leixing=1, + dingdan_jiage=dingdan.jine, dianpu_shouyi=dianpu_shouyi, + ) + except Exception as e: + logger.error(f"复查统计失败: {e}") + + self._update_szjilu(dingdan.jine) + update_daily_income(dingdan.jine) + sync_order_to_partners(dingdan.dingdan_id) + + def _update_szjilu(self, jine): + try: + jine_decimal = Decimal(str(jine)) + with transaction.atomic(): + szjilu, created = Szjilu.objects.select_for_update().get_or_create( + id=1, + defaults={ + 'zongsy': Decimal('0.00'), 'zongls': Decimal('0.00'), + 'zongzc': Decimal('0.00'), 'jrzc': Decimal('0.00'), + 'jrls': Decimal('0.00'), + } + ) + szjilu.zongsy += jine_decimal + szjilu.zongls += jine_decimal + szjilu.jrls += jine_decimal + szjilu.save() + except Exception as e: + logger.error(f"复查收支更新失败: {e}") + + + + + + + + + + + + + + + + +class PaymentVerifyView(APIView): + """ + 订单支付成功复查接口 - 前端支付成功后调用，确认订单状态 + 当订单状态为9时，主动查询微信支付状态，若已支付则更新本地状态 + 需要token认证 + """ + permission_classes = [permissions.IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + try: + # ---------- 1. 获取参数 ---------- + dingdanid = request.data.get('dingdanid') + if not dingdanid: + return Response({'code': 1, 'msg': '订单ID不能为空'}) + + # ---------- 2. 查询订单 ---------- + dingdan = Dingdan.objects.filter(dingdan_id=dingdanid).first() + if not dingdan: + return Response({'code': 2, 'msg': '订单不存在'}) + + # ---------- 3. 验证订单归属（安全） ---------- + current_user = request.user + user_identifier = f"Boss{current_user.yonghuid}" + if dingdan.user1_id != user_identifier: + logger.warning(f"用户 {current_user.yonghuid} 尝试复查他人订单 {dingdanid}") + return Response({'code': 403, 'msg': '无权访问'}) + + # ---------- 4. 如果订单状态已是1/7，直接返回成功 ---------- + if dingdan.zhuangtai in [1, 7]: + return Response({ + 'code': 0, + 'msg': '订单状态正常', + 'data': {'dingdanid': dingdanid, 'zhuangtai': dingdan.zhuangtai} + }) + + # ---------- 5. 如果状态为9，则主动查询微信支付状态 ---------- + if dingdan.zhuangtai == 9: + # 使用分布式锁防止并发处理同一订单 + lock_key = f"payment_verify_lock_{dingdanid}" + if not cache.add(lock_key, "locked", timeout=10): + # 已有其他进程在处理，让前端稍后重试 + return Response({'code': 1, 'msg': '订单正在处理中，请稍后'}) + + try: + # 调用微信订单查询接口 + trade_state, transaction_id = self._query_wechat_payment(dingdanid) + + if trade_state == 'SUCCESS': + # 支付成功，执行本地更新 + self._process_payment_success(dingdan, transaction_id, current_user.yonghuid) + # 重新获取订单以获取最新状态 + dingdan.refresh_from_db() + return Response({ + 'code': 0, + 'msg': '支付成功', + 'data': {'dingdanid': dingdanid, 'zhuangtai': dingdan.zhuangtai} + }) + elif trade_state in ['NOTPAY', 'USERPAYING']: + # 用户尚未支付或支付中 + return Response({'code': 1, 'msg': '支付中', 'data': {'zhuangtai': 9}}) + else: + # 其他状态：CLOSED, REVOKED, PAYERROR 等，视为支付失败 + return Response({'code': 2, 'msg': '支付失败'}) + + except Exception as e: + logger.error(f"查询微信支付异常: {e}", exc_info=True) + return Response({'code': 1, 'msg': '查询失败，请稍后重试'}) + finally: + cache.delete(lock_key) + else: + # ---------- 6. 其他异常状态 ---------- + status_msg = { + 2: '订单已取消', + 3: '订单已完成', + 4: '退款审核中', + 5: '已退款', + 6: '退款失败', + 8: '结算中', + 0: '订单已作废', + }.get(dingdan.zhuangtai, '订单状态异常') + return Response({'code': 3, 'msg': status_msg, 'data': {'zhuangtai': dingdan.zhuangtai}}) + + except Exception as e: + logger.error(f"订单复查接口异常: {e}", exc_info=True) + return Response({'code': 99, 'msg': f'系统错误: {str(e)}'}) + + def _process_payment_success(self, dingdan, transaction_id, operator_id): + """ + 支付成功后的原子操作（与微信回调逻辑完全一致） + 在事务内完成所有状态更新和数据一致性操作 + """ + with transaction.atomic(): + # 重新锁定订单，防止并发更新 + dingdan = Dingdan.objects.select_for_update().get(pk=dingdan.pk) + if dingdan.zhuangtai != 9: + # 订单状态已被其他进程更新，直接返回（幂等） + return + + # 更新订单状态 + dingdan.zhuangtai = 7 if dingdan.zhiding_id and dingdan.zhiding_id.strip() else 1 + dingdan.wechat_transaction_id = transaction_id + dingdan.clkf = operator_id # 可选：记录操作人ID + dingdan.save() + + # 删除同一用户同一商品的其他未支付订单（逻辑删除，状态25） + Dingdan.objects.filter( + user1_id=dingdan.user1_id, + shangpin_id=dingdan.shangpin_id, + zhuangtai=9 + ).exclude(dingdan_id=dingdan.dingdan_id).update(zhuangtai=25) + + # 更新老板扩展表 + laoban_id = dingdan.pingtai_kuozhan.laoban_id if hasattr(dingdan, 'pingtai_kuozhan') else None + if laoban_id: + user_main = UserMain.objects.filter(yonghuid=laoban_id).first() + if user_main and hasattr(user_main, 'boss_profile'): + boss = user_main.boss_profile + boss.zonge = (boss.zonge or 0) + (dingdan.jine or 0) + boss.alldingdan = (boss.alldingdan or 0) + 1 + boss.save() + + # 更新商品库存 + if dingdan.shangpin_id: + Shangpin.objects.filter(id=dingdan.shangpin_id).update( + kucun=F('kucun') - 1 + ) + + # ========== 新增：商品和店铺每日统计 ========== + try: + # 商品每日统计（只要有商品ID就执行） + if dingdan.shangpin_id: + # 从扩展表获取已计算好的收益值（下单时已存储） + pingtai_shouyi = Decimal('0.00') + dianpu_shouyi = Decimal('0.00') + if hasattr(dingdan, 'pingtai_kuozhan'): + pingtai_shouyi = dingdan.pingtai_kuozhan.pingtai_shouyi or Decimal('0.00') + dianpu_shouyi = dingdan.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + + update_shangpin_daily_stat( + shangpin_id=dingdan.shangpin_id, + caozuo_leixing=1, # 1 = 下单 + dingdan_jiage=dingdan.jine, + pingtai_shouyi=pingtai_shouyi, + dianpu_zongshouyi=dianpu_shouyi + ) + logger.info(f"商品统计更新完成，商品ID: {dingdan.shangpin_id}") + + # 店铺每日统计（仅当存在店铺ID时执行） + dianpu_id = None + if hasattr(dingdan, 'pingtai_kuozhan'): + dianpu_id = dingdan.pingtai_kuozhan.dianpu_id + if dianpu_id: + dianpu_shouyi = dingdan.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + update_dianpu_daily_stat( + dianpu_id=dianpu_id, + caozuo_leixing=1, # 1 = 下单 + dingdan_jiage=dingdan.jine, + dianpu_shouyi=dianpu_shouyi + ) + logger.info(f"店铺统计更新完成，店铺ID: {dianpu_id}") + except Exception as e: + logger.error(f"商品/店铺统计更新失败: {e}") + logger.error(traceback.format_exc()) + # 统计失败不影响主流程 + # ============================================= + + + + + # 更新收支记录 + self._update_szjilu(dingdan.jine) + + # 更新每日收入统计 + update_daily_income(dingdan.jine) + + # 跨平台同步（复查成功也需要通知） + sync_order_to_partners(dingdan.dingdan_id) + + def _query_wechat_payment(self, out_trade_no): + """ + 调用微信支付订单查询接口，返回 (trade_state, transaction_id) + 若查询失败，抛出异常 + """ + appid = settings.WEIXIN_APPID + mch_id = settings.WEIXIN_MCHID + key = settings.WEIXIN_SHANGHUMIYAO + nonce_str = self._generate_nonce_str() + + params = { + 'appid': appid, + 'mch_id': mch_id, + 'out_trade_no': out_trade_no, + 'nonce_str': nonce_str, + } + + # 生成签名 + sorted_keys = sorted(params.keys()) + stringA = '&'.join([f"{k}={params[k]}" for k in sorted_keys]) + stringSignTemp = f"{stringA}&key={key}" + sign = hashlib.md5(stringSignTemp.encode('utf-8')).hexdigest().upper() + params['sign'] = sign + + xml_data = self._dict_to_xml(params) + url = 'https://api.mch.weixin.qq.com/pay/orderquery' + response = requests.post(url, data=xml_data, timeout=10) + result = xmltodict.parse(response.content)['xml'] + + if result.get('return_code') == 'SUCCESS' and result.get('result_code') == 'SUCCESS': + return result.get('trade_state'), result.get('transaction_id') + else: + err_msg = result.get('return_msg', '未知错误') + raise Exception(f"微信订单查询失败: {err_msg}") + + def _update_szjilu(self, jine): + """更新收支记录表（ID=1的记录）""" + try: + jine_decimal = Decimal(str(jine)) + with transaction.atomic(): + szjilu, created = Szjilu.objects.select_for_update().get_or_create( + id=1, + defaults={ + 'zongsy': Decimal('0.00'), + 'zongls': Decimal('0.00'), + 'zongzc': Decimal('0.00'), + 'jrzc': Decimal('0.00'), + 'jrls': Decimal('0.00') + } + ) + if created: + logger.info("创建ID=1的收支记录") + szjilu.zongsy += jine_decimal + szjilu.zongls += jine_decimal + szjilu.jrls += jine_decimal + szjilu.save() + logger.info(f"收支记录更新成功，增加金额: {jine}") + except Exception as e: + logger.error(f"更新收支记录失败: {e}") + # 不抛出异常，因为收支记录不是核心流程，但记录错误供排查 + + def _generate_nonce_str(self): + """生成随机字符串，长度32""" + return ''.join(random.choices(string.ascii_letters + string.digits, k=32)) + + def _dict_to_xml(self, data): + """将字典转换为XML字符串""" + xml = [''] + for k, v in data.items(): + xml.append(f'<{k}>{v}') + xml.append('') + return ''.join(xml) + + +'''class PaymentVerifyView(APIView): + """ + 订单支付成功复查接口 - 前端支付成功后调用，确认订单状态 + 当订单状态为9时，主动查询微信支付状态，若已支付则更新本地状态 + 需要token认证 + """ + permission_classes = [permissions.IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + try: + # ---------- 1. 获取参数 ---------- + dingdanid = request.data.get('dingdanid') + if not dingdanid: + return Response({'code': 1, 'msg': '订单ID不能为空'}) + + # ---------- 2. 查询订单 ---------- + dingdan = Dingdan.objects.filter(dingdan_id=dingdanid).first() + if not dingdan: + return Response({'code': 2, 'msg': '订单不存在'}) + + # ---------- 3. 验证订单归属（安全） ---------- + current_user = request.user + user_identifier = f"Boss{current_user.yonghuid}" + if dingdan.user1_id != user_identifier: + logger.warning(f"用户 {current_user.yonghuid} 尝试复查他人订单 {dingdanid}") + return Response({'code': 403, 'msg': '无权访问'}) + + # ---------- 4. 如果订单状态已是1/7，直接返回成功 ---------- + if dingdan.zhuangtai in [1, 7]: + return Response({ + 'code': 0, + 'msg': '订单状态正常', + 'data': {'dingdanid': dingdanid, 'zhuangtai': dingdan.zhuangtai} + }) + + # ---------- 5. 如果状态为9，则主动查询微信支付状态 ---------- + if dingdan.zhuangtai == 9: + # 使用分布式锁防止并发处理同一订单 + lock_key = f"payment_verify_lock_{dingdanid}" + if not cache.add(lock_key, "locked", timeout=10): + # 已有其他进程在处理，让前端稍后重试 + return Response({'code': 1, 'msg': '订单正在处理中，请稍后'}) + + try: + # 调用微信订单查询接口 + trade_state, transaction_id = self._query_wechat_payment(dingdanid) + + if trade_state == 'SUCCESS': + # 支付成功，执行本地更新 + self._process_payment_success(dingdan, transaction_id, current_user.yonghuid) + # 重新获取订单以获取最新状态（因为_process_payment_success可能修改了dingdan） + dingdan.refresh_from_db() + return Response({ + 'code': 0, + 'msg': '支付成功', + 'data': {'dingdanid': dingdanid, 'zhuangtai': dingdan.zhuangtai} + }) + elif trade_state in ['NOTPAY', 'USERPAYING']: + # 用户尚未支付或支付中 + return Response({'code': 1, 'msg': '支付中', 'data': {'zhuangtai': 9}}) + else: + # 其他状态：CLOSED, REVOKED, PAYERROR 等，视为支付失败 + return Response({'code': 2, 'msg': '支付失败'}) + + except Exception as e: + logger.error(f"查询微信支付异常: {e}", exc_info=True) + return Response({'code': 1, 'msg': '查询失败，请稍后重试'}) + finally: + cache.delete(lock_key) + else: + # ---------- 6. 其他异常状态 ---------- + status_msg = { + 2: '订单已取消', + 3: '订单已完成', + 4: '退款审核中', + 5: '已退款', + 6: '退款失败', + 8: '结算中', + 0: '订单已作废', + }.get(dingdan.zhuangtai, '订单状态异常') + return Response({'code': 3, 'msg': status_msg, 'data': {'zhuangtai': dingdan.zhuangtai}}) + + except Exception as e: + logger.error(f"订单复查接口异常: {e}", exc_info=True) + return Response({'code': 99, 'msg': f'系统错误: {str(e)}'}) + + def _query_wechat_payment(self, out_trade_no): + """ + 调用微信支付订单查询接口，返回 (trade_state, transaction_id) + 若查询失败，抛出异常 + """ + appid = settings.WEIXIN_APPID + mch_id = settings.WEIXIN_MCHID + key = settings.WEIXIN_SHANGHUMIYAO + nonce_str = self._generate_nonce_str() + + params = { + 'appid': appid, + 'mch_id': mch_id, + 'out_trade_no': out_trade_no, + 'nonce_str': nonce_str, + } + + # 生成签名 + sorted_keys = sorted(params.keys()) + stringA = '&'.join([f"{k}={params[k]}" for k in sorted_keys]) + stringSignTemp = f"{stringA}&key={key}" + sign = hashlib.md5(stringSignTemp.encode('utf-8')).hexdigest().upper() + params['sign'] = sign + + xml_data = self._dict_to_xml(params) + url = 'https://api.mch.weixin.qq.com/pay/orderquery' + response = requests.post(url, data=xml_data, timeout=10) + result = xmltodict.parse(response.content)['xml'] + + if result.get('return_code') == 'SUCCESS' and result.get('result_code') == 'SUCCESS': + return result.get('trade_state'), result.get('transaction_id') + else: + err_msg = result.get('return_msg', '未知错误') + raise Exception(f"微信订单查询失败: {err_msg}") + + def _process_payment_success(self, dingdan, transaction_id, operator_id): + """ + 支付成功后的原子操作（与微信回调逻辑完全一致） + 在事务内完成所有状态更新和数据一致性操作 + """ + with transaction.atomic(): + # 重新锁定订单，防止并发更新 + dingdan = Dingdan.objects.select_for_update().get(pk=dingdan.pk) + if dingdan.zhuangtai != 9: + # 订单状态已被其他进程更新，直接返回（幂等） + return + + # 更新订单状态 + dingdan.zhuangtai = 7 if dingdan.zhiding_id and dingdan.zhiding_id.strip() else 1 + dingdan.wechat_transaction_id = transaction_id + dingdan.clkf = operator_id # 可选：记录操作人ID + dingdan.save() + + # 删除同一用户同一商品的其他未支付订单（避免僵尸订单） + Dingdan.objects.filter( + user1_id=dingdan.user1_id, + shangpin_id=dingdan.shangpin_id, + zhuangtai=9 + ).exclude(dingdan_id=dingdan.dingdan_id).delete() + + # 更新老板扩展表 + laoban_id = dingdan.pingtai_kuozhan.laoban_id + user_main = UserMain.objects.filter(yonghuid=laoban_id).first() + if user_main and hasattr(user_main, 'boss_profile'): + boss = user_main.boss_profile + boss.zonge = (boss.zonge or 0) + (dingdan.jine or 0) + boss.alldingdan = (boss.alldingdan or 0) + 1 + boss.save() + + # 更新商品库存 + Shangpin.objects.filter(id=dingdan.shangpin_id).update( + kucun=models.F('kucun') - 1 + ) + + # 更新收支记录 + self._update_szjilu(dingdan.jine) + + def _update_szjilu(self, jine): + """更新收支记录表（ID=1的记录）""" + try: + jine_decimal = Decimal(str(jine)) + with transaction.atomic(): + szjilu, created = Szjilu.objects.select_for_update().get_or_create( + id=1, + defaults={ + 'zongsy': Decimal('0.00'), + 'zongls': Decimal('0.00'), + 'zongzc': Decimal('0.00'), + 'jrzc': Decimal('0.00'), + 'jrls': Decimal('0.00') + } + ) + if created: + logger.info("创建ID=1的收支记录") + szjilu.zongsy += jine_decimal + szjilu.zongls += jine_decimal + szjilu.jrls += jine_decimal + szjilu.save() + logger.info(f"收支记录更新成功，增加金额: {jine}") + except Exception as e: + logger.error(f"更新收支记录失败: {e}") + # 这里不抛出异常，因为收支记录不是核心流程，但记录错误供排查 + + def _generate_nonce_str(self): + """生成随机字符串，长度32""" + return ''.join(random.choices(string.ascii_letters + string.digits, k=32)) + + def _dict_to_xml(self, data): + """将字典转换为XML字符串""" + xml = [''] + for k, v in data.items(): + xml.append(f'<{k}>{v}') + xml.append('') + return ''.join(xml)''' + + + + + +from rest_framework.views import APIView +from rest_framework.permissions import IsAuthenticated + + +class DingdanHuoquView(APIView): + """订单获取接口""" + permission_classes = [IsAuthenticated] + + def post(self, request): + # 获取当前登录用户 + try: + current_user = request.user + yonghuid = current_user.yonghuid + except Exception as e: + return Response({ + 'code': 1, + 'msg': '用户认证失败', + 'data': None + }) + + # 获取前端参数 + try: + data = request.data + zhuangtai_list = data.get('zhuangtai_list', []) + page = int(data.get('page', 1)) + page_size = int(data.get('page_size', 10)) + except Exception as e: + return Response({ + 'code': 2, + 'msg': '参数格式错误', + 'data': None + }) + + # 参数验证 + if not isinstance(zhuangtai_list, list) or len(zhuangtai_list) == 0: + return Response({ + 'code': 3, + 'msg': '状态列表不能为空', + 'data': None + }) + + if page < 1: + page = 1 + if page_size <= 0: + page_size = 10 + + try: + # 查询扩展表，获取用户的所有订单ID + pingtai_orders = DingdanPingtai.objects.filter(laoban_id=yonghuid) + pingtai_order_ids = list(pingtai_orders.values_list('dingdan__dingdan_id', flat=True)) + + if not pingtai_order_ids: + return Response({ + 'code': 0, + 'msg': '成功', + 'data': { + 'list': [], + 'has_more': False, + 'total': 0 + } + }) + + # 查询主表 + status_query = Q() + if zhuangtai_list != [1, 2, 3, 4, 5, 6, 7, 8]: + status_query = Q(zhuangtai__in=zhuangtai_list) + + query = Q(dingdan_id__in=pingtai_order_ids) & status_query + orders = Dingdan.objects.filter(query).order_by('-create_time') + #total_orders = orders.count() + + # 手动分页逻辑 + start_index = (page - 1) * page_size + end_index = start_index + page_size + + # 获取当前页的数据 + current_page_orders = orders[start_index:end_index] + + # 构建返回数据 + order_list = [] + for order in current_page_orders: + order_data = { + 'dingdanId': order.dingdan_id, + 'zhuangtai': order.zhuangtai, + 'jine': float(order.jine) if order.jine else 0.0, + 'tupian': order.tupian or '', + 'jieshao': order.jieshao or '', + 'beizhu': order.beizhu or '', + 'nicheng': order.nicheng or '', + 'chuangjianshijian': order.create_time.strftime('%Y-%m-%d %H:%M:%S') + } + order_list.append(order_data) + + + # 判断是否还有更多数据 + current_page_count = len(current_page_orders) + has_more = current_page_count == page_size + + return Response({ + 'code': 0, + 'msg': '成功', + 'data': { + 'list': order_list, + 'has_more': has_more, + #'total': total_orders + } + }) + + except Exception as e: + return Response({ + 'code': 4, + 'msg': '服务器内部错误', + 'data': None + }) + + +# dingdan/views.py + +from rest_framework.views import APIView +from rest_framework.permissions import IsAuthenticated +from rest_framework.response import Response +from django.db.models import Q +import json + +from .models import Dingdan, DingdanPingtai, Dashoutupian + + +class DingdanXiangqingView(APIView): + """订单详情接口""" + permission_classes = [IsAuthenticated] + + def post(self, request): + # 获取当前登录用户 + try: + current_user = request.user + yonghuid = current_user.yonghuid + except Exception as e: + return Response({ + 'code': 1, + 'msg': '用户认证失败', + 'data': None + }) + + # 获取前端参数 + try: + data = request.data + dingdan_id = data.get('dingdanId', '') + except Exception as e: + return Response({ + 'code': 2, + 'msg': '参数格式错误', + 'data': None + }) + + # 参数验证 + if not dingdan_id: + return Response({ + 'code': 3, + 'msg': '订单ID不能为空', + 'data': None + }) + + try: + # 1. 验证订单是否属于当前用户 + # 查询平台订单扩展表，检查laoban_id是否等于当前用户 + pingtai_kuozhan = DingdanPingtai.objects.filter( + laoban_id=yonghuid, + dingdan__dingdan_id=dingdan_id + ).first() + + if not pingtai_kuozhan: + # 如果不是平台订单，检查商家订单 + from .models import DingdanShangjia + shangjia_kuozhan = DingdanShangjia.objects.filter( + shangjia_id=yonghuid, + dingdan__dingdan_id=dingdan_id + ).first() + + if not shangjia_kuozhan: + return Response({ + 'code': 4, + 'msg': '订单不存在或无权限查看', + 'data': None + }) + + # 2. 查询订单主表 + dingdan = Dingdan.objects.filter(dingdan_id=dingdan_id).first() + + if not dingdan: + return Response({ + 'code': 5, + 'msg': '订单不存在', + 'data': None + }) + + # 3. 获取订单信息 + zhuangtai = dingdan.zhuangtai or 0 + zhiding_id = dingdan.zhiding_id or '' + jiedan_dashou_id = dingdan.jiedan_dashou_id or '' + dashou_liuyan = dingdan.dashou_liuyan or '' + + # 4. 查询打手交付图片 + dashoutupian_records = Dashoutupian.objects.filter( + dingdan_id=dingdan_id + ).order_by('create_time')[:9] # 最多取9条 + + dashoujiaofu_list = [] + for record in dashoutupian_records: + if record.tupian: + dashoujiaofu_list.append(record.tupian) + + # 5. 构建返回数据（字段名与前端对应） + response_data = { + 'zhuangtai': zhuangtai, # 订单状态 + 'zhiding': zhiding_id, # 指定打手ID + 'dashou': jiedan_dashou_id, # 服务打手ID + 'dashouliuyan': dashou_liuyan, # 打手留言 + 'dashoujiaofu': dashoujiaofu_list # 打手交付图片列表 + } + + # 6. 返回成功响应 + return Response({ + 'code': 0, + 'msg': '成功', + 'data': response_data + }) + + except Exception as e: + + return Response({ + 'code': 6, + 'msg': '服务器内部错误', + 'data': None + }) + + + + + + +class JiedanView(APIView): + """结单接口""" + permission_classes = [IsAuthenticated] + + def post(self, request): + # 获取当前登录用户 + try: + current_user = request.user + yonghuid = current_user.yonghuid + except Exception as e: + return Response({ + 'code': 1, + 'msg': '用户认证失败', + 'data': None + }) + + # 获取前端参数 + try: + data = request.data + dingdan_id = data.get('dingdanId', '') + pingfen = int(data.get('pingfen', 0)) # 评分，默认0 + liuyan = data.get('liuyan', '') # 留言，默认空 + except Exception as e: + return Response({ + 'code': 2, + 'msg': '参数格式错误', + 'data': None + }) + + # 参数验证 + if not dingdan_id: + return Response({ + 'code': 3, + 'msg': '订单ID不能为空', + 'data': None + }) + + # 验证评分范围 + if pingfen < 0 or pingfen > 5: + return Response({ + 'code': 4, + 'msg': '评分必须在0-5分之间', + 'data': None + }) + + # 使用事务确保数据一致性 + try: + with transaction.atomic(): + # 1. 验证订单是否存在且属于当前用户 + pingtai_kuozhan = DingdanPingtai.objects.filter( + laoban_id=yonghuid, + dingdan__dingdan_id=dingdan_id + ).select_related('dingdan').first() + + if not pingtai_kuozhan: + return Response({ + 'code': 5, + 'msg': '订单不存在或无权限操作', + 'data': None + }) + + dingdan = pingtai_kuozhan.dingdan + + # 2. 验证订单状态（必须是结算中 - 状态8） + if dingdan.zhuangtai != 8: + return Response({ + 'code': 6, + 'msg': '订单不在结算状态，无法结单', + 'data': None + }) + + # 3. 获取订单相关数据 + dashou_fencheng = dingdan.dashou_fencheng or Decimal('0.00') # 打手分成 + jiedan_dashou_id = dingdan.jiedan_dashou_id or '' # 接单打手ID + shangpin_id = dingdan.shangpin_id # 商品ID + + # 4. 更新平台扩展表的老板评价（如果有留言） + if liuyan: + pingtai_kuozhan.laoban_pingjia = liuyan + pingtai_kuozhan.save() + + # 5. 如果有评分，更新评分表 + if pingfen > 0 and jiedan_dashou_id: + # 使用filter查询，更健壮 + pingfen_records = Pingfen.objects.filter(dashou=jiedan_dashou_id) + + if pingfen_records.exists(): + # 已有记录，更新 + pingfen_record = pingfen_records.first() + pingfen_record.zongfen += Decimal(str(pingfen)) + pingfen_record.cishu += 1 + pingfen_record.save() + else: + # 新记录，创建 + Pingfen.objects.create( + dashou=jiedan_dashou_id, + zongfen=Decimal(str(pingfen)), + cishu=1 + ) + + # 6. 更新商品真实销量（如果有商品ID） + if shangpin_id: + shangpin_records = Shangpin.objects.filter(id=shangpin_id) + + if shangpin_records.exists(): + shangpin = shangpin_records.first() + # 检查字段是否存在 + if hasattr(shangpin, 'zhenshi_xiaoliang'): + shangpin.zhenshi_xiaoliang = (shangpin.zhenshi_xiaoliang or 0) + 1 + shangpin.save() + + # ========== 新增：跨平台我方派单且有对方信息，直接通知对方并跳过本地结算 ========== + if (dingdan.is_cross == 1 + and dingdan.partner_order_id + and dingdan.partner_club_id): + # 更新订单状态为已完成 + dingdan.zhuangtai = 3 + dingdan.clkf = current_user.phone if hasattr(current_user, 'phone') else yonghuid + dingdan.save() + + # 事务提交后异步通知对方平台 + transaction.on_commit( + lambda: self._notify_partner_jiedan( + my_dingdan_id=dingdan.dingdan_id, + partner_club_id=dingdan.partner_club_id, + partner_order_id=dingdan.partner_order_id, + new_status=3, + current_user=current_user + ) + ) + + # 直接返回，跳过后续所有本地打手结算、评价、统计等 + return Response({ + 'code': 0, + 'msg': '结单成功（已通知对方平台）', + 'data': None + }) + # ==================================================================== + + # 7. 更新打手扩展表（如果有打手ID和分成） + if jiedan_dashou_id and dashou_fencheng > 0: + # 查询打手用户 + dashou_user = UserMain.objects.filter(yonghuid=jiedan_dashou_id).first() + + if dashou_user: + # 查询打手扩展表 + dashou_kuozhan = UserDashou.objects.filter(user=dashou_user).first() + + if dashou_kuozhan: + # 更新四个金额字段 + dashou_kuozhan.zonge = (dashou_kuozhan.zonge or Decimal('0.00')) + dashou_fencheng + dashou_kuozhan.yue = (dashou_kuozhan.yue or Decimal('0.00')) + dashou_fencheng + dashou_kuozhan.jinrishouyi = (dashou_kuozhan.jinrishouyi or Decimal( + '0.00')) + dashou_fencheng + dashou_kuozhan.jinyueshouyi = (dashou_kuozhan.jinyueshouyi or Decimal( + '0.00')) + dashou_fencheng + + # 成交总量加1 + dashou_kuozhan.chengjiaozongliang = (dashou_kuozhan.chengjiaozongliang or 0) + 1 + + # 状态改为数字1 + dashou_kuozhan.zhuangtai = 1 + + dashou_kuozhan.save() + + # 8. 更新订单状态为已完成（状态3） + dingdan.zhuangtai = 3 + dingdan.save() + + # 🔥 新增：调用打手每日统计（成交） + try: + update_dashou_daily_by_action( + yonghuid=jiedan_dashou_id, + amount=dashou_fencheng, + action=2 # 2 表示成交（结算） + ) + logger.info(f"打手 {jiedan_dashou_id} 每日统计更新成功") + except Exception as e: + logger.error(f"打手每日统计更新失败: {e}") + # 不影响主流程 + + # ========== 新增：商品和店铺每日统计 ========== + try: + # 商品每日统计（只要有商品ID就执行） + if dingdan.shangpin_id: + # 从扩展表获取已计算好的收益值（下单时已存储） + pingtai_shouyi = Decimal('0.00') + dianpu_shouyi = Decimal('0.00') + if hasattr(dingdan, 'pingtai_kuozhan'): + pingtai_shouyi = dingdan.pingtai_kuozhan.pingtai_shouyi or Decimal('0.00') + dianpu_shouyi = dingdan.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + + update_shangpin_daily_stat( + shangpin_id=dingdan.shangpin_id, + caozuo_leixing=2, # 2 = 结单 + dingdan_jiage=dingdan.jine, + pingtai_shouyi=pingtai_shouyi, + dianpu_zongshouyi=dianpu_shouyi + ) + logger.info(f"商品统计更新完成，商品ID: {dingdan.shangpin_id}") + + # 店铺每日统计（仅当存在店铺ID时执行） + + # ========== 修改为 ========== + # 店铺每日统计（包含上级分红） + dianpu_id = None + shangji_id = None + shangji_fen = Decimal('0.00') + if hasattr(dingdan, 'pingtai_kuozhan'): + dianpu_id = dingdan.pingtai_kuozhan.dianpu_id + shangji_id = dingdan.pingtai_kuozhan.shangji_dianpu_id + shangji_fen = dingdan.pingtai_kuozhan.shangji_fenhong or Decimal('0.00') + if dianpu_id: + dianpu_shouyi = dingdan.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + update_dianpu_daily_stat( + dianpu_id=dianpu_id, + caozuo_leixing=2, # 结算 + dingdan_jiage=dingdan.jine, + dianpu_shouyi=dianpu_shouyi, + shangji_dianpu_id=shangji_id, # 新增：上级店铺ID + shangji_fenhong=shangji_fen # 新增：该单给上级的分红 + ) + logger.info( + f"店铺统计更新完成，店铺ID: {dianpu_id}, 上级ID: {shangji_id}, 上级分红: {shangji_fen}") + + + + '''dianpu_id = None + if hasattr(dingdan, 'pingtai_kuozhan'): + dianpu_id = dingdan.pingtai_kuozhan.dianpu_id + if dianpu_id: + dianpu_shouyi = dingdan.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + update_dianpu_daily_stat( + dianpu_id=dianpu_id, + caozuo_leixing=2, # 2 = 结单 + dingdan_jiage=dingdan.jine, + dianpu_shouyi=dianpu_shouyi + ) + logger.info(f"店铺统计更新完成，店铺ID: {dianpu_id}")''' + except Exception as e: + logger.error(f"商品/店铺统计更新失败: {e}") + logger.error(traceback.format_exc()) + # 统计失败不影响主流程 + # ============================================= + + + + + # 12. 更新平台收益流水（仅在平台发单时） + if dingdan.fadan_pingtai == 1: + try: + from dingdan.utils import update_platform_profit # 导入函数 + update_platform_profit(dingdan_id) + except Exception as e: + # 平台收益更新失败不影响主流程，但记录日志 + logger.error(f"强制结单后更新平台收益失败: {str(e)}") + + # 9. 返回成功响应 + return Response({ + 'code': 0, + 'msg': '结单成功', + 'data': None + }) + + except Exception as e: + + # 事务会自动回滚 + return Response({ + 'code': 7, + 'msg': '结单失败，服务器内部错误', + 'data': None + }) + + def _notify_partner_jiedan(self, my_dingdan_id, partner_club_id, partner_order_id, new_status, current_user): + """ + 通知对方俱乐部我方订单已完成 + 参照 CrossPlatformForceCompleteView._notify_partner_order_status 实现 + """ + try: + # 1. 获取我方俱乐部ID + from .models import CrossPlatformOrderData + my_club_config = ClubConfig.objects.filter(is_self=1).first() + if not my_club_config: + logger.error("未配置我方俱乐部信息，无法通知对方") + return + self_club_id = my_club_config.club_id + + # 2. 查询对方服务器域名 + club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=partner_club_id) + partner_domain = club_rel.partner_domain + if not partner_domain: + logger.error(f"对方俱乐部 {partner_club_id} 未配置域名") + return + + # 3. 构造通知请求 + url = partner_domain.rstrip('/') + '/houtai/dfddtk' + payload = { + 'order_id': partner_order_id, # 在对方看来这是他们的订单ID + 'club_id': self_club_id, + 'status': new_status + } + resp = requests.post(url, json=payload, timeout=3) + if resp.status_code == 200: + resp_json = resp.json() + if resp_json.get('code') == 0: + # 4. 更新跨平台订单扩展表（记录对方状态） + CrossPlatformOrderData.objects.update_or_create( + dingdan_id=my_dingdan_id, # 我方订单ID + defaults={ + 'partner_order_id': partner_order_id, + 'partner_club_id': partner_club_id, + 'partner_order_status': new_status, + 'partner_dashou_id': '', + 'partner_amount': Decimal('0') + } + ) + logger.info(f"老板结单通知对方成功: {partner_order_id} -> {new_status}") + else: + logger.warning(f"对方接口返回错误: {resp_json.get('msg')}") + else: + logger.warning(f"对方接口HTTP错误: {resp.status_code}") + except requests.exceptions.Timeout: + logger.error(f"通知对方平台超时: {partner_club_id}") + except Exception as e: + logger.error(f"通知对方平台异常: {str(e)}") + + + + + + + + + +from dengji.models import DashouBiaoxian +from dengji.services import record_dashou_biaoxian + + + + + + +# dingdan/views.py + + +class DingdanXiangqingView2(APIView): + """订单详情接口（老板端）- 返回完整评价信息""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + yonghuid = request.user.yonghuid + except Exception: + return Response({'code': 1, 'msg': '用户认证失败', 'data': None}) + + dingdan_id = request.data.get('dingdanId', '') + if not dingdan_id: + return Response({'code': 2, 'msg': '订单ID不能为空', 'data': None}) + + try: + # 权限验证 + pingtai_ext = DingdanPingtai.objects.filter( + laoban_id=yonghuid, + dingdan__dingdan_id=dingdan_id + ).select_related('dingdan').first() + + if not pingtai_ext: + return Response({'code': 3, 'msg': '订单不存在或无权限查看', 'data': None}) + + order = pingtai_ext.dingdan + zhuangtai = order.zhuangtai or 0 + jiedan_dashou_id = order.jiedan_dashou_id or '' + dashou_liuyan = order.dashou_liuyan or '' + update_time = order.update_time.strftime('%Y-%m-%d %H:%M:%S') if order.update_time else '' + + # 交付图片 + dashoujiaofu_list = list( + Dashoutupian.objects.filter(dingdan_id=dingdan_id) + .order_by('create_time')[:9] + .values_list('tupian', flat=True) + ) + + # 打手信息 + dashou_nicheng = '' + dashou_touxiang = '' + jiedan_time = '' + tijiao_time = '' + if jiedan_dashou_id: + dashou_user = UserMain.objects.filter(yonghuid=jiedan_dashou_id).first() + if dashou_user: + dashou_touxiang = dashou_user.avatar or '' + try: + dashou_nicheng = dashou_user.dashou_profile.nicheng or '' + except UserDashou.DoesNotExist: + pass + biaoxian = DashouBiaoxian.objects.filter( + dingdan_id=dingdan_id, + dashou_id=jiedan_dashou_id + ).first() + if biaoxian: + if biaoxian.jiedan_time: + jiedan_time = biaoxian.jiedan_time.strftime('%Y-%m-%d %H:%M:%S') + if biaoxian.tijiao_time: + tijiao_time = biaoxian.tijiao_time.strftime('%Y-%m-%d %H:%M:%S') + + # 老板自己的评价（如果已经结算过，可能已有评价） + laoban_pingjia = pingtai_ext.laoban_pingjia or '' + shangxian_sudu = None + fuwu_taidu = None + fanche_cishu = None + if jiedan_dashou_id and zhuangtai in [3, 4, 5, 6]: # 已完成或退款相关状态才可能有评价 + biaoxian = DashouBiaoxian.objects.filter( + dingdan_id=dingdan_id, + dashou_id=jiedan_dashou_id + ).first() + if biaoxian: + shangxian_sudu = biaoxian.shangxian_sudu + fuwu_taidu = biaoxian.fuwu_taidu + fanche_cishu = biaoxian.fanche_cishu + + data = { + 'zhuangtai': zhuangtai, + 'dashou': jiedan_dashou_id, + 'dashou_nicheng': dashou_nicheng, + 'dashou_touxiang': dashou_touxiang, + 'dashouliuyan': dashou_liuyan, + 'dashoujiaofu': dashoujiaofu_list, + 'update_time': update_time, + 'jiedan_time': jiedan_time, + 'tijiao_time': tijiao_time, + 'laoban_pingjia': laoban_pingjia, + 'shangxian_sudu': shangxian_sudu, # 1-5 或 null + 'fuwu_taidu': fuwu_taidu, # 1-5 或 null + 'fanche_cishu': fanche_cishu # int 或 null + } + + return Response({'code': 0, 'msg': '成功', 'data': data}) + + except Exception as e: + logger.error(f"订单详情查询异常: {e}", exc_info=True) + return Response({'code': 4, 'msg': '服务器内部错误', 'data': None}) + + +class JiedanView2(APIView): + """结单接口（老板端）- 接收全新评价字段并写入表现表""" + permission_classes = [IsAuthenticated] + + def post(self, request): + # 1. 用户认证 + try: + current_user = request.user + yonghuid = current_user.yonghuid + except Exception: + return Response({'code': 1, 'msg': '用户认证失败', 'data': None}) + + # 2. 获取参数（字段名与前端完全一致） + try: + data = request.data + dingdan_id = data.get('dingdanId', '') + fanche_cishu = data.get('fanche_cishu') # 前端传的字符串或数字，后端转为整数 + shangxian_sudu = data.get('shangxian_sudu') + fuwu_taidu = data.get('fuwu_taidu') + liuyan = data.get('liuyan', '') + except Exception: + return Response({'code': 2, 'msg': '参数格式错误', 'data': None}) + + # 参数校验 + if not dingdan_id: + return Response({'code': 3, 'msg': '订单ID不能为空', 'data': None}) + + # 转换并校验必填评价字段 + try: + fanche_cishu = int(fanche_cishu) if fanche_cishu is not None else None + shangxian_sudu = int(shangxian_sudu) if shangxian_sudu is not None else None + fuwu_taidu = int(fuwu_taidu) if fuwu_taidu is not None else None + except (ValueError, TypeError): + return Response({'code': 4, 'msg': '评价参数必须为整数', 'data': None}) + + if fanche_cishu is None: + return Response({'code': 5, 'msg': '翻车次数不能为空', 'data': None}) + if not (1 <= shangxian_sudu <= 5 and 1 <= fuwu_taidu <= 5): + return Response({'code': 6, 'msg': '评价分数必须在1-5之间', 'data': None}) + + # 使用事务保证数据一致性 + try: + with transaction.atomic(): + # 3. 权限验证：订单属于当前老板 + pingtai_ext = DingdanPingtai.objects.filter( + laoban_id=yonghuid, + dingdan__dingdan_id=dingdan_id + ).select_related('dingdan').first() + + if not pingtai_ext: + return Response({'code': 7, 'msg': '订单不存在或无权限操作', 'data': None}) + + order = pingtai_ext.dingdan + + # 4. 状态校验：必须是结算中（状态8） + if order.zhuangtai != 8: + return Response({'code': 8, 'msg': '订单不在结算状态', 'data': None}) + + # 5. 提取订单关键数据 + dashou_fencheng = order.dashou_fencheng or Decimal('0.00') + jiedan_dashou_id = order.jiedan_dashou_id or '' + shangpin_id = order.shangpin_id + + # 6. 保存老板评价（兼容旧逻辑） + if liuyan: + pingtai_ext.laoban_pingjia = liuyan + pingtai_ext.save() + + # 7. 更新评分表（用服务态度分作为综合评分，保留原有统计） + if jiedan_dashou_id and fuwu_taidu: + pingfen_records = Pingfen.objects.filter(dashou=jiedan_dashou_id) + if pingfen_records.exists(): + pf = pingfen_records.first() + pf.zongfen += Decimal(str(fuwu_taidu)) + pf.cishu += 1 + pf.save() + else: + Pingfen.objects.create( + dashou=jiedan_dashou_id, + zongfen=Decimal(str(fuwu_taidu)), + cishu=1 + ) + + # 8. 更新商品真实销量 + if shangpin_id: + shangpin_qs = Shangpin.objects.filter(id=shangpin_id) + if shangpin_qs.exists(): + sp = shangpin_qs.first() + if hasattr(sp, 'zhenshi_xiaoliang'): + sp.zhenshi_xiaoliang = (sp.zhenshi_xiaoliang or 0) + 1 + sp.save() + + # 9. 更新打手收益与状态 + if jiedan_dashou_id and dashou_fencheng > 0: + dashou_user = UserMain.objects.filter(yonghuid=jiedan_dashou_id).first() + if dashou_user: + try: + dashou_ext = dashou_user.dashou_profile + dashou_ext.zonge = (dashou_ext.zonge or Decimal('0.00')) + dashou_fencheng + dashou_ext.yue = (dashou_ext.yue or Decimal('0.00')) + dashou_fencheng + dashou_ext.jinrishouyi = (dashou_ext.jinrishouyi or Decimal('0.00')) + dashou_fencheng + dashou_ext.jinyueshouyi = (dashou_ext.jinyueshouyi or Decimal('0.00')) + dashou_fencheng + dashou_ext.chengjiaozongliang = (dashou_ext.chengjiaozongliang or 0) + 1 + dashou_ext.zhuangtai = 1 + dashou_ext.save() + except UserDashou.DoesNotExist: + pass + + # 10. 更新订单状态为已完成 + order.zhuangtai = 3 + order.save() + + # 11. 打手每日统计（成交） + try: + update_dashou_daily_by_action( + yonghuid=jiedan_dashou_id, + amount=dashou_fencheng, + action=2 # 2=结算/成交 + ) + except Exception as e: + logger.error(f"打手每日统计失败: {e}") + + # 12. 商品/店铺每日统计 + try: + if shangpin_id: + # 从扩展表取已计算收益 + pingtai_shouyi = Decimal('0.00') + dianpu_shouyi = Decimal('0.00') + if hasattr(order, 'pingtai_kuozhan'): + pingtai_shouyi = order.pingtai_kuozhan.pingtai_shouyi or Decimal('0.00') + dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + + update_shangpin_daily_stat( + shangpin_id=shangpin_id, + caozuo_leixing=2, + dingdan_jiage=order.jine, + pingtai_shouyi=pingtai_shouyi, + dianpu_zongshouyi=dianpu_shouyi + ) + + # 店铺统计（含上级分红） + if hasattr(order, 'pingtai_kuozhan'): + dianpu_id = order.pingtai_kuozhan.dianpu_id + shangji_id = order.pingtai_kuozhan.shangji_dianpu_id + shangji_fen = order.pingtai_kuozhan.shangji_fenhong or Decimal('0.00') + if dianpu_id: + update_dianpu_daily_stat( + dianpu_id=dianpu_id, + caozuo_leixing=2, + dingdan_jiage=order.jine, + dianpu_shouyi=dianpu_shouyi, + shangji_dianpu_id=shangji_id, + shangji_fenhong=shangji_fen + ) + except Exception as e: + logger.error(f"商品/店铺统计失败: {e}") + + # 13. 平台收益流水（仅平台发单） + if order.fadan_pingtai == 1: + try: + from dingdan.utils import update_platform_profit # 导入函数 + update_platform_profit(dingdan_id) + except Exception as e: + logger.error(f"平台收益更新失败: {e}") + + # 14. 🆕 写入打手表现表（结算评价） + if jiedan_dashou_id: + record_dashou_biaoxian( + dingdan_id=dingdan_id, + dashou_id=jiedan_dashou_id, + xingwei=3, # 3=结算 + fanche_cishu=fanche_cishu, + shangxian_sudu=shangxian_sudu, + fuwu_taidu=fuwu_taidu + # bankuai 暂不传入，后续可从订单商品关联 + ) + + # 15. 返回成功 + return Response({'code': 0, 'msg': '结单成功', 'data': None}) + + except Exception as e: + logger.error(f"结单事务异常: {e}", exc_info=True) + return Response({'code': 9, 'msg': '服务器内部错误，结单失败', 'data': None}) + + + + + + + + + + + + + + +from rest_framework.views import APIView +from rest_framework.response import Response +from rest_framework.permissions import IsAuthenticated +from django.db.models import Prefetch +from dengji.models import Chenghao + +class ShangpinLeixingView(APIView): + """ + 获取商家可用的商品类型列表（含关联板块的称号） + POST /dingdan/sjspleixing + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + # 1. 查询审核通过且抢单要求类型为1的商品类型，按排序权重升序 + shangpin_queryset = ShangpinLeixing.objects.filter( + yaoqiuleixing=1, + shenhezhuangtai=1 + ).select_related('bankuai').order_by('paixu') + + # 2. 收集所有涉及到的板块ID + bankuai_ids = shangpin_queryset.values_list('bankuai_id', flat=True).distinct() + + # 3. 查询这些板块下的所有称号（每个称号绑定到一个板块） + chenghao_list = Chenghao.objects.filter( + bankuai_id__in=bankuai_ids + ).values('id', 'mingcheng', 'texiao_miaoshu', 'bankuai_id') + + # 4. 构建板块ID -> 称号列表的映射（确保准确关联） + bankuai_chenghao_map = {} + for ch in chenghao_list: + bid = ch['bankuai_id'] + if bid not in bankuai_chenghao_map: + bankuai_chenghao_map[bid] = [] + bankuai_chenghao_map[bid].append({ + 'id': ch['id'], + 'mingcheng': ch['mingcheng'], + 'texiao_json': ch['texiao_miaoshu'] # 前端 chenghao-tag 组件需要 + }) + + # 5. 组装最终数据 + data_list = [] + for sp in shangpin_queryset: + item = { + 'id': sp.id, + 'yaoqiuleixing': sp.yaoqiuleixing, + 'huiyuan_id': sp.huiyuan_id, + 'jieshao': sp.jieshao, + # 当前类型所属板块的称号列表（无板块则为空数组） + 'chenghaoList': bankuai_chenghao_map.get(sp.bankuai_id, []) + } + data_list.append(item) + + return Response({ + 'code': 200, + 'msg': '获取成功', + 'data': data_list + }) + + except Exception as e: + logger.error(f"获取商品类型失败: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误', 'data': {}}, status=500) + + +# views/order_views.py - ShangjiaPaifaView完整代码 +import os +import logging +from shangpin.models import ShangpinLeixing +import threading +from utils.weixin_broadcast import WeixinBroadcastSender + + +logger = logging.getLogger(__name__) + + + + + + +'''class ShangjiaPaifaView(APIView): + """商家派单接口""" + permission_classes = [IsAuthenticated] + + def post(self, request): + # 记录请求日志 + logger.info(f"商家派单请求: user_id={request.user.yonghuid}, data={request.data}") + + # 1. 获取前端参数 + data = request.data + shangpin_type_id = data.get('shangpinTypeId') + huiyuan_id = data.get('huiyuanId') + yaoqiuleixing = data.get('yaoqiuleixing') + dingdan_jieshao = data.get('dingdanJieshao', '').strip() + dingdan_beizhu = data.get('dingdanBeizhu', '').strip() + laoban_name = data.get('laobanName', '').strip() + zhiding_uid = data.get('zhidingUid', '').strip() + jiage_str = data.get('jiage') + + # 2. 基本参数验证 + if not all([shangpin_type_id, huiyuan_id, dingdan_jieshao, laoban_name, jiage_str]): + logger.warning(f"参数缺失: {request.data}") + return Response({'code': 400, 'msg': '缺少必填参数', 'data': None}, status=status.HTTP_400_BAD_REQUEST) + + try: + jiage = float(jiage_str) + if jiage < 1 or jiage > 10000: + return Response({'code': 400, 'msg': '价格需在1-10000元之间', 'data': None}, + status=status.HTTP_400_BAD_REQUEST) + if '.' in jiage_str and len(jiage_str.split('.')[1]) > 2: + return Response({'code': 400, 'msg': '最多支持两位小数', 'data': None}, + status=status.HTTP_400_BAD_REQUEST) + except ValueError: + return Response({'code': 400, 'msg': '价格格式错误', 'data': None}, status=status.HTTP_400_BAD_REQUEST) + + # 3. 获取商家扩展信息 + try: + shangjia = request.user.shop_profile + except UserShangjia.DoesNotExist: + logger.warning(f"用户不是商家: user_id={request.user.yonghuid}") + return Response({'code': 403, 'msg': '您不是商家或商家信息未完善', 'data': None}, + status=status.HTTP_403_FORBIDDEN) + + # 4. 验证商家状态 + if shangjia.zhuangtai != 1: + logger.warning(f"商家状态异常: user_id={request.user.yonghuid}, status={shangjia.zhuangtai}") + return Response({'code': 403, 'msg': '商家账号状态异常，请联系管理员', 'data': None}, + status=status.HTTP_403_FORBIDDEN) + + # 5. 验证商家余额 + if jiage > shangjia.yue: + logger.warning(f"余额不足: user_id={request.user.yonghuid}, 余额={shangjia.yue}, 需要={jiage}") + return Response({'code': 400, 'msg': f'余额不足，当前余额{shangjia.yue}元', 'data': None}, + status=status.HTTP_400_BAD_REQUEST) + + # 6. 验证指定打手 + zhiding_dashou = None + dashou_user_main = None + if zhiding_uid: + try: + zhiding_user = UserMain.objects.get(yonghuid=zhiding_uid) + dashou_user_main = zhiding_user + + try: + zhiding_dashou = zhiding_user.dashou_profile + except UserDashou.DoesNotExist: + logger.warning(f"指定用户不是打手: zhiding_uid={zhiding_uid}") + return Response({'code': 400, 'msg': '指定用户不是打手', 'data': None}, + status=status.HTTP_400_BAD_REQUEST) + + if zhiding_dashou.zhanghaozhuangtai != 1: + logger.warning( + f"指定打手状态异常: zhiding_uid={zhiding_uid}, status={zhiding_dashou.zhanghaozhuangtai}") + return Response({'code': 400, 'msg': '指定打手账号状态异常', 'data': None}, + status=status.HTTP_400_BAD_REQUEST) + + except UserMain.DoesNotExist: + logger.warning(f"指定用户不存在: zhiding_uid={zhiding_uid}") + return Response({'code': 400, 'msg': '指定用户不存在', 'data': None}, + status=status.HTTP_400_BAD_REQUEST) + + # 7. 查询利率 + try: + lilu_obj = Lilubiao.objects.get(fadanpingtai='3') + lilu = float(lilu_obj.lilu) + if lilu <= 0: + lilu = 1 + except Lilubiao.DoesNotExist: + logger.warning("利率表不存在，使用默认值1") + lilu = 1 + + dashou_fencheng = round(jiage * lilu, 2) + + # 8. 生成订单ID + def generate_dingdan_id(): + import time + import random + timestamp = int(time.time() * 1000) + process_id = os.getpid() % 1000 + random_num = random.randint(1000, 9999) + return f"SJ{timestamp}{process_id:03d}{random_num}" + + # 9. 使用事务 + try: + with transaction.atomic(): + # 创建订单主表 + dingdan = Dingdan.objects.create( + dingdan_id=generate_dingdan_id(), + zhuangtai=7 if zhiding_dashou else 1, + fadan_pingtai=2, + jine=jiage, + dashou_fencheng=dashou_fencheng, + zhiding_id=zhiding_uid if zhiding_dashou else '', + shangpin_id=0, + leixing_id=int(shangpin_type_id), + yaoqiuleixing=int(yaoqiuleixing) if yaoqiuleixing else 1, + huiyuan_id=str(huiyuan_id), + jieshao=dingdan_jieshao[:2000], + beizhu=dingdan_beizhu[:1000], + nicheng=laoban_name[:50], + tupian=request.user.avatar, + user1_id=f"Sj{request.user.yonghuid}" + ) + + # 创建商家订单扩展表 + DingdanShangjia.objects.create( + dingdan=dingdan, + shangjia_id=request.user.yonghuid, + sjnicheng=request.user.boss_profile.nickname, + ) + + # 更新商家统计信息 + from django.db.models import F + UserShangjia.objects.filter(id=shangjia.id).update( + fabu=F('fabu') + 1, + yue=F('yue') - jiage, + jinridingdan=F('jinridingdan') + 1, + jinriliushui=F('jinriliushui') + jiage, + jinyuedingdan=F('jinyuedingdan') + 1, + jinyueliushui=F('jinyueliushui') + jiage, + ) + + # 🟢【10. 修改】发送模板消息 - 现在改为广播给所有用户 + from houtai.utils import update_shangjia_daily + + # ✅ 新方法（行为驱动，更安全） + update_shangjia_daily( + yonghuid=request.user.yonghuid, + amount=Decimal(str(jiage)), + action=1 # 1 = 派发 + ) + + + self.broadcast_order_notification_async(dingdan) + + # ========== 🆕 新增：判断是否需要跨平台同步 ========== + + sync_order_to_partners(dingdan.dingdan_id) + + + # 记录成功日志 + logger.info(f"商家派单成功: order_id={dingdan.dingdan_id}, amount={jiage}, zhiding={zhiding_uid}") + + return Response({'code': 200, 'msg': '派单成功', 'data': {'jine': str(dingdan.jine)}}, + status=status.HTTP_200_OK) + + except Exception as e: + logger.error(f"商家派单异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '系统错误，派单失败', 'data': None}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + def broadcast_order_notification_async(self, dingdan): + """异步广播订单通知给所有关注用户""" + try: + def broadcast_task(): + try: + # 构建订单信息 + order_info = { + 'dingdan_id': dingdan.dingdan_id, + 'game_type': self.get_game_type_name(dingdan.leixing_id), + 'amount': str(dingdan.jine), + 'order_desc': dingdan.jieshao[:50] if dingdan.jieshao else '新订单' + } + + # 调用广播器 + sender = WeixinBroadcastSender() + result = sender.broadcast_order(order_info) + + if result['success']: + logger.info(f"【商家派单】订单广播完成: {result['msg']}") + else: + logger.warning(f"【商家派单】订单广播异常: {result['msg']}") + + except Exception as e: + logger.error(f"【商家派单】广播任务异常: {str(e)}") + + # 启动异步线程 + thread = threading.Thread(target=broadcast_task) + thread.daemon = True + thread.start() + + except Exception as e: + logger.error(f"启动广播线程异常: {str(e)}") + + # 🗑️【重要】原 send_template_notification_async 方法不再需要 + # 可以注释掉或删除，因为现在统一用 broadcast_order_notification_async + + def get_game_type_name(self, leixing_id): + """获取游戏类型名称（保持不变）""" + try: + game_type = ShangpinLeixing.objects.filter(id=leixing_id).first() + return game_type.jieshao if game_type else '游戏订单' + except Exception: + return '游戏订单''''' + + +# ==================== 导入部分（确保已有） ==================== + +from dengji.models import DingdanBiaoqian,Chenghao + + +import os +import threading +import logging +from decimal import Decimal +from django.db import transaction +from django.db.models import F +from rest_framework.views import APIView +from rest_framework.response import Response +from rest_framework.permissions import IsAuthenticated +from rest_framework import status + +from yonghu.models import UserMain, UserShangjia, UserDashou + +from houtai.utils import update_shangjia_daily + +# 导入 Celery 广播任务 +from dingdan.tongzhi_tasks import dingdan_guangbo + +logger = logging.getLogger(__name__) + + +class ShangjiaPaifaView(APIView): + permission_classes = [IsAuthenticated] + + def post(self, request): + logger.info(f"商家派单请求: user_id={request.user.yonghuid}, data={request.data}") + + try: + data = request.data + + # ----- 1. 获取原始参数（保持原类型）----- + shangpin_type_id = data.get('shangpinTypeId') + huiyuan_id = data.get('huiyuanId') + yaoqiuleixing = data.get('yaoqiuleixing') + dingdan_jieshao_raw = data.get('dingdanJieshao', '') + dingdan_beizhu_raw = data.get('dingdanBeizhu', '') + laoban_name_raw = data.get('laobanName', '') + zhiding_uid_raw = data.get('zhidingUid', '') + jiage_str = data.get('jiage') + + label_id = data.get('labelId') # 整数或 None + commission_enabled = data.get('commissionEnabled', False) + commission_value_raw = data.get('commissionValue') + + # ----- 2. 字符串字段安全处理 ----- + dingdan_jieshao = str(dingdan_jieshao_raw).strip() + dingdan_beizhu = str(dingdan_beizhu_raw).strip() + laoban_name = str(laoban_name_raw).strip() + zhiding_uid = str(zhiding_uid_raw).strip() + commission_value_str = str(commission_value_raw).strip() if commission_value_raw is not None else '' + + # ----- 3. 必填校验 ----- + if not all([shangpin_type_id, huiyuan_id, dingdan_jieshao, laoban_name, jiage_str]): + logger.warning(f"参数缺失: {request.data}") + return Response({'code': 400, 'msg': '缺少必填参数'}) + + # ----- 4. 价格验证 ----- + try: + jiage = float(jiage_str) + if jiage < 1 or jiage > 10000: + return Response({'code': 400, 'msg': '价格需在1-10000元之间'}) + if '.' in str(jiage_str) and len(str(jiage_str).split('.')[1]) > 2: + return Response({'code': 400, 'msg': '最多支持两位小数'}) + except ValueError: + return Response({'code': 400, 'msg': '价格格式错误'}) + + # ----- 5. 商品类型 ----- + try: + shangpin_type = ShangpinLeixing.objects.get(id=shangpin_type_id) + except ShangpinLeixing.DoesNotExist: + logger.error(f"商品类型不存在: {shangpin_type_id}") + return Response({'code': 400, 'msg': '商品类型不存在'}) + + # ----- 6. 押金 / 会员模式决定 ----- + final_yongjin = None + if commission_enabled and commission_value_str: + try: + cv = float(commission_value_str) + if cv > 0: + final_yaoqiu_type = 2 + final_yongjin = Decimal(str(cv)) + final_huiyuan_id = '' + logger.info(f"押金模式: 佣金={cv}") + else: + final_yaoqiu_type = shangpin_type.yaoqiuleixing or 1 + final_huiyuan_id = str(huiyuan_id) if huiyuan_id else '' + logger.warning("佣金为0，降级为会员模式") + except ValueError: + final_yaoqiu_type = shangpin_type.yaoqiuleixing or 1 + final_huiyuan_id = str(huiyuan_id) if huiyuan_id else '' + logger.warning("佣金格式错误，降级为会员模式") + else: + final_yaoqiu_type = shangpin_type.yaoqiuleixing or 1 + final_huiyuan_id = str(huiyuan_id) if huiyuan_id else '' + logger.info(f"会员模式: 类型={final_yaoqiu_type}") + + # ----- 7. 称号（可选：不传/空值/无效/不存在均视为无标签）----- + chenghao_obj = None + label_id_str = str(label_id).strip() if label_id is not None else '' + if label_id_str and label_id_str not in ('0', 'null', 'undefined'): + try: + lid = int(label_id_str) + if lid > 0: + chenghao_obj = Chenghao.objects.filter(id=lid).first() + if chenghao_obj: + logger.info(f"订单将关联称号: {chenghao_obj.mingcheng}") + else: + logger.info(f"标签不存在，按无标签派单: {label_id}") + except (ValueError, TypeError): + logger.info(f"标签ID无效，按无标签派单: {label_id}") + + # ----- 8. 商家信息 ----- + try: + shangjia = request.user.shop_profile + except UserShangjia.DoesNotExist: + logger.warning(f"用户不是商家: {request.user.yonghuid}") + return Response({'code': 403, 'msg': '您不是商家'}) + + if shangjia.zhuangtai != 1: + logger.warning(f"商家状态异常: {shangjia.zhuangtai}") + return Response({'code': 403, 'msg': '商家状态异常'}) + + if jiage > shangjia.yue: + logger.warning(f"余额不足: {shangjia.yue} < {jiage}") + return Response({'code': 400, 'msg': f'余额不足，当前余额{shangjia.yue}元'}) + + # ----- 9. 指定打手 ----- + zhiding_dashou = None + if zhiding_uid: + try: + zhiding_user = UserMain.objects.get(yonghuid=zhiding_uid) + zhiding_dashou = zhiding_user.dashou_profile + if zhiding_dashou.zhanghaozhuangtai != 1: + return Response({'code': 400, 'msg': '指定打手状态异常'}) + except UserMain.DoesNotExist: + return Response({'code': 400, 'msg': '指定用户不存在'}) + except UserDashou.DoesNotExist: + return Response({'code': 400, 'msg': '指定用户不是打手'}) + + # ----- 10. 利率（打手+管事分成，打手优先） ----- + from dingdan.utils import calc_shangjia_order_fencheng + dashou_fencheng, guanshi_fencheng = calc_shangjia_order_fencheng(jiage) + + # ----- 11. 生成订单ID ----- + def generate_dingdan_id(): + import time, random + ts = int(time.time() * 1000) + pid = os.getpid() % 1000 + rnd = random.randint(1000, 9999) + return f"SJ{ts}{pid:03d}{rnd}" + + # ----- 12. 事务：创建订单、更新商家统计 ----- + dingdan = None + try: + with transaction.atomic(): + dingdan = Dingdan.objects.create( + dingdan_id=generate_dingdan_id(), + zhuangtai=7 if zhiding_dashou else 1, + fadan_pingtai=2, + jine=jiage, + dashou_fencheng=dashou_fencheng, + guanshi_fencheng=guanshi_fencheng, + zhiding_id=zhiding_uid if zhiding_dashou else '', + shangpin_id=0, + leixing_id=int(shangpin_type_id), + yaoqiuleixing=final_yaoqiu_type, + yongjin=final_yongjin, + huiyuan_id=final_huiyuan_id, + jieshao=dingdan_jieshao[:2000], + beizhu=dingdan_beizhu[:1000], + nicheng=laoban_name[:50], + tupian=request.user.avatar, + user1_id=f"Sj{request.user.yonghuid}" + ) + logger.info(f"订单主表创建: {dingdan.dingdan_id}") + + DingdanShangjia.objects.create( + dingdan=dingdan, + shangjia_id=request.user.yonghuid, + sjnicheng=shangjia.nicheng, + ) + + if chenghao_obj: + DingdanBiaoqian.objects.create(dingdan=dingdan, chenghao=chenghao_obj) + logger.info(f"订单关联称号: {chenghao_obj.mingcheng}") + + # 更新商家统计 + UserShangjia.objects.filter(id=shangjia.id).update( + fabu=F('fabu') + 1, + yue=F('yue') - jiage, + jinridingdan=F('jinridingdan') + 1, + jinriliushui=F('jinriliushui') + jiage, + jinyuedingdan=F('jinyuedingdan') + 1, + jinyueliushui=F('jinyueliushui') + jiage, + ) + + update_shangjia_daily( + yonghuid=request.user.yonghuid, + amount=Decimal(str(jiage)), + action=1 + ) + # 事务提交，订单已持久化 + except Exception as e: + logger.error(f"订单创建事务失败: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '订单创建失败，请稍后重试'}) + + # ========== 以下操作均在事务外，避免异步任务查不到订单 ========== + # 跨平台同步（内部可能是异步任务，但函数本身是同步调用，现在订单已存在） + try: + sync_order_to_partners(dingdan.dingdan_id) + except Exception as e: + logger.error(f"跨平台同步失败: {e}", exc_info=True) + + # Celery 广播任务（异步） + try: + order_info = { + 'dingdan_id': dingdan.dingdan_id, + 'game_type': self._get_game_type_name(dingdan.leixing_id), + 'amount': str(dingdan.jine), + 'order_desc': (dingdan.jieshao or '')[:50], + } + dingdan_guangbo.delay(order_info) + logger.info(f"已提交广播任务: {dingdan.dingdan_id}") + except Exception as e: + logger.error(f"广播任务提交失败: {e}", exc_info=True) + + logger.info(f"商家派单成功: {dingdan.dingdan_id}, 金额={jiage}") + return Response({'code': 200, 'msg': '派单成功', 'data': {'jine': str(dingdan.jine)}}) + + except Exception as e: + logger.error(f"商家派单接口未捕获异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '系统内部错误'}) + + def _get_game_type_name(self, leixing_id): + try: + gt = ShangpinLeixing.objects.filter(id=leixing_id).first() + return gt.jieshao if gt else '游戏订单' + except Exception: + return '游戏订单' +# apps/dingdan/views.py +from django.db.models import Q, Count +from rest_framework.views import APIView +from rest_framework.response import Response +from rest_framework import status +from rest_framework.permissions import IsAuthenticated +from .models import Dingdan, DingdanShangjia +import logging + +logger = logging.getLogger(__name__) + + +'''class ShangjiaDingdanHuoquView(APIView): + """ + 商家订单获取接口 + POST /dingdan/shangjia/dingdan + 需要JWT认证 + 支持分页、状态筛选、精确搜索（订单ID或游戏昵称） + 返回待处理订单数量（pending_count） + """ + + permission_classes = [IsAuthenticated] + + def post(self, request): + # 1. 获取当前登录用户的yonghuid + try: + current_user = request.user + yonghuid = current_user.yonghuid + except AttributeError: + return Response({ + 'code': 1, + 'msg': '用户认证失败', + 'data': None + }, status=status.HTTP_401_UNAUTHORIZED) + + # 2. 解析参数 + try: + data = request.data + zhuangtai_list = data.get('zhuangtai_list', []) + page = max(1, int(data.get('page', 1))) + page_size = min(100, max(1, int(data.get('page_size', 10)))) + + # 搜索参数（精确匹配） + search_type = data.get('search_type') # 可能的值：'order_id' 或 'nicheng' + search_value = data.get('search_value', '').strip() + except (ValueError, TypeError): + return Response({ + 'code': 2, + 'msg': '参数格式错误', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 3. 验证状态列表 + if not isinstance(zhuangtai_list, list) or len(zhuangtai_list) == 0: + return Response({ + 'code': 3, + 'msg': '状态列表不能为空', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + try: + # 4. 构建基础查询（该商家的所有订单） + base_qs = DingdanShangjia.objects.filter( + shangjia_id=yonghuid + ).select_related('dingdan') + + # 5. 状态过滤（始终使用传入的zhuangtai_list） + if zhuangtai_list: + base_qs = base_qs.filter(dingdan__zhuangtai__in=zhuangtai_list) + + # 6. 搜索过滤（精确匹配） + if search_type and search_value: + if search_type == 'order_id': + # 订单ID精确匹配（dingdan_id有唯一索引） + base_qs = base_qs.filter(dingdan__dingdan_id=search_value) + elif search_type == 'nicheng': + # 游戏昵称精确匹配（建议为nicheng字段添加索引） + base_qs = base_qs.filter(dingdan__nicheng=search_value) + # 其他类型忽略 + + # 7. 计算待处理订单数量（可抢订单：状态为1或7） + pending_count = DingdanShangjia.objects.filter( + shangjia_id=yonghuid, + dingdan__zhuangtai__in=[1, 7] + ).count() + + # 8. 排序、分页 + total_count = base_qs.count() + start_index = (page - 1) * page_size + end_index = start_index + page_size + # 注意：这里使用切片会触发数据库LIMIT，性能良好 + current_page_orders = base_qs.order_by('-dingdan__create_time')[start_index:end_index] + + # 9. 构建返回数据 + order_list = [] + for shangjia_order in current_page_orders: + order = shangjia_order.dingdan + order_data = { + 'dingdan_id': order.dingdan_id, + 'zhuangtai': order.zhuangtai, + 'jine': float(order.jine) if order.jine else 0.0, + 'jieshao': order.jieshao or '', + 'beizhu': order.beizhu or '', + 'nicheng': order.nicheng or '', + 'create_time': order.create_time.strftime('%Y-%m-%d %H:%M:%S') if order.create_time else '' + } + order_list.append(order_data) + + # 10. 判断是否还有更多 + current_page_count = len(current_page_orders) + has_more = current_page_count == page_size and end_index < total_count + + return Response({ + 'code': 0, + 'msg': '成功', + 'data': { + 'list': order_list, + 'has_more': has_more, + 'total': total_count, + 'pending_count': pending_count # 新增待处理数量 + } + }, status=status.HTTP_200_OK) + + except Exception as e: + logger.error(f"商家订单获取失败: {str(e)}", exc_info=True) + return Response({ + 'code': 4, + 'msg': '服务器内部错误', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)''' + + + + + + + +# views.py 中 ShangjiaDingdanHuoquView 完整改造 + +class ShangjiaDingdanHuoquView(APIView): + """ + 商家订单获取接口 + POST /dingdan/sjdingdanhq + 需要JWT认证 + 支持分页、状态筛选、商品类型筛选、模糊搜索（订单ID/订单介绍/游戏昵称/打手ID） + 返回待结算订单数量（pending_count） + """ + + permission_classes = [IsAuthenticated] + + def post(self, request): + # 1. 获取当前登录用户的yonghuid + try: + current_user = request.user + yonghuid = current_user.yonghuid + except AttributeError: + return Response({ + 'code': 1, + 'msg': '用户认证失败', + 'data': None + }, status=status.HTTP_401_UNAUTHORIZED) + + # 2. 解析参数 + try: + data = request.data + zhuangtai_list = data.get('zhuangtai_list', []) + page = max(1, int(data.get('page', 1))) + page_size = min(100, max(1, int(data.get('page_size', 10)))) + + # 🆕 商品类型筛选 + leixing_id = data.get('leixing_id', None) + + # 🆕 模糊搜索关键字（支持订单ID、订单介绍、游戏昵称、打手ID） + keyword = data.get('keyword', '').strip() + except (ValueError, TypeError): + return Response({ + 'code': 2, + 'msg': '参数格式错误', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 3. 验证状态列表 + if not isinstance(zhuangtai_list, list) or len(zhuangtai_list) == 0: + return Response({ + 'code': 3, + 'msg': '状态列表不能为空', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + try: + # 4. 构建基础查询（该商家的所有订单） + base_qs = DingdanShangjia.objects.filter( + shangjia_id=yonghuid + ).select_related('dingdan') + + # 5. 状态过滤 + base_qs = base_qs.filter(dingdan__zhuangtai__in=zhuangtai_list) + + # 🆕 6. 商品类型筛选 + if leixing_id is not None: + try: + leixing_id_int = int(leixing_id) + base_qs = base_qs.filter(dingdan__leixing_id=leixing_id_int) + except (ValueError, TypeError): + # 如果leixing_id不是有效整数，忽略该筛选 + pass + + # 🆕 7. 模糊搜索（支持订单ID、订单介绍、游戏昵称、打手ID） + if keyword: + from django.db.models import Q + # 订单ID精确匹配（dingdan_id有唯一索引，先用精确匹配） + dingdan_id_match = Q(dingdan__dingdan_id__exact=keyword) + # 订单介绍模糊匹配 + jieshao_match = Q(dingdan__jieshao__icontains=keyword) + # 游戏昵称模糊匹配 + nicheng_match = Q(dingdan__nicheng__icontains=keyword) + # 打手ID精确匹配 + dashou_match = Q(dingdan__jiedan_dashou_id__exact=keyword) + + base_qs = base_qs.filter( + dingdan_id_match | jieshao_match | nicheng_match | dashou_match + ) + + # 8. 计算待结算订单数量（状态为8） + pending_count = DingdanShangjia.objects.filter( + shangjia_id=yonghuid, + dingdan__zhuangtai=8 + ).count() + + # 9. 排序、分页 + total_count = base_qs.count() + start_index = (page - 1) * page_size + end_index = start_index + page_size + current_page_orders = base_qs.order_by('-dingdan__create_time')[start_index:end_index] + + # 10. 构建返回数据 + order_list = [] + for shangjia_order in current_page_orders: + order = shangjia_order.dingdan + order_data = { + 'dingdan_id': order.dingdan_id, + 'zhuangtai': order.zhuangtai, + 'jine': float(order.jine) if order.jine else 0.0, + 'jieshao': order.jieshao or '', + 'beizhu': order.beizhu or '', + 'nicheng': order.nicheng or '', + 'leixing_id': order.leixing_id, # 🆕 返回商品类型ID + 'tupian': order.tupian or '', # 🆕 返回商品图片 + 'jiedan_dashou_id': order.jiedan_dashou_id or '', # 🆕 返回打手ID + 'create_time': order.create_time.strftime('%Y-%m-%d %H:%M:%S') if order.create_time else '' + } + order_list.append(order_data) + + # 11. 判断是否还有更多 + current_page_count = len(current_page_orders) + has_more = current_page_count == page_size and end_index < total_count + + return Response({ + 'code': 0, + 'msg': '成功', + 'data': { + 'list': order_list, + 'has_more': has_more, + 'total': total_count, + 'pending_count': pending_count + } + }, status=status.HTTP_200_OK) + + except Exception as e: + logger.error(f"商家订单获取失败: {str(e)}", exc_info=True) + return Response({ + 'code': 4, + 'msg': '服务器内部错误', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + + + +'''class ShangjiaDingdanXiangqingView(APIView): + """商家订单详情接口 - 高性能实现""" + permission_classes = [IsAuthenticated] # JWT认证 + + def post(self, request): + # 1. 获取当前登录用户的yonghuid + try: + current_user = request.user + yonghuid = current_user.yonghuid + except AttributeError: + return Response({ + 'code': 1, + 'msg': '用户认证失败', + 'data': None + }, status=status.HTTP_401_UNAUTHORIZED) + + # 2. 获取前端参数 + try: + data = request.data + dingdan_id = data.get('dingdan_id', '').strip() + except Exception: + return Response({ + 'code': 2, + 'msg': '参数格式错误', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 3. 参数验证 + if not dingdan_id: + return Response({ + 'code': 3, + 'msg': '订单ID不能为空', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + try: + # 4. 高性能查询：一次性获取所有关联数据 + # 使用select_related和prefetch_related避免N+1查询 + + # 先查询商家订单扩展表，验证订单权限 + shangjia_kuozhan = DingdanShangjia.objects.filter( + shangjia_id=yonghuid, + dingdan__dingdan_id=dingdan_id + ).select_related('dingdan').first() + + if not shangjia_kuozhan: + return Response({ + 'code': 4, + 'msg': '订单不存在或您无权限查看', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 5. 查询打手交付图片（使用prefetch_related可以一次性获取所有相关图片） + # 这里我们单独查询，因为是多对一关系 + dashou_tupian_list = Dashoutupian.objects.filter( + dingdan_id=dingdan_id + ).order_by('create_time').values_list('tupian', flat=True) + + # 转换为列表，确保即使为空也返回列表 + dashou_jiaofu = list(dashou_tupian_list) + + # 6. 构建返回数据 - 字段名必须与前端完全匹配 + # 注意：所有字段即使为空也要返回，前端会处理空值 + order = shangjia_kuozhan.dingdan + + response_data = { + # 基础字段 + 'dingdan_id': order.dingdan_id, + 'zhuangtai': order.zhuangtai or 0, + + # 服务相关信息 + 'fuwudashou_id': order.jiedan_dashou_id or '', # 服务打手ID + 'dashou_liuyan': order.dashou_liuyan or '', # 打手留言 + 'dashou_jiaofu': dashou_jiaofu, # 打手交付图片列表 + + # 商家订单扩展表字段 + 'shangjia_liuyan': shangjia_kuozhan.shangjia_pingjia or '', # 商家留言 + 'tkliyou': order.tkly or '', # 退款理由（暂时没有字段） + 'cfliyou': shangjia_kuozhan.cfliyou or '', # 处罚申请原因 + 'sqzhuangtai': shangjia_kuozhan.sqzhuangtai or 0, # 申请状态 + 'bhliyou': shangjia_kuozhan.bhliyou or '', # 驳回理由 + 'chufa_jieguo': '', # 处罚结果（暂时没有字段） + + # 其他可能需要的基础信息 + 'jine': float(order.jine) if order.jine else 0.0, + 'jieshao': order.jieshao or '', + 'beizhu': order.beizhu or '', + 'nicheng': order.nicheng or '', + 'create_time': order.create_time.strftime('%Y-%m-%d %H:%M:%S'), + + + } + + return Response({ + 'code': 0, + 'msg': '成功', + 'data': response_data + }, status=status.HTTP_200_OK) + + except Exception as e: + # 记录异常日志 + import logging + logger = logging.getLogger(__name__) + logger.error(f"商家订单详情查询失败: {str(e)}", exc_info=True) + + return Response({ + 'code': 5, + 'msg': '服务器内部错误', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)''' + + + + +# views.py 中的 ShangjiaDingdanXiangqingView 完整改造 + + + +from dingdan.models import Dingdan, DingdanShangjia, Dashoutupian, Fadan + +from .models import FadanFenhong # 注意：fadan_fenhong 可能在其他 app 中，根据实际路径调整 + +logger = logging.getLogger(__name__) + + +class ShangjiaDingdanXiangqingView(APIView): + """ + 商家订单详情接口 + 返回订单基础信息、打手信息、交付图片、罚款数据、分红利率、更换打手产生的新订单ID等 + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + # 1. 获取当前登录用户的 yonghuid + try: + current_user = request.user + yonghuid = current_user.yonghuid + except AttributeError: + return Response({ + 'code': 1, + 'msg': '用户认证失败', + 'data': None + }, status=status.HTTP_401_UNAUTHORIZED) + + # 2. 获取前端参数 + try: + data = request.data + dingdan_id = data.get('dingdan_id', '').strip() + except Exception: + return Response({ + 'code': 2, + 'msg': '参数格式错误', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + if not dingdan_id: + return Response({ + 'code': 3, + 'msg': '订单ID不能为空', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + try: + # 3. 查询商家订单扩展表，验证权限并获取基础订单数据 + shangjia_kuozhan = DingdanShangjia.objects.filter( + shangjia_id=yonghuid, + dingdan__dingdan_id=dingdan_id + ).select_related('dingdan').first() + + if not shangjia_kuozhan: + return Response({ + 'code': 4, + 'msg': '订单不存在或您无权限查看', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + order = shangjia_kuozhan.dingdan + + # 4. 交付图片列表 + dashou_tupian_list = Dashoutupian.objects.filter( + dingdan_id=dingdan_id + ).order_by('create_time').values_list('tupian', flat=True) + dashou_jiaofu = list(dashou_tupian_list) + + # 5. 打手详细信息（头像、昵称、用户ID） + dashou_yonghuid = order.jiedan_dashou_id or '' + dashou_nicheng = '' + dashou_avatar = '' + if dashou_yonghuid: + dashou_user = UserMain.objects.filter( + yonghuid=dashou_yonghuid + ).select_related('dashou_profile').first() + if dashou_user: + dashou_avatar = dashou_user.avatar or '' + if hasattr(dashou_user, 'dashou_profile') and dashou_user.dashou_profile: + dashou_nicheng = dashou_user.dashou_profile.nicheng or '' + + # 6. 罚款数据（如果存在） + fadan_obj = Fadan.objects.filter( + guanliandingdan_id=dingdan_id, + beichufa_id=dashou_yonghuid + ).first() + fadan_dict = None + if fadan_obj: + fadan_dict = { + 'id': fadan_obj.id, + 'chufaliyou': fadan_obj.chufaliyou or '', + 'fakuanjine': float(fadan_obj.fakuanjine) if fadan_obj.fakuanjine else 0.0, + 'yingxiang_qiangdan': fadan_obj.yingxiang_qiangdan, + 'zhuangtai': fadan_obj.zhuangtai, + 'shensuliyou': fadan_obj.shensuliyou or '', + 'tongyi_chufaliyou': fadan_obj.tongyi_chufaliyou or '', + 'bohuiliyou': fadan_obj.bohuiliyou or '', + 'create_time': fadan_obj.create_time.strftime('%Y-%m-%d %H:%M:%S') if fadan_obj.create_time else '', + 'update_time': fadan_obj.update_time.strftime('%Y-%m-%d %H:%M:%S') if fadan_obj.update_time else '', + } + + # 7. 商家自己的分红利率（用于罚款分红计算） + fenhong_lilv = 0.0 + try: + # 查找商家作为分红者的最新记录，取应得利率 + last_fenhong = FadanFenhong.objects.filter( + fenhongzhe_id=yonghuid, + shenfen=1 # 1=商家 + ).order_by('-create_time').first() + if last_fenhong: + fenhong_lilv = float(last_fenhong.yingde_lilv or 0) + except Exception as e: + logger.warning(f'获取分红利率失败: {e}') + + # 8. 更换打手后产生的新订单ID（如果当前订单被更换过） + xin_dingdan_id = '' + try: + # 查找以当前订单作为“上一个订单ID”的新订单扩展记录 + new_shangjia_order = DingdanShangjia.objects.filter( + shangyige_dingdan_id=dingdan_id, + shangjia_id=yonghuid + ).select_related('dingdan').first() + if new_shangjia_order: + xin_dingdan_id = new_shangjia_order.dingdan.dingdan_id + except Exception as e: + logger.warning(f'查找新订单ID失败: {e}') + + # 9. 构建返回数据 + response_data = { + # 基础订单字段 + 'dingdan_id': order.dingdan_id, + 'zhuangtai': order.zhuangtai or 0, + 'jine': float(order.jine) if order.jine else 0.0, + 'jieshao': order.jieshao or '', + 'beizhu': order.beizhu or '', + 'nicheng': order.nicheng or '', + 'create_time': order.create_time.strftime('%Y-%m-%d %H:%M:%S') if order.create_time else '', + + # 打手信息 + 'dashou_yonghuid': dashou_yonghuid, + 'dashou_nicheng': dashou_nicheng, + 'dashou_avatar': dashou_avatar, + + # 服务详情 + 'fuwudashou_id': dashou_yonghuid, # 保留旧字段兼容 + 'dashou_liuyan': order.dashou_liuyan or '', + 'dashou_jiaofu': dashou_jiaofu, + + # 商家扩展字段（旧） + 'shangjia_liuyan': shangjia_kuozhan.shangjia_pingjia or '', + 'tkliyou': order.tkly or '', + 'cfliyou': shangjia_kuozhan.cfliyou or '', # 保留，但不影响新罚款 + 'sqzhuangtai': shangjia_kuozhan.sqzhuangtai or 0, + 'bhliyou': shangjia_kuozhan.bhliyou or '', + 'chufa_jieguo': '', # 已弃用 + + # 新增：罚款数据 + 'fadan': fadan_dict, + + # 新增：分红利率 + 'fenhong_lilv': fenhong_lilv, + + # 新增：更换打手后的新订单ID + 'xin_dingdan_id': xin_dingdan_id, + } + + return Response({ + 'code': 0, + 'msg': '成功', + 'data': response_data + }, status=status.HTTP_200_OK) + + except Exception as e: + logger.error(f"商家订单详情查询失败: {str(e)}", exc_info=True) + return Response({ + 'code': 5, + 'msg': '服务器内部错误', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + + + +from dingdan.models import Dingdan, DingdanShangjia, PreSettlement + + + +logger = logging.getLogger(__name__) + +from houtai.utils import update_shangjia_daily +class ShangjiaJiesuanView(APIView): + """商家结单接口（支持跨平台订单）""" + permission_classes = [permissions.IsAuthenticated] + + def post(self, request): + # 1. 获取当前登录用户 + try: + current_user = request.user + yonghuid = current_user.yonghuid + + try: + shangjia = current_user.shop_profile + except UserShangjia.DoesNotExist: + return Response({ + 'code': 1, + 'msg': '您不是商家或商家信息未完善', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + except AttributeError: + return Response({ + 'code': 1, + 'msg': '用户认证失败', + 'data': None + }, status=status.HTTP_401_UNAUTHORIZED) + + # 2. 获取前端参数 + try: + data = request.data + dingdan_id = data.get('dingdan_id', '').strip() + pingfen = int(data.get('pingfen', 0)) + liuyan = data.get('liuyan', '').strip() + except (ValueError, TypeError): + return Response({ + 'code': 2, + 'msg': '参数格式错误', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 3. 参数验证 + if not dingdan_id: + return Response({ + 'code': 3, + 'msg': '订单ID不能为空', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + if pingfen < 0 or pingfen > 5: + return Response({ + 'code': 4, + 'msg': '评分必须在0-5分之间', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + try: + with transaction.atomic(): + # 4. 查询订单并加锁（修复并发问题） + order = Dingdan.objects.select_for_update().get(dingdan_id=dingdan_id) + + # 验证订单是否属于当前商家 + shangjia_kuozhan = DingdanShangjia.objects.filter( + dingdan=order, + shangjia_id=yonghuid + ).first() + + if not shangjia_kuozhan: + return Response({ + 'code': 5, + 'msg': '订单不存在或您无权限操作', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 5. 验证订单状态 + if order.zhuangtai != 8: + return Response({ + 'code': 6, + 'msg': '订单不在结算状态，无法结单', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 获取订单字段 + jine = order.jine or Decimal('0') + dashou_fencheng = order.dashou_fencheng or Decimal('0') + jiedan_dashou_id = order.jiedan_dashou_id + dispatch_type = order.dispatch_type # 1=我方派单，2=对方派单 + is_cross = order.is_cross + partner_club_id = order.partner_club_id + partner_order_id = order.partner_order_id + + if not jiedan_dashou_id: + return Response({ + 'code': 7, + 'msg': '订单没有接单打手，无法结单', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # ========== 跨平台判断 ========== + is_cross_claimed_by_partner = (is_cross == 1 and (partner_club_id or partner_order_id)) + + # ========== 根据订单类型处理 ========== + # 情况1：对方派单（我方打手接单）-> 预结算，不直接给打手加钱 + if dispatch_type == 2: + # 创建预结算记录 + PreSettlement.objects.update_or_create( + dingdan_id=dingdan_id, + defaults={ + 'partner_order_id': partner_order_id, + 'partner_club_id': partner_club_id or '000001', + 'dashou_id': jiedan_dashou_id, + 'amount': dashou_fencheng, + 'order_amount': jine, + 'status': 0, + 'operator': request.user.phone, + } + ) + # 更新订单状态 + order.zhuangtai = 3 + order.save() + + # 更新统计表 + update_daily_dispatch_stat( + direction=2, + partner_club_id=partner_club_id or '000001', + success_amount=jine, + success_count=1 + ) + + # 情况2：我方派单且被对方打手接单 -> 只改状态，不给本地打手加钱 + elif dispatch_type == 1 and is_cross_claimed_by_partner: + order.zhuangtai = 3 + order.save() + + update_daily_dispatch_stat( + direction=1, + partner_club_id=partner_club_id or '000001', + success_amount=dashou_fencheng, + success_count=1 + ) + + # 情况3：本地订单或跨平台但自家打手接单 -> 正常结算给打手 + else: + # 查询打手信息 + try: + dashou_user = UserMain.objects.get(yonghuid=jiedan_dashou_id) + dashou = dashou_user.dashou_profile + except (UserMain.DoesNotExist, UserDashou.DoesNotExist): + return Response({ + 'code': 8, + 'msg': '接单打手不存在或信息不完整', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 原子更新打手数据（使用 F 表达式） + UserDashou.objects.filter(id=dashou.id).update( + chengjiaozongliang=F('chengjiaozongliang') + 1, + yue=F('yue') + dashou_fencheng, + zonge=F('zonge') + dashou_fencheng, + jinrishouyi=F('jinrishouyi') + dashou_fencheng, + jinyueshouyi=F('jinyueshouyi') + dashou_fencheng, + ) + + # 更新商家成交单量 + UserShangjia.objects.filter(id=shangjia.id).update( + chengjiao=F('chengjiao') + 1, + ) + + # 更新订单状态 + order.zhuangtai = 3 + order.save() + + # 处理评分（所有情况都处理） + if pingfen > 0: + pingfen_obj, created = Pingfen.objects.get_or_create( + dashou=jiedan_dashou_id, + defaults={'zongfen': pingfen, 'cishu': 1} + ) + if not created: + Pingfen.objects.filter(id=pingfen_obj.id).update( + zongfen=F('zongfen') + pingfen, + cishu=F('cishu') + 1, + ) + + # 更新商家订单扩展表的评价 + DingdanShangjia.objects.filter(id=shangjia_kuozhan.id).update( + shangjia_pingjia=liuyan, + ) + + # 🔥 新增：调用打手每日统计（成交） + try: + update_dashou_daily_by_action( + yonghuid=jiedan_dashou_id, + amount=dashou_fencheng, + action=2 # 2 表示成交（结算） + ) + logger.info(f"打手 {jiedan_dashou_id} 每日统计更新成功") + except Exception as e: + logger.error(f"打手每日统计更新失败: {e}") + # 不影响主流程 + + # ✅ 新方法（行为驱动，更安全） + update_shangjia_daily( + yonghuid=request.user.yonghuid, + amount=Decimal(str(jine)), + action=2 # 2 = 结算 + ) + + # 商家订单管事分红（仅 fadan_pingtai=2） + if order.fadan_pingtai == 2: + from dingdan.utils import settle_shangjia_order_guanshi_fenhong + settle_shangjia_order_guanshi_fenhong(order, jiedan_dashou_id) + + # 返回成功 + return Response({ + 'code': 0, + 'msg': '结单成功', + 'data': { + 'dingdan_id': dingdan_id, + 'new_zhuangtai': 3, + 'jine': float(jine), + 'dashou_fencheng': float(dashou_fencheng), + 'jiedan_dashou_id': jiedan_dashou_id, + 'pingfen': pingfen, + 'liuyan': liuyan + } + }, status=status.HTTP_200_OK) + + except Dingdan.DoesNotExist: + return Response({ + 'code': 5, + 'msg': '订单不存在', + 'data': None + }, status=status.HTTP_404_NOT_FOUND) + except Exception as e: + logger.error(f"商家结单失败: {str(e)}", exc_info=True) + return Response({ + 'code': 9, + 'msg': '服务器内部错误，结单失败', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + + + +from dingdan.models import Dingdan, DingdanShangjia, Tuikuanjilu + + +class ShangjiaChexiaoView(APIView): + """商家撤销订单申请接口""" + permission_classes = [IsAuthenticated] # JWT认证 + + def post(self, request): + # 1. 获取当前登录用户并验证商家身份 + try: + current_user = request.user + # 使用反向查询获取商家扩展信息（性能最佳） + shangjia = current_user.shop_profile + except UserShangjia.DoesNotExist: + return Response({ + 'code': 1, + 'msg': '您不是商家或商家信息未完善', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 2. 检查商家账号状态 + if shangjia.zhuangtai != 1: + return Response({ + 'code': 2, + 'msg': '商家账号状态异常，无法操作', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 3. 获取前端参数 + try: + data = request.data + dingdan_id = data.get('dingdan_id', '').strip() + chexiao_liyou = data.get('chexiao_liyou', '').strip() + except Exception: + return Response({ + 'code': 3, + 'msg': '参数格式错误', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 4. 参数验证 + if not dingdan_id or not chexiao_liyou: + return Response({ + 'code': 4, + 'msg': '订单ID和撤销原因不能为空', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + try: + # 5. 使用事务确保数据一致性 + with transaction.atomic(): + # 查询订单主表 + dingdan = Dingdan.objects.filter(dingdan_id=dingdan_id).first() + if not dingdan: + return Response({ + 'code': 5, + 'msg': '订单不存在', + 'data': None + }, status=status.HTTP_404_NOT_FOUND) + + # 6. 验证订单状态 + if dingdan.zhuangtai not in [1, 7]: + return Response({ + 'code': 6, + 'msg': '当前订单状态不可撤销', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 7. 验证订单所属商家（使用反向查询） + shangjia_kuozhan = DingdanShangjia.objects.filter( + dingdan__dingdan_id=dingdan_id, + shangjia_id=current_user.yonghuid + ).first() + + if not shangjia_kuozhan: + return Response({ + 'code': 7, + 'msg': '您无权撤销此订单', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 8. 创建退款记录（注意：申请状态直接设为1-成功） + Tuikuanjilu.objects.create( + dingdan_id=dingdan_id, + qingqiuid=current_user.yonghuid, + liyou=chexiao_liyou, + sqzhuangtai=1, # 直接成功 + jine=dingdan.jine, + dashou_fencheng=dingdan.dashou_fencheng, + jieshao=dingdan.jieshao, + beizhu=dingdan.beizhu, + nicheng=dingdan.nicheng, + + ) + + # 9. 更新商家扩展表数据（使用F表达式原子操作） + UserShangjia.objects.filter(id=shangjia.id).update( + yue=F('yue') + dingdan.jine, + tuikuan=F('tuikuan') + 1, + jinridingdan=F('jinridingdan') - 1, + jinyuedingdan=F('jinyuedingdan') - 1, + jinriliushui=F('jinriliushui') - dingdan.jine, + jinyueliushui=F('jinyueliushui') - dingdan.jine, + + ) + + # 10. 更新订单状态为5（已退款） + dingdan.zhuangtai = 5 + + dingdan.save() + + + # ✅ 新方法（行为驱动，更安全） + from houtai.utils import update_shangjia_daily + update_shangjia_daily( + yonghuid=request.user.yonghuid, + amount=Decimal(str(dingdan.jine)), + action=3 # 3 = 退款 + ) + + return Response({ + 'code': 0, + 'msg': '撤销成功', + 'data': { + 'dingdan_id': dingdan_id, + 'new_zhuangtai': 5, + 'tuikuan_liyou': chexiao_liyou, + 'jine': float(dingdan.jine) if dingdan.jine else 0.0 + } + }, status=status.HTTP_200_OK) + + except Exception as e: + # 记录异常日志 + import logging + logger = logging.getLogger(__name__) + logger.error(f"商家撤销订单失败: {str(e)}", exc_info=True) + + return Response({ + 'code': 8, + 'msg': '服务器内部错误，撤销失败', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + + + + + +class ShangjiaTuikuanShenqingView(APIView): + """商家退款申请接口""" + permission_classes = [IsAuthenticated] # JWT认证 + + def post(self, request): + # 1. 获取当前登录用户并验证商家身份 + try: + current_user = request.user + shangjia = current_user.shop_profile + except UserShangjia.DoesNotExist: + return Response({ + 'code': 1, + 'msg': '您不是商家或商家信息未完善', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 2. 检查商家账号状态 + if shangjia.zhuangtai != 1: + return Response({ + 'code': 2, + 'msg': '商家账号状态异常，无法操作', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 3. 获取前端参数 + try: + data = request.data + dingdan_id = data.get('dingdan_id', '').strip() + tuikuan_liyou = data.get('tuikuan_liyou', '').strip() + except Exception: + return Response({ + 'code': 3, + 'msg': '参数格式错误', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 4. 参数验证 + if not dingdan_id or not tuikuan_liyou: + return Response({ + 'code': 4, + 'msg': '订单ID和退款原因不能为空', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + try: + # 5. 使用事务确保数据一致性 + with transaction.atomic(): + # 查询订单主表 + dingdan = Dingdan.objects.filter(dingdan_id=dingdan_id).first() + if not dingdan: + return Response({ + 'code': 5, + 'msg': '订单不存在', + 'data': None + }, status=status.HTTP_404_NOT_FOUND) + + # 6. 验证订单状态 + if dingdan.zhuangtai not in [2, 8]: + return Response({ + 'code': 6, + 'msg': '当前订单状态不可申请退款', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 7. 验证订单所属商家 + shangjia_kuozhan = DingdanShangjia.objects.filter( + dingdan__dingdan_id=dingdan_id, + shangjia_id=current_user.yonghuid + ).first() + + if not shangjia_kuozhan: + return Response({ + 'code': 7, + 'msg': '您无权为此订单申请退款', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # ========== 8. 处理退款记录（修改点：先查询是否存在） ========== + refund_record, created = Tuikuanjilu.objects.get_or_create( + dingdan_id=dingdan_id, + defaults={ + 'dashouid': dingdan.jiedan_dashou_id, + 'qingqiuid': current_user.yonghuid, + 'liyou': tuikuan_liyou, + 'sqzhuangtai': 0, # 待处理 + 'jine': dingdan.jine, + 'dashou_fencheng': dingdan.dashou_fencheng, + 'jieshao': dingdan.jieshao, + 'beizhu': dingdan.beizhu, + 'nicheng': dingdan.nicheng, + } + ) + if not created: + # 记录已存在，更新退款理由和申请时间 + refund_record.liyou = tuikuan_liyou + refund_record.save(update_fields=['liyou', 'update_time']) + logger.info(f"订单 {dingdan_id} 已有退款记录，已更新退款理由") + + # 9. 更新订单状态为4（退款中） + dingdan.zhuangtai = 4 + dingdan.tkly = tuikuan_liyou + dingdan.save() + + # ====== 原有功能：更新打手状态 ====== + if dingdan.jiedan_dashou_id: + try: + dashou_main = UserMain.objects.filter( + yonghuid=dingdan.jiedan_dashou_id + ).first() + if dashou_main and hasattr(dashou_main, 'dashou_profile'): + dashou_profile = dashou_main.dashou_profile + dashou_profile.zhuangtai = 1 + dashou_profile.save() + logger.info(f"退款申请成功，打手状态已更新：订单{dingdan_id}，打手{dingdan.jiedan_dashou_id}状态变更为1") + except Exception as e: + logger.error(f"更新打手状态失败：{str(e)}，订单{dingdan_id}，打手ID{dingdan.jiedan_dashou_id}") + + # ========== 新增：如果是跨平台订单，异步通知对方平台 ========== + if dingdan.is_cross == 1: + import threading + import requests + from django.conf import settings + + def send_refund_notify(): + url = f"{settings.PARTNER_BASE_URL}{settings.PARTNER_REFUND_NOTIFY_URL}" + payload = { + 'token': settings.CROSS_PLATFORM_TOKEN, + 'order_id': dingdan.dingdan_id + } + try: + resp = requests.post(url, json=payload, timeout=5) + if resp.status_code == 200: + data = resp.json() + if data.get('code') == 0: + logger.info(f"跨平台退款通知发送成功: {dingdan.dingdan_id}") + else: + logger.error(f"跨平台退款通知业务失败: {data}") + else: + logger.error(f"跨平台退款通知HTTP失败: {resp.status_code}") + except Exception as e: + logger.error(f"跨平台退款通知异常: {str(e)}", exc_info=True) + + thread = threading.Thread(target=send_refund_notify) + thread.daemon = True + thread.start() + logger.info(f"跨平台退款通知线程已启动: {dingdan.dingdan_id}") + # ========== 新增结束 ========== + + return Response({ + 'code': 0, + 'msg': '退款申请提交成功', + 'data': { + 'dingdan_id': dingdan_id, + 'new_zhuangtai': 4, + 'tuikuan_liyou': tuikuan_liyou, + 'jine': float(dingdan.jine) if dingdan.jine else 0.0, + 'dashou_id': dingdan.jiedan_dashou_id + } + }, status=status.HTTP_200_OK) + + except Exception as e: + logger.error(f"商家退款申请失败: {str(e)}", exc_info=True) + return Response({ + 'code': 8, + 'msg': '服务器内部错误，申请失败', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + +'''class ShangjiaTuikuanShenqingView(APIView): + """商家退款申请接口""" + permission_classes = [IsAuthenticated] # JWT认证 + + def post(self, request): + # 1. 获取当前登录用户并验证商家身份 + try: + current_user = request.user + shangjia = current_user.shop_profile + except UserShangjia.DoesNotExist: + return Response({ + 'code': 1, + 'msg': '您不是商家或商家信息未完善', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 2. 检查商家账号状态 + if shangjia.zhuangtai != 1: + return Response({ + 'code': 2, + 'msg': '商家账号状态异常，无法操作', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 3. 获取前端参数 + try: + data = request.data + dingdan_id = data.get('dingdan_id', '').strip() + tuikuan_liyou = data.get('tuikuan_liyou', '').strip() + except Exception: + return Response({ + 'code': 3, + 'msg': '参数格式错误', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 4. 参数验证 + if not dingdan_id or not tuikuan_liyou: + return Response({ + 'code': 4, + 'msg': '订单ID和退款原因不能为空', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + try: + # 5. 使用事务确保数据一致性 + with transaction.atomic(): + # 查询订单主表 + dingdan = Dingdan.objects.filter(dingdan_id=dingdan_id).first() + if not dingdan: + return Response({ + 'code': 5, + 'msg': '订单不存在', + 'data': None + }, status=status.HTTP_404_NOT_FOUND) + + # 6. 验证订单状态 + if dingdan.zhuangtai not in [2, 8]: + return Response({ + 'code': 6, + 'msg': '当前订单状态不可申请退款', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 7. 验证订单所属商家 + shangjia_kuozhan = DingdanShangjia.objects.filter( + dingdan__dingdan_id=dingdan_id, + shangjia_id=current_user.yonghuid + ).first() + + if not shangjia_kuozhan: + return Response({ + 'code': 7, + 'msg': '您无权为此订单申请退款', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 8. 创建退款记录（申请状态为0-待处理） + Tuikuanjilu.objects.create( + dingdan_id=dingdan_id, + dashouid=dingdan.jiedan_dashou_id, + qingqiuid=current_user.yonghuid, + liyou=tuikuan_liyou, + sqzhuangtai=0, # 待处理 + jine=dingdan.jine, + dashou_fencheng=dingdan.dashou_fencheng, + jieshao=dingdan.jieshao, + beizhu=dingdan.beizhu, + nicheng=dingdan.nicheng, + ) + + # 9. 更新订单状态为4（退款中） + dingdan.zhuangtai = 4 + dingdan.tkly = tuikuan_liyou + dingdan.save() + + # ====== 原有功能：更新打手状态 ====== + if dingdan.jiedan_dashou_id: + try: + dashou_main = UserMain.objects.filter( + yonghuid=dingdan.jiedan_dashou_id + ).first() + if dashou_main and hasattr(dashou_main, 'dashou_profile'): + dashou_profile = dashou_main.dashou_profile + dashou_profile.zhuangtai = 1 + dashou_profile.save() + logger.info(f"退款申请成功，打手状态已更新：订单{dingdan_id}，打手{dingdan.jiedan_dashou_id}状态变更为1") + except Exception as e: + logger.error(f"更新打手状态失败：{str(e)}，订单{dingdan_id}，打手ID{dingdan.jiedan_dashou_id}") + + # ========== 新增：如果是跨平台订单，异步通知对方平台 ========== + if dingdan.is_cross == 1: + import threading + import requests + from django.conf import settings + + def send_refund_notify(): + url = f"{settings.PARTNER_BASE_URL}{settings.PARTNER_REFUND_NOTIFY_URL}" + payload = { + 'token': settings.CROSS_PLATFORM_TOKEN, + 'order_id': dingdan.dingdan_id # 发送我方订单ID，对方用 partner_order_id 查找 + } + try: + resp = requests.post(url, json=payload, timeout=5) + if resp.status_code == 200: + data = resp.json() + if data.get('code') == 0: + logger.info(f"跨平台退款通知发送成功: {dingdan.dingdan_id}") + else: + logger.error(f"跨平台退款通知业务失败: {data}") + else: + logger.error(f"跨平台退款通知HTTP失败: {resp.status_code}") + except Exception as e: + logger.error(f"跨平台退款通知异常: {str(e)}", exc_info=True) + + thread = threading.Thread(target=send_refund_notify) + thread.daemon = True + thread.start() + logger.info(f"跨平台退款通知线程已启动: {dingdan.dingdan_id}") + # ========== 新增结束 ========== + + return Response({ + 'code': 0, + 'msg': '退款申请提交成功', + 'data': { + 'dingdan_id': dingdan_id, + 'new_zhuangtai': 4, + 'tuikuan_liyou': tuikuan_liyou, + 'jine': float(dingdan.jine) if dingdan.jine else 0.0, + 'dashou_id': dingdan.jiedan_dashou_id + } + }, status=status.HTTP_200_OK) + + except Exception as e: + logger.error(f"商家退款申请失败: {str(e)}", exc_info=True) + return Response({ + 'code': 8, + 'msg': '服务器内部错误，申请失败', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)''' + + + + +class ShangjiaChufaShenqingView(APIView): + """商家处罚申请接口（已添加图片上传功能）""" + permission_classes = [IsAuthenticated] # JWT认证 + + def post(self, request): + # 1. 获取当前登录用户并验证商家身份 + try: + current_user = request.user + shangjia = current_user.shop_profile + except UserShangjia.DoesNotExist: + return Response({ + 'code': 1, + 'msg': '您不是商家或商家信息未完善', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 2. 检查商家账号状态 + if shangjia.zhuangtai != 1: + return Response({ + 'code': 2, + 'msg': '商家账号状态异常，无法操作', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 3. 获取前端参数 + try: + data = request.data + dingdan_id = data.get('dingdan_id', '').strip() + dashou_id = data.get('dashou_id', '').strip() + chufa_liyou = data.get('chufa_liyou', '').strip() + chufa_tupian_urls = data.get('chufa_tupian_urls', []) # 🔴 新增：图片URL数组 + except Exception: + return Response({ + 'code': 3, + 'msg': '参数格式错误', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 4. 参数验证 + if not dingdan_id or not dashou_id or not chufa_liyou: + return Response({ + 'code': 4, + 'msg': '订单ID、打手ID和处罚原因不能为空', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + try: + # 5. 使用事务确保数据一致性 + with transaction.atomic(): + # 验证打手身份 + try: + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou = dashou_user.dashou_profile + except UserMain.DoesNotExist: + return Response({ + 'code': 5, + 'msg': '打手用户不存在', + 'data': None + }, status=status.HTTP_404_NOT_FOUND) + except UserDashou.DoesNotExist: + return Response({ + 'code': 5, + 'msg': '该用户不是打手', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 查询订单主表 + dingdan = Dingdan.objects.filter(dingdan_id=dingdan_id).first() + if not dingdan: + return Response({ + 'code': 6, + 'msg': '订单不存在', + 'data': None + }, status=status.HTTP_404_NOT_FOUND) + + # 验证订单状态 + if dingdan.zhuangtai not in [2, 8, 4, 5, 6, 3]: + return Response({ + 'code': 7, + 'msg': '当前订单状态不可申请处罚', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 验证订单所属商家 + shangjia_kuozhan = DingdanShangjia.objects.filter( + dingdan__dingdan_id=dingdan_id, + shangjia_id=current_user.yonghuid + ).first() + + if not shangjia_kuozhan: + return Response({ + 'code': 8, + 'msg': '您无权为此订单申请处罚', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 验证订单的打手是否与提供的打手ID一致 + if dingdan.jiedan_dashou_id != dashou_id: + return Response({ + 'code': 9, + 'msg': '该打手并非此订单的服务打手', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 创建处罚记录 + chufajilu = Chufajilu.objects.create( + dashouid=dashou_id, + qingqiuid=current_user.yonghuid, + cfliyou=chufa_liyou, + sqzhuangtai=0, # 待处理 + jifen=5, # 扣除5积分 + dingdan_id=dingdan_id, + ) + # 🔴【新增】在创建处罚记录后立即扣除打手积分 + # 注意：这里使用前面已经获取的dashou对象（打手扩展表） + jifen_kouchu = chufajilu.jifen # 扣除的积分，这里是5 + if jifen_kouchu > 0: + # 检查打手积分是否足够 + if dashou.jifen < jifen_kouchu: + dashou.jifen = 0 + else: + dashou.jifen -= jifen_kouchu + dashou.save() + + # 🔴【新增】保存处罚图片到数据库 + if chufa_tupian_urls and isinstance(chufa_tupian_urls, list): + for tupian_url in chufa_tupian_urls: + if tupian_url and tupian_url.strip(): + Chufatupian.objects.create( + dingdan_id=dingdan_id, + yonghuid=current_user.yonghuid, + tupian=tupian_url + ) + + # 更新商家订单扩展表的处罚相关字段 + shangjia_kuozhan.cfliyou = chufa_liyou + shangjia_kuozhan.sqzhuangtai = 0 + shangjia_kuozhan.save() + + return Response({ + 'code': 0, + 'msg': '处罚申请提交成功', + 'data': { + 'dingdan_id': dingdan_id, + 'dashou_id': dashou_id, + 'chufa_liyou': chufa_liyou, + 'sqzhuangtai': 0, + 'jifen': 5, + 'tupian_count': len(chufa_tupian_urls) if chufa_tupian_urls else 0 # 🔴 返回图片数量 + } + }, status=status.HTTP_200_OK) + + except Exception as e: + import logging + logger = logging.getLogger(__name__) + logger.error(f"商家处罚申请失败: {str(e)}", exc_info=True) + + return Response({ + 'code': 10, + 'msg': '服务器内部错误，申请失败', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + +# apps/dingdan/views.py +from django.db.models import Q, OuterRef, Subquery +from django.core.paginator import Paginator +from rest_framework.views import APIView +from rest_framework.response import Response +from rest_framework.permissions import IsAuthenticated +from rest_framework_simplejwt.authentication import JWTAuthentication +from .models import Dingdan, DingdanShangjia + + + +'''class DashouDingdanHuoquView(APIView): + """ + 获取可抢订单列表 + POST /dingdan/ddhq + 需要JWT Token认证 + """ + + permission_classes = [IsAuthenticated] + + def post(self, request): + # 1. 获取请求参数 + data = request.data + leixing_id = data.get('leixing_id') + page = int(data.get('page', 1)) + page_size = int(data.get('page_size', 10)) + + # 2. 构建基础查询条件 + base_query = Q(zhuangtai__in=[1, 7]) + if leixing_id: + base_query &= Q(leixing_id=leixing_id) + + # 3. 构建基础查询集（仅过滤，不执行） + base_qs = Dingdan.objects.filter(base_query).order_by('-create_time') + + # 4. 获取总记录数 + total = base_qs.count() + + # 5. 计算分页偏移量 + offset = (page - 1) * page_size + limit = page_size + + # 6. 获取当前页数据（数据库层切片，只返回当前页） + page_qs = base_qs[offset:offset + limit] + + # 7. 使用子查询获取商家昵称（性能优化，只针对当前页） + shangjia_sub = DingdanShangjia.objects.filter( + dingdan_id=OuterRef('id') + ).values('sjnicheng')[:1] + + # 8. 获取当前页所有需要的字段（包含商家昵称） + dingdan_values = page_qs.annotate( + sjnicheng=Subquery(shangjia_sub) + ).values( + 'dingdan_id', 'zhuangtai', 'fadan_pingtai', 'dashou_fencheng', + 'zhiding_id', 'leixing_id', 'tupian', 'yaoqiuleixing', + 'huiyuan_id', 'yongjin', 'jieshao', 'beizhu', 'create_time', + 'sjnicheng' + ) + + # 9. 转换为列表以便后续修改 + dingdan_list = list(dingdan_values) + + # 10. 批量获取指定打手的头像和昵称 + zhiding_ids = {item['zhiding_id'] for item in dingdan_list if item.get('zhiding_id')} + zhiding_info = {} + if zhiding_ids: + # 一次性查询所有打手信息（通过 UserMain 关联 UserDashou） + dashou_query = UserMain.objects.filter( + yonghuid__in=zhiding_ids + ).select_related('dashou_profile').annotate( + nicheng=F('dashou_profile__nicheng') + ).values('yonghuid', 'avatar', 'nicheng') + + zhiding_info = { + item['yonghuid']: { + 'avatar': item['avatar'] or '', + 'nicheng': item['nicheng'] or '' + } + for item in dashou_query + } + + # 11. 格式化返回数据，并添加打手头像和昵称 + formatted_list = [] + for order in dingdan_list: + zid = order.get('zhiding_id') + info = zhiding_info.get(zid, {}) + formatted_order = { + 'dingdan_id': order['dingdan_id'], + 'zhuangtai': order['zhuangtai'], + 'pingtai': order['fadan_pingtai'], + 'fadan_pingtai': order['fadan_pingtai'], + 'dashou_fencheng': float(order['dashou_fencheng']) if order['dashou_fencheng'] else 0.0, + 'zhiding_id': order['zhiding_id'] or '', + 'leixing_id': order['leixing_id'] or 0, + 'tupian': order['tupian'] or '', + 'yaoqiuleixing': order['yaoqiuleixing'] or 0, + 'huiyuan_id': order['huiyuan_id'] or '', + 'yajin': float(order['yongjin']) if order['yongjin'] else 0.0, + 'yongjin': float(order['yongjin']) if order['yongjin'] else 0.0, + 'jieshao': order['jieshao'] or '', + 'beizhu': order['beizhu'] or '', + 'creat_time': order['create_time'].strftime('%Y-%m-%d %H:%M:%S') if order['create_time'] else '', + 'sjnicheng': order['sjnicheng'] or '', + 'zhiding_uid': order['zhiding_id'] or '', + # 新增字段 + 'zhiding_avatar': info.get('avatar', ''), + 'zhiding_nicheng': info.get('nicheng', ''), + } + formatted_list.append(formatted_order) + + # 12. 判断是否有更多数据 + has_more = (page * page_size) < total + + return Response({ + 'code': 200, + 'msg': '获取成功', + 'data': { + 'list': formatted_list, + 'has_more': has_more, + 'total': total, + 'current_page': page, + 'page_size': page_size, + 'total_pages': (total + page_size - 1) // page_size, + } + })''' + +# apps/dingdan/views.py +from shangpin.models import ShangpinLeixing # 假设这是你的商品类型模型 + + +class ShangpinLeixingHuoquView(APIView): + """ + 获取商品类型列表 + POST /dingdan/ddlxhq + 需要JWT Token认证 + """ + authentication_classes = [JWTAuthentication] + permission_classes = [IsAuthenticated] + + def post(self, request): + # 1. 查询商品类型表 + # 假设你的商品类型模型字段为：id, jieshao, tupian_url + leixing_list = ShangpinLeixing.objects.all().values( + 'id', # 商品类型ID + 'jieshao', # 类型介绍 + 'tupian_url' # 类型图片URL（相对URL） + ).order_by('id') # 按ID排序，可根据需要调整 + + # 2. 格式化返回数据 + formatted_list = [] + for leixing in leixing_list: + formatted_leixing = { + 'id': leixing['id'], + 'jieshao': leixing['jieshao'] or '', # 处理空值 + 'tupian_url': leixing['tupian_url'] or '' # 处理空值 + } + formatted_list.append(formatted_leixing) + + # 3. 返回响应 + return Response({ + 'code': 200, + 'msg': '获取成功', + 'data': { + 'list': formatted_list, + 'total': len(formatted_list) + } + }) + + + + + + + + + + + + +# dingdan/views.py +from django.db.models import Q, OuterRef, Subquery, F, Prefetch + +from dengji.models import DingdanBiaoqian +from dengji.models import YonghuChenghao, Chenghao +from rest_framework_simplejwt.authentication import JWTAuthentication + +class DashouDingdanHuoquView(APIView): + """ + 获取可抢订单列表（支持标签筛选） + POST /dingdan/ddhq + 需要JWT Token认证 + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + # 1. 获取请求参数 + data = request.data + leixing_id = data.get('leixing_id') + page = int(data.get('page', 1)) + page_size = int(data.get('page_size', 10)) + biaoqian_id = data.get('biaoqian_id') + + # 2. 构建基础查询条件 + base_query = Q(zhuangtai__in=[1, 7]) + if leixing_id: + base_query &= Q(leixing_id=leixing_id) + + # 3. 标签筛选 + if biaoqian_id and int(biaoqian_id) > 0: + base_query &= Q(dingdanbiaoqian__chenghao_id=int(biaoqian_id)) + + # 4. 构建基础查询集 + base_qs = Dingdan.objects.filter(base_query).order_by('-create_time').distinct() + + # 5. 获取总记录数 + total = base_qs.count() + + # 6. 计算分页偏移量 + offset = (page - 1) * page_size + limit = page_size + + # 7. 获取当前页数据，并通过 select_related 预取商家扩展表（反向关联） + page_qs = base_qs[offset:offset + limit].select_related('shangjia_kuozhan') + + # 8. 获取当前页所有需要的字段 + dingdan_values = page_qs.values( + 'dingdan_id', 'zhuangtai', 'fadan_pingtai', 'dashou_fencheng', + 'zhiding_id', 'leixing_id', 'tupian', 'yaoqiuleixing', + 'huiyuan_id', 'yongjin', 'jieshao', 'beizhu', 'create_time', + 'shangjia_kuozhan__sjnicheng', # 商家昵称 + 'shangjia_kuozhan__shangjia_id', # 商家ID + ) + + # 9. 转换为列表并格式化 + dingdan_list = [] + for order in dingdan_values: + dingdan_list.append({ + 'dingdan_id': order['dingdan_id'], + 'zhuangtai': order['zhuangtai'], + 'pingtai': order['fadan_pingtai'], + 'fadan_pingtai': order['fadan_pingtai'], + 'dashou_fencheng': float(order['dashou_fencheng']) if order['dashou_fencheng'] else 0.0, + 'zhiding_id': order['zhiding_id'] or '', + 'leixing_id': order['leixing_id'] or 0, + 'tupian': order['tupian'] or '', + 'yaoqiuleixing': order['yaoqiuleixing'] or 0, + 'huiyuan_id': order['huiyuan_id'] or '', + 'yajin': float(order['yongjin']) if order['yongjin'] else 0.0, + 'yongjin': float(order['yongjin']) if order['yongjin'] else 0.0, + 'jieshao': order['jieshao'] or '', + 'beizhu': order['beizhu'] or '', + 'creat_time': order['create_time'].strftime('%Y-%m-%d %H:%M:%S') if order['create_time'] else '', + 'sjnicheng': order['shangjia_kuozhan__sjnicheng'] or '', + 'sj_id': order['shangjia_kuozhan__shangjia_id'] or '', + # 其他字段后面补充 + }) + + # 10. 批量获取指定打手的头像和昵称 + zhiding_ids = {item['zhiding_id'] for item in dingdan_list if item.get('zhiding_id')} + zhiding_info = {} + if zhiding_ids: + dashou_query = UserMain.objects.filter( + yonghuid__in=zhiding_ids + ).select_related('dashou_profile').annotate( + nicheng=F('dashou_profile__nicheng') + ).values('yonghuid', 'avatar', 'nicheng') + zhiding_info = { + item['yonghuid']: { + 'avatar': item['avatar'] or '', + 'nicheng': item['nicheng'] or '' + } + for item in dashou_query + } + + # 11. 批量获取三层标签（不变） + order_ids = [item['dingdan_id'] for item in dingdan_list] + + # --- 订单需求标签 --- + xuqiu_tags_map = {} + if order_ids: + try: + dbq_qs = DingdanBiaoqian.objects.filter( + dingdan_id__in=order_ids + ).select_related('chenghao') + for dbq in dbq_qs: + oid = dbq.dingdan_id + if oid not in xuqiu_tags_map: + xuqiu_tags_map[oid] = [] + ch = dbq.chenghao + xuqiu_tags_map[oid].append({ + 'id': ch.id, + 'mingcheng': ch.mingcheng, + 'texiao_json': self._parse_texiao_json(ch.texiao_miaoshu) + }) + except Exception as e: + logger.error(f"查询订单需求标签失败: {e}", exc_info=True) + + # --- 用户标签（打手+商家） --- + yonghuid_set = set(zhiding_ids) + # 商家ID从订单列表中提取（已含 sj_id） + for item in dingdan_list: + if item['fadan_pingtai'] == 2 and item.get('sj_id'): + yonghuid_set.add(item['sj_id']) + + user_id_map = {} + if yonghuid_set: + users = UserMain.objects.filter(yonghuid__in=yonghuid_set).values('id', 'yonghuid') + for u in users: + user_id_map[u['yonghuid']] = u['id'] + + user_main_ids = list(user_id_map.values()) + user_tags_map = {} + if user_main_ids: + uc_qs = YonghuChenghao.objects.filter( + yonghu_id__in=user_main_ids + ).select_related('chenghao') + for uc in uc_qs: + uid = uc.yonghu_id + if uid not in user_tags_map: + user_tags_map[uid] = [] + user_tags_map[uid].append(uc.chenghao) + + # 为每个订单组装标签 + dashou_tags_map = {} + shangjia_tags_map = {} + for item in dingdan_list: + oid = item['dingdan_id'] + # 打手标签 + zhid = item['zhiding_id'] + dashou_tags = [] + if zhid and zhid in user_id_map: + uid = user_id_map[zhid] + if uid in user_tags_map: + for ch in user_tags_map[uid]: + if ch.leixing == 'dashou': + dashou_tags.append({ + 'id': ch.id, + 'mingcheng': ch.mingcheng, + 'texiao_json': self._parse_texiao_json(ch.texiao_miaoshu) + }) + dashou_tags_map[oid] = dashou_tags + + # 商家标签 + sj_tags = [] + if item['fadan_pingtai'] == 2: + sj_yonghuid = item.get('sj_id') + if sj_yonghuid and sj_yonghuid in user_id_map: + uid = user_id_map[sj_yonghuid] + if uid in user_tags_map: + for ch in user_tags_map[uid]: + if ch.leixing == 'shangjia': + sj_tags.append({ + 'id': ch.id, + 'mingcheng': ch.mingcheng, + 'texiao_json': self._parse_texiao_json(ch.texiao_miaoshu) + }) + shangjia_tags_map[oid] = sj_tags + + # 12. 组装最终返回数据 + formatted_list = [] + for item in dingdan_list: + oid = item['dingdan_id'] + zid = item.get('zhiding_id') + info = zhiding_info.get(zid, {}) + formatted_list.append({ + **item, + 'zhiding_uid': zid, + 'zhiding_avatar': info.get('avatar', ''), + 'zhiding_nicheng': info.get('nicheng', ''), + 'xuqiu_biaoqian': xuqiu_tags_map.get(oid, []), + 'dashou_biaoqian': dashou_tags_map.get(oid, []), + 'shangjia_biaoqian': shangjia_tags_map.get(oid, []), + }) + + has_more = (page * page_size) < total + + return Response({ + 'code': 200, + 'msg': '获取成功', + 'data': { + 'list': formatted_list, + 'has_more': has_more, + 'total': total, + 'current_page': page, + 'page_size': page_size, + 'total_pages': (total + page_size - 1) // page_size, + } + }) + + except Exception as e: + logger.error(f"订单列表查询失败: {e}", exc_info=True) + return Response({'code': 500, 'msg': f'服务器内部错误: {str(e)}'}, status=500) + + def _parse_texiao_json(self, texiao_miaoshu): + if not texiao_miaoshu: + return {} + try: + return json.loads(texiao_miaoshu) + except: + return {} + + + + + + +import logging + +logger = logging.getLogger(__name__) + + + + +from rest_framework_simplejwt.authentication import JWTAuthentication +import logging + + +from .models import Dingdan, DingdanPingtai, DingdanShangjia + + +logger = logging.getLogger(__name__) + +from rest_framework.views import APIView +from rest_framework.response import Response +from rest_framework.permissions import IsAuthenticated +from django.utils import timezone +from django.db.models import F + + +logger = logging.getLogger(__name__) + + + + + + +'''class QiangdanView(APIView): + authentication_classes = [JWTAuthentication] + permission_classes = [IsAuthenticated] + + def post(self, request): + data = request.data + dingdan_id = data.get('dingdan_id') + if not dingdan_id: + return Response({'code': 400, 'msg': '订单ID不能为空'}, status=400) + + try: + with transaction.atomic(): + # 1. 验证打手身份和状态 + dashou_profile = self._validate_dashou_status(request.user) + if not dashou_profile: + return Response({'code': 403, 'msg': '您不是打手或账号状态异常'}, status=403) + + # 2. 锁定并验证订单（行锁） + order_result = self._validate_and_lock_order(dingdan_id, request.user.yonghuid) + if isinstance(order_result, str): + return Response({'code': 400, 'msg': order_result}) + order = order_result + + is_cross = order.is_cross == 1 + dispatch_type = order.dispatch_type # 1=我方派单，2=对方派单 + + # ========== 跨平台订单处理 ========== + if is_cross and dispatch_type == 2: + # 对方派单（跨平台且对方派给我方） + validation_result = self._validate_order_requirements(order, dashou_profile, request.user.yonghuid) + if not validation_result['success']: + return Response({'code': 400, 'msg': validation_result['message']}) + + # 向对方平台发送抢单询问 + claim_allowed = self._request_partner_check_claim(order, request.user.yonghuid) + if claim_allowed is None: + return Response({'code': 500, 'msg': '跨平台通信失败，请重试'}, status=500) + elif claim_allowed is False: + if order.zhuangtai == 1: + order.zhuangtai = 21 + order.save() + logger.info(f"订单 {dingdan_id} 被对方拒绝抢单，状态改为21") + else: + order.zhuangtai = 20 + order.save() + logger.info(f"订单 {dingdan_id} 已被其他平台抢走，状态改为20") + return Response({'code': 400, 'msg': '订单已被其他平台打手抢走或不可抢'}) + + # 允许抢单，执行本地抢单 + self._execute_qiangdan(order, dashou_profile, request.user.yonghuid) + + # 更新抢单统计（对方派单，我方抢到） + try: + update_daily_dispatch_stat( + direction=2, # 对方派单 + partner_club_id=order.partner_club_id or '000001', + claimed_amount=order.jine, # 订单金额 + claimed_count=1 + ) + except Exception as e: + logger.error(f"更新抢单统计失败: {e}", exc_info=True) + + elif is_cross and dispatch_type == 1: + # 我方派单 + validation_result = self._validate_order_requirements(order, dashou_profile, request.user.yonghuid) + if not validation_result['success']: + return Response({'code': 400, 'msg': validation_result['message']}) + + self._execute_qiangdan(order, dashou_profile, request.user.yonghuid) + + # 异步通知所有合作俱乐部：此订单已被抢 + self._async_notify_partners_order_claimed(order) + + else: + # 普通订单 + validation_result = self._validate_order_requirements(order, dashou_profile, request.user.yonghuid) + if not validation_result['success']: + return Response({'code': 400, 'msg': validation_result['message']}) + self._execute_qiangdan(order, dashou_profile, request.user.yonghuid) + + # 抢单成功后建立聊天关系（事务外） + chat_success = self._establish_chat_relationship(order, request.user.yonghuid, dashou_profile, request.user.avatar) + + # 🔥 新增：调用打手每日统计（成交） + try: + update_dashou_daily_by_action( + yonghuid=order.jiedan_dashou_id, + amount=order.dashou_fencheng, + action=1 # 1 表示接单（接单） + ) + logger.info(f"打手 {order.jiedan_dashou_id} 每日统计更新成功") + except Exception as e: + logger.error(f"打手每日统计更新失败: {e}") + # 不影响主流程 + + return Response({ + 'code': 200, + 'msg': '抢单成功', + 'data': { + 'dingdan_id': dingdan_id, + 'chat_established': chat_success + } + }) + + except Exception as e: + logger.error(f"抢单异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '系统异常，请稍后重试'}, status=500) + + # ---------- 辅助方法 ---------- + def _validate_dashou_status(self, user): + try: + dashou_profile = user.dashou_profile + if (dashou_profile.zhuangtai != 1 or + dashou_profile.zhanghaozhuangtai != 1 or + dashou_profile.jifen < 5): + return None + return dashou_profile + except UserDashou.DoesNotExist: + return None + + def _validate_and_lock_order(self, dingdan_id, dashou_yonghuid): + try: + order = Dingdan.objects.select_for_update().get(dingdan_id=dingdan_id) + if order.zhuangtai not in [1, 7]: + return "订单状态不可抢" + if order.zhuangtai == 7: + if not order.zhiding_id or order.zhiding_id != dashou_yonghuid: + return "此订单为指定单，您不是指定打手" + if order.jiedan_dashou_id: + return "订单已被其他打手抢走" + return order + except Dingdan.DoesNotExist: + return "订单不存在" + + def _validate_order_requirements(self, order, dashou_profile, dashou_yonghuid): + if order.yaoqiuleixing == 1: + return self._validate_huiyuan_requirement(order, dashou_yonghuid) + elif order.yaoqiuleixing == 2: + return self._validate_yajin_requirement(order, dashou_profile) + return {'success': True, 'message': '验证通过'} + + def _validate_huiyuan_requirement(self, order, dashou_yonghuid): + try: + huiyuan_record = Huiyuangoumai.objects.get( + huiyuan_id=order.huiyuan_id, + yonghu_id=dashou_yonghuid + ) + if huiyuan_record.jiance_shifou_daoqi() or huiyuan_record.huiyuan_zhuangtai != 1: + return {'success': False, 'message': '会员已过期或未开通对应会员'} + return {'success': True, 'message': '会员验证通过'} + except Huiyuangoumai.DoesNotExist: + return {'success': False, 'message': '未开通对应会员，无法抢此订单'} + + def _validate_yajin_requirement(self, order, dashou_profile): + yajin_required = order.yongjin or 0 + dashou_yajin = dashou_profile.yajin or 0 + if dashou_yajin < yajin_required: + return {'success': False, 'message': f'押金不足，需要{yajin_required}元，当前有{dashou_yajin}元'} + return {'success': True, 'message': '押金验证通过'} + + def _execute_qiangdan(self, order, dashou_profile, dashou_yonghuid): + order.zhuangtai = 2 + order.jiedan_dashou_id = dashou_yonghuid + order.user2_id = f"Ds{dashou_yonghuid}" + order.save() + + dashou_profile.zhuangtai = 0 + dashou_profile.jiedanzongliang = F('jiedanzongliang') + 1 + dashou_profile.jinrijiedan = F('jinrijiedan') + 1 + dashou_profile.jinyuejiedan = F('jinyuejiedan') + 1 + dashou_profile.save() + + # ---------- 跨平台询问对方 ---------- + def _request_partner_check_claim(self, order, dashou_id): + partner_club_id = order.partner_club_id or '000001' + try: + club = Club.objects.filter(partner_club_id=partner_club_id).first() + if not club or not club.partner_domain: + logger.error(f"未找到对方俱乐部配置: partner_club_id={partner_club_id}") + return None + + my_club = Club.objects.filter(partner_club_id=club.partner_club_id).first() + if not my_club: + logger.error(f"未找到我方俱乐部配置: partner_club_id={club.partner_club_id}") + return None + + payload = { + 'token': settings.CROSS_PLATFORM_TOKEN, + 'wofangdingdan_id': order.partner_order_id, + 'partner_order_id': order.dingdan_id, + 'our_club_id': my_club.club_id, + 'partner_club_id': club.partner_club_id, + 'dashou_id': dashou_id, + 'sj_id': f"Sj{settings.AGENT_SHANGJIA_ID}" + } + + url = club.partner_domain.rstrip('/') + '/dingdan/partner_check_claim' + resp = requests.post(url, json=payload, timeout=5) + + if resp.status_code != 200: + logger.error(f"跨平台抢单询问HTTP失败: {resp.status_code}") + return None + + data = resp.json() + if data.get('code') == 0: + return data.get('data', {}).get('can_claim') is True + else: + logger.error(f"跨平台抢单询问业务失败: {data}") + return False + except Exception as e: + logger.error(f"跨平台抢单询问异常: {e}", exc_info=True) + return None + + # ---------- 异步通知其他俱乐部 ---------- + def _async_notify_partners_order_claimed(self, order): + def notify_task(): + clubs = Club.objects.filter(is_interop_enabled=True).select_related() + for club in clubs: + for attempt in range(1, 4): + success = self._send_claim_notification_to_partner(order, club) + if success: + break + if attempt < 3: + import time + time.sleep(2 ** attempt) + else: + logger.error(f"通知俱乐部 {club.club_id} 订单已抢失败，重试3次后仍失败") + + thread = threading.Thread(target=notify_task) + thread.daemon = True + thread.start() + + def _send_claim_notification_to_partner(self, order, club): + try: + my_club = Club.objects.filter(partner_club_id=club.partner_club_id).first() + if not my_club: + logger.warning(f"未找到我方俱乐部配置: partner_club_id={club.partner_club_id}") + return False + + payload = { + 'token': settings.CROSS_PLATFORM_TOKEN, + 'our_club_id': my_club.club_id, + 'partner_club_id': club.partner_club_id, + 'partner_order_id': order.dingdan_id, + 'claimed': True + } + url = club.partner_domain.rstrip('/') + '/dingdan/partner_notify_claim' + resp = requests.post(url, json=payload, timeout=3) + return resp.status_code == 200 + except Exception as e: + logger.error(f"通知俱乐部 {club.club_id} 异常: {e}") + return False + + # ---------- 聊天关系建立（完整版） ---------- + def _establish_chat_relationship(self, order, dashou_yonghuid, dashou_profile, dashou_avatar): + try: + dashou_info = { + 'goeasy_id': f"Ds{dashou_yonghuid}", + 'avatar': dashou_avatar or '', + 'nickname': dashou_profile.nicheng or f'打手{dashou_yonghuid}' + } + + laoban_info = self._get_laoban_info(order) + if not laoban_info: + return False + + # 打手给老板/商家发消息 + success1 = self._send_goeasy_message( + sender_id=dashou_info['goeasy_id'], + sender_data={ + "avatar": dashou_info['avatar'], + "name": dashou_info['nickname'], + "nickname": dashou_info['nickname'] + }, + receiver_id=laoban_info['goeasy_id'], + receiver_data={ + "avatar": laoban_info['avatar'], + "name": laoban_info['nickname'], + "nickname": laoban_info['nickname'] + }, + message_type="text", + message_payload={ + "action": "new_chat", + "partner_id": laoban_info['goeasy_id'], + "partner_info": { + "userId": laoban_info['goeasy_id'], + "avatar": laoban_info['avatar'], + "name": laoban_info['nickname'], + "nickname": laoban_info['nickname'] + }, + "order_id": order.dingdan_id, + "message": f"您好，我已接单：{order.jieshao}，您的备注是：{order.beizhu}，游戏ID是：{order.nicheng} 请确认订单信息" + } + ) + + # 老板/商家给打手发消息 + success2 = self._send_goeasy_message( + sender_id=laoban_info['goeasy_id'], + sender_data={ + "avatar": laoban_info['avatar'], + "name": laoban_info['nickname'], + "nickname": laoban_info['nickname'] + }, + receiver_id=dashou_info['goeasy_id'], + receiver_data={ + "avatar": dashou_info['avatar'], + "name": dashou_info['nickname'], + "nickname": dashou_info['nickname'] + }, + message_type="text", + message_payload={ + "action": "new_chat", + "partner_id": dashou_info['goeasy_id'], + "partner_info": { + "userId": dashou_info['goeasy_id'], + "avatar": dashou_info['avatar'], + "name": dashou_info['nickname'], + "nickname": dashou_info['nickname'] + }, + "order_id": order.dingdan_id, + "message": f"好的，订单已确认，请开始服务" + } + ) + + return success1 and success2 + + except Exception as e: + logger.error(f"建立聊天关系异常: {e}", exc_info=True) + return False + + def _get_laoban_info(self, order): + try: + laoban_info = { + 'goeasy_id': '', + 'avatar': '', + 'nickname': '' + } + + if order.fadan_pingtai == 1: + pingtai_kuozhan = DingdanPingtai.objects.filter(dingdan=order).first() + if not pingtai_kuozhan or not pingtai_kuozhan.laoban_id: + return None + yonghuid = pingtai_kuozhan.laoban_id + laoban_info['goeasy_id'] = f"Boss{yonghuid}" + laoban_user = UserMain.objects.filter(yonghuid=yonghuid).first() + if not laoban_user: + return None + laoban_info['avatar'] = laoban_user.avatar or '' + boss_profile = UserBoss.objects.filter(user=laoban_user).first() + laoban_info['nickname'] = boss_profile.nickname if boss_profile and boss_profile.nickname else f'老板{yonghuid}' + + elif order.fadan_pingtai == 2: + shangjia_kuozhan = DingdanShangjia.objects.filter(dingdan=order).first() + if not shangjia_kuozhan or not shangjia_kuozhan.shangjia_id: + return None + yonghuid = shangjia_kuozhan.shangjia_id + laoban_info['goeasy_id'] = f"Sj{yonghuid}" + shangjia_user = UserMain.objects.filter(yonghuid=yonghuid).first() + if not shangjia_user: + return None + laoban_info['avatar'] = shangjia_user.avatar or '' + if shangjia_kuozhan.sjnicheng: + laoban_info['nickname'] = shangjia_kuozhan.sjnicheng + else: + shop_profile = UserShangjia.objects.filter(user=shangjia_user).first() + laoban_info['nickname'] = shop_profile.nicheng if shop_profile else f'商家{yonghuid}' + else: + if order.user1_id: + laoban_info['goeasy_id'] = order.user1_id + if laoban_info['goeasy_id'].startswith('Boss'): + yonghuid = laoban_info['goeasy_id'][4:] + laoban_info['nickname'] = f'老板{yonghuid}' + elif laoban_info['goeasy_id'].startswith('Sj'): + yonghuid = laoban_info['goeasy_id'][2:] + laoban_info['nickname'] = f'商家{yonghuid}' + else: + laoban_info['nickname'] = '用户' + else: + return None + + if not laoban_info['goeasy_id']: + return None + return laoban_info + + except Exception as e: + logger.error(f"获取老板信息异常: {e}", exc_info=True) + return None + + def _send_goeasy_message(self, sender_id, sender_data, receiver_id, receiver_data, message_type, message_payload): + try: + if not hasattr(settings, 'GOEASY_APPKEY') or not settings.GOEASY_APPKEY: + return False + if not hasattr(settings, 'GOEASY_SECRET') or not settings.GOEASY_SECRET: + return False + if not hasattr(settings, 'GOEASY_REST_URL') or not settings.GOEASY_REST_URL: + return False + + appkey = settings.GOEASY_APPKEY + secret = settings.GOEASY_SECRET + url = settings.GOEASY_REST_URL + + if isinstance(message_payload, dict) and 'message' in message_payload: + payload_text = str(message_payload['message']) + else: + payload_text = str(message_payload) + + payload_data = {"text": payload_text} + payload_str = json.dumps(payload_data, ensure_ascii=False) + + request_data = { + "appkey": appkey, + "senderId": str(sender_id), + "senderData": { + "avatar": str(sender_data.get('avatar', '')), + "name": str(sender_data.get('name', '系统通知')) + }, + "to": { + "type": "private", + "id": str(receiver_id), + "data": { + "avatar": str(receiver_data.get('avatar', '')), + "name": str(receiver_data.get('name', '用户')) + } + }, + "type": "text", + "payload": payload_str + } + + headers = { + "Content-Type": "application/json", + "Authorization": f"Bearer {secret}" + } + + response = requests.post(url, headers=headers, json=request_data, timeout=10) + return response.status_code == 200 + + except Exception as e: + logger.error(f"发送GoEasy消息异常: {e}", exc_info=True) + return False''' + + + +from peizhi.models import ClubConfig +from utils.chat_utils import establish_order_chat # 【新增】导入聊天工具 +class QiangdanView(APIView): + authentication_classes = [JWTAuthentication] + permission_classes = [IsAuthenticated] + + def post(self, request): + data = request.data + dingdan_id = data.get('dingdan_id') + if not dingdan_id: + return Response({'code': 400, 'msg': '订单ID不能为空'}, status=400) + + try: + with transaction.atomic(): + # 1. 验证打手身份和状态 + dashou_profile = self._validate_dashou_status(request.user) + if not dashou_profile: + return Response({'code': 403, 'msg': '您不是打手或账号状态异常'}, status=403) + + # ==================== 【新增】罚单检查 ==================== + from utils.fadan_utils import check_fadan_qiangdan_eligible + fadan_ok, fadan_msg = check_fadan_qiangdan_eligible(request.user.yonghuid,1) + if not fadan_ok: + return Response({'code': 400, 'msg': fadan_msg}) + # ========================================================= + # ========== 标签快速校验（提前拒绝，避免锁资源） ========== + from dengji.utils import check_dashou_biaoqian_required + biaoqian_ok, biaoqian_msg = check_dashou_biaoqian_required(dingdan_id, request.user.yonghuid) + if not biaoqian_ok: + return Response({'code': 400, 'msg': biaoqian_msg}) + # =========================================================== + + # 2. 锁定并验证订单（行锁） + order_result = self._validate_and_lock_order(dingdan_id, request.user.yonghuid) + if isinstance(order_result, str): + return Response({'code': 400, 'msg': order_result}) + order = order_result + + is_cross = order.is_cross == 1 + dispatch_type = order.dispatch_type + + if is_cross and dispatch_type == 2: + validation_result = self._validate_order_requirements(order, dashou_profile, request.user.yonghuid) + if not validation_result['success']: + return Response({'code': 400, 'msg': validation_result['message']}) + + claim_allowed = self._request_partner_check_claim(order, request.user.yonghuid) + if claim_allowed is None: + return Response({'code': 500, 'msg': '跨平台通信失败，请重试'}, status=500) + elif claim_allowed is False: + if order.zhuangtai == 1: + order.zhuangtai = 21 + order.save() + logger.info(f"订单 {dingdan_id} 被对方拒绝抢单，状态改为21") + else: + order.zhuangtai = 20 + order.save() + logger.info(f"订单 {dingdan_id} 已被其他平台抢走，状态改为20") + return Response({'code': 400, 'msg': '订单已被其他平台打手抢走或不可抢'}) + + self._execute_qiangdan(order, dashou_profile, request.user.yonghuid) + + try: + update_daily_dispatch_stat( + direction=2, + partner_club_id=order.partner_club_id or '000001', + claimed_amount=order.jine, + claimed_count=1 + ) + except Exception as e: + logger.error(f"更新抢单统计失败: {e}", exc_info=True) + + elif is_cross and dispatch_type == 1: + validation_result = self._validate_order_requirements(order, dashou_profile, request.user.yonghuid) + if not validation_result['success']: + return Response({'code': 400, 'msg': validation_result['message']}) + + self._execute_qiangdan(order, dashou_profile, request.user.yonghuid) + self._async_notify_partners_order_claimed(order) + + else: + validation_result = self._validate_order_requirements(order, dashou_profile, request.user.yonghuid) + if not validation_result['success']: + return Response({'code': 400, 'msg': validation_result['message']}) + self._execute_qiangdan(order, dashou_profile, request.user.yonghuid) + + # ========== 【唯一改动】聊天建立方式 ========== + chat_success = establish_order_chat(dingdan_id) + + try: + update_dashou_daily_by_action( + yonghuid=order.jiedan_dashou_id, + amount=order.dashou_fencheng, + action=1 + ) + logger.info(f"打手 {order.jiedan_dashou_id} 每日统计更新成功") + except Exception as e: + logger.error(f"打手每日统计更新失败: {e}") + + # 在 QiangdanView.post 里，_execute_qiangdan 之后添加： + from dengji.services import record_dashou_biaoxian + # 记录抢单表现（不影响主流程） + # 如果订单表里有 bankuai 信息，可以用 order.bankuai 代替 None + record_dashou_biaoxian( + dingdan_id=dingdan_id, + dashou_id=order.jiedan_dashou_id, + xingwei=1, + jiedan_time=timezone.now(), # 直接取当前时间 + bankuai=None # 暂不填，后续提交时补上 + ) + + + return Response({ + 'code': 200, + 'msg': '抢单成功', + 'data': { + 'dingdan_id': dingdan_id, + 'chat_established': chat_success + } + }) + + except Exception as e: + logger.error(f"抢单异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '系统异常，请稍后重试'}, status=500) + + # ---------- 以下所有方法原封不动照抄旧版 ---------- + def _validate_dashou_status(self, user): + try: + dashou_profile = user.dashou_profile + if (dashou_profile.zhuangtai != 1 or + dashou_profile.zhanghaozhuangtai != 1 or + dashou_profile.jifen < 5): + return None + return dashou_profile + except UserDashou.DoesNotExist: + return None + + def _validate_and_lock_order(self, dingdan_id, dashou_yonghuid): + try: + order = Dingdan.objects.select_for_update().get(dingdan_id=dingdan_id) + if order.zhuangtai not in [1, 7]: + return "订单状态不可抢" + if order.zhuangtai == 7: + if not order.zhiding_id or order.zhiding_id != dashou_yonghuid: + return "此订单为指定单，您不是指定打手" + if order.jiedan_dashou_id: + return "订单已被其他打手抢走" + return order + except Dingdan.DoesNotExist: + return "订单不存在" + + def _validate_order_requirements(self, order, dashou_profile, dashou_yonghuid): + if order.yaoqiuleixing == 1: + return self._validate_huiyuan_requirement(order, dashou_yonghuid) + elif order.yaoqiuleixing == 2: + return self._validate_yajin_requirement(order, dashou_profile) + return {'success': True, 'message': '验证通过'} + + def _validate_huiyuan_requirement(self, order, dashou_yonghuid): + try: + huiyuan_record = Huiyuangoumai.objects.get( + huiyuan_id=order.huiyuan_id, + yonghu_id=dashou_yonghuid + ) + if huiyuan_record.jiance_shifou_daoqi() or huiyuan_record.huiyuan_zhuangtai != 1: + return {'success': False, 'message': '会员已过期或未开通对应会员'} + return {'success': True, 'message': '会员验证通过'} + except Huiyuangoumai.DoesNotExist: + return {'success': False, 'message': '未开通对应会员，无法抢此订单'} + + def _validate_yajin_requirement(self, order, dashou_profile): + yajin_required = order.yongjin or 0 + dashou_yajin = dashou_profile.yajin or 0 + if dashou_yajin < yajin_required: + return {'success': False, 'message': f'押金不足，需要{yajin_required}元，当前有{dashou_yajin}元'} + return {'success': True, 'message': '押金验证通过'} + + def _execute_qiangdan(self, order, dashou_profile, dashou_yonghuid): + order.zhuangtai = 2 + order.jiedan_dashou_id = dashou_yonghuid + order.user2_id = f"Ds{dashou_yonghuid}" + order.save() + + dashou_profile.zhuangtai = 0 + dashou_profile.jiedanzongliang = F('jiedanzongliang') + 1 + dashou_profile.jinrijiedan = F('jinrijiedan') + 1 + dashou_profile.jinyuejiedan = F('jinyuejiedan') + 1 + dashou_profile.save() + + # ---------- 跨平台询问对方（照抄） ---------- + def _request_partner_check_claim(self, order, dashou_id): + partner_club_id = order.partner_club_id or '000001' + try: + club = Club.objects.filter(partner_club_id=partner_club_id).first() + if not club or not club.partner_domain: + logger.error(f"未找到对方俱乐部配置: partner_club_id={partner_club_id}") + return None + + my_club = Club.objects.filter(partner_club_id=club.partner_club_id).first() + if not my_club: + logger.error(f"未找到我方俱乐部配置: partner_club_id={club.partner_club_id}") + return None + + payload = { + 'token': settings.CROSS_PLATFORM_TOKEN, + 'wofangdingdan_id': order.partner_order_id, + 'partner_order_id': order.dingdan_id, + 'our_club_id': my_club.club_id, + 'partner_club_id': club.partner_club_id, + 'dashou_id': dashou_id, + 'sj_id': f"Sj{settings.AGENT_SHANGJIA_ID}" + } + + url = club.partner_domain.rstrip('/') + '/dingdan/partner_check_claim' + resp = requests.post(url, json=payload, timeout=5) + + if resp.status_code != 200: + logger.error(f"跨平台抢单询问HTTP失败: {resp.status_code}") + return None + + data = resp.json() + if data.get('code') == 0: + return data.get('data', {}).get('can_claim') is True + else: + logger.error(f"跨平台抢单询问业务失败: {data}") + return False + except Exception as e: + logger.error(f"跨平台抢单询问异常: {e}", exc_info=True) + return None + + # ---------- 异步通知其他俱乐部 ---------- + def _async_notify_partners_order_claimed(self, order): + def notify_task(): + clubs = Club.objects.filter(is_interop_enabled=True).select_related() + for club in clubs: + for attempt in range(1, 4): + success = self._send_claim_notification_to_partner(order, club) + if success: + break + if attempt < 3: + time.sleep(2 ** attempt) + else: + logger.error(f"通知俱乐部 {club.club_id} 订单已抢失败，重试3次后仍失败") + + thread = threading.Thread(target=notify_task) + thread.daemon = True + thread.start() + + def _send_claim_notification_to_partner(self, order, club): + try: + my_club = Club.objects.filter(partner_club_id=club.partner_club_id).first() + if not my_club: + logger.warning(f"未找到我方俱乐部配置: partner_club_id={club.partner_club_id}") + return False + + payload = { + 'token': settings.CROSS_PLATFORM_TOKEN, + 'our_club_id': my_club.club_id, + 'partner_club_id': club.partner_club_id, + 'partner_order_id': order.dingdan_id, + 'claimed': True + } + url = club.partner_domain.rstrip('/') + '/dingdan/partner_notify_claim' + resp = requests.post(url, json=payload, timeout=3) + return resp.status_code == 200 + except Exception as e: + logger.error(f"通知俱乐部 {club.club_id} 异常: {e}") + return False + + +# dingdan/views.py +import logging +import requests +from rest_framework.views import APIView +from rest_framework.response import Response +from rest_framework import status, permissions +from .models import Dingdan, DingdanPingtai, DingdanShangjia +from yonghu.models import UserMain, UserDashou, UserBoss, UserShangjia +from peizhi.models import ClubConfig +from utils.chat_utils import _send_group_message, _subscribe_users_to_group + +logger = logging.getLogger('dingdan') + + +# ----------------- 基础配置获取 ----------------- +def get_self_goeasy_appkey(): + try: + cfg = ClubConfig.objects.filter(is_self=1).first() + return cfg.chat_api_key if cfg else None + except Exception: + return None + + +def get_self_goeasy_secret(): + try: + cfg = ClubConfig.objects.filter(is_self=1).first() + return cfg.chat_api_id if cfg else None + except Exception: + return None + + +def get_self_storage_domain(): + try: + cfg = ClubConfig.objects.filter(is_self=1).first() + return cfg.storage_bucket_domain if cfg else '' + except Exception: + return '' + + +def full_avatar(relative_url, bucket_domain=None): + if not relative_url: + return '' + if relative_url.startswith('http'): + return relative_url + domain = bucket_domain or get_self_storage_domain() + if domain: + domain = domain.rstrip('/') + '/' + return domain + relative_url.lstrip('/') + return relative_url + + +# ----------------- GoEasy API 封装 ----------------- +def subscribe_users_to_group(user_ids, group_ids, appkey=None, secret=None): + """订阅用户到群组，确保能收发该群消息""" + if not appkey: + appkey = get_self_goeasy_appkey() + if not secret: + secret = get_self_goeasy_secret() + if not appkey: + logger.error("订阅失败：GoEasy AppKey 未配置") + return False + url = 'https://rest-hangzhou.goeasy.io/v2/im/subscribe-groups' + body = {"appkey": appkey, "userIds": user_ids, "groupIds": group_ids} + headers = {"Content-Type": "application/json"} + if secret: + headers["Authorization"] = f"Bearer {secret}" + try: + r = requests.post(url, headers=headers, json=body, timeout=10) + if r.status_code == 200: + logger.info(f"订阅成功：用户 {user_ids} -> 群 {group_ids}") + return True + logger.error(f"订阅失败：{r.status_code} {r.text}") + return False + except Exception as e: + logger.exception("订阅异常") + return False + + +def send_group_message( + appkey, secret, group_id, sender_id, sender_name, sender_avatar, + message_text='', custom_payload=None, group_name='', order_id='', is_cross=0 +): + """ + 通过 GoEasy REST API 发送群消息。 + message_text: 普通文本内容 + custom_payload: 自定义消息体（如订单卡片），此时 type 设为 'order' + """ + url = 'https://rest-hangzhou.goeasy.io/v2/im/message' + to_data = { + "name": group_name or group_id, + "avatar": sender_avatar or '', + "orderId": order_id, + "isCross": is_cross + } + msg_type = 'order' if custom_payload else 'text' + payload = custom_payload if custom_payload else message_text + + body = { + "appkey": appkey, + "senderId": sender_id, + "senderData": {"avatar": sender_avatar, "name": sender_name}, + "to": {"type": "group", "id": group_id, "data": to_data}, + "type": msg_type, + "payload": payload + } + headers = {"Content-Type": "application/json"} + if secret: + headers["Authorization"] = f"Bearer {secret}" + + for attempt in range(3): # 最多重试3次 + try: + r = requests.post(url, headers=headers, json=body, timeout=10) + if r.status_code == 200: + logger.info(f"消息发送成功：sender={sender_id}, group={group_id}, type={msg_type}") + return True + logger.warning(f"消息发送失败 (尝试 {attempt+1}/3)：状态码 {r.status_code}, 响应 {r.text}") + except Exception as e: + logger.warning(f"消息发送异常 (尝试 {attempt+1}/3)：{e}") + if attempt < 2: + time.sleep(1) + logger.error(f"消息最终发送失败：sender={sender_id}, group={group_id}") + return False + + +# ----------------- 权限校验 ----------------- +def check_user_permission(identity_type, uid, order): + """验证用户身份、账号状态、以及是否属于该订单""" + try: + user = UserMain.objects.get(yonghuid=uid) + except UserMain.DoesNotExist: + return False, '用户不存在' + + if identity_type == 'dashou': + try: + dashou = UserDashou.objects.get(user=user) + if dashou.zhanghaozhuangtai != 1 : + return False, '打手账号已被封禁或状态异常' + except UserDashou.DoesNotExist: + return False, '该用户不是打手' + if order.jiedan_dashou_id != uid: + return False, '你不是该订单的接单打手' + + elif identity_type == 'shangjia': + try: + shop = UserShangjia.objects.get(user=user) + if shop.zhuangtai != 1: + return False, '商家账号已被禁用' + except UserShangjia.DoesNotExist: + return False, '该用户不是商家' + try: + if order.shangjia_kuozhan.shangjia_id != uid: + return False, '你不是该订单的发布商家' + except DingdanShangjia.DoesNotExist: + return False, '订单缺少商家信息' + + elif identity_type == 'boss': + try: + UserBoss.objects.get(user=user) # 老板暂无封禁字段，仅需存在 + except UserBoss.DoesNotExist: + return False, '该用户不是老板' + try: + if order.pingtai_kuozhan.laoban_id != uid: + return False, '你不是该订单的老板' + except DingdanPingtai.DoesNotExist: + return False, '订单缺少平台信息' + + else: + return False, '不支持的身份类型' + return True, '' + + +# ----------------- 跨平台对方配置获取 ----------------- +def get_partner_club_config(partner_club_id): + try: + return ClubConfig.objects.get(club_id=partner_club_id, is_self=0) + except ClubConfig.DoesNotExist: + return None + + +# ----------------- 主视图 ----------------- + + +class DaiLiQunLiaoXiaoXiView(APIView): + """ + 代理发送群聊消息 + 支持： + - 非跨平台订单：直接用我方 GoEasy Key 以真实身份发送 + - 跨平台订单（双方任意一方派单）：除了我方群外，还需用对方 GoEasy Key 以代理身份向对方群发送 + 跨平台判断条件：订单同时存在 partner_order_id 和 partner_club_id 即视为跨平台 + """ + permission_classes = [permissions.IsAuthenticated] + + def post(self, request): + # ===== 1. 参数解析 ===== + order_id = request.data.get('orderId') + identity_type = request.data.get('identityType') # dashou / shangjia / boss + sender_name = request.data.get('senderName', '') + sender_avatar_raw = request.data.get('senderAvatar', '') + message_type = request.data.get('messageType', 'text') + message_text = request.data.get('text', '') + order_payload = request.data.get('orderPayload', None) + + logger.info(f"[群聊代理] 收到请求: orderId={order_id}, identityType={identity_type}, " + f"messageType={message_type}, text={message_text[:20]}...") + + if not order_id or not identity_type: + return Response({'code': 400, 'msg': '缺少 orderId 或 identityType'}) + if identity_type not in ('dashou', 'shangjia', 'boss'): + return Response({'code': 400, 'msg': 'identityType 无效'}) + + # ===== 2. 构造 senderId ===== + uid = request.user.yonghuid + prefix_map = {'dashou': 'Ds', 'shangjia': 'Sj', 'boss': 'Boss'} + sender_id = prefix_map[identity_type] + uid + logger.info(f"[群聊代理] 登录用户 yonghuid={uid}, 构造 senderId={sender_id}") + + # ===== 3. 查询订单 ===== + try: + order = Dingdan.objects.select_related('pingtai_kuozhan', 'shangjia_kuozhan').get(dingdan_id=order_id) + except Dingdan.DoesNotExist: + logger.warning(f"[群聊代理] 订单 {order_id} 不存在") + return Response({'code': 404, 'msg': '订单不存在'}) + + # ===== 4. 权限校验 ===== + valid, err_msg = check_user_permission(identity_type, uid, order) + if not valid: + logger.warning(f"[群聊代理] 权限校验失败: {err_msg}, uid={uid}, identity={identity_type}") + return Response({'code': 403, 'msg': err_msg}) + + # ===== 5. 我方 GoEasy 配置 ===== + self_appkey = get_self_goeasy_appkey() + self_secret = get_self_goeasy_secret() + if not self_appkey: + logger.error("[群聊代理] 我方 GoEasy AppKey 未配置") + return Response({'code': 500, 'msg': '系统配置错误(APPKEY)'}) + + # ===== 6. 公共群信息 ===== + real_group_id = f"group_{order.dingdan_id}" + group_name = (order.jieshao[:20] + '…') if order.jieshao and len(order.jieshao) > 20 else f"订单{order.dingdan_id}" + sender_avatar = full_avatar(sender_avatar_raw) if sender_avatar_raw else full_avatar('') + + # ===== 7. 订阅发送者到群 ===== + if not subscribe_users_to_group([sender_id], [real_group_id], self_appkey, self_secret): + logger.error("[群聊代理] 订阅群组失败") + return Response({'code': 500, 'msg': '订阅群组失败'}) + + # ===== 8. 判断跨平台（只看对方订单ID和俱乐部ID） ===== + partner_order_id = order.partner_order_id + partner_club_id = order.partner_club_id + is_cross = 1 if (partner_order_id and partner_club_id) else 0 + logger.info(f"[群聊代理] 订单 {order_id} partner_order_id={partner_order_id}, partner_club_id={partner_club_id}, 判定跨平台={is_cross}") + + custom_payload = order_payload if message_type == 'order' else None + text_content = message_text + + # ---------- 先向我方群发送消息（永远执行） ---------- + local_ok = send_group_message( + appkey=self_appkey, + secret=self_secret, + group_id=real_group_id, + sender_id=sender_id, + sender_name=sender_name, + sender_avatar=sender_avatar, + message_text=text_content, + custom_payload=custom_payload, + group_name=group_name, + order_id=order.dingdan_id, + is_cross=is_cross + ) + if not local_ok: + return Response({'code': 500, 'msg': '消息发送失败'}) + + # ---------- 跨平台转发（如果有对方订单ID和俱乐部ID） ---------- + if is_cross: + logger.info("[群聊代理] 满足跨平台条件，准备双平台发送") + partner_cfg = get_partner_club_config(partner_club_id) + if not partner_cfg or not partner_cfg.chat_api_key: + logger.warning("[群聊代理] 对方俱乐部配置不可用，仅发送我方群") + return Response({'code': 200, 'msg': '发送成功（对方GoEasy未配置）'}) + + partner_appkey = partner_cfg.chat_api_key + partner_secret = partner_cfg.chat_api_id or '' + partner_group_id = f"group_{partner_order_id}" + + # 构造代理身份 + agent_sender_id = f"{order.dingdan_id}_{sender_id}" + if identity_type == 'dashou': + agent_sender_name = f"[我方]{sender_name}" + elif identity_type == 'shangjia': + agent_sender_name = f"[我方商家]{sender_name}" + else: + agent_sender_name = f"[我方老板]{sender_name}" + agent_avatar = full_avatar('') + + logger.info(f"[群聊代理] 对方群组={partner_group_id}, 代理身份={agent_sender_id}/{agent_sender_name}") + + # 向对方群发送代理消息 + partner_ok = send_group_message( + appkey=partner_appkey, + secret=partner_secret, + group_id=partner_group_id, + sender_id=agent_sender_id, + sender_name=agent_sender_name, + sender_avatar=agent_avatar, + message_text=text_content, + custom_payload=custom_payload, + group_name='跨平台订单交流', + order_id=partner_order_id, + is_cross=1 + ) + logger.info(f"[群聊代理] 对方群发送结果: {partner_ok}") + + if partner_ok: + return Response({'code': 200, 'msg': '发送成功（双平台）'}) + else: + return Response({'code': 200, 'msg': '我方发送成功，对方发送失败'}) + else: + logger.info("[群聊代理] 非跨平台，仅发送我方群") + return Response({'code': 200, 'msg': '发送成功'}) + + +'''class DaiLiQunLiaoXiaoXiView(APIView): + """ + 代理发送群聊消息 + 支持： + - 非跨平台订单：直接用我方 GoEasy Key 以真实身份发送 + - 跨平台订单（我方派单）：同上 + - 跨平台订单（对方派单）：除了我方群外，还需用对方 GoEasy Key 以代理身份向对方群发送 + """ + permission_classes = [permissions.IsAuthenticated] + + def post(self, request): + # ===== 1. 参数解析 ===== + order_id = request.data.get('orderId') + identity_type = request.data.get('identityType') # 前端必传：dashou / shangjia / boss + sender_name = request.data.get('senderName', '') + sender_avatar_raw = request.data.get('senderAvatar', '') + message_type = request.data.get('messageType', 'text') + message_text = request.data.get('text', '') + order_payload = request.data.get('orderPayload', None) + + logger.info(f"[群聊代理] 收到请求: orderId={order_id}, identityType={identity_type}, " + f"messageType={message_type}, text={message_text[:20]}...") + + if not order_id or not identity_type: + return Response({'code': 400, 'msg': '缺少 orderId 或 identityType'}) + if identity_type not in ('dashou', 'shangjia', 'boss'): + return Response({'code': 400, 'msg': 'identityType 无效'}) + + # ===== 2. 构造 senderId ===== + uid = request.user.yonghuid + prefix_map = {'dashou': 'Ds', 'shangjia': 'Sj', 'boss': 'Boss'} + sender_id = prefix_map[identity_type] + uid + logger.info(f"[群聊代理] 登录用户 yonghuid={uid}, 构造 senderId={sender_id}") + + # ===== 3. 查询订单 ===== + try: + order = Dingdan.objects.select_related('pingtai_kuozhan', 'shangjia_kuozhan').get(dingdan_id=order_id) + except Dingdan.DoesNotExist: + logger.warning(f"[群聊代理] 订单 {order_id} 不存在") + return Response({'code': 404, 'msg': '订单不存在'}) + + # ===== 4. 权限校验 ===== + valid, err_msg = check_user_permission(identity_type, uid, order) + if not valid: + logger.warning(f"[群聊代理] 权限校验失败: {err_msg}, uid={uid}, identity={identity_type}") + return Response({'code': 403, 'msg': err_msg}) + + # ===== 5. 我方 GoEasy 配置 ===== + self_appkey = get_self_goeasy_appkey() + self_secret = get_self_goeasy_secret() + if not self_appkey: + logger.error("[群聊代理] 我方 GoEasy AppKey 未配置") + return Response({'code': 500, 'msg': '系统配置错误(APPKEY)'}) + + # ===== 6. 公共群信息 ===== + real_group_id = f"group_{order.dingdan_id}" + group_name = (order.jieshao[:20] + '…') if order.jieshao and len(order.jieshao) > 20 else f"订单{order.dingdan_id}" + sender_avatar = full_avatar(sender_avatar_raw) if sender_avatar_raw else full_avatar('') + + # ===== 7. 订阅发送者到群（确保在群内） ===== + if not subscribe_users_to_group([sender_id], [real_group_id], self_appkey, self_secret): + logger.error("[群聊代理] 订阅群组失败") + return Response({'code': 500, 'msg': '订阅群组失败'}) + + # ===== 8. 判断跨平台状态 ===== + is_cross = order.is_cross + dispatch_type = order.dispatch_type # 1=我方派单, 2=对方派单 + logger.info(f"[群聊代理] 订单 {order_id} is_cross={is_cross}, dispatch_type={dispatch_type}") + + custom_payload = order_payload if message_type == 'order' else None + text_content = message_text + + # ---------- 非跨平台或我方派单 ---------- + if is_cross != 1 or dispatch_type == 1: + logger.info("[群聊代理] 走非跨平台/我方派单发送通道") + success = send_group_message( + appkey=self_appkey, + secret=self_secret, + group_id=real_group_id, + sender_id=sender_id, + sender_name=sender_name, + sender_avatar=sender_avatar, + message_text=text_content, + custom_payload=custom_payload, + group_name=group_name, + order_id=order.dingdan_id, + is_cross=1 if is_cross == 1 else 0 + ) + if success: + return Response({'code': 200, 'msg': '发送成功'}) + else: + return Response({'code': 500, 'msg': '消息发送失败'}) + + # ---------- 跨平台且对方派单 ---------- + logger.info("[群聊代理] 检测到跨平台对方派单，准备双平台发送") + partner_club_id = order.partner_club_id + partner_order_id = order.partner_order_id + + if not partner_club_id or not partner_order_id: + logger.warning("[群聊代理] 缺少 partner_club_id 或 partner_order_id，降级为本地发送") + success = send_group_message( + self_appkey, self_secret, real_group_id, sender_id, sender_name, + sender_avatar, text_content, custom_payload, group_name, order.dingdan_id, is_cross=1 + ) + return Response({'code': 200, 'msg': '发送成功（对方信息缺失）'} if success else ('发送失败', 500)) + + partner_cfg = get_partner_club_config(partner_club_id) + if not partner_cfg or not partner_cfg.chat_api_key: + logger.warning("[群聊代理] 对方俱乐部配置不可用，仅发送我方群") + success = send_group_message( + self_appkey, self_secret, real_group_id, sender_id, sender_name, + sender_avatar, text_content, custom_payload, group_name, order.dingdan_id, is_cross=1 + ) + return Response({'code': 200, 'msg': '发送成功（对方GoEasy未配置）'} if success else ('发送失败', 500)) + + partner_appkey = partner_cfg.chat_api_key + partner_secret = partner_cfg.chat_api_id or '' + partner_group_id = f"group_{partner_order_id}" + + # 构造代理身份（参考 chat_utils.py） + agent_sender_id = f"{order.dingdan_id}_{sender_id}" + if identity_type == 'dashou': + agent_sender_name = f"[我方]{sender_name}" + elif identity_type == 'shangjia': + agent_sender_name = f"[我方商家]{sender_name}" + else: + agent_sender_name = f"[我方老板]{sender_name}" + agent_avatar = full_avatar('') # 可定制 + + logger.info(f"[群聊代理] 对方群组={partner_group_id}, 代理身份={agent_sender_id}/{agent_sender_name}") + + # 1) 在我方群发送真实身份消息 + local_ok = send_group_message( + self_appkey, self_secret, real_group_id, sender_id, sender_name, + sender_avatar, text_content, custom_payload, group_name, order.dingdan_id, is_cross=1 + ) + logger.info(f"[群聊代理] 我方群发送结果: {local_ok}") + + # 2) 在对方群发送代理身份消息 + partner_ok = send_group_message( + partner_appkey, partner_secret, partner_group_id, + agent_sender_id, agent_sender_name, agent_avatar, + text_content, custom_payload, + '跨平台订单交流', partner_order_id, is_cross=1 + ) + logger.info(f"[群聊代理] 对方群发送结果: {partner_ok}") + + if local_ok and partner_ok: + return Response({'code': 200, 'msg': '发送成功（双平台）'}) + elif local_ok: + return Response({'code': 200, 'msg': '我方发送成功，对方发送失败'}) + else: + return Response({'code': 500, 'msg': '消息发送失败'})''' + + + + +'''class DashouDingdanHuoquView1(APIView): + """打手订单获取接口""" + permission_classes = [IsAuthenticated] # JWT认证 + + def post(self, request): + # 1. 获取当前登录用户的yonghuid + try: + current_user = request.user + yonghuid = current_user.yonghuid + + except AttributeError: + return Response({ + 'code': 1, + 'msg': '用户认证失败', + 'data': None + }, status=status.HTTP_401_UNAUTHORIZED) + + # 2. 获取和验证前端参数 + try: + data = request.data + zhuangtai_list = data.get('zhuangtai_list', []) + page = max(1, int(data.get('page', 1))) + page_size = min(100, max(1, int(data.get('page_size', 10)))) + + + + except (ValueError, TypeError): + return Response({ + 'code': 2, + 'msg': '参数格式错误', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 3. 验证状态列表参数 + if not isinstance(zhuangtai_list, list) or len(zhuangtai_list) == 0: + return Response({ + 'code': 3, + 'msg': '状态列表不能为空', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + try: + # 4. 构建查询条件 - 直接查询订单主表 + # 条件1: 当前打手是接单打手 + # 条件2: 订单状态在指定列表中 + + # 注意：打手看不到状态1和7的订单（已下单、指定中） + # 但这里由前端控制传递的zhuangtai_list决定 + dashou_query = Q(jiedan_dashou_id=yonghuid) + zhuangtai_query = Q(zhuangtai__in=zhuangtai_list) + + # 5. 执行查询 - 只查询需要的字段，按创建时间倒序 + dingdan_query = Dingdan.objects.filter( + dashou_query & zhuangtai_query + ).order_by('-create_time') + + # 只选择需要的字段，提高性能 + dingdan_query = dingdan_query.only( + 'dingdan_id', + 'zhuangtai', + 'dashou_fencheng', # ✅ 关键：打手分成，不是jine + 'jieshao', + 'tupian', + 'nicheng', + 'create_time' + ) + + total_count = dingdan_query.count() + + + # 6. 计算分页 + start_index = (page - 1) * page_size + end_index = start_index + page_size + + # 获取当前页的订单数据 + current_page_orders = dingdan_query[start_index:end_index] + current_page_count = len(current_page_orders) + + # 7. 构建返回数据 - 只返回前端需要的字段 + order_list = [] + for order in current_page_orders: + order_data = { + # 核心字段 - 必须与前端完全对应 + 'dingdan_id': order.dingdan_id, # 订单ID + 'zhuangtai': order.zhuangtai, # 订单状态码 + # ✅ 关键：这里返回的是打手分成，不是订单金额 + 'jine': float(order.dashou_fencheng) if order.dashou_fencheng else 0.0, + 'jieshao': order.jieshao or '', # 订单介绍 + 'tupian': order.tupian or '', # 商品图片URL + 'nicheng': order.nicheng or '', # 游戏昵称 + 'create_time': order.create_time.strftime('%Y-%m-%d %H:%M:%S') if order.create_time else '' + } + order_list.append(order_data) + + + + # 8. 判断是否还有更多数据 + # 条件1: 当前页获取了满page_size条数据 + # 条件2: 还有更多数据没取完 + has_more = current_page_count == page_size and end_index < total_count + + # 如果总数为0，直接没有更多 + if total_count == 0: + has_more = False + + + + return Response({ + 'code': 0, + 'msg': '成功', + 'data': { + 'list': order_list, # 订单列表 + 'has_more': has_more, # 是否还有更多数据 + 'total': total_count # 总订单数（可选） + } + }, status=status.HTTP_200_OK) + + except Exception as e: + # 记录异常日志 + import logging + logger = logging.getLogger(__name__) + logger.error(f"打手订单获取失败: {str(e)}", exc_info=True) + + + + return Response({ + 'code': 4, + 'msg': '服务器内部错误', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)''' + + + + + +class DashouDingdanHuoquView1(APIView): + """ + 打手订单获取接口 + 支持筛选条件： + - zhuangtai_list: 订单状态列表（可选，空数组或不传表示全部状态） + - leixing_id: 商品类型ID（可选） + - keyword: 搜索关键词，模糊匹配订单ID和订单介绍（可选） + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + # 1. 获取当前登录用户的 yonghuid + try: + current_user = request.user + yonghuid = current_user.yonghuid + except AttributeError: + return Response({ + 'code': 1, + 'msg': '用户认证失败', + 'data': None + }, status=status.HTTP_401_UNAUTHORIZED) + + # 2. 获取并校验前端参数 + try: + data = request.data + zhuangtai_list = data.get('zhuangtai_list', []) # 可选，默认空列表（全部） + page = max(1, int(data.get('page', 1))) + page_size = min(100, max(1, int(data.get('page_size', 10)))) + leixing_id = data.get('leixing_id', None) # 可选，商品类型ID + keyword = data.get('keyword', '').strip() # 可选，搜索关键词 + except (ValueError, TypeError): + return Response({ + 'code': 2, + 'msg': '参数格式错误', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 3. 参数默认值与类型修正 + if not isinstance(zhuangtai_list, list): + zhuangtai_list = [] # 非列表则视为全部 + if leixing_id is not None: + try: + leixing_id = int(leixing_id) + except (ValueError, TypeError): + leixing_id = None + + # 4. 构建查询条件 + try: + # 基础条件：当前打手接单 + query = Q(jiedan_dashou_id=yonghuid) + + # 状态筛选：如果 zhuangtai_list 不为空列表，则加入筛选；否则查询全部状态 + if zhuangtai_list: + query &= Q(zhuangtai__in=zhuangtai_list) + + # 商品类型筛选 + if leixing_id is not None: + query &= Q(leixing_id=leixing_id) + + # 关键词搜索：模糊匹配订单ID和订单介绍 + if keyword: + keyword_query = Q(dingdan_id__icontains=keyword) | Q(jieshao__icontains=keyword) + query &= keyword_query + + # 5. 执行查询，按创建时间倒序 + dingdan_query = Dingdan.objects.filter(query).order_by('-create_time') + + # 只选择需要的字段，提高性能 + dingdan_query = dingdan_query.only( + 'dingdan_id', + 'zhuangtai', + 'dashou_fencheng', # 打手分成金额 + 'jieshao', + 'tupian', + 'nicheng', + 'create_time' + ) + + total_count = dingdan_query.count() + + # 6. 分页处理 + start_index = (page - 1) * page_size + end_index = start_index + page_size + current_page_orders = dingdan_query[start_index:end_index] + current_page_count = len(current_page_orders) + + # 7. 构建返回数据列表 + order_list = [] + for order in current_page_orders: + order_data = { + 'dingdan_id': order.dingdan_id, + 'zhuangtai': order.zhuangtai, + 'jine': float(order.dashou_fencheng) if order.dashou_fencheng else 0.0, + 'jieshao': order.jieshao or '', + 'tupian': order.tupian or '', + 'nicheng': order.nicheng or '', + 'create_time': order.create_time.strftime('%Y-%m-%d %H:%M:%S') if order.create_time else '' + } + order_list.append(order_data) + + # 8. 判断是否还有更多数据 + has_more = (current_page_count == page_size) and (end_index < total_count) + if total_count == 0: + has_more = False + + return Response({ + 'code': 0, + 'msg': '成功', + 'data': { + 'list': order_list, + 'has_more': has_more, + 'total': total_count + } + }, status=status.HTTP_200_OK) + + except Exception as e: + import logging + logger = logging.getLogger(__name__) + logger.error(f"打手订单获取失败: {str(e)}", exc_info=True) + + return Response({ + 'code': 4, + 'msg': '服务器内部错误', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + + + + + + +from peizhi.models import ClubConfig, ShangjiaLianjie +logger = logging.getLogger('dingdan') + +# ---------- 跨平台对方配置获取 ---------- +def get_partner_club_config(partner_club_id): + try: + return ClubConfig.objects.get(club_id=partner_club_id, is_self=0) + except ClubConfig.DoesNotExist: + return None + + +class ShangjiaLianjieLiuYanZhuanFaView(APIView): + """ + 商家链接留言转发接口 + 路径：POST /dingdan/sjljlbxxzf + 固定以 B{商家ID} 身份发送群消息。通过 partner_order_id/partner_club_id 判断是否跨平台。 + """ + permission_classes = [] + + def post(self, request): + token = request.data.get('token') + text = request.data.get('text', '') + + if not token or not text: + return Response({'code': 400, 'msg': '缺少参数'}) + + try: + lianjie = ShangjiaLianjie.objects.get(lianjie_token=token) + except ShangjiaLianjie.DoesNotExist: + return Response({'code': 404, 'msg': '链接不存在或已失效'}) + + if not lianjie.dingdan_id: + return Response({'code': 400, 'msg': '链接缺少订单ID'}) + + try: + order = Dingdan.objects.select_related('pingtai_kuozhan', 'shangjia_kuozhan').get(dingdan_id=lianjie.dingdan_id) + except Dingdan.DoesNotExist: + return Response({'code': 500, 'msg': '订单数据异常'}) + + shangjia_uid = lianjie.yonghu_id + sender_id = f"B{shangjia_uid}" + sender_name = "老板" + sender_avatar = '' + + appkey = get_self_goeasy_appkey() + secret = get_self_goeasy_secret() + if not appkey: + return Response({'code': 500, 'msg': '系统配置错误(APPKEY)'}) + + group_id = f"group_{order.dingdan_id}" + group_name = (order.jieshao[:20] + '…') if order.jieshao and len(order.jieshao) > 20 else f"订单{order.dingdan_id}" + + local_cross_flag = 1 if (order.partner_order_id and order.partner_club_id) else 0 + + if not _subscribe_users_to_group([sender_id], [group_id], appkey, secret): + return Response({'code': 500, 'msg': '订阅群组失败'}) + + local_ok = _send_group_message( + appkey=appkey, + secret=secret, + group_id=group_id, + sender_id=sender_id, + sender_name=sender_name, + sender_avatar=sender_avatar, + message_text=text, + custom_payload=None, + group_name=group_name, + order_id=order.dingdan_id, + is_cross=local_cross_flag + ) + if not local_ok: + return Response({'code': 500, 'msg': '消息发送失败'}) + + # 跨平台转发 + partner_order_id = order.partner_order_id + partner_club_id = order.partner_club_id + + if not partner_order_id or not partner_club_id: + return Response({'code': 200, 'msg': '发送成功'}) + + partner_cfg = get_partner_club_config(partner_club_id) + if not partner_cfg or not partner_cfg.chat_api_key: + return Response({'code': 200, 'msg': '发送成功（对方未配置）'}) + + agent_sender_id = f"{order.dingdan_id}_{sender_id}" + agent_sender_name = f"[我方老板]{shangjia_uid}" + + partner_group_id = f"group_{partner_order_id}" + + partner_ok = _send_group_message( + appkey=partner_cfg.chat_api_key, + secret=partner_cfg.chat_api_id or '', + group_id=partner_group_id, + sender_id=agent_sender_id, + sender_name=agent_sender_name, + sender_avatar='', + message_text=text, + custom_payload=None, + group_name='跨平台订单交流', + order_id=partner_order_id, + is_cross=1 + ) + + if partner_ok: + return Response({'code': 200, 'msg': '发送成功（双平台）'}) + else: + return Response({'code': 200, 'msg': '我方发送成功，对方发送失败'}) + + + +# views.py - 打手COS凭证接口（完整替换） +import json +import time +from tencentcloud.common import credential +from tencentcloud.common.exception.tencent_cloud_sdk_exception import TencentCloudSDKException +from tencentcloud.sts.v20180813 import sts_client, models +from django.conf import settings +from rest_framework.views import APIView +from rest_framework.permissions import IsAuthenticated +from rest_framework.response import Response +from rest_framework import status +import logging + +logger = logging.getLogger(__name__) + +class DashouCOSZhengshuView(APIView): + """打手获取COS上传凭证接口（调试版本）""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + # 1. 接收参数（修复 int 无 strip 问题） + dingdan_id = str(request.data.get('dingdan_id', '')).strip() + yongtu = request.data.get('yongtu', 'dingdan') + + # 2. 条件判断修正：除了 fakuan 之外，其他用途均需提供 dingdan_id + if yongtu != 'fakuan' and not dingdan_id: + return Response( + {'code': 400, 'msg': '订单ID不能为空', 'error': 'dingdan_id is required when yongtu is not fakuan'}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 3. 业务验证逻辑（根据用途分别验证） + if yongtu == 'chufa': + try: + from .models import Chufajilu + chufa_record = Chufajilu.objects.filter( + dingdan_id=dingdan_id, + dashouid=request.user.yonghuid, + sqzhuangtai__in=[0, 3] + ).first() + if not chufa_record: + return Response( + {'code': 403, 'msg': '处罚记录无权限或状态不对', + 'error': f'No punishment record found for user {request.user.yonghuid} on order {dingdan_id}'}, + status=status.HTTP_403_FORBIDDEN + ) + except Exception as e: + logger.error(f"查处罚记录异常: {str(e)}") + return Response( + {'code': 500, 'msg': '服务器内部错误', 'error': str(e)}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR + ) + elif yongtu == 'fakuan': + # 罚款申诉不需要订单验证 + pass + else: + # 默认为订单相关，需要验证订单且打手必须接单 + try: + from .models import Dingdan + dingdan = Dingdan.objects.get( + dingdan_id=dingdan_id, + jiedan_dashou_id=request.user.yonghuid, + zhuangtai__in=[2, 8] + ) + except Dingdan.DoesNotExist: + return Response( + {'code': 403, 'msg': '此功能暂未开放', 'error': f'Order {dingdan_id} not found or not assigned to user {request.user.yonghuid}'}, + status=status.HTTP_403_FORBIDDEN + ) + + # 4. 获取腾讯云STS临时密钥 + try: + # 初始化固定凭证 + cred = credential.Credential( + settings.COS_SECRET_ID, + settings.COS_SECRET_KEY + ) + + # 创建STS客户端 + http_profile = HttpProfile() + http_profile.endpoint = "sts.tencentcloudapi.com" + client_profile = ClientProfile() + client_profile.httpProfile = http_profile + client = sts_client.StsClient(cred, "ap-shanghai", client_profile) + + # 构建策略资源 + resources = [] + if yongtu == 'chufa': + resources.append( + f"qcs::cos:{settings.COS_REGION}:uid/{settings.COS_APPID}:{settings.COS_BUCKET}/a_long/chfajltp/dssstp/*" + ) + elif yongtu == 'fakuan': + resources.append( + f"qcs::cos:{settings.COS_REGION}:uid/{settings.COS_APPID}:{settings.COS_BUCKET}/fakuan/dashoufakuan/dashoufakuanshensu/*" + ) + else: + resources.append( + f"qcs::cos:{settings.COS_REGION}:uid/{settings.COS_APPID}:{settings.COS_BUCKET}/order/{dingdan_id}/*" + ) + + policy = { + "version": "2.0", + "statement": [{ + "effect": "allow", + "action": [ + "cos:PutObject", + "cos:PostObject", + "cos:InitiateMultipartUpload", + "cos:UploadPart", + "cos:CompleteMultipartUpload" + ], + "resource": resources + }] + } + + req = models.GetFederationTokenRequest() + req.Name = f"dashou_{dingdan_id}_{int(time.time())}" + req.Policy = json.dumps(policy) + req.DurationSeconds = 7200 + + resp = client.GetFederationToken(req) + credentials = resp.Credentials + + except TencentCloudSDKException as e: + logger.error(f"获取STS临时密钥失败: {str(e)}") + return Response({ + 'code': 500, + 'msg': f'获取上传凭证失败: {str(e)}', + 'error_detail': str(e) + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + # 5. 构建响应 + current_time = int(time.time()) + upload_dir = 'fakuan/dashoufakuan/dashoufakuanshensu/' if yongtu == 'fakuan' else ( + 'a_long/chfajltp/dssstp/' if yongtu == 'chufa' else f'order/{dingdan_id}/' + ) + response_data = { + 'credentials': { + 'tmpSecretId': credentials.TmpSecretId, + 'tmpSecretKey': credentials.TmpSecretKey, + 'sessionToken': credentials.Token, + }, + 'startTime': current_time, + 'expiredTime': current_time + 7200, + 'bucket': settings.COS_BUCKET, + 'region': settings.COS_REGION, + 'upload_dir': upload_dir, + } + return Response({'code': 0, 'msg': '成功', 'data': response_data}) + + except Exception as e: + # 捕捉所有未预期的异常，返回完整 traceback + logger.error(f'COS凭证接口未知错误: {traceback.format_exc()}') + return Response({ + 'code': 500, + 'msg': f'服务器内部错误: {str(e)}', + 'error_detail': traceback.format_exc() + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + +class ShangjiaCOSZhengshuView(APIView): + """商家获取COS上传凭证接口（用于处罚申诉图片上传）""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + # 1. 接收参数 + dingdan_id = request.data.get('dingdan_id', '').strip() + yongtu = request.data.get('yongtu', 'chufa') # 用途：chufa=处罚申诉 + + if not dingdan_id: + return Response({'code': 1, 'msg': '订单ID不能为空', 'data': None}, + status=status.HTTP_400_BAD_REQUEST) + + # 2. 🔴【修改】验证商家身份 - 通过反向查询shop_profile判断是否为商家 + try: + # 检查是否有商家扩展表 + shangjia_profile = request.user.shop_profile + + # 验证商家状态是否为1（正常） + if shangjia_profile.zhuangtai != 1: + return Response({'code': 3, 'msg': '商家账号状态异常，无法操作', 'data': None}, + status=status.HTTP_403_FORBIDDEN) + + # 🔴【重要】获取商家ID（从商家扩展表中获取） + shangjia_id = request.user.yonghuid # 假设商家扩展表中有yonghuid字段 + + except AttributeError: + # 没有shop_profile属性，说明不是商家 + return Response({'code': 3, 'msg': '非商家用户无权限', 'data': None}, + status=status.HTTP_403_FORBIDDEN) + + # 3. 🔴【修改】验证订单权限 - 通过商家订单扩展表验证 + try: + from .models import Dingdan, DingdanShangjia + + # 获取订单 + dingdan = Dingdan.objects.get(dingdan_id=dingdan_id) + + # 🔴【重要】通过反向查询商家扩展表验证订单是否属于当前商家 + try: + shangjia_kuozhan = dingdan.shangjia_kuozhan # 使用反向关系名 + + # 验证商家ID是否匹配 + if str(shangjia_kuozhan.shangjia_id) != str(shangjia_id): + return Response({'code': 2, 'msg': '订单不属于当前商家', 'data': None}, + status=status.HTTP_403_FORBIDDEN) + + # 验证订单状态是否允许申请处罚（根据前端逻辑） + allowed_zhuangtai = [2, 4, 5, 6, 8] + if dingdan.zhuangtai not in allowed_zhuangtai: + return Response({'code': 4, 'msg': '当前订单状态不允许申请处罚', 'data': None}, + status=status.HTTP_400_BAD_REQUEST) + + # 🔴【新增】检查是否已存在处罚申请（通过Chufajilu模型） + # 注意：这里假设Chufajilu模型存在，并且有shangjia_id字段 + try: + from .models import Chufajilu + existing_chufa = Chufajilu.objects.filter( + dingdan_id=dingdan_id, + qingqiuid=shangjia_id, + sqzhuangtai__in=[0, 1] # 审核中或已处罚状态 + ).exists() + + if existing_chufa: + return Response({'code': 5, 'msg': '该订单已有处罚申请，请勿重复上传', 'data': None}, + status=status.HTTP_400_BAD_REQUEST) + except ImportError: + # 如果没有Chufajilu模型，跳过这个检查 + pass + + except DingdanShangjia.DoesNotExist: + # 没有商家扩展记录，说明这不是商家订单 + return Response({'code': 2, 'msg': '非商家订单无法操作', 'data': None}, + status=status.HTTP_403_FORBIDDEN) + + except Dingdan.DoesNotExist: + return Response({'code': 2, 'msg': '订单不存在', 'data': None}, + status=status.HTTP_404_NOT_FOUND) + except Exception as e: + logger.error(f"订单验证异常: {str(e)}") + return Response({'code': 500, 'msg': '服务器验证异常', 'data': None}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + # 4. 获取腾讯云STS临时密钥 + try: + # 初始化固定凭证 + cred = credential.Credential( + settings.COS_SECRET_ID, + settings.COS_SECRET_KEY + ) + + # 创建STS客户端 + http_profile = HttpProfile() + http_profile.endpoint = "sts.tencentcloudapi.com" + client_profile = ClientProfile() + client_profile.httpProfile = http_profile + + client = sts_client.StsClient(cred, "ap-shanghai", client_profile) + + # 🔴【修改】构建策略 - 只允许上传到商家处罚证据图片目录 + resources = [ + f"qcs::cos:{settings.COS_REGION}:uid/{settings.COS_APPID}:{settings.COS_BUCKET}/a_long/chfajltp/sjzjtp/*" + ] + + policy = { + "version": "2.0", + "statement": [ + { + "effect": "allow", + "action": [ + "cos:PutObject", + "cos:PostObject", + "cos:InitiateMultipartUpload", + "cos:UploadPart", + "cos:CompleteMultipartUpload" + ], + "resource": resources + } + ] + } + + # 请求STS临时凭证 + req = models.GetFederationTokenRequest() + # 🔴【修改】命名包含商家ID + req.Name = f"shangjia_{shangjia_id}_{dingdan_id}_{int(time.time())}" + req.Policy = json.dumps(policy) + req.DurationSeconds = 7200 # 2小时有效期 + + resp = client.GetFederationToken(req) + + # 提取临时密钥 + credentials = resp.Credentials + + except TencentCloudSDKException as e: + logger.error(f"商家获取STS临时密钥失败: {str(e)}") + return Response({ + 'code': 500, + 'msg': f'获取上传凭证失败: {str(e)}', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + # 5. 构建响应数据 + current_time = int(time.time()) + response_data = { + 'credentials': { + 'tmpSecretId': credentials.TmpSecretId, + 'tmpSecretKey': credentials.TmpSecretKey, + 'sessionToken': credentials.Token, + }, + 'startTime': current_time, + 'expiredTime': current_time + 7200, + 'bucket': settings.COS_BUCKET, + 'region': settings.COS_REGION, + # 🔴【修改】商家专用上传目录 + 'upload_dir': 'a_long/chfajltp/sjzjtp/', + # 🔴【新增】返回商家ID和订单ID，便于前端生成文件名 + 'dingdan_id': dingdan_id, + 'shangjia_id': shangjia_id, + # 🔴【新增】可选：返回商家昵称，便于前端显示 + 'shangjia_nicheng': shangjia_profile.nicheng if hasattr(shangjia_profile, 'nicheng') else '' + } + + # 6. 返回成功 + return Response({ + 'code': 0, + 'msg': '成功', + 'data': response_data + }, status=status.HTTP_200_OK) + + except Exception as e: + logger.error(f'商家COS凭证接口未知错误: {str(e)}', exc_info=True) + return Response({ + 'code': 500, + 'msg': f'服务器内部错误: {str(e)}', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + +'''class DashouCOSZhengshuView(APIView): + """打手获取COS上传凭证接口（使用腾讯云STS临时密钥）""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + + + # 1. 接收参数 + dingdan_id = request.data.get('dingdan_id', '').strip() + print(dingdan_id) + if not dingdan_id: + return Response({'code': 1, 'msg': '订单ID不能为空', 'data': None}, status=status.HTTP_400_BAD_REQUEST) + + # 2. 业务验证逻辑（保持你的原有逻辑） + try: + from .models import Dingdan + dingdan = Dingdan.objects.get( + dingdan_id=dingdan_id, + jiedan_dashou_id=request.user.yonghuid, + #zhuangtai=2 + ) + + except Dingdan.DoesNotExist: + return Response({'code': 5, 'msg': '订单无权限或状态不对', 'data': None}, + status=status.HTTP_403_FORBIDDEN) + except Exception as e: + + return Response({'code': 500, 'msg': '服务器验证异常', 'data': None}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + # 3. 获取腾讯云STS临时密钥 + try: + # 初始化固定凭证 + cred = credential.Credential( + settings.COS_SECRET_ID, + settings.COS_SECRET_KEY + ) + + # 创建STS客户端 + http_profile = HttpProfile() + http_profile.endpoint = "sts.tencentcloudapi.com" + client_profile = ClientProfile() + client_profile.httpProfile = http_profile + + client = sts_client.StsClient(cred, "ap-shanghai", client_profile) + + # 构建策略（允许上传到订单目录） + policy = { + "version": "2.0", + "statement": [ + { + "effect": "allow", + "action": [ + "cos:PutObject", + "cos:PostObject", + "cos:InitiateMultipartUpload", + "cos:UploadPart", + "cos:CompleteMultipartUpload" + ], + "resource": [ + f"qcs::cos:{settings.COS_REGION}:uid/{settings.COS_APPID}:{settings.COS_BUCKET}/order/{dingdan_id}/*" + ] + } + ] + } + + # 请求STS临时凭证 + req = models.GetFederationTokenRequest() + req.Name = f"dashou_{dingdan_id}_{int(time.time())}" + req.Policy = json.dumps(policy) + req.DurationSeconds = 7200 # 2小时有效期 + + resp = client.GetFederationToken(req) + + # 提取临时密钥 + credentials = resp.Credentials + + + except TencentCloudSDKException as e: + logger.error(f"获取STS临时密钥失败: {str(e)}") + return Response({ + 'code': 500, + 'msg': f'获取上传凭证失败: {str(e)}', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + # 4. 构建响应数据（严格遵循小程序COS SDK要求） + current_time = int(time.time()) + response_data = { + 'credentials': { + 'tmpSecretId': credentials.TmpSecretId, # 临时SecretId + 'tmpSecretKey': credentials.TmpSecretKey, # 临时SecretKey + 'sessionToken': credentials.Token, # 必须的Token + }, + 'startTime': current_time, + 'expiredTime': current_time + 7200, + 'bucket': settings.COS_BUCKET, + 'region': settings.COS_REGION, + 'upload_dir': f'order/{dingdan_id}/' + } + + + + # 5. 返回成功 + return Response({ + 'code': 0, + 'msg': '成功', + 'data': response_data + }, status=status.HTTP_200_OK) + + except Exception as e: + logger.error(f'COS凭证接口未知错误: {str(e)}', exc_info=True) + return Response({ + 'code': 500, + 'msg': f'服务器内部错误: {str(e)}', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)''' + +# + + +class DashouTijiaoView(APIView): + """打手提交订单完成接口""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + # 1. 获取参数 + data = request.data + dingdan_id = data.get('dingdan_id', '') + liuyan = data.get('liuyan', '') + jiaofu_tupian_urls = data.get('jiaofu_tupian_urls', []) + + # 2. 参数验证 + if not dingdan_id: + return Response({ + 'code': 1, + 'msg': '订单ID不能为空', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + if not isinstance(jiaofu_tupian_urls, list): + return Response({ + 'code': 2, + 'msg': '图片URL列表格式错误', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 限制图片数量（最多9张，最少1张） + if len(jiaofu_tupian_urls) == 0: + return Response({ + 'code': 3, + 'msg': '至少需要上传一张图片', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + if len(jiaofu_tupian_urls) > 9: + return Response({ + 'code': 4, + 'msg': '最多只能上传9张图片', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 留言长度限制（50字） + if liuyan and len(liuyan) > 50: + return Response({ + 'code': 5, + 'msg': '留言最多50个字', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 3. 获取当前用户并验证打手身份 + current_user = request.user + yonghuid = current_user.yonghuid + + try: + dashou_profile = current_user.dashou_profile + except UserDashou.DoesNotExist: + return Response({ + 'code': 6, + 'msg': '用户不是打手身份', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 4. 验证订单状态和权限 + try: + dingdan = Dingdan.objects.get( + dingdan_id=dingdan_id, + jiedan_dashou_id=yonghuid, + zhuangtai=2 # 必须是进行中的订单 + ) + except Dingdan.DoesNotExist: + return Response({ + 'code': 7, + 'msg': '订单不存在或没有提交权限', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 5. 存储图片到Dashoutupian表 + for tupian_url in jiaofu_tupian_urls: + # 创建打手提交图片记录 + Dashoutupian.objects.create( + dingdan_id=dingdan_id, + dashou=yonghuid, + tupian=tupian_url, + create_time=timezone.now() + ) + + # 6. 更新订单主表 + dingdan.dashou_liuyan = liuyan + dingdan.zhuangtai = 8 # 状态改为结算中 + dingdan.update_time = timezone.now() + dingdan.save() + + # 7. 更新打手扩展表状态 + dashou_profile.zhuangtai = 1 # 改为数字1（根据你之前说的） + dashou_profile.save() + + from dengji.services import record_dashou_biaoxian + # ========== 新增：记录打手提交时间 ========== + record_dashou_biaoxian( + dingdan_id=dingdan_id, + dashou_id=yonghuid, + xingwei=2, # 提交 + tijiao_time=timezone.now() + ) + # =========================================== + + # 8. 返回成功响应 + return Response({ + 'code': 0, + 'msg': '订单提交成功', + 'data': { + 'dingdan_id': dingdan_id, + 'new_zhuangtai': 8, # 新的订单状态 + 'dashou_zhuangtai': 1 # 打手新的状态 + } + }, status=status.HTTP_200_OK) + + except Exception as e: + import logging + logger = logging.getLogger(__name__) + logger.error(f"打手提交订单失败: {str(e)}", exc_info=True) + + return Response({ + 'code': 8, + 'msg': '服务器内部错误', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + + + + + + + + + +class DashouDingdanXiangqingView(APIView): + """打手订单详情获取接口""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + # 1. 获取订单ID + dingdan_id = request.data.get('dingdan_id', '') + if not dingdan_id: + return Response({ + 'code': 1, + 'msg': '订单ID不能为空', + 'data': None + }, status=status.HTTP_400_BAD_REQUEST) + + # 2. 获取当前用户并验证权限 + current_user = request.user + yonghuid = current_user.yonghuid + + try: + dashou_profile = current_user.dashou_profile + except UserDashou.DoesNotExist: + return Response({ + 'code': 2, + 'msg': '用户不是打手身份', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 3. 查询订单主表 + try: + dingdan = Dingdan.objects.get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + return Response({ + 'code': 3, + 'msg': '订单不存在', + 'data': None + }, status=status.HTTP_404_NOT_FOUND) + + # 4. 验证订单是否属于当前打手 + if dingdan.jiedan_dashou_id != yonghuid: + return Response({ + 'code': 4, + 'msg': '没有权限查看此订单', + 'data': None + }, status=status.HTTP_403_FORBIDDEN) + + # 5. 构建基础订单数据 + dingdan_data = { + 'dingdan_id': dingdan.dingdan_id, + 'zhuangtai': dingdan.zhuangtai, + 'jine': float(dingdan.dashou_fencheng) if dingdan.dashou_fencheng else 0.0, + 'jieshao': dingdan.jieshao or '', + 'tupian': dingdan.tupian or '', + 'nicheng': dingdan.nicheng or '', + 'beizhu': dingdan.beizhu or '', + 'create_time': dingdan.create_time.strftime('%Y-%m-%d %H:%M:%S') if dingdan.create_time else '', + 'dashou_liuyan': dingdan.dashou_liuyan or '', + 'fuwudashou_id': dingdan.jiedan_dashou_id or '', + 'fadanpingtai': dingdan.fadan_pingtai or '', + 'tuikuan_liyou': dingdan.tkly or '' + } + + # 6. 查询打手提交的图片 + dashou_tupian_list = Dashoutupian.objects.filter( + dingdan_id=dingdan_id, + dashou=yonghuid + ).order_by('create_time') + + jiaofu_tupian_urls = [] + for tupian_record in dashou_tupian_list: + if tupian_record.tupian: + jiaofu_tupian_urls.append(tupian_record.tupian) + + dingdan_data['dashou_jiaofu'] = jiaofu_tupian_urls + + # 7. 查询商家扩展表信息 + shangjia_info = {} + try: + shangjia_kuozhan = dingdan.shangjia_kuozhan + shangjia_info = { + 'shangjia_id': shangjia_kuozhan.shangjia_id or '', + 'shangjia_nicheng': shangjia_kuozhan.sjnicheng or '', + 'shangjia_liuyan': shangjia_kuozhan.shangjia_pingjia or '', + + 'chufa_liyou': shangjia_kuozhan.cfliyou or '', + 'chufa_zhuangtai': shangjia_kuozhan.sqzhuangtai or 0, + #'chufa_jieguo': shangjia_kuozhan.chufa_jieguo or '', + 'bohui_liyou': shangjia_kuozhan.bhliyou or '', + #'tuikuan_liyou': dingdan.tkly or '' + } + except DingdanShangjia.DoesNotExist: + # 没有商家扩展信息，返回空值 + shangjia_info = { + 'shangjia_id': '', + 'shangjia_nicheng': '', + 'shangjia_liuyan': '', + #'tuikuan_liyou': '', + 'chufa_liyou': '', + 'chufa_zhuangtai': 0, + 'chufa_jieguo': '', + 'bohui_liyou': '' + } + + # 8. 查询平台扩展表信息（如果有的话） + pingtai_info = {} + try: + pingtai_kuozhan = dingdan.pingtai_kuozhan + pingtai_info = { + 'laoban_id': pingtai_kuozhan.laoban_id or '', + 'laoban_pingjia': pingtai_kuozhan.laoban_pingjia or '' + } + except DingdanPingtai.DoesNotExist: + pingtai_info = { + 'laoban_id': '', + 'laoban_pingjia': '' + } + + # 9. 合并所有数据 + response_data = { + **dingdan_data, + **shangjia_info, + **pingtai_info + } + + return Response({ + 'code': 0, + 'msg': '成功', + 'data': response_data + }, status=status.HTTP_200_OK) + + except Exception as e: + import logging + logger = logging.getLogger(__name__) + logger.error(f"获取打手订单详情失败: {str(e)}", exc_info=True) + + return Response({ + 'code': 5, + 'msg': '服务器内部错误', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + + + +# dingdan/views.py +from rest_framework.views import APIView +from rest_framework.response import Response +from rest_framework import status +from rest_framework.permissions import IsAuthenticated +from rest_framework.parsers import JSONParser +import logging + + +logger = logging.getLogger(__name__) + + +class AdGetDingdanXiangQing(APIView): + """ + 后台订单详情获取接口 + 权限: JWT Token认证 + 管理员身份验证 + 前端调用: POST /dingdan/adddxq + 参数: {"zhanghao": "管理员手机号", "dingdan_id": "订单ID"} + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + """ + 获取订单详情数据 + 返回: 订单主表数据 + 扩展表数据 + 打手图片列表 + """ + try: + # 1. 获取前端参数 + qianzhanghao = request.data.get('zhanghao', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + + if not qianzhanghao or not dingdan_id: + return Response( + {'code': 400, 'message': '参数不完整', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 2. JWT Token身份验证 (IsAuthenticated已处理) + dangqianyonghu = request.user + + # 3. 验证手机号是否匹配 + if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 4. 验证用户类型是否为管理员 + if dangqianyonghu.user_type != 'admin': + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 5. 验证管理员扩展表是否存在 + try: + guanliyuan = dangqianyonghu.admin_profile + except AttributeError: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 6. 查询订单主表 + try: + from dingdan.models import Dingdan, DingdanPingtai, DingdanShangjia, Dashoutupian + + # 查询订单主表 - 使用select_related预加载关联表 + dingdan_obj = Dingdan.objects.select_related( + 'pingtai_kuozhan', 'shangjia_kuozhan' + ).get(dingdan_id=dingdan_id) + + except Dingdan.DoesNotExist: + return Response( + {'code': 404, 'message': '订单不存在', 'data': None}, + status=status.HTTP_404_NOT_FOUND + ) + + # 7. 构建返回数据 - 主表字段 + response_data = { + # 基础信息字段 + 'dingdan_id': dingdan_obj.dingdan_id or '', + 'jieshao': dingdan_obj.jieshao or '', + 'zhuangtai': dingdan_obj.zhuangtai or 0, + 'leixing': dingdan_obj.leixing_id or 0, # 前端需要 leixing，对应 leixing_id + 'fadanpingtai': dingdan_obj.fadan_pingtai or 0, # 前端需要 fadanpingtai，对应 fadan_pingtai + 'jiage': float(dingdan_obj.jine) if dingdan_obj.jine else 0.00, # 前端需要 jiage，对应 jine + 'tupian_url': dingdan_obj.tupian or '', # 前端需要 tupian_url，对应 tupian + 'beizhu': dingdan_obj.beizhu or '', + + # 服务信息字段 + 'jiedan_dashou_id': dingdan_obj.jiedan_dashou_id or '', + 'dashou_fencheng': float(dingdan_obj.dashou_fencheng) if dingdan_obj.dashou_fencheng else 0.00, + 'zhiding_id': dingdan_obj.zhiding_id or '', + 'dashou_liuyan': dingdan_obj.dashou_liuyan or '', + + # 时间字段 + 'chuangjianshijian': dingdan_obj.create_time.strftime( + '%Y-%m-%d %H:%M:%S') if dingdan_obj.create_time else '', + 'genggaishijian': dingdan_obj.update_time.strftime( + '%Y-%m-%d %H:%M:%S') if dingdan_obj.update_time else '', + } + + # 8. 根据发单平台查询扩展表数据 + fadan_pingtai = dingdan_obj.fadan_pingtai + + if fadan_pingtai == 1: + # 平台发单 - 查询平台订单扩展表 + try: + # 使用反向关联 pingtai_kuozhan + pingtai_kuozhan = dingdan_obj.pingtai_kuozhan + + response_data.update({ + 'laoban_id': pingtai_kuozhan.laoban_id or '', + 'nicheng': dingdan_obj.nicheng or '', # 这个字段在订单主表 + 'laoban_pingjia': pingtai_kuozhan.laoban_pingjia or '', + }) + except DingdanPingtai.DoesNotExist: + # 扩展表不存在，返回空值 + response_data.update({ + 'laoban_id': '', + 'nicheng': dingdan_obj.nicheng or '', + 'laoban_pingjia': '', + }) + + elif fadan_pingtai == 2: + # 商家发单 - 查询商家订单扩展表 + try: + # 使用反向关联 shangjia_kuozhan + shangjia_kuozhan = dingdan_obj.shangjia_kuozhan + + response_data.update({ + 'shangjia_id': shangjia_kuozhan.shangjia_id or '', + 'sjnicheng': shangjia_kuozhan.sjnicheng or '', + 'shangjia_pingjia': shangjia_kuozhan.shangjia_pingjia or '', + 'cfliyou': shangjia_kuozhan.cfliyou or '', # 商家处罚理由 + 'bhliyou': shangjia_kuozhan.bhliyou or '', # 驳回理由 + }) + except DingdanShangjia.DoesNotExist: + # 扩展表不存在，返回空值 + response_data.update({ + 'shangjia_id': '', + 'sjnicheng': '', + 'shangjia_pingjia': '', + 'cfliyou': '', + 'bhliyou': '', + }) + + # 9. 查询打手提交的图片 + try: + # 查询该订单的所有打手提交图片 + dashou_tupian_list = Dashoutupian.objects.filter( + dingdan_id=dingdan_id + ).values_list('tupian', flat=True) + + # 转换为列表，过滤空值 + dashou_images = [img for img in dashou_tupian_list if img] + response_data['dashou_images'] = dashou_images + except Exception as e: + logger.warning(f"查询打手图片失败: {str(e)}") + response_data['dashou_images'] = [] + + # 🔥 新增：查询退款记录表中的商家退款理由 + try: + # 导入退款记录模型 + from dingdan.models import Tuikuanjilu + + # 查询该订单的退款记录（一个订单可能有多次退款申请，我们取最新的） + tuikuan_record = Tuikuanjilu.objects.filter( + dingdan_id=dingdan_id + ).order_by('-create_time').first() # 按创建时间倒序，取最新的 + + if tuikuan_record and tuikuan_record.liyou: + # 如果有退款记录且理由不为空，添加到返回数据 + response_data['tuikuan_liyou'] = tuikuan_record.liyou + else: + # 没有找到退款记录或理由为空 + response_data['tuikuan_liyou'] = '' + except Tuikuanjilu.DoesNotExist: + # 退款记录表不存在该订单的记录 + response_data['tuikuan_liyou'] = '' + except Exception as e: + # 查询过程中出现其他异常 + logger.warning(f"查询退款记录失败: {str(e)}") + response_data['tuikuan_liyou'] = '' + + # 10. 返回成功响应 + return Response({ + 'code': 0, + 'message': '获取成功', + 'data': response_data + }) + + except Exception as e: + logger.error(f"获取订单详情异常: {str(e)}", exc_info=True) + return Response( + {'code': 500, 'message': '服务器内部错误', 'data': None}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR + ) + + + + +# 获取日志器 +logger = logging.getLogger(__name__) + + +class AdGengHuanDaShou(APIView): + """ + 后台更换打手接口 + 权限: JWT Token认证 + 管理员身份验证 + 前端调用: POST /dingdan/adddgh + 参数: { + "zhanghao": "管理员账号", + "dingdan_id": "订单ID", + "new_dashou_id": "新打手ID" + } + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + """ + 更换订单的打手 + 核心逻辑： + 1. 验证管理员身份 + 2. 验证订单存在且状态为进行中(2)或结算中(8) + 3. 验证新打手ID存在且是打手身份 + 4. 验证新打手状态正常（zhuangtai=1且zhanghaozhuangtai=1） + 5. 根据订单的抢单要求类型进行验证： + - 会员抢单(1)：验证打手有对应会员且未过期 + - 押金抢单(2)：验证打手押金≥订单押金 + 6. 更新新打手状态和统计数据 + 7. 更新原打手状态和统计数据 + 8. 更新订单信息 + """ + try: + # 1. 获取前端参数 + qianzhanghao = request.data.get('zhanghao', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + new_dashou_id = request.data.get('new_dashou_id', '').strip() + + if not qianzhanghao or not dingdan_id or not new_dashou_id: + return Response( + {'code': 400, 'message': '参数不完整', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 2. JWT Token身份验证 + dangqianyonghu = request.user + + # 3. 验证手机号是否匹配 + if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 4. 验证用户类型是否为管理员 + if dangqianyonghu.user_type != 'admin': + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 5. 验证管理员扩展表是否存在 + try: + guanliyuan = dangqianyonghu.admin_profile + except AttributeError: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 6. 查询订单主表 + try: + from dingdan.models import Dingdan + dingdan_obj = Dingdan.objects.get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + return Response( + {'code': 404, 'message': '订单不存在', 'data': None}, + status=status.HTTP_404_NOT_FOUND + ) + + # 7. 验证订单状态是否为进行中(2)或结算中(8) + if dingdan_obj.zhuangtai not in [2, 8]: + return Response( + {'code': 400, 'message': '订单状态不允许更换打手', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 8. 验证新打手ID是否存在，并且是打手身份 + try: + new_dashou_user = UserMain.objects.get( + yonghuid=new_dashou_id, + #user_type='dashou' + ) + except UserMain.DoesNotExist: + return Response( + {'code': 404, 'message': '打手不存在或不是打手身份', 'data': None}, + status=status.HTTP_404_NOT_FOUND + ) + + # 9. 获取新打手扩展表 + try: + new_dashou_profile = new_dashou_user.dashou_profile + except AttributeError: + return Response( + {'code': 404, 'message': '打手信息不完整', 'data': None}, + status=status.HTTP_404_NOT_FOUND + ) + + # 10. 验证新打手状态：zhuangtai=1且zhanghaozhuangtai=1 + if new_dashou_profile.zhuangtai != 1 or new_dashou_profile.zhanghaozhuangtai != 1: + return Response( + {'code': 400, 'message': '打手状态不允许接单', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 11. 根据订单的抢单要求类型进行验证 + yaoqiuleixing = dingdan_obj.yaoqiuleixing + + if yaoqiuleixing == 1: # 会员抢单 + # 获取订单的会员ID + huiyuan_id = dingdan_obj.huiyuan_id + if not huiyuan_id: + return Response( + {'code': 400, 'message': '订单会员ID为空', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 查询会员购买记录 + try: + from shangpin.models import Huiyuangoumai + huiyuan_goumai = Huiyuangoumai.objects.get( + huiyuan_id=huiyuan_id, + yonghu_id=new_dashou_id # 注意：yonghu_id存储的是用户ID（yonghuid） + ) + except Huiyuangoumai.DoesNotExist: + return Response( + {'code': 400, 'message': '打手未购买该订单要求的会员', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 检查会员是否过期 + # ✅ 可以调用！因为jiance_shifou_daoqi()是Huiyuangoumai模型的实例方法 + is_expired = huiyuan_goumai.jiance_shifou_daoqi() + if is_expired or huiyuan_goumai.huiyuan_zhuangtai != 1: + return Response( + {'code': 400, 'message': '打手的会员已过期', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + elif yaoqiuleixing == 2: # 押金抢单 + # 获取订单的押金（yongjin字段） + order_yajin = dingdan_obj.yongjin + if order_yajin is None: + return Response( + {'code': 400, 'message': '订单押金为空', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 验证打手押金是否大于等于订单押金 + if new_dashou_profile.yajin < order_yajin: + return Response( + {'code': 400, 'message': '打手押金不足', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + else: + # 未知的抢单要求类型 + return Response( + {'code': 400, 'message': '订单抢单要求类型错误', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 12. 所有验证通过，开始更换打手（使用事务保证一致性） + with transaction.atomic(): + # 12.1 更新新打手扩展表 + new_dashou_profile.zhuangtai = 0 # 接单中 + new_dashou_profile.jiedanzongliang += 1 + new_dashou_profile.jinrijiedan += 1 + new_dashou_profile.jinyuejiedan += 1 + new_dashou_profile.save() + + # 12.2 如果原订单有接单打手，则更新原打手状态 + old_dashou_id = dingdan_obj.jiedan_dashou_id + if old_dashou_id: + try: + # 查询原打手主表 + old_dashou_user = UserMain.objects.get( + yonghuid=old_dashou_id, + #user_type='dashou' + ) + + # 获取原打手扩展表 + old_dashou_profile = old_dashou_user.dashou_profile + + # 更新原打手状态 + old_dashou_profile.zhuangtai = 1 # 空闲 + old_dashou_profile.tuikuanliang += 1 # 退款订单总量+1 + old_dashou_profile.save() + + logger.info(f"成功更新原打手{old_dashou_id}状态") + except UserMain.DoesNotExist: + # 原打手不存在，继续执行不影响更换 + logger.warning(f"原打手{old_dashou_id}不存在，跳过更新") + except AttributeError: + # 原打手扩展表不存在，继续执行不影响更换 + logger.warning(f"原打手{old_dashou_id}扩展信息不存在，跳过更新") + except Exception as e: + # 其他异常，记录日志但继续执行 + logger.error(f"更新原打手状态异常: {str(e)}", exc_info=True) + + # 12.3 更新订单表 + dingdan_obj.jiedan_dashou_id = new_dashou_id + dingdan_obj.zhuangtai = 2 # 进行中状态 + dingdan_obj.save() + + # 13. 返回成功响应 + return Response({ + 'code': 0, + 'message': '更换打手成功', + 'data': None + }) + + except Exception as e: + logger.error(f"更换打手接口异常: {str(e)}", exc_info=True) + return Response( + {'code': 500, 'message': '服务器内部错误', 'data': None}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR + ) + + +import logging + +# 获取日志器 +logger = logging.getLogger(__name__) + + +'''class AdQiangZhiJieDan(APIView): + """ + 后台强制结单接口 + 权限: JWT Token认证 + 管理员身份验证 + 前端调用: POST /dingdan/adddqzjd + 参数: { + "zhanghao": "管理员账号", + "dingdan_id": "订单ID" + } + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + """ + 强制结单接口 + 核心逻辑： + 1. 验证管理员身份 + 2. 验证订单状态为2(进行中)、8(结算中)或4(退款审核中)才能强制结单 + 3. 根据发单平台(1=平台发单, 2=商家发单)分别处理 + 4. 更新订单状态为3(已完成) + 5. 给打手结算分成金额 + 6. 如果是商家发单，还需要更新商家成交订单数量 + """ + try: + # 1. 获取前端参数 + qianzhanghao = request.data.get('zhanghao', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + + if not qianzhanghao or not dingdan_id: + return Response( + {'code': 400, 'message': '参数不完整', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 2. JWT Token身份验证 + dangqianyonghu = request.user + + # 3. 验证手机号是否匹配 + if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 4. 验证用户类型是否为管理员 + if dangqianyonghu.user_type != 'admin': + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 5. 验证管理员扩展表是否存在 + try: + guanliyuan = dangqianyonghu.admin_profile + except AttributeError: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 6. 查询订单主表 + try: + from dingdan.models import Dingdan, DingdanPingtai, DingdanShangjia + dingdan_obj = Dingdan.objects.get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + return Response( + {'code': 404, 'message': '订单不存在', 'data': None}, + status=status.HTTP_404_NOT_FOUND + ) + + # 7. 验证订单状态是否为2、8或4 + if dingdan_obj.zhuangtai not in [2, 8, 4]: + return Response( + {'code': 400, 'message': '订单状态不允许强制结单', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 8. 获取订单的重要字段 + jiedan_dashou_id = dingdan_obj.jiedan_dashou_id # 接单打手ID + dashou_fencheng = dingdan_obj.dashou_fencheng # 打手分成金额 + fadan_pingtai = dingdan_obj.fadan_pingtai # 发单平台 + + # 9. 验证打手分成金额是否存在 + if dashou_fencheng is None: + return Response( + {'code': 400, 'message': '订单缺少打手分成金额', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 10. 使用事务保证数据一致性 + with transaction.atomic(): + # 10.1 更新订单状态为3（已完成） + dingdan_obj.zhuangtai = 3 + dingdan_obj.save() + + # 10.2 处理打手结算 + if jiedan_dashou_id: + try: + # 查询打手用户主表 + dashou_user = UserMain.objects.get( + yonghuid=jiedan_dashou_id, + #user_type='dashou' + ) + + # 获取打手扩展表 + dashou_profile = dashou_user.dashou_profile + + dashou_profile.zhuangtai = 1 + + # 更新打手扩展表数据 + # ✅ 确认字段：chengjiaozongliang 成交单总量 + dashou_profile.chengjiaozongliang += 1 + + # ✅ 确认字段：yue 可提现余额 + dashou_profile.yue += dashou_fencheng + + # ✅ 确认字段：zonge 打单赚取总额 + dashou_profile.zonge += dashou_fencheng + + # ✅ 确认字段：jinrishouyi 今日收益金额 + dashou_profile.jinrishouyi += dashou_fencheng + + # ✅ 确认字段：jinyueshouyi 今月收益金额 + dashou_profile.jinyueshouyi += dashou_fencheng + + dashou_profile.save() + logger.info(f"强制结单成功，打手{jiedan_dashou_id}结算分成：{dashou_fencheng}") + + except UserMain.DoesNotExist: + # 打手用户不存在，记录日志但不影响强制结单 + logger.warning(f"强制结单：打手{jiedan_dashou_id}不存在，跳过打手结算") + except AttributeError: + # 打手扩展表不存在，记录日志但不影响强制结单 + logger.warning(f"强制结单：打手{jiedan_dashou_id}扩展信息不存在，跳过打手结算") + + # 10.3 如果是商家发单，还需要更新商家扩展表 + if fadan_pingtai == 2: + try: + # 获取商家订单扩展表 + shangjia_kuozhan = dingdan_obj.shangjia_kuozhan + shangjia_id = shangjia_kuozhan.shangjia_id + + if shangjia_id: + # 查询商家用户主表 + shangjia_user = UserMain.objects.get( + yonghuid=shangjia_id, + #user_type='shop' + ) + + # 获取商家扩展表 + shangjia_profile = shangjia_user.shop_profile + + # ✅ 确认字段：chengjiao 商家成交订单总量 + shangjia_profile.chengjiao += 1 + shangjia_profile.save() + + logger.info(f"强制结单成功，商家{shangjia_id}成交订单+1") + + except DingdanShangjia.DoesNotExist: + # 商家订单扩展表不存在，跳过商家更新 + logger.warning(f"强制结单：订单{dingdan_id}商家扩展表不存在，跳过商家更新") + except UserMain.DoesNotExist: + # 商家用户不存在，跳过商家更新 + logger.warning(f"强制结单：商家{shangjia_id}不存在，跳过商家更新") + except AttributeError: + # 商家扩展表不存在，跳过商家更新 + logger.warning(f"强制结单：商家{shangjia_id}扩展信息不存在，跳过商家更新") + + # 11. 返回成功响应 + # 12. 更新平台收益流水（仅在平台发单时） + if dingdan_obj.fadan_pingtai == 1: + try: + from dingdan.utils import update_platform_profit # 导入函数 + update_platform_profit(dingdan_id) + except Exception as e: + # 平台收益更新失败不影响主流程，但记录日志 + logger.error(f"强制结单后更新平台收益失败: {str(e)}") + + return Response({ + 'code': 0, + 'message': '强制结单成功', + 'data': None + }) + + except Exception as e: + logger.error(f"强制结单接口异常: {str(e)}", exc_info=True) + return Response( + {'code': 500, 'message': '服务器内部错误', 'data': None}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR + )''' + + + +class AdQiangZhiJieDan(APIView): + """后台强制结单接口（支持跨平台订单）""" + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + try: + # 1. 获取参数 + qianzhanghao = request.data.get('zhanghao', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + + if not qianzhanghao or not dingdan_id: + return Response( + {'code': 400, 'message': '参数不完整', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 2. 身份验证 + dangqianyonghu = request.user + if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + if dangqianyonghu.user_type != 'admin': + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + try: + guanliyuan = dangqianyonghu.admin_profile + except AttributeError: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 3. 查询订单并加锁（修复并发问题） + with transaction.atomic(): + try: + order = Dingdan.objects.select_for_update().get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + return Response( + {'code': 404, 'message': '订单不存在', 'data': None}, + status=status.HTTP_404_NOT_FOUND + ) + + # 4. 验证订单状态 + if order.zhuangtai not in [2, 8, 4]: + return Response( + {'code': 400, 'message': '订单状态不允许强制结单', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 获取订单字段 + jiedan_dashou_id = order.jiedan_dashou_id + dashou_fencheng = order.dashou_fencheng or Decimal('0') + fadan_pingtai = order.fadan_pingtai + dispatch_type = order.dispatch_type + is_cross = order.is_cross + partner_club_id = order.partner_club_id + partner_order_id = order.partner_order_id + jine = order.jine or Decimal('0') + + if dashou_fencheng is None: + return Response( + {'code': 400, 'message': '订单缺少打手分成金额', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # ========== 跨平台判断 ========== + is_cross_claimed_by_partner = (is_cross == 1 and (partner_club_id or partner_order_id)) + + # ========== 根据订单类型处理 ========== + # 情况1：对方派单（我方打手接单）-> 预结算，不直接给打手加钱 + if dispatch_type == 2: + # 创建预结算记录 + PreSettlement.objects.update_or_create( + dingdan_id=dingdan_id, + defaults={ + 'partner_order_id': partner_order_id, + 'partner_club_id': partner_club_id or '000001', + 'dashou_id': jiedan_dashou_id, + 'amount': dashou_fencheng, + 'order_amount': jine, + 'status': 0, + 'operator': qianzhanghao, + } + ) + order.zhuangtai = 3 + order.save() + + # 更新统计表 + update_daily_dispatch_stat( + direction=2, + partner_club_id=partner_club_id or '000001', + success_amount=jine, + success_count=1 + ) + + # 情况2：我方派单且被对方打手接单 -> 只改状态，不给本地打手加钱 + elif dispatch_type == 1 and is_cross_claimed_by_partner: + order.zhuangtai = 3 + order.save() + + update_daily_dispatch_stat( + direction=1, + partner_club_id=partner_club_id or '000001', + success_amount=dashou_fencheng, + success_count=1 + ) + + # 情况3：本地订单或跨平台但自家打手接单 -> 正常结算给打手 + else: + # 处理打手结算 + if jiedan_dashou_id: + try: + dashou_user = UserMain.objects.get(yonghuid=jiedan_dashou_id) + dashou_profile = dashou_user.dashou_profile + + # 原子更新打手数据 + dashou_profile.zhuangtai = 1 + dashou_profile.chengjiaozongliang = F('chengjiaozongliang') + 1 + dashou_profile.yue = F('yue') + dashou_fencheng + dashou_profile.zonge = F('zonge') + dashou_fencheng + dashou_profile.jinrishouyi = F('jinrishouyi') + dashou_fencheng + dashou_profile.jinyueshouyi = F('jinyueshouyi') + dashou_fencheng + dashou_profile.save(update_fields=[ + 'zhuangtai', 'chengjiaozongliang', 'yue', 'zonge', + 'jinrishouyi', 'jinyueshouyi' + ]) + logger.info(f"强制结单成功，打手{jiedan_dashou_id}结算分成：{dashou_fencheng}") + except (UserMain.DoesNotExist, AttributeError): + logger.warning(f"强制结单：打手{jiedan_dashou_id}不存在，跳过打手结算") + + # 处理商家订单 + if fadan_pingtai == 2: + try: + shangjia_kuozhan = order.shangjia_kuozhan + shangjia_id = shangjia_kuozhan.shangjia_id + if shangjia_id: + shangjia_user = UserMain.objects.get(yonghuid=shangjia_id) + shangjia_profile = shangjia_user.shop_profile + shangjia_profile.chengjiao = F('chengjiao') + 1 + shangjia_profile.save(update_fields=['chengjiao']) + logger.info(f"强制结单成功，商家{shangjia_id}成交订单+1") + except Exception as e: + logger.warning(f"强制结单：商家更新失败 - {str(e)}") + + order.zhuangtai = 3 + order.save() + + if fadan_pingtai == 2 and order.zhuangtai == 3: + from dingdan.utils import settle_shangjia_order_guanshi_fenhong + settle_shangjia_order_guanshi_fenhong(order, jiedan_dashou_id) + + # 返回成功 + return Response({ + 'code': 0, + 'message': '强制结单成功', + 'data': None + }) + + except Exception as e: + logger.error(f"强制结单接口异常: {str(e)}", exc_info=True) + return Response( + {'code': 500, 'message': '服务器内部错误', 'data': None}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR + ) + + + +class AdJuJueTuiKuan(APIView): + """ + 后台拒绝退款接口 + 权限: JWT Token认证 + 管理员身份验证 + 前端调用: POST /dingdan/adddjj + 参数: { + "zhanghao": "管理员账号", + "dingdan_id": "订单ID", + "jujue_liyou": "拒绝退款理由（可选）" + } + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + """ + 拒绝退款接口 + 核心逻辑： + 1. 验证管理员身份 + 2. 拒绝退款后订单状态改为6（退款失败） + 3. 给打手结算分成金额 + 4. 如果是商家发单，更新商家成交订单数量 + 5. 更新退款记录表，状态改为2（驳回） + """ + try: + # 1. 获取前端参数 + qianzhanghao = request.data.get('zhanghao', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + jujue_liyou = request.data.get('jujue_liyou', '').strip() + + if not qianzhanghao or not dingdan_id: + return Response( + {'code': 400, 'message': '参数不完整', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 2. JWT Token身份验证 + dangqianyonghu = request.user + + # 3. 验证手机号是否匹配 + if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 4. 验证用户类型是否为管理员 + if dangqianyonghu.user_type != 'admin': + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 5. 验证管理员扩展表是否存在 + try: + guanliyuan = dangqianyonghu.admin_profile + except AttributeError: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 6. 查询订单主表 + try: + from dingdan.models import Dingdan, DingdanShangjia, Tuikuanjilu + dingdan_obj = Dingdan.objects.get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + return Response( + {'code': 404, 'message': '订单不存在', 'data': None}, + status=status.HTTP_404_NOT_FOUND + ) + + # 7. 获取订单的重要字段 + jiedan_dashou_id = dingdan_obj.jiedan_dashou_id # 接单打手ID + dashou_fencheng = dingdan_obj.dashou_fencheng # 打手分成金额 + fadan_pingtai = dingdan_obj.fadan_pingtai # 发单平台 + + # 8. 验证打手分成金额是否存在 + if dashou_fencheng is None: + return Response( + {'code': 400, 'message': '订单缺少打手分成金额', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 9. 使用事务保证数据一致性 + with transaction.atomic(): + # 9.1 更新订单状态为6（退款失败） + dingdan_obj.zhuangtai = 6 + dingdan_obj.save() + + # 9.2 处理打手结算 + if jiedan_dashou_id: + try: + # 查询打手用户主表 + dashou_user = UserMain.objects.get( + yonghuid=jiedan_dashou_id, + #user_type='dashou' + ) + + # 获取打手扩展表 + dashou_profile = dashou_user.dashou_profile + + # 更新打手扩展表数据 + # ✅ 确认字段：chengjiaozongliang 成交单总量 + dashou_profile.chengjiaozongliang += 1 + + # ✅ 确认字段：yue 可提现余额 + dashou_profile.yue += dashou_fencheng + + # ✅ 确认字段：zonge 打单赚取总额 + dashou_profile.zonge += dashou_fencheng + + # ✅ 确认字段：jinrishouyi 今日收益金额 + dashou_profile.jinrishouyi += dashou_fencheng + + # ✅ 确认字段：jinyueshouyi 今月收益金额 + dashou_profile.jinyueshouyi += dashou_fencheng + + dashou_profile.save() + logger.info(f"拒绝退款成功，打手{jiedan_dashou_id}结算分成：{dashou_fencheng}") + + except UserMain.DoesNotExist: + # 打手用户不存在，记录日志但不影响操作 + logger.warning(f"拒绝退款：打手{jiedan_dashou_id}不存在，跳过打手结算") + except AttributeError: + # 打手扩展表不存在，记录日志但不影响操作 + logger.warning(f"拒绝退款：打手{jiedan_dashou_id}扩展信息不存在，跳过打手结算") + + # 9.3 如果是商家发单，还需要更新商家扩展表 + if fadan_pingtai == 2: + try: + # 获取商家订单扩展表 + shangjia_kuozhan = dingdan_obj.shangjia_kuozhan + shangjia_id = shangjia_kuozhan.shangjia_id + + if shangjia_id: + # 查询商家用户主表 + shangjia_user = UserMain.objects.get( + yonghuid=shangjia_id, + #user_type='shop' + ) + + # 获取商家扩展表 + shangjia_profile = shangjia_user.shop_profile + + # ✅ 确认字段：chengjiao 商家成交订单总量 + shangjia_profile.chengjiao += 1 + shangjia_profile.save() + + logger.info(f"拒绝退款成功，商家{shangjia_id}成交订单+1") + + except DingdanShangjia.DoesNotExist: + # 商家订单扩展表不存在，跳过商家更新 + logger.warning(f"拒绝退款：订单{dingdan_id}商家扩展表不存在，跳过商家更新") + except UserMain.DoesNotExist: + # 商家用户不存在，跳过商家更新 + logger.warning(f"拒绝退款：商家{shangjia_id}不存在，跳过商家更新") + except AttributeError: + # 商家扩展表不存在，跳过商家更新 + logger.warning(f"拒绝退款：商家{shangjia_id}扩展信息不存在，跳过商家更新") + + # 9.4 更新退款记录表 + try: + # 查询退款记录表 + tuikuan_jilu = Tuikuanjilu.objects.get(dingdan_id=dingdan_id) + + # ✅ 确认字段：sqzhuangtai 申请状态，改为2（驳回） + tuikuan_jilu.sqzhuangtai = 2 + + # ✅ 确认字段：bhliyou 驳回理由 + tuikuan_jilu.bhliyou = jujue_liyou + + # ✅ 确认字段：chuliid 处理人ID（使用管理员账号，即手机号） + tuikuan_jilu.chuliid = qianzhanghao + + tuikuan_jilu.save() + logger.info(f"拒绝退款成功，更新退款记录表，订单：{dingdan_id}") + + except Tuikuanjilu.DoesNotExist: + # 退款记录表不存在，记录日志但不影响主流程 + logger.warning(f"拒绝退款：订单{dingdan_id}退款记录不存在，跳过更新") + + # 10. 返回成功响应 + return Response({ + 'code': 0, + 'message': '拒绝退款成功', + 'data': None + }) + + except Exception as e: + logger.error(f"拒绝退款接口异常: {str(e)}", exc_info=True) + return Response( + {'code': 500, 'message': '服务器内部错误', 'data': None}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR + ) + + +class AdTongYiTuiKuanShangJia(APIView): + """ + 后台同意退款接口（商家发单） + 权限: JWT Token认证 + 管理员身份验证 + 密码验证 + 前端调用: POST /dingdan/adddsjtk + 参数: { + "zhanghao": "管理员账号", + "dingdan_id": "订单ID", + "tuikuan_liyou": "退款理由（可选）", + "pay_password": "支付密码（openid）" + } + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + """ + 同意退款接口（商家发单） + 核心逻辑： + 1. 验证管理员身份 + 2. 验证支付密码（openid） + 3. 检查订单状态为4（退款审核中） + 4. 更新订单状态为5（已退款） + 5. 更新打手退款订单数量 + 6. 更新商家退款订单数量和余额（加上订单金额） + 7. 更新退款记录表，状态改为1（成功） + """ + try: + # 1. 获取前端参数 + qianzhanghao = request.data.get('zhanghao', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + tuikuan_liyou = request.data.get('tuikuan_liyou', '').strip() + pay_password = request.data.get('pay_password', '').strip() + + if not qianzhanghao or not dingdan_id or not pay_password: + return Response( + {'code': 400, 'message': '参数不完整', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 2. JWT Token身份验证 + dangqianyonghu = request.user + + # 3. 验证手机号是否匹配 + if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 4. 验证用户类型是否为管理员 + if dangqianyonghu.user_type != 'admin': + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 5. 验证管理员扩展表是否存在 + try: + guanliyuan = dangqianyonghu.admin_profile + except AttributeError: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 6. 验证支付密码（对比openid） + if pay_password != dangqianyonghu.openid: + return Response( + {'code': 401, 'message': '支付密码错误', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 7. 查询订单主表 + try: + from dingdan.models import Dingdan, DingdanShangjia, Tuikuanjilu + dingdan_obj = Dingdan.objects.get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + return Response( + {'code': 404, 'message': '订单不存在', 'data': None}, + status=status.HTTP_404_NOT_FOUND + ) + + # 8. 验证订单状态为4（退款审核中） + + # 8. 验证订单状态是否为允许退款的状态 + allowed_statuses = [4, 8, 1, 2, 7] # 允许退款的状态：退款审核中、已下单、结算中、进行中、指定中 + if dingdan_obj.zhuangtai not in allowed_statuses: + return Response( + { + 'code': 400, + 'message': f'订单当前状态不允许退款。允许退款的状态为：退款审核中(4)、已下单(8)、结算中(1)、进行中(2)、指定中(7)', + 'data': None + }, + status=status.HTTP_400_BAD_REQUEST + ) + '''if dingdan_obj.zhuangtai != 4: + return Response( + {'code': 400, 'message': '订单状态不是退款审核中', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + )''' + + # 9. 验证订单为商家发单 + if dingdan_obj.fadan_pingtai != 2: + return Response( + {'code': 400, 'message': '此接口只处理商家发单的退款', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 10. 获取订单的重要字段 + jiedan_dashou_id = dingdan_obj.jiedan_dashou_id # 接单打手ID + jine = dingdan_obj.jine # 订单金额（不是打手分成） + + # 11. 验证订单金额是否存在 + if jine is None: + return Response( + {'code': 400, 'message': '订单缺少订单金额', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 12. 获取商家ID + try: + shangjia_kuozhan = dingdan_obj.shangjia_kuozhan + shangjia_id = shangjia_kuozhan.shangjia_id + except DingdanShangjia.DoesNotExist: + return Response( + {'code': 400, 'message': '订单商家信息不存在', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 13. 使用事务保证数据一致性 + with transaction.atomic(): + # 13.1 更新订单状态为5（已退款） + dingdan_obj.zhuangtai = 5 + dingdan_obj.save() + + # 13.2 更新打手扩展表（退款订单总量+1） + if jiedan_dashou_id: + try: + # 查询打手用户主表 + dashou_user = UserMain.objects.get( + yonghuid=jiedan_dashou_id, + #user_type='dashou' + ) + + # 获取打手扩展表 + dashou_profile = dashou_user.dashou_profile + + # ✅ 确认字段：tuikuanliang 退款订单总量 + dashou_profile.tuikuanliang += 1 + dashou_profile.zhuangtai = 1 + + dashou_profile.save() + logger.info(f"同意退款成功，打手{jiedan_dashou_id}退款订单+1") + + except UserMain.DoesNotExist: + # 打手用户不存在，记录日志但不影响操作 + logger.warning(f"同意退款：打手{jiedan_dashou_id}不存在，跳过打手更新") + except AttributeError: + # 打手扩展表不存在，记录日志但不影响操作 + logger.warning(f"同意退款：打手{jiedan_dashou_id}扩展信息不存在，跳过打手更新") + + # 13.3 更新商家扩展表 + if shangjia_id: + try: + # 查询商家用户主表 + shangjia_user = UserMain.objects.get( + yonghuid=shangjia_id, + #user_type='shop' + ) + + # 获取商家扩展表 + shangjia_profile = shangjia_user.shop_profile + + # ✅ 确认字段：tuikuan 退款订单总量 + shangjia_profile.tuikuan += 1 + + # ✅ 确认字段：yue 商家余额（加上订单金额） + shangjia_profile.yue += jine + + shangjia_profile.save() + logger.info(f"同意退款成功，商家{shangjia_id}退款订单+1，余额增加：{jine}") + + except UserMain.DoesNotExist: + # 商家用户不存在，记录日志但不影响操作 + logger.warning(f"同意退款：商家{shangjia_id}不存在，跳过商家更新") + except AttributeError: + # 商家扩展表不存在，记录日志但不影响操作 + logger.warning(f"同意退款：商家{shangjia_id}扩展信息不存在，跳过商家更新") + + # 13.4 更新退款记录表 + try: + # 查询退款记录表 + tuikuan_jilu = Tuikuanjilu.objects.get(dingdan_id=dingdan_id) + + # ✅ 确认字段：sqzhuangtai 申请状态，改为1（成功） + tuikuan_jilu.sqzhuangtai = 1 + + # 可以添加同意理由字段，如：tongyi_liyou + # tuikuan_jilu.tongyi_liyou = tuikuan_liyou + + # ✅ 确认字段：chuliid 处理人ID（使用管理员账号，即手机号） + tuikuan_jilu.chuliid = qianzhanghao + + tuikuan_jilu.save() + logger.info(f"同意退款成功，更新退款记录表，订单：{dingdan_id}") + + except Tuikuanjilu.DoesNotExist: + # 退款记录表不存在，记录日志但不影响主流程 + logger.warning(f"同意退款：订单{dingdan_id}退款记录不存在，跳过更新") + + # 14. 返回成功响应 + return Response({ + 'code': 0, + 'message': '同意退款成功', + 'data': None + }) + + except Exception as e: + logger.error(f"同意退款接口异常: {str(e)}", exc_info=True) + return Response( + {'code': 500, 'message': '服务器内部错误', 'data': None}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR + ) + + +# dingdan/views.py +import logging +import time +import random +import hashlib +import requests +import xml.etree.ElementTree as ET +from decimal import Decimal +from django.db import transaction +from django.conf import settings +from rest_framework.views import APIView +from rest_framework.response import Response +from rest_framework import status +from rest_framework.permissions import IsAuthenticated +from rest_framework.parsers import JSONParser + +from yonghu.models import UserMain, UserDashou, UserBoss +from dingdan.models import Dingdan, DingdanPingtai, Tuikuanjilu +from peizhi.models import Szjilu + +logger = logging.getLogger(__name__) + + +class AdTongYiTuiKuanPingTai(APIView): + """ + 后台同意退款接口（平台发单） + 权限: JWT Token认证 + 管理员身份验证 + 密码验证 + 前端调用: POST /dingdan/adddpttk + 参数: { + "zhanghao": "管理员账号", + "dingdan_id": "订单ID", + "tuikuan_liyou": "退款理由（可选）", + "pay_password": "支付密码（openid）" + } + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + try: + # 1. 获取前端参数 + qianzhanghao = request.data.get('zhanghao', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + tuikuan_liyou = request.data.get('tuikuan_liyou', '').strip() + pay_password = request.data.get('pay_password', '').strip() + + if not qianzhanghao or not dingdan_id or not pay_password: + return Response( + {'code': 400, 'message': '参数不完整', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 2. JWT Token身份验证 + dangqianyonghu = request.user + + # 3. 验证手机号是否匹配 + if str(getattr(dangqianyonghu, 'phone', '')) != qianzhanghao: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 4. 验证用户类型是否为管理员 + if dangqianyonghu.user_type != 'admin': + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 5. 验证管理员扩展表是否存在 + try: + guanliyuan = dangqianyonghu.admin_profile + except AttributeError: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 6. 验证支付密码（对比openid） + if pay_password != dangqianyonghu.openid: + return Response( + {'code': 401, 'message': '支付密码错误', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 7. 查询订单主表（加锁） + with transaction.atomic(): + try: + dingdan_obj = Dingdan.objects.select_related('pingtai_kuozhan').select_for_update().get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + return Response( + {'code': 404, 'message': '订单不存在', 'data': None}, + status=status.HTTP_404_NOT_FOUND + ) + + # 8. 验证订单状态为1、7、2、8、4（允许退款的状态） + if dingdan_obj.zhuangtai not in [1, 7, 2, 8, 4]: + return Response( + {'code': 400, 'message': '订单状态不允许退款', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 9. 验证订单为平台发单 + if dingdan_obj.fadan_pingtai != 1: + return Response( + {'code': 400, 'message': '此接口只处理平台发单的退款', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 10. 获取订单的重要字段 + jiedan_dashou_id = dingdan_obj.jiedan_dashou_id + jine = dingdan_obj.jine + if jine is None: + return Response( + {'code': 400, 'message': '订单缺少订单金额', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 11. 获取老板ID（从平台订单扩展表） + if not hasattr(dingdan_obj, 'pingtai_kuozhan') or not dingdan_obj.pingtai_kuozhan: + return Response( + {'code': 400, 'message': '订单老板信息不存在', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + laoban_id = dingdan_obj.pingtai_kuozhan.laoban_id + + # 12. 调用微信退款接口（优先使用 wechat_transaction_id） + transaction_id = getattr(dingdan_obj, 'wechat_transaction_id', None) + weixin_refund_result = self.call_weixin_refund( + out_trade_no=dingdan_id, + jine=jine, + transaction_id=transaction_id + ) + + if not weixin_refund_result.get('success'): + logger.error(f"微信退款失败，订单：{dingdan_id}，错误：{weixin_refund_result.get('msg')}") + return Response( + {'code': 400, 'message': weixin_refund_result.get('msg', '退款失败')}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 13. 更新订单状态为5（已退款） + dingdan_obj.zhuangtai = 5 + dingdan_obj.save() + + # 14. 更新打手扩展表 + if jiedan_dashou_id: + try: + dashou_user = UserMain.objects.get(yonghuid=jiedan_dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.zhuangtai = 1 # 打手状态设为空闲 + dashou_profile.tuikuanliang += 1 + dashou_profile.save() + except (UserMain.DoesNotExist, AttributeError): + logger.warning(f"平台退款：打手{jiedan_dashou_id}不存在或扩展信息缺失，跳过") + + # 15. 更新老板扩展表 + if laoban_id: + try: + laoban_user = UserMain.objects.get(yonghuid=laoban_id) + laoban_profile = laoban_user.boss_profile + laoban_profile.alltui += 1 + laoban_profile.zonge -= jine + if laoban_profile.zonge < 0: + laoban_profile.zonge = 0 + laoban_profile.save() + except (UserMain.DoesNotExist, AttributeError): + logger.warning(f"平台退款：老板{laoban_id}不存在或扩展信息缺失，跳过") + + # 16. 更新收支记录表（id=1） + # 12.更新退款统计 + + + + try: + + from dingdan.utils import update_daily_payout + update_daily_payout(jine) + + + szjilu_obj = Szjilu.objects.get(id=1) + szjilu_obj.zongsy -= jine + szjilu_obj.zongzc += jine + szjilu_obj.jrzc += jine + szjilu_obj.save() + except Szjilu.DoesNotExist: + logger.error(f"平台退款：收支记录表(id=1)不存在，跳过") + except Exception as e: + logger.error(f"更新收支记录表异常: {str(e)}") + + # 17. 更新退款记录表 + try: + tuikuan_jilu, created = Tuikuanjilu.objects.get_or_create( + dingdan_id=dingdan_id, + defaults={ + 'dashouid': jiedan_dashou_id if jiedan_dashou_id else '', + 'qingqiuid': laoban_id if laoban_id else '', + 'chuliid': qianzhanghao, + 'liyou': tuikuan_liyou if tuikuan_liyou else '给老板退款', + 'sqzhuangtai': 1, + 'jine': jine, + 'dashou_fencheng': dingdan_obj.dashou_fencheng or 0, + 'jieshao': dingdan_obj.jieshao or '', + 'beizhu': '给老板退款', + 'nicheng': dingdan_obj.nicheng or '', + } + ) + if not created: + tuikuan_jilu.sqzhuangtai = 1 + if tuikuan_liyou: + tuikuan_jilu.liyou = tuikuan_liyou + tuikuan_jilu.chuliid = qianzhanghao + tuikuan_jilu.save() + except Exception as e: + logger.error(f"更新退款记录表异常: {str(e)}") + + logger.info(f"平台退款成功，订单：{dingdan_id}，退款单号：{weixin_refund_result.get('refund_id')}") + + return Response({'code': 0, 'message': '退款处理成功', 'data': None}) + + except Exception as e: + logger.error(f"平台退款接口异常: {str(e)}", exc_info=True) + return Response( + {'code': 500, 'message': '服务器内部错误', 'data': None}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR + ) + + def call_weixin_refund(self, out_trade_no, jine, transaction_id=None): + """ + 调用微信退款接口 + :param out_trade_no: 商户订单号 + :param jine: 退款金额 + :param transaction_id: 微信支付订单号（优先使用） + :return: {'success': True/False, 'msg': '消息', 'refund_id': '退款单号'} + """ + try: + # 检查配置 + required_settings = ['WEIXIN_APPID', 'WEIXIN_MCHID', 'WEIXIN_SHANGHUMIYAO', 'WEIXIN_CERT_PATH', 'WEIXIN_KEY_PATH'] + for setting in required_settings: + if not hasattr(settings, setting) or not getattr(settings, setting): + return {'success': False, 'msg': f'缺少微信支付配置: {setting}'} + + # 生成退款单号 + refund_id = f"TK{int(time.time())}{random.randint(1000, 9999)}" + total_fee_in_fen = int(float(jine) * 100) + + # 构造请求参数 + refund_data = { + 'appid': settings.WEIXIN_APPID, + 'mch_id': settings.WEIXIN_MCHID, + 'nonce_str': hashlib.md5(str(time.time()).encode()).hexdigest(), + 'out_refund_no': refund_id, + 'total_fee': total_fee_in_fen, + 'refund_fee': total_fee_in_fen, + 'op_user_id': settings.WEIXIN_MCHID, + 'refund_account': 'REFUND_SOURCE_UNSETTLED_FUNDS' + } + # 优先使用 transaction_id，否则用 out_trade_no + if transaction_id: + refund_data['transaction_id'] = transaction_id + else: + refund_data['out_trade_no'] = out_trade_no + + # 生成签名 + sorted_params = sorted(refund_data.items()) + sign_string = '&'.join([f"{k}={v}" for k, v in sorted_params if v]) + sign_string += f"&key={settings.WEIXIN_SHANGHUMIYAO}" + sign = hashlib.md5(sign_string.encode()).hexdigest().upper() + refund_data['sign'] = sign + + xml_data = self.dict_to_xml(refund_data) + url = "https://api.mch.weixin.qq.com/secapi/pay/refund" + response = requests.post( + url, + data=xml_data.encode('utf-8'), + headers={'Content-Type': 'application/xml'}, + cert=(settings.WEIXIN_CERT_PATH, settings.WEIXIN_KEY_PATH), + timeout=30 + ) + + if response.status_code == 200: + result = self.xml_to_dict(response.content) + if result.get('return_code') == 'SUCCESS' and result.get('result_code') == 'SUCCESS': + logger.info(f"微信退款成功，订单：{out_trade_no}，退款单号：{refund_id}") + return {'success': True, 'msg': '退款申请提交成功', 'refund_id': refund_id} + else: + error_msg = result.get('err_code_des', result.get('return_msg', '退款申请失败')) + logger.error(f"微信退款失败，订单：{out_trade_no}，错误：{error_msg}") + return {'success': False, 'msg': f'微信退款失败: {error_msg}'} + else: + logger.error(f"微信退款接口调用失败，状态码：{response.status_code}") + return {'success': False, 'msg': '微信退款接口调用失败'} + + except requests.exceptions.Timeout: + logger.error(f"微信退款接口请求超时，订单：{out_trade_no}") + return {'success': False, 'msg': '微信退款接口请求超时'} + except Exception as e: + logger.error(f"调用微信退款接口异常: {str(e)}") + return {'success': False, 'msg': f'退款处理异常: {str(e)}'} + + def dict_to_xml(self, dict_data): + xml = [""] + for k, v in dict_data.items(): + xml.append(f"<{k}>{v}") + xml.append("") + return "".join(xml) + + def xml_to_dict(self, xml_data): + try: + root = ET.fromstring(xml_data) + return {child.tag: child.text for child in root} + except ET.ParseError as e: + logger.error(f"XML解析失败: {str(e)}") + return {'return_code': 'FAIL', 'return_msg': 'XML解析失败'} + + + + + + + + + + + + + + + +logger = logging.getLogger(__name__) + + +class DashouHuoquLeixingView(APIView): + """ + 打手获取商品类型接口 - 抢单页面使用 + 接口地址：POST /dingdan/dsqdhqddlx + 功能：返回所有正常的商品类型，已按排序权重排序 + + 返回格式（与前端原数据格式完全一致）: + { + "code": 200, + "msg": "成功", + "data": { + "list": [ + { + "id": 1, + "jieshao": "王者荣耀", + "tupian_url": "leixing/wzry.jpg", + "yaoqiuleixing": null, + "huiyuan_id": null, + "yongjin": null, + "paixu": 100, + "shenhezhuangtai": 1 + }, + // ... 更多类型 + ] + } + } + """ + + # 🔴 使用JWT Token认证 + permission_classes = [IsAuthenticated] + + def post(self, request): + """ + 处理POST请求，返回商品类型列表 + + 请求参数：无特殊参数，只验证用户身份 + + 安全验证： + 1. JWT Token验证用户身份 + 2. 只返回 shenhezhuangtai=1（正常状态）的类型 + 3. 数据已排序：paixu降序 → id升序 + """ + try: + logger.info(f"打手获取商品类型请求 - 用户ID: {request.user.yonghuid}") + + # 🔴 导入商品类型模型 + from shangpin.models import ShangpinLeixing + + # 🔴 查询所有正常状态的商品类型 + # 条件：shenhezhuangtai=1（正常状态） + # 排序：先按 paixu 降序（数值大的在前），再按 id 升序 + leixing_queryset = ShangpinLeixing.objects.filter( + shenhezhuangtai=1 # 🔴 只取正常状态，排除审核专用 + ).order_by('-paixu', 'id') + + # 🔴 构建返回数据列表 + leixing_list = [] + for leixing in leixing_queryset: + leixing_list.append({ + "id": leixing.id, + "jieshao": leixing.jieshao or "", + "tupian_url": leixing.tupian_url or "", + "yaoqiuleixing": leixing.yaoqiuleixing, + "huiyuan_id": leixing.huiyuan_id, + "yongjin": float(leixing.yongjin) if leixing.yongjin else None, + "paixu": leixing.paixu or 0, + "shenhezhuangtai": leixing.shenhezhuangtai or 1 + }) + + # 🔴 记录日志 + logger.info(f"返回商品类型数据：{len(leixing_list)}条，用户: {request.user.yonghuid}") + + # 🔴 返回成功响应 + # 注意：保持与前端原数据格式完全一致 + return Response({ + "code": 200, + "msg": "成功", + "data": { + "list": leixing_list # 🔴 保持原字段名 "list" + } + }, status=status.HTTP_200_OK) + + except Exception as e: + # 🔴 异常处理 + logger.error(f"打手获取商品类型失败 - 用户ID: {request.user.yonghuid}, 错误: {str(e)}", exc_info=True) + + return Response({ + "code": 500, + "msg": f"服务器内部错误: {str(e)}", + "data": None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + + + + + + + + + + +logger = logging.getLogger(__name__) + + +class AdJuJueJieSuan(APIView): + """ + 后台拒绝结算接口（平台发单） + 权限: JWT Token认证 + 管理员身份验证 + 前端调用: POST /dingdan/adddjjjs + 参数: { + "zhanghao": "管理员账号(手机号)", + "dingdan_id": "订单ID", + "tkly": "拒绝结算理由（必填）" + } + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + try: + # 1. 获取参数 + qianzhanghao = request.data.get('zhanghao', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + tkly = request.data.get('tkly', '').strip() + + if not all([qianzhanghao, dingdan_id, tkly]): + return Response( + {'code': 400, 'message': '参数不完整（需要zhanghao, dingdan_id, tkly）', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + # 2. JWT用户验证 + dangqianyonghu = request.user + + # 3. 验证手机号匹配（管理员账号通常为手机号） + if str(dangqianyonghu.phone) != qianzhanghao: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 4. 验证用户类型为管理员 + if dangqianyonghu.user_type != 'admin': + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + # 5. 查询订单 + try: + dingdan = Dingdan.objects.get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + return Response( + {'code': 404, 'message': '订单不存在', 'data': None}, + status=status.HTTP_404_NOT_FOUND + ) + + # 6. 校验订单条件：平台发单（1）且状态为2或8 + if dingdan.fadan_pingtai != 1 or dingdan.zhuangtai not in [2, 8]: + return Response( + {'code': 400, 'message': '仅平台发单且状态为进行中(2)或结算中(8)的订单可拒绝结算', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + jiedan_dashou_id = dingdan.jiedan_dashou_id + if not jiedan_dashou_id: + return Response( + {'code': 400, 'message': '订单暂无接单打手', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + with transaction.atomic(): + # 7. 更新订单状态为5（已退款），并保存拒绝理由 + dingdan.zhuangtai = 5 + dingdan.tkly = tkly + dingdan.save() + + # 8. 更新打手扩展表 + try: + dashou_user = UserMain.objects.get(yonghuid=jiedan_dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.zhuangtai = 1 # 打手状态设为正常 + dashou_profile.tuikuanliang += 1 # 退款订单总量+1 + dashou_profile.save() + except (UserMain.DoesNotExist, AttributeError) as e: + logger.warning(f"拒绝结算：打手{jiedan_dashou_id}信息更新失败 - {str(e)}") + + return Response({'code': 0, 'message': '拒绝结算成功', 'data': None}) + + except Exception as e: + logger.error(f"拒绝结算接口异常: {str(e)}", exc_info=True) + return Response( + {'code': 500, 'message': '服务器内部错误', 'data': None}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR + ) + + +class AdZhuanYiDaTing(APIView): + """ + 后台转移大厅接口 + 权限: JWT Token认证 + 管理员身份验证 + 前端调用: POST /dingdan/adddzydt + 参数: { + "zhanghao": "管理员账号(手机号)", + "dingdan_id": "订单ID" + } + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + try: + qianzhanghao = request.data.get('zhanghao', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + + if not all([qianzhanghao, dingdan_id]): + return Response( + {'code': 400, 'message': '参数不完整（需要zhanghao, dingdan_id）', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + dangqianyonghu = request.user + + if str(dangqianyonghu.phone) != qianzhanghao: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + if dangqianyonghu.user_type != 'admin': + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + try: + dingdan = Dingdan.objects.get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + return Response( + {'code': 404, 'message': '订单不存在', 'data': None}, + status=status.HTTP_404_NOT_FOUND + ) + + # 校验订单状态：允许2、8、4 + if dingdan.zhuangtai not in [2, 8, 4]: + return Response( + {'code': 400, 'message': '仅状态为进行中(2)、结算中(8)或退款审核(4)的订单可转移大厅', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + jiedan_dashou_id = dingdan.jiedan_dashou_id + + with transaction.atomic(): + # 更新订单：状态改为1（下单中），清空接单打手ID + dingdan.zhuangtai = 1 + dingdan.jiedan_dashou_id = None + dingdan.save() + + # 如果有接单打手，更新其扩展表 + if jiedan_dashou_id: + try: + dashou_user = UserMain.objects.get(yonghuid=jiedan_dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.zhuangtai = 1 + dashou_profile.tuikuanliang += 1 + dashou_profile.save() + except (UserMain.DoesNotExist, AttributeError) as e: + logger.warning(f"转移大厅：打手{jiedan_dashou_id}信息更新失败 - {str(e)}") + + return Response({'code': 0, 'message': '转移大厅成功', 'data': None}) + + except Exception as e: + logger.error(f"转移大厅接口异常: {str(e)}", exc_info=True) + return Response( + {'code': 500, 'message': '服务器内部错误', 'data': None}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR + ) + + +class AdQuXiaoZhiDing(APIView): + """ + 后台取消指定接口 + 权限: JWT Token认证 + 管理员身份验证 + 前端调用: POST /dingdan/adddqxzd + 参数: { + "zhanghao": "管理员账号(手机号)", + "dingdan_id": "订单ID" + } + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + try: + qianzhanghao = request.data.get('zhanghao', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + + if not all([qianzhanghao, dingdan_id]): + return Response( + {'code': 400, 'message': '参数不完整（需要zhanghao, dingdan_id）', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + dangqianyonghu = request.user + + if str(dangqianyonghu.phone) != qianzhanghao: + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + if dangqianyonghu.user_type != 'admin': + return Response( + {'code': 401, 'message': '身份验证失败', 'data': None}, + status=status.HTTP_401_UNAUTHORIZED + ) + + try: + dingdan = Dingdan.objects.get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + return Response( + {'code': 404, 'message': '订单不存在', 'data': None}, + status=status.HTTP_404_NOT_FOUND + ) + + # 校验订单状态：必须为7（指定中） + if dingdan.zhuangtai != 7: + return Response( + {'code': 400, 'message': '仅状态为指定中(7)的订单可取消指定', 'data': None}, + status=status.HTTP_400_BAD_REQUEST + ) + + with transaction.atomic(): + # 更新订单：状态改为1（下单中），清空指定ID + dingdan.zhuangtai = 1 + dingdan.zhiding_id = None + dingdan.save() + + return Response({'code': 0, 'message': '取消指定成功', 'data': None}) + + except Exception as e: + logger.error(f"取消指定接口异常: {str(e)}", exc_info=True) + return Response( + {'code': 500, 'message': '服务器内部错误', 'data': None}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR + ) + + + + + + + + + + + + + + + +from peizhi.models import Club ,OrderTypeMapping + +logger = logging.getLogger(__name__) + +'''class PartnerSyncOrderView(APIView): + """ + 接收对方平台派单通知接口 + 对方平台商家派单成功后，异步调用此接口，将订单信息同步过来。 + 请求方式: POST + 接口地址: /dingdan/partner_sync_order + """ + throttle_classes = [AnonRateThrottle] + permission_classes = [AllowAny] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 验证 token + token = request.data.get('token') + if token != settings.CROSS_PLATFORM_TOKEN: + logger.warning(f"跨平台派单 token 无效: {token}") + return Response({'code': 403, 'message': 'Invalid token'}, status=status.HTTP_403_FORBIDDEN) + + # 2. 获取必要参数 + our_club_id = request.data.get('our_club_id') # 对方平台发送的我方俱乐部ID（即对方在 Club 表中 partner_club_id） + partner_club_id = request.data.get('partner_club_id') # 对方平台的俱乐部ID（对方自己的ID） + partner_order_id = request.data.get('partner_order_id') + jine = request.data.get('jine') + dashou_fencheng = request.data.get('dashou_fencheng') + jieshao = request.data.get('jieshao') + beizhu = request.data.get('beizhu', '') + create_time_str = request.data.get('create_time') + nicheng = request.data.get('nicheng') + leixing_id = request.data.get('leixing_id') # 对方平台的商品类型ID + + # 必需字段校验 + required_fields = [our_club_id, partner_club_id, partner_order_id, jine, dashou_fencheng, + jieshao, create_time_str, nicheng, leixing_id] + if not all(required_fields): + logger.error(f"跨平台派单参数缺失: {request.data}") + return Response({'code': 400, 'message': 'Missing required parameters'}, status=status.HTTP_400_BAD_REQUEST) + + # 3. 验证我方俱乐部是否存在且同意接收订单 + # 注意：our_club_id 是对方发送过来的，代表我方在对方系统中的ID，所以用 partner_club_id 匹配 + try: + my_club = Club.objects.get(partner_club_id=our_club_id) + except Club.DoesNotExist: + logger.warning(f"我方俱乐部不存在，partner_club_id={our_club_id}") + return Response({'code': 404, 'message': 'Club not found'}, status=status.HTTP_404_NOT_FOUND) + + if not my_club.is_receive_enabled: + logger.warning(f"我方俱乐部 {my_club.club_id} 未同意接收订单") + return Response({'code': 403, 'message': 'Receiving not allowed'}, status=status.HTTP_403_FORBIDDEN) + + # 4. 查找订单类型映射 + try: + mapping = OrderTypeMapping.objects.get( + partner_club_id=our_club_id, + partner_type_id=leixing_id + ) + our_type_id = mapping.our_type_id + except OrderTypeMapping.DoesNotExist: + logger.error(f"未找到订单类型映射: 对方俱乐部={our_club_id}, 对方类型ID={leixing_id}") + return Response({'code': 400, 'message': 'Order type mapping not found'}, status=status.HTTP_400_BAD_REQUEST) + + # 5. 获取我方商品类型信息（用于获取会员ID、佣金等） + try: + our_leixing = ShangpinLeixing.objects.get(id=our_type_id) + except ShangpinLeixing.DoesNotExist: + logger.error(f"我方商品类型不存在: {our_type_id}") + return Response({'code': 400, 'message': 'Local product type not found'}, status=status.HTTP_400_BAD_REQUEST) + + # 6. 幂等检查：如果已存在相同 partner_order_id 的订单，直接返回 + existing = Dingdan.objects.filter(partner_order_id=partner_order_id).first() + if existing: + logger.info(f"跨平台派单幂等返回: partner_order_id={partner_order_id} 已存在") + return Response({ + 'code': 0, + 'data': {'local_order_id': existing.dingdan_id} + }) + + # 7. 生成我方订单ID + def generate_dingdan_id(): + import time, random, os + timestamp = int(time.time() * 1000) + process_id = os.getpid() % 1000 + random_num = random.randint(1000, 9999) + return f"SJ{timestamp}{process_id:03d}{random_num}" + + # 8. 获取代理商家头像（用于订单图片） + agent_user = UserMain.objects.filter(yonghuid=settings.AGENT_SHANGJIA_ID).first() + agent_avatar = agent_user.avatar if agent_user else '' + + # 9. 事务创建订单 + try: + with transaction.atomic(): + new_id = generate_dingdan_id() + # 创建主订单 + dingdan = Dingdan.objects.create( + dingdan_id=new_id, + zhuangtai=1, # 普通订单（默认） + fadan_pingtai=2, # 商家发单 + jine=jine, + dashou_fencheng=dashou_fencheng, + jieshao=jieshao, + beizhu=beizhu, + create_time=create_time_str, + yaoqiuleixing=our_leixing.yaoqiuleixing, + nicheng=nicheng, + huiyuan_id=our_leixing.huiyuan_id, + yongjin=our_leixing.yongjin, + leixing_id=our_type_id, + partner_order_id=partner_order_id, + is_cross=1, + dispatch_type=2, # 对方派给我方 + partner_club_id=our_club_id, # 对方的俱乐部ID + tupian=agent_avatar, # 使用代理商家头像作为订单图片 + ) + # 创建商家扩展表（使用代理商家） + DingdanShangjia.objects.create( + dingdan=dingdan, + shangjia_id=settings.AGENT_SHANGJIA_ID, + sjnicheng='跨平台代理' + ) + logger.info(f"跨平台订单同步成功: partner_order_id={partner_order_id}, local_id={new_id}") + return Response({ + 'code': 0, + 'data': {'local_order_id': new_id} + },status=200) + except Exception as e: + logger.error(f"跨平台订单同步失败: {str(e)}", exc_info=True) + return Response({'code': 500, 'message': 'Internal error'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)''' + + + + +class PartnerSyncOrderView(APIView): + """ + 接收对方平台派单通知接口 + 对方平台商家派单成功后，异步调用此接口，将订单信息同步过来。 + """ + throttle_classes = [AnonRateThrottle] + permission_classes = [AllowAny] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 验证 token + token = request.data.get('token') + if token != settings.CROSS_PLATFORM_TOKEN: + logger.warning(f"跨平台派单 token 无效: {token}") + return Response({'code': 403, 'message': 'Invalid token'}, status=status.HTTP_403_FORBIDDEN) + + # 2. 获取必要参数 + our_club_id = request.data.get('our_club_id') # 对方平台发送的我方俱乐部ID（即我方在对方表中的 partner_club_id） + partner_club_id = request.data.get('partner_club_id') # 对方平台的俱乐部ID（对方自己的ID） + partner_order_id = request.data.get('partner_order_id') + jine = request.data.get('jine') + dashou_fencheng = request.data.get('dashou_fencheng') + jieshao = request.data.get('jieshao') + beizhu = request.data.get('beizhu', '') + create_time_str = request.data.get('create_time') + nicheng = request.data.get('nicheng') + leixing_id = request.data.get('leixing_id') # 对方平台的商品类型ID + partner_yonghu_id = request.data.get('user_id') # 对方下单用户ID + + # 必需字段校验 + required_fields = [our_club_id, partner_club_id, partner_order_id, jine, dashou_fencheng, + jieshao, create_time_str, nicheng, leixing_id] + if not all(required_fields): + logger.error(f"跨平台派单参数缺失: {request.data}") + return Response({'code': 400, 'message': 'Missing required parameters'}, status=status.HTTP_400_BAD_REQUEST) + + # 3. 验证我方俱乐部是否存在且同意接收订单 + try: + my_club = Club.objects.get(partner_club_id=our_club_id) + except Club.DoesNotExist: + logger.warning(f"我方俱乐部不存在，partner_club_id={our_club_id}") + return Response({'code': 404, 'message': 'Club not found'}, status=status.HTTP_404_NOT_FOUND) + + if not my_club.is_receive_enabled: + logger.warning(f"我方俱乐部 {my_club.club_id} 未同意接收订单") + return Response({'code': 403, 'message': 'Receiving not allowed'}, status=status.HTTP_403_FORBIDDEN) + + # 4. 查找订单类型映射 + try: + mapping = OrderTypeMapping.objects.get( + partner_club_id=our_club_id, # 对方在我方的标识 + partner_type_id=leixing_id + ) + our_type_id = mapping.our_type_id + except OrderTypeMapping.DoesNotExist: + logger.error(f"未找到订单类型映射: 对方俱乐部={our_club_id}, 对方类型ID={leixing_id}") + return Response({'code': 400, 'message': 'Order type mapping not found'}, status=status.HTTP_400_BAD_REQUEST) + + # 5. 获取我方商品类型信息（用于获取会员ID、佣金等） + try: + our_leixing = ShangpinLeixing.objects.get(id=our_type_id) + except ShangpinLeixing.DoesNotExist: + logger.error(f"我方商品类型不存在: {our_type_id}") + return Response({'code': 400, 'message': 'Local product type not found'}, status=status.HTTP_400_BAD_REQUEST) + + # 6. 幂等检查：如果已存在相同 partner_order_id 的订单，直接返回（附带 status='existed'） + existing = Dingdan.objects.filter(partner_order_id=partner_order_id).first() + if existing: + logger.info(f"跨平台派单幂等返回: partner_order_id={partner_order_id} 已存在") + return Response({ + 'code': 0, + 'data': { + 'local_order_id': existing.dingdan_id, + 'status': 'existed' # 明确告知已存在 + } + }) + + # 7. 生成我方订单ID（确保唯一性） + def generate_dingdan_id(): + timestamp = int(time.time() * 1000) + process_id = os.getpid() % 1000 + random_num = random.randint(1000, 9999) + return f"SJ{timestamp}{process_id:03d}{random_num}" + + # 8. 获取代理商家头像（用于订单图片） + agent_user = UserMain.objects.filter(yonghuid=settings.AGENT_SHANGJIA_ID).first() + agent_avatar = agent_user.avatar if agent_user else '' + + # 9. 计算我方实际打手分成金额：对方传来的打手分成 × 我方接收费率 + try: + actual_dashou_fencheng = Decimal(dashou_fencheng) * my_club.receive_rate + except Exception: + actual_dashou_fencheng = Decimal(dashou_fencheng) + + # 10. 事务创建订单 + try: + with transaction.atomic(): + new_id = generate_dingdan_id() + # 创建主订单 + dingdan = Dingdan.objects.create( + dingdan_id=new_id, + zhuangtai=1, # 普通订单（待接单） + fadan_pingtai=2, # 商家发单 + jine=jine, # 原始订单金额 + dashou_fencheng=actual_dashou_fencheng, # 调整后的打手分成 + jieshao=jieshao, + beizhu=beizhu, + create_time=create_time_str, + yaoqiuleixing=our_leixing.yaoqiuleixing, + nicheng=nicheng, + huiyuan_id=our_leixing.huiyuan_id, + yongjin=our_leixing.yongjin, + leixing_id=our_type_id, + partner_order_id=partner_order_id, # 存储对方订单ID + is_cross=1, + dispatch_type=2, # 对方派单 + partner_club_id=our_club_id, # 对方俱乐部ID + tupian=agent_avatar, # 使用代理商家头像作为订单图片 + ) + # 创建商家扩展表（使用代理商家） + DingdanShangjia.objects.create( + dingdan=dingdan, + shangjia_id=settings.AGENT_SHANGJIA_ID, + sjnicheng='跨平台代理', + partner_yonghu_id=partner_yonghu_id or '', + ) + + # 成功创建后更新每日派单统计（方向=对方派单） + try: + update_daily_dispatch_stat( + direction=2, # 对方派单 + partner_club_id=our_club_id, + dispatch_amount=Decimal(jine), # 统计使用原始订单金额 + + ) + except Exception as e: + logger.error(f"更新派单统计失败: {e}", exc_info=True) + + logger.info(f"跨平台订单同步成功: partner_order_id={partner_order_id}, local_id={new_id}") + return Response({ + 'code': 0, + 'data': { + 'local_order_id': new_id, + 'status': 'created' + } + }) + + except Exception as e: + logger.error(f"跨平台订单同步失败: {str(e)}", exc_info=True) + return Response({'code': 500, 'message': 'Internal error'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + + + + + +from dingdan.utils import update_daily_dispatch_stat + +logger = logging.getLogger(__name__) + + + + + + +class PartnerCheckClaimView(APIView): + """ + 接收对方平台抢单询问（对方打手抢我方派出的订单） + 如果允许抢单： + 1. 订单状态改为2（已接单） + 2. 记录对方打手ID、对方俱乐部ID、对方订单ID + 3. 更新派单成交统计（success_count/success_amount） + """ + throttle_classes = [AnonRateThrottle] + permission_classes = [AllowAny] + parser_classes = [JSONParser] + + def post(self, request): + token = request.data.get('token') + if token != settings.CROSS_PLATFORM_TOKEN: + logger.warning(f"token无效: {token}") + return Response({'code': 403, 'message': 'Invalid token'}, status=status.HTTP_403_FORBIDDEN) + + wofangdingdan_id = request.data.get('wofangdingdan_id') + partner_order_id = request.data.get('partner_order_id') + our_club_id = request.data.get('our_club_id') + dashou_id = request.data.get('dashou_id') + sj_id = request.data.get('sj_id') + + if not all([wofangdingdan_id, partner_order_id, our_club_id, dashou_id, sj_id]): + logger.error(f"参数缺失: {request.data}") + return Response({'code': 400, 'message': 'Missing parameters'}) + + try: + with transaction.atomic(): + # 查询我方俱乐部配置 + try: + club = Club.objects.select_for_update().get(partner_club_id=our_club_id) + except Club.DoesNotExist: + logger.warning(f"俱乐部配置不存在 partner_club_id={our_club_id}") + return Response({'code': 0, 'data': {'can_claim': False}}) + + if not club.is_interop_enabled: + logger.warning(f"俱乐部 {club.club_id} 未开启互通") + return Response({'code': 0, 'data': {'can_claim': False}}) + + # 锁定订单 + try: + order = Dingdan.objects.select_for_update().get(dingdan_id=wofangdingdan_id) + except Dingdan.DoesNotExist: + logger.warning(f"订单不存在: {wofangdingdan_id}") + return Response({'code': 404, 'message': 'Order not found'}, status=status.HTTP_404_NOT_FOUND) + + # 只有状态1可抢 + if order.zhuangtai != 1: + logger.info(f"订单 {order.dingdan_id} 状态 {order.zhuangtai} 不可抢") + return Response({'code': 0, 'data': {'can_claim': False}}) + + # 商品类型检查 + try: + leixing = ShangpinLeixing.objects.get(id=order.leixing_id) + except ShangpinLeixing.DoesNotExist: + logger.warning(f"商品类型不存在: {order.leixing_id}") + return Response({'code': 0, 'data': {'can_claim': False}}) + + if not leixing.is_cross_enabled: + logger.warning(f"商品类型 {leixing.jieshao} 未开启跨平台") + return Response({'code': 0, 'data': {'can_claim': False}}) + + # 执行抢单：状态改为2（已接单） + order.zhuangtai = 2 + order.jiedan_dashou_id = dashou_id + order.partner_club_id = our_club_id + order.partner_order_id = partner_order_id + if order.is_cross != 1: + order.is_cross = 1 + # dispatch_type 保持原值（1-我方派单），不变 + order.save() + + # 更新派单成交统计（我方派单被成功接单） + update_daily_dispatch_stat( + direction=1, + partner_club_id=our_club_id, + claimed_amount=order.jine, + + ) + + logger.info(f"对方抢单成功: 订单 {order.dingdan_id}, 对方打手 {dashou_id}") + return Response({'code': 0, 'data': {'can_claim': True}}) + + except Exception as e: + logger.error(f"异常: {e}", exc_info=True) + return Response({'code': 500, 'message': 'Internal error'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + +'''class PartnerCheckClaimView(APIView): + """ + 接收对方平台抢单询问接口 + 对方平台打手抢单前，调用此接口询问订单是否可抢。 + 请求方式: POST + 接口地址: /dingdan/partner_check_claim + 请求参数: + token: 认证令牌 + partner_order_id: 对方平台订单ID（即我方记录的 partner_order_id） + partner_club_id: 对方俱乐部ID（对方在我方系统中的标识） + dashou_id: 对方平台打手ID + sj_id: 对方平台商家ID（带前缀，如 SjAGENT001） + 返回: + code: 0成功 + data: { + can_claim: true/false + } + 注意：此接口会原子地检查并更新订单状态，必须使用行锁。 + """ + throttle_classes = [AnonRateThrottle] + permission_classes = [AllowAny] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 验证 token + token = request.data.get('token') + if token != settings.CROSS_PLATFORM_TOKEN: + logger.warning(f"跨平台抢单询问 token 无效: {token}") + return Response({'code': 403, 'message': 'Invalid token'}, status=status.HTTP_403_FORBIDDEN) + + # 2. 获取必要参数 + duifangdingdan_id = request.data.get('wofangdingdan_id') + partner_order_id = request.data.get('partner_order_id') # 我方订单ID + partner_club_id = request.data.get('our_club_id') # 对方俱乐部ID + dashou_id = request.data.get('dashou_id') # 对方打手ID + sj_id = request.data.get('sj_id') # 对方商家ID（带前缀，如 SjAGENT001） + + if not all([partner_order_id, partner_club_id, dashou_id, sj_id]): + logger.error(f"跨平台抢单询问参数缺失: {request.data}") + return Response({'code': 400, 'message': 'Missing parameters'}, status=status.HTTP_400_BAD_REQUEST) + + try: + with transaction.atomic(): + # 3. 查询我方俱乐部配置（通过对方的 partner_club_id） + try: + club = Club.objects.select_for_update().get(partner_club_id=partner_club_id) + except Club.DoesNotExist: + logger.warning(f"跨平台抢单询问: 我方俱乐部配置不存在 partner_club_id={partner_club_id}") + return Response({'code': 404, 'message': 'Club not found'}, status=status.HTTP_404_NOT_FOUND) + + # 检查俱乐部是否已开启平台互通（我方同意接收对方订单） + if not club.is_interop_enabled: + logger.warning(f"俱乐部 {club.club_id} 未开启接收跨平台订单，拒绝抢单") + return Response({'code': 0, 'data': {'can_claim': False}}) + + # 4. 查询订单并锁定 + try: + order = Dingdan.objects.select_for_update().get(dingdan_id=partner_order_id) + except Dingdan.DoesNotExist: + logger.warning(f"跨平台抢单询问: 订单不存在 dingdan_id={partner_order_id}") + return Response({'code': 404, 'message': 'Order not found'}, status=status.HTTP_404_NOT_FOUND) + + # 5. 检查订单状态（必须为1） + if order.zhuangtai != 1: + logger.info(f"跨平台抢单失败: 订单状态 {order.zhuangtai}，不可抢") + return Response({'code': 0, 'data': {'can_claim': False}}) + + # 6. 检查订单对应的商品类型是否支持跨平台抢单 + try: + leixing = ShangpinLeixing.objects.get(id=order.leixing_id) + except ShangpinLeixing.DoesNotExist: + logger.warning(f"订单 {order.dingdan_id} 的商品类型 {order.leixing_id} 不存在") + return Response({'code': 0, 'data': {'can_claim': False}}) + + if not leixing.is_cross_enabled: + logger.warning(f"商品类型 {leixing.jieshao} 未开启跨平台抢单") + return Response({'code': 0, 'data': {'can_claim': False}}) + + # 7. 所有检查通过，执行抢单操作 + # 更新订单主表 + order.zhuangtai = 2 # 已接单 + order.jiedan_dashou_id = dashou_id # 对方打手ID + order.is_cross = 1 # 标记为跨平台订单 + order.dispatch_type = 1 # 我方派单，对方抢单 + order.partner_club_id = partner_club_id # 记录对方俱乐部ID + order.partner_order_id = duifangdingdan_id#记录对方订单id + # 存储对方商家ID（带前缀）到商家扩展表的 shangjia_id（如果原来有则更新） + # 注意：商家扩展表已存在，需要更新或创建？原订单可能已有 shangjia_kuozhan，我们直接更新 + order.save() + + # 8. 记录每日派单统计（使用新统计函数，不再更新 Club 表） + fencheng = order.dashou_fencheng or Decimal('0.00') + amount = fencheng * club.dashou_rate + update_daily_dispatch_stat( + dispatch_date=timezone.now().date(), + direction=2, # 对方派单 + partner_club_id=partner_club_id, + amount=amount, + count=1 + ) + # 9. 返回成功，告知对方可以抢单 + logger.info(f"跨平台抢单成功: 订单 {order.dingdan_id}, 对方打手 {dashou_id}, 俱乐部 {club.club_id}") + return Response({'code': 0, 'data': {'can_claim': True}}) + + + + + except Exception as e: + logger.error(f"跨平台抢单询问异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'message': 'Internal error'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)''' + + + + + + + + + +'''class PartnerNotifyClaimView(APIView): + """ + 接收对方平台抢单成功通知接口 + 对方平台打手抢单成功后，调用此接口，我方处理本地订单。 + 请求方式: POST + 接口地址: /dingdan/partner_notify_claim + 请求参数: + token: 认证令牌，需与settings.CROSS_PLATFORM_TOKEN一致 + order_id: 对方平台的订单ID（即我方记录的 partner_order_id） + 返回: + code: 0成功，其他失败 + message: 描述信息 + """ + throttle_classes = [AnonRateThrottle] + permission_classes = [AllowAny] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 验证token + token = request.data.get('token') + if token != settings.CROSS_PLATFORM_TOKEN: + logger.warning(f"跨平台抢单通知 token 无效: {token}") + return Response({'code': 403, 'message': 'Invalid token'}, status=status.HTTP_403_FORBIDDEN) + + order_id = request.data.get('local_order_id') # 对方平台的订单ID（即我方的 partner_order_id） + if not order_id: + logger.error("跨平台抢单通知参数缺失: order_id") + return Response({'code': 400, 'message': 'Missing order_id'}, status=status.HTTP_400_BAD_REQUEST) + + try: + with transaction.atomic(): + # 2. 根据 partner_order_id 查找订单 + order = Dingdan.objects.select_for_update().get(partner_order_id=order_id) + + # 3. 根据订单状态处理 + if order.zhuangtai == 1: + # 订单未被抢，直接删除（包括关联的商家扩展表） + # 先删除扩展表 + DingdanShangjia.objects.filter(dingdan=order).delete() + # 再删除主订单 + order.delete() + logger.info(f"跨平台抢单通知：订单状态为1，已删除，partner_order_id={order_id}") + return Response({'code': 0, 'message': 'Order deleted'}) + else: + # 订单状态不是1（已被抢或异常），改为状态15（异常订单） + order.zhuangtai = 15 + order.save() + logger.info(f"跨平台抢单通知：订单状态异常，已改为15，partner_order_id={order_id}") + return Response({'code': 0, 'message': 'Order marked as abnormal'}) + + except Dingdan.DoesNotExist: + logger.warning(f"跨平台抢单通知：订单不存在 partner_order_id={order_id}") + return Response({'code': 404, 'message': 'Order not found'}, status=status.HTTP_404_NOT_FOUND) + except Exception as e: + logger.error(f"跨平台抢单通知异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'message': 'Internal error'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)''' + + + + + +class PartnerNotifyClaimView(APIView): + """ + 接收对方平台抢单成功通知（对方派单被他们自己的打手抢了） + 我方根据 partner_order_id 找到订单，如果状态为1则改为20，不更新任何统计。 + """ + throttle_classes = [AnonRateThrottle] + permission_classes = [AllowAny] + parser_classes = [JSONParser] + + def post(self, request): + token = request.data.get('token') + if token != settings.CROSS_PLATFORM_TOKEN: + logger.warning(f"token无效: {token}") + return Response({'code': 403, 'message': 'Invalid token'}, status=status.HTTP_403_FORBIDDEN) + + partner_order_id = request.data.get('partner_order_id') + if not partner_order_id: + logger.error("缺少 partner_order_id") + return Response({'code': 400, 'message': 'Missing partner_order_id'}, status=status.HTTP_400_BAD_REQUEST) + + try: + with transaction.atomic(): + order = Dingdan.objects.select_for_update().get(partner_order_id=partner_order_id) + # 只有状态为1（未被抢）时才改为20 + if order.zhuangtai == 1: + order.zhuangtai = 20 + order.save() + logger.info(f"订单 {order.dingdan_id} 状态改为20（被其他俱乐部抢走）") + else: + logger.info(f"订单 {order.dingdan_id} 当前状态 {order.zhuangtai}，无需修改") + return Response({'code': 0, 'message': 'OK'}) + except Dingdan.DoesNotExist: + logger.warning(f"订单不存在 partner_order_id={partner_order_id}") + return Response({'code': 404, 'message': 'Order not found'}, status=status.HTTP_404_NOT_FOUND) + except Exception as e: + logger.error(f"异常: {e}", exc_info=True) + return Response({'code': 500, 'message': 'Internal error'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + +'''class PartnerCheckClaimView(APIView): + """ + 接收对方平台抢单询问接口 + 对方平台打手抢单前，调用此接口询问订单是否可抢。 + 请求方式: POST + 接口地址: /dingdan/partner_check_claim + 请求参数: + token: 认证令牌 + partner_order_id: 对方平台订单ID（即我方记录的 partner_order_id） + dashou_id: 对方平台打手ID + 返回: + code: 0成功 + data: { + can_claim: true/false // true表示我方允许抢单，且已更新订单状态 + } + 注意：此接口会原子地检查并更新订单状态，必须使用行锁。 + """ + throttle_classes = [AnonRateThrottle] + permission_classes = [AllowAny] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 验证token + token = request.data.get('token') + if token != settings.CROSS_PLATFORM_TOKEN: + logger.warning(f"跨平台抢单询问 token 无效: {token}") + return Response({'code': 403, 'message': 'Invalid token'}, status=status.HTTP_403_FORBIDDEN) + + partner_order_id = request.data.get('partner_order_id') + dashou_id = request.data.get('dashou_id') + + if not partner_order_id or not dashou_id: + logger.error(f"跨平台抢单询问参数缺失: {request.data}") + return Response({'code': 400, 'message': 'Missing parameters'}, status=status.HTTP_400_BAD_REQUEST) + + try: + with transaction.atomic(): + # 使用 select_for_update 锁定订单行，防止并发 + order = Dingdan.objects.select_for_update().get(dingdan_id=partner_order_id) + + # 检查订单状态是否为1（待抢） + if order.zhuangtai == 1: + # 允许抢单，更新订单 + order.zhuangtai = 2 + order.jiedan_dashou_id = dashou_id + order.is_cross = 1 # 标记为被跨平台抢单 + order.save() + logger.info(f"跨平台抢单成功: dingdan_id={partner_order_id}, 被对方打手 {dashou_id} 抢走") + return Response({'code': 0, 'data': {'can_claim': True}}) + else: + # 订单已被抢，不可抢 + logger.info(f"跨平台抢单失败: dingdan_id={partner_order_id}, 当前状态 {order.zhuangtai}") + return Response({'code': 0, 'data': {'can_claim': False}}) + except Dingdan.DoesNotExist: + logger.warning(f"跨平台抢单询问: 订单不存在 dingdan_id={partner_order_id}") + return Response({'code': 404, 'message': 'Order not found'}, status=status.HTTP_404_NOT_FOUND) + except Exception as e: + logger.error(f"跨平台抢单询问异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'message': 'Internal error'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)''' + + + + + + + + + + +class PartnerRefundNotifyView(APIView): + """ + 接收对方平台退款通知接口 + 对方平台商家申请退款时，调用此接口通知我方，我方将本地对应订单改为退款状态。 + 请求方式: POST + 接口地址: /dingdan/partner_refund_notify + 请求参数: + token: 认证令牌，需与settings.CROSS_PLATFORM_TOKEN一致 + order_id: 对方平台的订单ID（即我方记录的 partner_order_id） + 返回: + code: 0成功，其他失败 + message: 描述信息 + """ + throttle_classes = [AnonRateThrottle] + permission_classes = [AllowAny] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 验证token + token = request.data.get('token') + if token != settings.CROSS_PLATFORM_TOKEN: + logger.warning(f"跨平台退款通知 token 无效: {token}") + return Response({'code': 403, 'message': 'Invalid token'}, status=status.HTTP_403_FORBIDDEN) + + order_id = request.data.get('order_id') # 对方平台的订单ID（即我方的 partner_order_id） + if not order_id: + logger.error("跨平台退款通知参数缺失: order_id") + return Response({'code': 400, 'message': 'Missing order_id'}, status=status.HTTP_400_BAD_REQUEST) + + try: + with transaction.atomic(): + # 2. 根据 partner_order_id 查找订单（必须存在且为跨平台订单） + order = Dingdan.objects.select_for_update().get(partner_order_id=order_id, is_cross=1) + # 如果订单已完成，不允许退款 + if order.zhuangtai == 3: + logger.warning(f"跨平台退款通知：订单 {order_id} 已完成，不可退款") + return Response({'code': 400, 'message': 'Order already completed, cannot refund'}, + status=status.HTTP_400_BAD_REQUEST) + + # 3. 如果订单状态不是5，则改为5（已退款），并更新打手信息 + if order.zhuangtai != 5: + # 记录原打手ID + old_dashou_id = order.jiedan_dashou_id + if old_dashou_id: + try: + # 查询打手用户主表 + dashou_user = UserMain.objects.get(yonghuid=old_dashou_id) + # 通过反向关系获取打手扩展表 + if hasattr(dashou_user, 'dashou_profile'): + dashou_profile = dashou_user.dashou_profile + dashou_profile.zhuangtai = 1 # 恢复打手状态 + dashou_profile.tuikuanliang += 1 # 退款订单量+1 + dashou_profile.save() + logger.info(f"退款通知：打手 {old_dashou_id} 状态已恢复，退款订单+1") + except UserMain.DoesNotExist: + logger.warning(f"退款通知：打手用户不存在 {old_dashou_id}") + except Exception as e: + logger.error(f"退款通知：更新打手信息失败 {str(e)}") + + # 更新订单状态为5 + order.zhuangtai = 5 + # 可选：清空接单打手ID + #order.jiedan_dashou_id = None + order.save() + logger.info(f"跨平台退款通知成功：订单 {order_id} 已改为退款状态") + else: + logger.info(f"跨平台退款通知：订单 {order_id} 已是退款状态，无需重复处理") + + return Response({'code': 0, 'message': 'Refund processed successfully'}) + + except Dingdan.DoesNotExist: + logger.warning(f"跨平台退款通知：订单不存在或不是跨平台订单，partner_order_id={order_id}") + return Response({'code': 404, 'message': 'Order not found'}, status=status.HTTP_404_NOT_FOUND) + except Exception as e: + logger.error(f"跨平台退款通知异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'message': 'Internal error'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + + + + + +class DashouXiugaiView(APIView): + """ + 打手修改订单交付内容接口 + 请求方式：POST + 请求路径：/dingdan/dsxiugaidd + 权限：需携带有效JWT Token，且用户为打手身份 + 请求参数： + dingdan_id : 订单ID（必填） + liuyan : 新的留言内容（可选，最长50字） + deleted_images : 要删除的图片URL列表（数组，每个元素为完整COS URL） + new_images : 新增的图片URL列表（数组，每个元素为完整COS URL） + 返回： + 成功：{"code":0,"msg":"修改成功","data":null} + 失败：返回相应错误码和提示 + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + # 获取请求数据 + data = request.data + dingdan_id = data.get('dingdan_id', '') + liuyan = data.get('liuyan', '') + deleted_images = data.get('deleted_images', []) + new_images = data.get('new_images', []) + + # ---------- 参数校验 ---------- + if not dingdan_id: + return Response({'code': 1, 'msg': '订单ID不能为空', 'data': None}, + status=status.HTTP_400_BAD_REQUEST) + + if not isinstance(deleted_images, list): + return Response({'code': 2, 'msg': 'deleted_images 必须为数组', 'data': None}, + status=status.HTTP_400_BAD_REQUEST) + + if not isinstance(new_images, list): + return Response({'code': 3, 'msg': 'new_images 必须为数组', 'data': None}, + status=status.HTTP_400_BAD_REQUEST) + + if liuyan and len(liuyan) > 50: + return Response({'code': 4, 'msg': '留言最多50个字', 'data': None}, + status=status.HTTP_400_BAD_REQUEST) + + # ---------- 用户身份验证 ---------- + current_user = request.user + yonghuid = current_user.yonghuid + + # 检查是否为打手 + try: + dashou_profile = current_user.dashou_profile # 假设User模型有related_name='dashou_profile' + except UserDashou.DoesNotExist: + return Response({'code': 5, 'msg': '用户不是打手身份', 'data': None}, + status=status.HTTP_403_FORBIDDEN) + + # ---------- 订单查询及权限验证 ---------- + try: + # 订单必须属于该打手，且状态为4（退款中）或8（结算中） + dingdan = Dingdan.objects.get( + dingdan_id=dingdan_id, + jiedan_dashou_id=yonghuid, + zhuangtai__in=[4, 8] # 只允许修改退款中或结算中的订单 + ) + except Dingdan.DoesNotExist: + return Response({'code': 6, 'msg': '订单不存在或没有修改权限', 'data': None}, + status=status.HTTP_403_FORBIDDEN) + + # ---------- 执行修改（使用事务保证原子性） ---------- + try: + with transaction.atomic(): + # 1. 处理删除的图片：从 Dashoutupian 表中删除记录 + if deleted_images: + # 根据订单ID、打手ID和图片URL删除记录 + delete_count, _ = Dashoutupian.objects.filter( + dingdan_id=dingdan_id, + dashou=yonghuid, + tupian__in=deleted_images + ).delete() + # 可选：记录删除数量 + logger.info(f"订单 {dingdan_id} 删除图片 {delete_count} 张") + + # 2. 处理新增的图片：插入新记录 + if new_images: + # 批量创建 + new_records = [] + for url in new_images: + new_records.append(Dashoutupian( + dingdan_id=dingdan_id, + dashou=yonghuid, + tupian=url, + create_time=timezone.now() + )) + Dashoutupian.objects.bulk_create(new_records) + logger.info(f"订单 {dingdan_id} 新增图片 {len(new_records)} 张") + + # 3. 更新订单留言（如果发生变化） + # 注意：即使留言为空字符串，也允许更新，表示清空留言 + if 'liuyan' in data: # 判断是否传了liuyan字段（可能为空字符串） + dingdan.dashou_liuyan = liuyan + dingdan.update_time = timezone.now() + dingdan.save(update_fields=['dashou_liuyan', 'update_time']) + + # 全部成功，返回成功响应 + return Response({ + 'code': 0, + 'msg': '修改成功', + 'data': None + }, status=status.HTTP_200_OK) + + except Exception as e: + logger.error(f"修改订单失败: {str(e)}", exc_info=True) + return Response({ + 'code': 7, + 'msg': '服务器内部错误', + 'data': None + }, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + + + + + + + +from django.core.exceptions import ObjectDoesNotExist +from dingdan.tongzhi_tasks import dingdan_guangbo + +class ZxsjghdsView(APIView): + """ + 商家更换打手接口 + 路径：POST /dingdan/zxsjghds + 权限：仅限已认证商家（通过JWT） + 功能： + 1. 将原订单状态改为已退款(5)，释放接单打手（若有） + 2. 更新打手统计（退款量、状态、每日统计） + 3. 写入退款记录 + 4. 若为跨平台订单，通知对方平台退款（必须成功） + 5. 基于原订单生成新订单（状态直接为1），复制核心数据 + 6. 不操作商家余额、退款次数等（替换订单） + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # ========== 1. 获取当前商家用户 ========== + current_user = request.user + try: + yonghuid = current_user.yonghuid + except AttributeError: + return Response({'code': 1, 'msg': '用户认证失败'}, status=status.HTTP_401_UNAUTHORIZED) + + # ========== 2. 提取订单ID ========== + dingdan_id = request.data.get('dingdan_id', '').strip() + if not dingdan_id: + return Response({'code': 2, 'msg': '订单ID不能为空'}, status=status.HTTP_400_BAD_REQUEST) + + # ========== 3. 查询订单并校验权限 ========== + try: + # 关联查询商家扩展表，确保当前商家是该订单的发布者 + shangjia_kuozhan = DingdanShangjia.objects.select_related('dingdan').get( + dingdan__dingdan_id=dingdan_id, + shangjia_id=yonghuid + ) + except DingdanShangjia.DoesNotExist: + return Response({'code': 3, 'msg': '订单不存在或您无权操作'}, status=status.HTTP_403_FORBIDDEN) + + old_order = shangjia_kuozhan.dingdan + + # ========== 4. 状态校验（仅允许进行中或结算中） ========== + if old_order.zhuangtai not in [2, 8]: + return Response({'code': 4, 'msg': '当前订单状态不允许更换打手'}, status=status.HTTP_400_BAD_REQUEST) + + # ========== 5. 收集订单关键数据（用于新订单复制） ========== + # 这些字段将在退款处理后用于创建新订单 + jine = old_order.jine + dashou_fencheng = old_order.dashou_fencheng + leixing_id = old_order.leixing_id + yaoqiuleixing = old_order.yaoqiuleixing + huiyuan_id = old_order.huiyuan_id + yongjin = old_order.yongjin + jieshao = old_order.jieshao + nicheng = old_order.nicheng + beizhu = old_order.beizhu + user1_id = old_order.user1_id + tupian = old_order.tupian + fadan_pingtai = old_order.fadan_pingtai + + # 跨平台相关 + is_cross = old_order.is_cross + partner_club_id = old_order.partner_club_id + partner_order_id = old_order.partner_order_id + need_notify_partner = is_cross and partner_club_id and partner_order_id + + dashou_id = old_order.jiedan_dashou_id # 可能为空 + + # ========== 6. 退款处理（事务块1：退款原订单 + 打手统计 + 跨平台通知） ========== + try: + with transaction.atomic(): + # 6.1 订单状态更新为已退款 + old_order.zhuangtai = 5 + old_order.save(update_fields=['zhuangtai']) + + # 6.2 释放打手 + if dashou_id: + try: + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.tuikuanliang = (dashou_profile.tuikuanliang or 0) + 1 + dashou_profile.zhuangtai = 1 # 空闲 + dashou_profile.save(update_fields=['tuikuanliang', 'zhuangtai']) + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.warning(f"打手 {dashou_id} 不存在或扩展表缺失，跳过更新") + + # 6.3 更新退款记录 + Tuikuanjilu.objects.update_or_create( + dingdan_id=dingdan_id, + defaults={ + 'dashouid': dashou_id or '', + 'qingqiuid': yonghuid, # 申请人为当前商家 + 'chuliid': yonghuid, # 处理人也是商家自己 + 'liyou': '商家更换打手', + 'sqzhuangtai': 1, # 状态 1=成功 + 'jine': jine or 0, + 'dashou_fencheng': dashou_fencheng or 0, + 'jieshao': jieshao or '', + 'beizhu': '更换打手系统自动退款', + 'nicheng': nicheng or '', + } + ) + + # 6.4 打手每日统计（退款行为） + if dashou_id: + try: + from houtai.utils import update_dashou_daily_by_action + update_dashou_daily_by_action( + yonghuid=dashou_id, + amount=dashou_fencheng, + action=3 # 3=退款 + ) + except Exception as e: + logger.error(f"更新打手每日统计失败: {e}") + # 统计失败不应阻断主流程，但可记录 + + # 6.5 跨平台退款通知 + if need_notify_partner: + try: + from peizhi.models import ClubConfig, Club + my_club_config = ClubConfig.objects.filter(is_self=1).first() + if not my_club_config: + raise Exception("我方俱乐部配置不存在") + self_club_id = my_club_config.club_id + club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=partner_club_id) + partner_domain = club_rel.partner_domain.rstrip('/') + + notify_url = f"{partner_domain}/houtai/dfddtk" + payload = { + 'order_id': partner_order_id, + 'club_id': self_club_id, + 'status': 5, + 'reason': '商家更换打手退款' + } + resp = requests.post(notify_url, json=payload, timeout=5) + if resp.status_code != 200: + transaction.set_rollback(True) + logger.error(f"对方平台接口HTTP错误: {resp.status_code}") + return Response({'code': 500, 'msg': '通知对方平台失败'}) + resp_json = resp.json() + if resp_json.get('code') != 0: + transaction.set_rollback(True) + logger.error(f"对方平台退款通知失败: {resp_json.get('msg')}") + return Response({'code': 500, 'msg': f"对方平台通知失败: {resp_json.get('msg')}"}) + + # 更新跨平台扩展数据 + from dingdan.models import CrossPlatformOrderData + CrossPlatformOrderData.objects.update_or_create( + dingdan_id=dingdan_id, + defaults={ + 'partner_order_id': partner_order_id, + 'partner_club_id': partner_club_id, + 'partner_order_status': 5, + } + ) + except Exception as e: + transaction.set_rollback(True) + logger.error(f"通知对方平台异常: {e}") + return Response({'code': 500, 'msg': f'通知对方平台失败: {str(e)}'}) + + except Exception as e: + logger.error(f"退款处理事务失败: {e}", exc_info=True) + return Response({'code': 500, 'msg': '退款处理失败'}) + + # ========== 7. 生成新订单（事务块2） ========== + try: + with transaction.atomic(): + # 7.1 生成新的订单ID + def generate_dingdan_id(): + timestamp = int(time.time() * 1000) + process_id = os.getpid() % 1000 + random_num = random.randint(1000, 9999) + return f"SJ{timestamp}{process_id:03d}{random_num}" + + new_dingdan_id = generate_dingdan_id() + # 确保唯一 + while Dingdan.objects.filter(dingdan_id=new_dingdan_id).exists(): + new_dingdan_id = generate_dingdan_id() + + # 7.2 创建新订单（复制数据，状态为 1） + new_order = Dingdan.objects.create( + dingdan_id=new_dingdan_id, + zhuangtai=1, # 已下单 + fadan_pingtai=fadan_pingtai, + jine=jine, + dashou_fencheng=dashou_fencheng, + leixing_id=leixing_id, + yaoqiuleixing=yaoqiuleixing, + huiyuan_id=huiyuan_id, + yongjin=yongjin, + jieshao=jieshao, + nicheng=nicheng, + beizhu=beizhu, + user1_id=user1_id, # 商家标识 + tupian=tupian, + # 不继承：zhiding_id, jiedan_dashou_id, dashou_liuyan 等 + ) + + # 7.3 创建商家扩展表（关联新订单） + DingdanShangjia.objects.create( + dingdan=new_order, + shangjia_id=yonghuid, + sjnicheng=shangjia_kuozhan.sjnicheng or '', + ) + + # 7.4 异步通知打手（广播新订单） + try: + order_info = { + 'dingdan_id': new_dingdan_id, + 'game_type': self._get_game_type_name(leixing_id), + 'amount': str(jine), + 'order_desc': (jieshao or '')[:50], + } + dingdan_guangbo.delay(order_info) + except Exception as e: + logger.error(f"广播通知失败: {e}") + + # 7.5 跨平台同步（如果适用） + try: + sync_order_to_partners(new_dingdan_id) + except Exception as e: + logger.error(f"跨平台同步失败: {e}") + + # 注意：此处不更新商家余额、发布量等统计，因为是替换订单 + + logger.info(f"商家{yonghuid}更换打手成功，旧订单{dingdan_id}已退款，新订单{new_dingdan_id}") + + return Response({ + 'code': 0, + 'msg': '更换成功', + 'data': { + 'xin_dingdan_id': new_dingdan_id, + } + }) + + except Exception as e: + logger.error(f"生成新订单事务失败: {e}", exc_info=True) + return Response({'code': 500, 'msg': '生成新订单失败'}) + + def _get_game_type_name(self, leixing_id): + """根据类型ID获取游戏类型名称""" + try: + gt = ShangpinLeixing.objects.filter(id=leixing_id).first() + return gt.jieshao if gt else '游戏订单' + except Exception: + return '游戏订单' + + + +# ===================== 视图：商家罚款申请 ===================== +# 文件路径：dingdan/views.py 或单独文件，根据项目结构放置 + + + + +class ShangjiaFakuanApplyView(APIView): + """ + 商家罚款申请接口 + 路径：POST /dingdan/sjfksq + 权限：JWT认证的商家用户 + 参数： + dingdan_id - 订单ID (必填) + chufa_liyou - 罚款原因 (必填) + fakuanjine - 罚款金额，元 (必填) + yingxiang_qiangdan - 是否影响抢单 1是 0否 (必填) + 说明： + 1. 自动从订单中获取被打手ID，防止商家篡改目标。 + 2. 同一订单同一打手不允许重复罚款。 + 3. 跨平台订单若为我方派单，则通知对方平台处罚；否则本地生成罚单。 + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # ========== 1. 身份验证 ========== + current_user = request.user + try: + shangjia_id = current_user.yonghuid # 商家的用户ID + except AttributeError: + return Response({'code': 1, 'msg': '用户认证失败'}, status=status.HTTP_401_UNAUTHORIZED) + + # ========== 2. 参数提取与校验 ========== + dingdan_id = request.data.get('dingdan_id', '').strip() + chufa_liyou = request.data.get('chufa_liyou', '').strip() + fakuanjine = request.data.get('fakuanjine', 0) + yingxiang_qiangdan = int(request.data.get('yingxiang_qiangdan', 1)) + + if not dingdan_id or not chufa_liyou or not fakuanjine: + return Response({'code': 2, 'msg': '参数不完整'}, status=status.HTTP_400_BAD_REQUEST) + + try: + fakuanjine = float(fakuanjine) + if fakuanjine <= 0: + raise ValueError + except (ValueError, TypeError): + return Response({'code': 2, 'msg': '罚款金额格式错误'}, status=status.HTTP_400_BAD_REQUEST) + + # ========== 3. 获取订单，校验归属商家 ========== + try: + # 关联查询商家扩展表，确保订单属于当前商家 + shangjia_kuozhan = DingdanShangjia.objects.select_related('dingdan').get( + dingdan__dingdan_id=dingdan_id, + shangjia_id=shangjia_id + ) + order = shangjia_kuozhan.dingdan + except DingdanShangjia.DoesNotExist: + return Response({'code': 3, 'msg': '订单不存在或您无权操作'}, status=status.HTTP_403_FORBIDDEN) + + # ========== 4. 获取被打手ID ========== + dashou_id = order.jiedan_dashou_id + if not dashou_id: + return Response({'code': 4, 'msg': '该订单暂无接单打手，无法罚款'}, status=status.HTTP_400_BAD_REQUEST) + + # ========== 5. 重复罚款检查 ========== + if Fadan.objects.filter(beichufa_id=dashou_id, guanliandingdan_id=dingdan_id).exists(): + return Response({'code': 5, 'msg': '该打手在此订单已被罚款，不能重复申请'}, status=status.HTTP_400_BAD_REQUEST) + + # ========== 6. 跨平台信息 ========== + is_cross = order.is_cross + partner_order_id = order.partner_order_id or '' + partner_club_id = order.partner_club_id or '' + dispatch_type = order.dispatch_type or 0 # 1=我方派单，2=对方派单 + + # 是否需要通知对方平台：我方派单且存在对方订单ID + need_notify_partner = is_cross and partner_order_id and dispatch_type == 1 + + # ========== 7. 本地创建罚单（可重用） ========== + def create_local_fadan(): + Fadan.objects.create( + beichufa_id=dashou_id, + shenqing_chufa=shangjia_id, # 申请人为当前商家 + shenfen=1, # 被打者身份：1=打手 + chufaliyou=chufa_liyou, + fakuanjine=fakuanjine, + guanliandingdan_id=dingdan_id, + zhuangtai=1, # 待缴纳 + yingxiang_qiangdan=yingxiang_qiangdan, + shenqingren_shenfen=5, # 申请人是商家 + partner_club_id='', + ) + + # ========== 8. 本地处罚分支 ========== + if not need_notify_partner: + with transaction.atomic(): + create_local_fadan() + logger.info(f"商家{shangjia_id}对订单{dingdan_id}打手{dashou_id}罚款成功，金额{fakuanjine}") + return Response({'code': 0, 'msg': '罚款申请已提交'}) + + # ========== 9. 跨平台通知分支 ========== + try: + # 9.1 获取我方俱乐部ID + my_club = ClubConfig.objects.filter(is_self=1).first() + if not my_club: + return Response({'code': 500, 'msg': '系统配置错误'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + self_club_id = my_club.club_id + + # 9.2 获取对方平台域名 + club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=partner_club_id) + partner_domain = club_rel.partner_domain.rstrip('/') + except ObjectDoesNotExist: + return Response({'code': 500, 'msg': '对方平台信息未配置'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + # 9.3 构造通知参数 + notify_url = f"{partner_domain}/houtai/kffkdssq_notify" # 与后台接口保持一致 + payload = { + 'order_id': partner_order_id, + 'club_id': self_club_id, + 'chufaliyou': chufa_liyou, + 'fakuanjine': fakuanjine, + 'yingxiang_qiangdan': yingxiang_qiangdan, + 'shenqingren_shenfen': 5, # 商家身份 + 'operator': shangjia_id, # 操作人ID + } + + # 9.4 带重试的通知 + timeout = 3 + retries = 2 + success = False + for attempt in range(retries): + try: + resp = requests.post(notify_url, json=payload, timeout=timeout) + if resp.status_code == 200: + resp_data = resp.json() + if resp_data.get('code') == 0: + success = True + break + else: + logger.warning(f"对方平台罚款通知失败，响应: {resp_data}") + else: + logger.warning(f"对方平台HTTP错误: {resp.status_code}") + except Exception as e: + logger.warning(f"通知对方平台异常，第{attempt+1}次尝试: {e}") + continue + + if not success: + return Response({'code': 500, 'msg': '通知对方平台失败，请稍后重试'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + # 9.5 通知成功后，本地也创建罚单（标记跨平台） + with transaction.atomic(): + Fadan.objects.create( + beichufa_id=dashou_id, + shenqing_chufa=shangjia_id, + shenfen=1, + chufaliyou=chufa_liyou, + fakuanjine=fakuanjine, + guanliandingdan_id=dingdan_id, + zhuangtai=1, + yingxiang_qiangdan=yingxiang_qiangdan, + shenqingren_shenfen=5, + partner_club_id=partner_club_id, # 记录对方俱乐部ID + ) + + logger.info(f"商家{shangjia_id}跨平台罚款成功: {dingdan_id}") + return Response({'code': 0, 'msg': '罚款已提交至对方平台'}) + + + + + + + + + + + + + +class ShangjiaFakuaiXiugaiView(APIView): + """ + 商家端统一修改接口：罚款修改/撤销/再次申请，订单退款撤销/修改理由 + URL: /dingdan/sjfkxgycx + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + user = request.user + # 验证商家身份 + try: + shangjia = user.shop_profile + except UserShangjia.DoesNotExist: + return Response({'code': 403, 'msg': '您不是商家'}, status=status.HTTP_403_FORBIDDEN) + if shangjia.zhuangtai != 1: + return Response({'code': 403, 'msg': '商家状态异常'}, status=status.HTTP_403_FORBIDDEN) + + operation = request.data.get('operation') + dingdan_id = request.data.get('dingdan_id') + if not dingdan_id: + return Response({'code': 400, 'msg': '缺少订单ID'}, status=status.HTTP_400_BAD_REQUEST) + + # 验证订单属于该商家 + try: + dingdan = Dingdan.objects.select_related('shangjia_kuozhan').get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + return Response({'code': 404, 'msg': '订单不存在'}, status=status.HTTP_404_NOT_FOUND) + if not hasattr(dingdan, 'shangjia_kuozhan') or dingdan.shangjia_kuozhan.shangjia_id != user.yonghuid: + return Response({'code': 403, 'msg': '无权操作此订单'}, status=status.HTTP_403_FORBIDDEN) + + # 处理订单相关操作 + if operation == 'cancel_refund': + return self._cancel_refund(dingdan, request.data.get('liyou', '')) + elif operation == 'modify_refund_reason': + return self._modify_refund_reason(dingdan, request.data.get('liyou', '')) + + # 处理罚款相关操作 + fadan_id = request.data.get('fadan_id') + if not fadan_id: + return Response({'code': 400, 'msg': '缺少罚单ID'}, status=status.HTTP_400_BAD_REQUEST) + try: + fadan = Fadan.objects.get(id=fadan_id) + except Fadan.DoesNotExist: + return Response({'code': 404, 'msg': '罚单不存在'}, status=status.HTTP_404_NOT_FOUND) + if fadan.guanliandingdan_id != dingdan_id: + return Response({'code': 403, 'msg': '罚单与订单不匹配'}, status=status.HTTP_403_FORBIDDEN) + + if operation == 'modify_penalty': + return self._modify_penalty(fadan, request.data.get('liyou', ''), request.data.get('jine')) + elif operation == 'cancel_penalty': + return self._cancel_penalty(fadan, request.data.get('liyou', '')) + elif operation == 'resubmit_penalty': + return self._resubmit_penalty(fadan, request.data.get('liyou', ''), request.data.get('jine')) + else: + return Response({'code': 400, 'msg': '无效的操作类型'}, status=status.HTTP_400_BAD_REQUEST) + + def _cancel_refund(self, dingdan, liyou): + """撤销退款申请（状态4 → 状态8，清空退款理由）""" + if dingdan.zhuangtai != 4: + return Response({'code': 400, 'msg': '只有退款中的订单可以撤销退款申请'}) + with transaction.atomic(): + dingdan.zhuangtai = 8 + dingdan.tkly = '' # 清空退款理由 + dingdan.save() + # 记录撤销理由可存入日志（如需要可另建日志表，此处简单处理） + logger.info(f"商家撤销退款订单 {dingdan.dingdan_id}，理由: {liyou}") + return Response({'code': 0, 'msg': '已撤销退款申请'}) + + def _modify_refund_reason(self, dingdan, liyou): + """修改退款理由（仅状态4时）""" + if dingdan.zhuangtai != 4: + return Response({'code': 400, 'msg': '只有退款中的订单可以修改退款理由'}) + if not liyou.strip(): + return Response({'code': 400, 'msg': '退款理由不能为空'}) + dingdan.tkly = liyou[:500] + dingdan.save() + return Response({'code': 0, 'msg': '退款理由修改成功'}) + + def _modify_penalty(self, fadan, liyou, jine_str): + """修改罚款（仅状态1待缴纳或 3申诉中）""" + if fadan.zhuangtai not in (1, 3): + return Response({'code': 400, 'msg': '当前罚单状态不可修改'}) + if not liyou.strip(): + return Response({'code': 400, 'msg': '罚款理由不能为空'}) + try: + jine = Decimal(jine_str) + if jine <= 0: + raise ValueError + except: + return Response({'code': 400, 'msg': '罚款金额必须为正数'}) + with transaction.atomic(): + fadan.chufaliyou = liyou[:500] + fadan.fakuanjine = jine + # 如果之前是驳回状态修改，需要重置状态为待缴纳？不，修改不应改变状态 + fadan.save() + return Response({'code': 0, 'msg': '罚款修改成功'}) + + def _cancel_penalty(self, fadan, liyou): + """撤销罚款（状态1或3 → 状态4 已驳回）""" + if fadan.zhuangtai not in (1, 3): + return Response({'code': 400, 'msg': '当前罚单状态不可撤销'}) + if not liyou.strip(): + return Response({'code': 400, 'msg': '驳回理由不能为空'}) + with transaction.atomic(): + fadan.zhuangtai = 4 # 已驳回 + fadan.bohuiliyou = liyou[:500] + fadan.save() + return Response({'code': 0, 'msg': '罚款已撤销（驳回）'}) + + def _resubmit_penalty(self, fadan, liyou, jine_str): + """再次申请罚款（状态4 → 状态1，修改理由和金额）""" + if fadan.zhuangtai != 4: + return Response({'code': 400, 'msg': '只有已驳回的罚单可再次申请'}) + if not liyou.strip(): + return Response({'code': 400, 'msg': '罚款理由不能为空'}) + try: + jine = Decimal(jine_str) + if jine <= 0: + raise ValueError + except: + return Response({'code': 400, 'msg': '罚款金额必须为正数'}) + with transaction.atomic(): + fadan.zhuangtai = 1 # 待缴纳 + fadan.chufaliyou = liyou[:500] + fadan.fakuanjine = jine + fadan.bohuiliyou = '' # 清空驳回理由 + fadan.save() + return Response({'code': 0, 'msg': '已重新申请罚款'}) \ No newline at end of file diff --git a/houtai/__pycache__/apps.cpython-313.pyc b/houtai/__pycache__/apps.cpython-313.pyc new file mode 100644 index 0000000..54fde51 Binary files /dev/null and b/houtai/__pycache__/apps.cpython-313.pyc differ diff --git a/houtai/__pycache__/models.cpython-313.pyc b/houtai/__pycache__/models.cpython-313.pyc new file mode 100644 index 0000000..8b0ef0d Binary files /dev/null and b/houtai/__pycache__/models.cpython-313.pyc differ diff --git a/houtai/__pycache__/serializers.cpython-313.pyc b/houtai/__pycache__/serializers.cpython-313.pyc new file mode 100644 index 0000000..253ef14 Binary files /dev/null and b/houtai/__pycache__/serializers.cpython-313.pyc differ diff --git a/houtai/__pycache__/urls.cpython-313.pyc b/houtai/__pycache__/urls.cpython-313.pyc new file mode 100644 index 0000000..b27ea65 Binary files /dev/null and b/houtai/__pycache__/urls.cpython-313.pyc differ diff --git a/houtai/__pycache__/utils.cpython-312.pyc b/houtai/__pycache__/utils.cpython-312.pyc new file mode 100644 index 0000000..2fe48dd Binary files /dev/null and b/houtai/__pycache__/utils.cpython-312.pyc differ diff --git a/houtai/__pycache__/utils.cpython-313.pyc b/houtai/__pycache__/utils.cpython-313.pyc new file mode 100644 index 0000000..680213a Binary files /dev/null and b/houtai/__pycache__/utils.cpython-313.pyc differ diff --git a/houtai/__pycache__/view.cpython-313.pyc b/houtai/__pycache__/view.cpython-313.pyc new file mode 100644 index 0000000..4057088 Binary files /dev/null and b/houtai/__pycache__/view.cpython-313.pyc differ diff --git a/houtai/_init_.py b/houtai/_init_.py new file mode 100644 index 0000000..e69de29 diff --git a/houtai/apps.py b/houtai/apps.py new file mode 100644 index 0000000..bc21450 --- /dev/null +++ b/houtai/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + +class HoutaiConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'houtai' \ No newline at end of file diff --git a/houtai/migrations/0001_initial.py b/houtai/migrations/0001_initial.py new file mode 100644 index 0000000..e71b4e2 --- /dev/null +++ b/houtai/migrations/0001_initial.py @@ -0,0 +1,296 @@ +# Generated by Django 4.2.27 on 2026-04-06 23:31 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [] + + operations = [ + migrations.CreateModel( + name="AbnormalUserLog", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "account_id", + models.CharField( + db_index=True, max_length=20, verbose_name="账号ID（phone）" + ), + ), + ( + "ip_address", + models.GenericIPAddressField( + blank=True, null=True, verbose_name="IP地址" + ), + ), + ( + "real_ip", + models.GenericIPAddressField( + blank=True, null=True, verbose_name="真实IP（穿透代理后）" + ), + ), + ( + "x_forwarded_for", + models.CharField( + blank=True, + default="", + max_length=255, + verbose_name="X-Forwarded-For", + ), + ), + ( + "user_agent", + models.CharField( + blank=True, + default="", + max_length=500, + verbose_name="User-Agent", + ), + ), + ( + "request_method", + models.CharField( + blank=True, default="", max_length=10, verbose_name="请求方法" + ), + ), + ( + "request_path", + models.CharField( + blank=True, default="", max_length=500, verbose_name="请求路径" + ), + ), + ( + "request_params", + models.TextField( + blank=True, default="", verbose_name="请求参数（GET/POST）" + ), + ), + ( + "request_body", + models.TextField( + blank=True, default="", verbose_name="请求体（原始）" + ), + ), + ( + "request_headers", + models.TextField( + blank=True, default="", verbose_name="请求头（JSON格式）" + ), + ), + ( + "attempt_type", + models.CharField( + blank=True, default="", max_length=50, verbose_name="攻击类型" + ), + ), + ( + "detail", + models.TextField(blank=True, default="", verbose_name="详细描述"), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ], + options={ + "verbose_name": "异常用户日志", + "verbose_name_plural": "异常用户日志", + "db_table": "abnormal_user_log", + }, + ), + migrations.CreateModel( + name="Permission", + fields=[ + ( + "perm_id", + models.AutoField( + primary_key=True, serialize=False, verbose_name="权限ID" + ), + ), + ( + "perm_code", + models.CharField( + db_index=True, + max_length=100, + unique=True, + verbose_name="权限编码", + ), + ), + ( + "perm_name", + models.CharField(max_length=100, verbose_name="权限名称"), + ), + ( + "description", + models.CharField( + blank=True, default="", max_length=200, verbose_name="权限描述" + ), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ( + "update_time", + models.DateTimeField(auto_now=True, verbose_name="更新时间"), + ), + ], + options={ + "verbose_name": "权限", + "verbose_name_plural": "权限", + "db_table": "permission", + }, + ), + migrations.CreateModel( + name="Role", + fields=[ + ( + "role_id", + models.AutoField( + primary_key=True, serialize=False, verbose_name="角色ID" + ), + ), + ( + "role_code", + models.CharField( + db_index=True, + max_length=50, + unique=True, + verbose_name="角色编码", + ), + ), + ("role_name", models.CharField(max_length=50, verbose_name="角色名称")), + ( + "description", + models.CharField( + blank=True, default="", max_length=200, verbose_name="角色描述" + ), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ( + "update_time", + models.DateTimeField(auto_now=True, verbose_name="更新时间"), + ), + ], + options={ + "verbose_name": "角色", + "verbose_name_plural": "角色", + "db_table": "role", + }, + ), + migrations.CreateModel( + name="UserRole", + fields=[ + ("id", models.AutoField(primary_key=True, serialize=False)), + ( + "account_id", + models.CharField( + db_index=True, max_length=11, verbose_name="账号ID" + ), + ), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ( + "update_time", + models.DateTimeField(auto_now=True, verbose_name="更新时间"), + ), + ( + "role", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="houtai.role", + verbose_name="角色", + ), + ), + ], + options={ + "verbose_name": "用户角色关联", + "verbose_name_plural": "用户角色关联", + "db_table": "user_role", + }, + ), + migrations.CreateModel( + name="RolePermission", + fields=[ + ("id", models.AutoField(primary_key=True, serialize=False)), + ( + "create_time", + models.DateTimeField(auto_now_add=True, verbose_name="创建时间"), + ), + ( + "permission", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="houtai.permission", + verbose_name="权限", + ), + ), + ( + "role", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="houtai.role", + verbose_name="角色", + ), + ), + ], + options={ + "verbose_name": "角色权限关联", + "verbose_name_plural": "角色权限关联", + "db_table": "role_permission", + }, + ), + migrations.AddIndex( + model_name="role", + index=models.Index(fields=["role_code"], name="role_role_co_b9f497_idx"), + ), + migrations.AddIndex( + model_name="permission", + index=models.Index( + fields=["perm_code"], name="permission_perm_co_56cbe3_idx" + ), + ), + migrations.AddIndex( + model_name="abnormaluserlog", + index=models.Index( + fields=["account_id"], name="abnormal_us_account_425899_idx" + ), + ), + migrations.AddIndex( + model_name="abnormaluserlog", + index=models.Index( + fields=["ip_address"], name="abnormal_us_ip_addr_3d612b_idx" + ), + ), + migrations.AddIndex( + model_name="abnormaluserlog", + index=models.Index( + fields=["create_time"], name="abnormal_us_create__ee16da_idx" + ), + ), + migrations.AlterUniqueTogether( + name="userrole", + unique_together={("account_id", "role")}, + ), + migrations.AlterUniqueTogether( + name="rolepermission", + unique_together={("role", "permission")}, + ), + ] diff --git a/houtai/migrations/0002_zuzhangritongji_shangjiaritongji_and_more.py b/houtai/migrations/0002_zuzhangritongji_shangjiaritongji_and_more.py new file mode 100644 index 0000000..6284dd8 --- /dev/null +++ b/houtai/migrations/0002_zuzhangritongji_shangjiaritongji_and_more.py @@ -0,0 +1,339 @@ +# Generated by Django 4.2.27 on 2026-04-09 14:53 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("houtai", "0001_initial"), + ] + + operations = [ + migrations.CreateModel( + name="ZuzhangRiTongji", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "yonghuid", + models.CharField( + db_index=True, max_length=7, verbose_name="组长用户ID" + ), + ), + ("riqi", models.DateField(db_index=True, verbose_name="日期")), + ( + "yaoqing_guanshi_shu", + models.IntegerField(default=0, verbose_name="邀请管事总数"), + ), + ( + "shouru_zonge", + models.DecimalField( + decimal_places=2, + default=0.0, + max_digits=12, + verbose_name="收入总额（分佣）", + ), + ), + ( + "fenyong_jine", + models.DecimalField( + decimal_places=2, + default=0.0, + max_digits=12, + verbose_name="分佣金额", + ), + ), + ], + options={ + "verbose_name": "组长每日统计", + "db_table": "zuzhang_ri_tongji", + "indexes": [ + models.Index( + fields=["riqi", "-yaoqing_guanshi_shu"], + name="zuzhang_ri__riqi_87169e_idx", + ), + models.Index( + fields=["riqi", "-shouru_zonge"], + name="zuzhang_ri__riqi_1d7e51_idx", + ), + ], + "unique_together": {("yonghuid", "riqi")}, + }, + ), + migrations.CreateModel( + name="ShangjiaRiTongji", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "yonghuid", + models.CharField( + db_index=True, max_length=7, verbose_name="商家用户ID" + ), + ), + ("riqi", models.DateField(db_index=True, verbose_name="日期")), + ( + "paifa_dingdan_shu", + models.IntegerField(default=0, verbose_name="派发订单总数"), + ), + ( + "paifa_jine", + models.DecimalField( + decimal_places=2, + default=0.0, + max_digits=12, + verbose_name="派发订单总金额", + ), + ), + ( + "jiesuan_dingdan_shu", + models.IntegerField(default=0, verbose_name="结算订单总数"), + ), + ( + "jiesuan_jine", + models.DecimalField( + decimal_places=2, + default=0.0, + max_digits=12, + verbose_name="结算总金额", + ), + ), + ( + "tuikuan_dingdan_shu", + models.IntegerField(default=0, verbose_name="退款订单总数"), + ), + ( + "tuikuan_jine", + models.DecimalField( + decimal_places=2, + default=0.0, + max_digits=12, + verbose_name="退款总金额", + ), + ), + ], + options={ + "verbose_name": "商家每日统计", + "db_table": "shangjia_ri_tongji", + "indexes": [ + models.Index( + fields=["riqi", "-paifa_jine"], + name="shangjia_ri_riqi_d00f7f_idx", + ), + models.Index( + fields=["riqi", "-jiesuan_jine"], + name="shangjia_ri_riqi_25772a_idx", + ), + models.Index( + fields=["riqi", "-paifa_dingdan_shu"], + name="shangjia_ri_riqi_e05c54_idx", + ), + ], + "unique_together": {("yonghuid", "riqi")}, + }, + ), + migrations.CreateModel( + name="GuanshiXufeiRiTongji", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "yonghuid", + models.CharField( + db_index=True, max_length=7, verbose_name="管事用户ID" + ), + ), + ("riqi", models.DateField(db_index=True, verbose_name="日期")), + ( + "xufei_zongshu", + models.IntegerField(default=0, verbose_name="今日续费总数"), + ), + ( + "xufei_shouyi", + models.DecimalField( + decimal_places=2, + default=0.0, + max_digits=12, + verbose_name="续费收益金额", + ), + ), + ], + options={ + "verbose_name": "管事续费每日统计", + "db_table": "guanshi_xufei_ri_tongji", + "indexes": [ + models.Index( + fields=["riqi", "-xufei_zongshu"], + name="guanshi_xuf_riqi_7c128f_idx", + ), + models.Index( + fields=["riqi", "-xufei_shouyi"], + name="guanshi_xuf_riqi_8f09b5_idx", + ), + ], + "unique_together": {("yonghuid", "riqi")}, + }, + ), + migrations.CreateModel( + name="GuanshiRiTongji", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "yonghuid", + models.CharField( + db_index=True, max_length=7, verbose_name="管事用户ID" + ), + ), + ("riqi", models.DateField(db_index=True, verbose_name="日期")), + ( + "yaoqing_dashou_shu", + models.IntegerField(default=0, verbose_name="邀请打手总数"), + ), + ( + "chongzhi_dashou_shu", + models.IntegerField(default=0, verbose_name="充值打手数量"), + ), + ( + "shouru_zonge", + models.DecimalField( + decimal_places=2, + default=0.0, + max_digits=12, + verbose_name="收入总额", + ), + ), + ], + options={ + "verbose_name": "管事每日统计", + "db_table": "guanshi_ri_tongji", + "indexes": [ + models.Index( + fields=["riqi", "-yaoqing_dashou_shu"], + name="guanshi_ri__riqi_075e1a_idx", + ), + models.Index( + fields=["riqi", "-chongzhi_dashou_shu"], + name="guanshi_ri__riqi_78a79d_idx", + ), + models.Index( + fields=["riqi", "-shouru_zonge"], + name="guanshi_ri__riqi_334f52_idx", + ), + ], + "unique_together": {("yonghuid", "riqi")}, + }, + ), + migrations.CreateModel( + name="DashouRiTongji", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "yonghuid", + models.CharField( + db_index=True, max_length=7, verbose_name="打手用户ID" + ), + ), + ("riqi", models.DateField(db_index=True, verbose_name="日期")), + ( + "jiedan_zongliang", + models.IntegerField(default=0, verbose_name="接单总量"), + ), + ( + "chengjiao_zongliang", + models.IntegerField(default=0, verbose_name="成交单总量"), + ), + ( + "jiedan_zonge", + models.DecimalField( + decimal_places=2, + default=0.0, + max_digits=12, + verbose_name="接单总金额", + ), + ), + ( + "chengjiao_zonge", + models.DecimalField( + decimal_places=2, + default=0.0, + max_digits=12, + verbose_name="成交总金额", + ), + ), + ( + "tuikuan_liang", + models.IntegerField(default=0, verbose_name="退款订单量"), + ), + ( + "tuikuan_jine", + models.DecimalField( + decimal_places=2, + default=0.0, + max_digits=12, + verbose_name="退款总金额", + ), + ), + ], + options={ + "verbose_name": "打手每日统计", + "db_table": "dashou_ri_tongji", + "indexes": [ + models.Index( + fields=["riqi", "-jiedan_zongliang"], + name="dashou_ri_t_riqi_95a785_idx", + ), + models.Index( + fields=["riqi", "-chengjiao_zongliang"], + name="dashou_ri_t_riqi_ad9c1a_idx", + ), + models.Index( + fields=["riqi", "-jiedan_zonge"], + name="dashou_ri_t_riqi_5da703_idx", + ), + models.Index( + fields=["riqi", "-chengjiao_zonge"], + name="dashou_ri_t_riqi_0a3156_idx", + ), + ], + "unique_together": {("yonghuid", "riqi")}, + }, + ), + ] diff --git a/houtai/migrations/0003_tixianritongji.py b/houtai/migrations/0003_tixianritongji.py new file mode 100644 index 0000000..8149a08 --- /dev/null +++ b/houtai/migrations/0003_tixianritongji.py @@ -0,0 +1,54 @@ +# Generated by Django 4.2.27 on 2026-04-10 18:05 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("houtai", "0002_zuzhangritongji_shangjiaritongji_and_more"), + ] + + operations = [ + migrations.CreateModel( + name="TixianRiTongji", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("riqi", models.DateField(db_index=True, verbose_name="日期")), + ( + "leixing", + models.IntegerField( + choices=[(1, "打手"), (2, "管事"), (3, "组长")], + verbose_name="用户类型", + ), + ), + ( + "total_amount", + models.DecimalField( + decimal_places=2, + default=0.0, + max_digits=12, + verbose_name="当天提现总额(元)", + ), + ), + ], + options={ + "verbose_name": "每日提现统计", + "db_table": "tixian_ri_tongji", + "indexes": [ + models.Index( + fields=["riqi", "leixing"], name="tixian_ri_t_riqi_c18bb2_idx" + ) + ], + "unique_together": {("riqi", "leixing")}, + }, + ), + ] diff --git a/houtai/migrations/0024_alter_tixianritongji_leixing.py b/houtai/migrations/0024_alter_tixianritongji_leixing.py new file mode 100644 index 0000000..3e70ca4 --- /dev/null +++ b/houtai/migrations/0024_alter_tixianritongji_leixing.py @@ -0,0 +1,28 @@ +# Generated by Django 4.2.27 on 2026-06-12 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("houtai", "0003_tixianritongji"), + ] + + operations = [ + migrations.AlterField( + model_name="tixianritongji", + name="leixing", + field=models.IntegerField( + choices=[ + (1, "打手"), + (2, "管事"), + (3, "组长"), + (4, "考核官"), + (5, "打手押金"), + (6, "商家余额"), + ], + verbose_name="用户类型", + ), + ), + ] diff --git a/houtai/migrations/__init__.py b/houtai/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/houtai/migrations/__pycache__/0001_initial.cpython-313.pyc b/houtai/migrations/__pycache__/0001_initial.cpython-313.pyc new file mode 100644 index 0000000..e47cd67 Binary files /dev/null and b/houtai/migrations/__pycache__/0001_initial.cpython-313.pyc differ diff --git a/houtai/migrations/__pycache__/0002_zuzhangritongji_shangjiaritongji_and_more.cpython-313.pyc b/houtai/migrations/__pycache__/0002_zuzhangritongji_shangjiaritongji_and_more.cpython-313.pyc new file mode 100644 index 0000000..a4c3b29 Binary files /dev/null and b/houtai/migrations/__pycache__/0002_zuzhangritongji_shangjiaritongji_and_more.cpython-313.pyc differ diff --git a/houtai/migrations/__pycache__/0003_tixianritongji.cpython-313.pyc b/houtai/migrations/__pycache__/0003_tixianritongji.cpython-313.pyc new file mode 100644 index 0000000..5983468 Binary files /dev/null and b/houtai/migrations/__pycache__/0003_tixianritongji.cpython-313.pyc differ diff --git a/houtai/migrations/__pycache__/__init__.cpython-313.pyc b/houtai/migrations/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..7ecec24 Binary files /dev/null and b/houtai/migrations/__pycache__/__init__.cpython-313.pyc differ diff --git a/houtai/migrations/_init_.py b/houtai/migrations/_init_.py new file mode 100644 index 0000000..e69de29 diff --git a/houtai/models.py b/houtai/models.py new file mode 100644 index 0000000..c97883e --- /dev/null +++ b/houtai/models.py @@ -0,0 +1,272 @@ +from django.db import models + +# ==================== 1. 角色表 ==================== +class Role(models.Model): + """角色表""" + role_id = models.AutoField(primary_key=True, verbose_name='角色ID') + role_code = models.CharField(max_length=50, unique=True, db_index=True, verbose_name='角色编码') + role_name = models.CharField(max_length=50, verbose_name='角色名称') + description = models.CharField(max_length=200, blank=True, default='', verbose_name='角色描述') + + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + + class Meta: + db_table = 'role' + verbose_name = '角色' + verbose_name_plural = '角色' + indexes = [ + models.Index(fields=['role_code']), + + ] + + def __str__(self): + return self.role_name + + +# ==================== 2. 权限表 ==================== +class Permission(models.Model): + """权限表""" + perm_id = models.AutoField(primary_key=True, verbose_name='权限ID') + perm_code = models.CharField(max_length=100, unique=True, db_index=True, verbose_name='权限编码') + perm_name = models.CharField(max_length=100, verbose_name='权限名称') + description = models.CharField(max_length=200, blank=True, default='', verbose_name='权限描述') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + + class Meta: + db_table = 'permission' + verbose_name = '权限' + verbose_name_plural = '权限' + indexes = [ + models.Index(fields=['perm_code']), + ] + + def __str__(self): + return f"{self.perm_name} ({self.perm_code})" + + +# ==================== 3. 角色-权限关联表 ==================== +class RolePermission(models.Model): + """角色权限关联表""" + id = models.AutoField(primary_key=True) + role = models.ForeignKey(Role, on_delete=models.CASCADE, db_index=True, verbose_name='角色') + permission = models.ForeignKey(Permission, on_delete=models.CASCADE, db_index=True, verbose_name='权限') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + + class Meta: + db_table = 'role_permission' + verbose_name = '角色权限关联' + verbose_name_plural = '角色权限关联' + unique_together = [['role', 'permission']] # 防止重复授权 + + def __str__(self): + return f"{self.role.role_name} -> {self.permission.perm_name}" + + +# ==================== 4. 用户-角色关联表 ==================== +class UserRole(models.Model): + """用户角色关联表""" + id = models.AutoField(primary_key=True) + account_id = models.CharField(max_length=11, db_index=True, verbose_name='账号ID') # 对应 UserMain 的 phone 字段 + role = models.ForeignKey(Role, on_delete=models.CASCADE, db_index=True, verbose_name='角色') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') + + class Meta: + db_table = 'user_role' + verbose_name = '用户角色关联' + verbose_name_plural = '用户角色关联' + unique_together = [['account_id', 'role']] # 同一用户同一角色只能有一条 + + def __str__(self): + return f"{self.account_id} -> {self.role.role_name}" + + +class AbnormalUserLog(models.Model): + """记录恶意尝试越权操作的用户信息""" + # 账号信息 + account_id = models.CharField(max_length=20, db_index=True, verbose_name='账号ID（phone）') + + # 网络信息 + ip_address = models.GenericIPAddressField(null=True, blank=True, verbose_name='IP地址') + real_ip = models.GenericIPAddressField(null=True, blank=True, verbose_name='真实IP（穿透代理后）') + x_forwarded_for = models.CharField(max_length=255, blank=True, default='', verbose_name='X-Forwarded-For') + user_agent = models.CharField(max_length=500, blank=True, default='', verbose_name='User-Agent') + + # 地理位置信息（需借助第三方API，这里只存储请求时的IP，后续可离线解析） + # 但我们可以存储更多请求细节 + request_method = models.CharField(max_length=10, blank=True, default='', verbose_name='请求方法') + request_path = models.CharField(max_length=500, blank=True, default='', verbose_name='请求路径') + request_params = models.TextField(blank=True, default='', verbose_name='请求参数（GET/POST）') + request_body = models.TextField(blank=True, default='', verbose_name='请求体（原始）') + request_headers = models.TextField(blank=True, default='', verbose_name='请求头（JSON格式）') + + # 攻击特征 + attempt_type = models.CharField(max_length=50, blank=True, default='', verbose_name='攻击类型') + detail = models.TextField(blank=True, default='', verbose_name='详细描述') + + # 时间戳 + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + + class Meta: + db_table = 'abnormal_user_log' + verbose_name = '异常用户日志' + verbose_name_plural = verbose_name + indexes = [ + models.Index(fields=['account_id']), + models.Index(fields=['ip_address']), + models.Index(fields=['create_time']), + ] + + def __str__(self): + return f"{self.account_id} @ {self.ip_address} - {self.create_time}" + + + + + +class ShangjiaRiTongji(models.Model): + yonghuid = models.CharField(max_length=7, db_index=True, verbose_name='商家用户ID') + riqi = models.DateField(db_index=True, verbose_name='日期') # 年月日 + + # 派发统计 + paifa_dingdan_shu = models.IntegerField(default=0, verbose_name='派发订单总数') + paifa_jine = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='派发订单总金额') + + # 结算统计（成交） + jiesuan_dingdan_shu = models.IntegerField(default=0, verbose_name='结算订单总数') + jiesuan_jine = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='结算总金额') + + # 退款统计（可选） + tuikuan_dingdan_shu = models.IntegerField(default=0, verbose_name='退款订单总数') + tuikuan_jine = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='退款总金额') + + class Meta: + db_table = 'shangjia_ri_tongji' + verbose_name = '商家每日统计' + unique_together = [['yonghuid', 'riqi']] # 每人每天一条记录 + indexes = [ + models.Index(fields=['riqi', '-paifa_jine']), + models.Index(fields=['riqi', '-jiesuan_jine']), + models.Index(fields=['riqi', '-paifa_dingdan_shu']), + ] + + + + + +class DashouRiTongji(models.Model): + yonghuid = models.CharField(max_length=7, db_index=True, verbose_name='打手用户ID') + riqi = models.DateField(db_index=True, verbose_name='日期') # 年月日 + + # 接单统计 + jiedan_zongliang = models.IntegerField(default=0, verbose_name='接单总量') + chengjiao_zongliang = models.IntegerField(default=0, verbose_name='成交单总量') + + # 金额统计 + jiedan_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='接单总金额') + chengjiao_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='成交总金额') + + # 退款统计 + tuikuan_liang = models.IntegerField(default=0, verbose_name='退款订单量') + tuikuan_jine = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='退款总金额') + + class Meta: + db_table = 'dashou_ri_tongji' + verbose_name = '打手每日统计' + unique_together = [['yonghuid', 'riqi']] + indexes = [ + models.Index(fields=['riqi', '-jiedan_zongliang']), + models.Index(fields=['riqi', '-chengjiao_zongliang']), + models.Index(fields=['riqi', '-jiedan_zonge']), + models.Index(fields=['riqi', '-chengjiao_zonge']), + ] + + + +class ZuzhangRiTongji(models.Model): + yonghuid = models.CharField(max_length=7, db_index=True, verbose_name='组长用户ID') + riqi = models.DateField(db_index=True, verbose_name='日期') # 年月日 + + yaoqing_guanshi_shu = models.IntegerField(default=0, verbose_name='邀请管事总数') + shouru_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='收入总额（分佣）') + + # 可选明细 + fenyong_jine = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='分佣金额') + + class Meta: + db_table = 'zuzhang_ri_tongji' + verbose_name = '组长每日统计' + unique_together = [['yonghuid', 'riqi']] + indexes = [ + models.Index(fields=['riqi', '-yaoqing_guanshi_shu']), + models.Index(fields=['riqi', '-shouru_zonge']), + ] + + + + +class GuanshiRiTongji(models.Model): + yonghuid = models.CharField(max_length=7, db_index=True, verbose_name='管事用户ID') + riqi = models.DateField(db_index=True, verbose_name='日期') # 年月日 + + yaoqing_dashou_shu = models.IntegerField(default=0, verbose_name='邀请打手总数') + chongzhi_dashou_shu = models.IntegerField(default=0, verbose_name='充值打手数量') + shouru_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='收入总额') + + class Meta: + db_table = 'guanshi_ri_tongji' + verbose_name = '管事每日统计' + unique_together = [['yonghuid', 'riqi']] + indexes = [ + models.Index(fields=['riqi', '-yaoqing_dashou_shu']), + models.Index(fields=['riqi', '-chongzhi_dashou_shu']), + models.Index(fields=['riqi', '-shouru_zonge']), + ] + + + + +class GuanshiXufeiRiTongji(models.Model): + yonghuid = models.CharField(max_length=7, db_index=True, verbose_name='管事用户ID') + riqi = models.DateField(db_index=True, verbose_name='日期') # 年月日 + + xufei_zongshu = models.IntegerField(default=0, verbose_name='今日续费总数') # 续费订单数（或续费打手数） + xufei_shouyi = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='续费收益金额') + + class Meta: + db_table = 'guanshi_xufei_ri_tongji' + verbose_name = '管事续费每日统计' + unique_together = [['yonghuid', 'riqi']] + indexes = [ + models.Index(fields=['riqi', '-xufei_zongshu']), + models.Index(fields=['riqi', '-xufei_shouyi']), + ] + + + +# models.py 中添加 + +class TixianRiTongji(models.Model): + """ + 每日提现统计表（按身份统计当天提现总额） + """ + riqi = models.DateField(db_index=True, verbose_name='日期') + leixing = models.IntegerField( + choices=[ + (1, '打手'), (2, '管事'), (3, '组长'), + (4, '考核官'), (5, '打手押金'), (6, '商家余额'), + ], + verbose_name='用户类型' + ) + total_amount = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='当天提现总额(元)') + + class Meta: + db_table = 'tixian_ri_tongji' + verbose_name = '每日提现统计' + unique_together = [['riqi', 'leixing']] # 每天每个身份一条记录 + indexes = [models.Index(fields=['riqi', 'leixing'])] + + def __str__(self): + return f"{self.riqi} - {self.get_leixing_display()} 提现总额: {self.total_amount}" \ No newline at end of file diff --git a/houtai/serializers.py b/houtai/serializers.py new file mode 100644 index 0000000..68c7b37 --- /dev/null +++ b/houtai/serializers.py @@ -0,0 +1,39 @@ +# serializers.py + +#小程序弹窗序列化器 +from rest_framework import serializers +from peizhi.models import PopupPage, PopupConfig, PopupImage + +class PopupImageSerializer(serializers.ModelSerializer): + """图片序列化器（输出用）""" + class Meta: + model = PopupImage + fields = ['id', 'image_url', 'text', 'sort_order'] + + +class PopupConfigSerializer(serializers.ModelSerializer): + """弹窗配置序列化器（输出用）""" + images = PopupImageSerializer(many=True, read_only=True) + + class Meta: + model = PopupConfig + fields = [ + 'id', 'popup_id', 'title', 'description', + 'strategy_type', 'max_count', 'reset_interval', + 'duration', 'force_even_muted', 'sort_order', + 'is_active', 'start_time', 'end_time', + 'created_at', 'updated_at', 'images' + ] + + +class PopupPageSerializer(serializers.ModelSerializer): + """页面序列化器（输出用）""" + popups = PopupConfigSerializer(many=True, read_only=True) + + class Meta: + model = PopupPage + fields = [ + 'id', 'page_key', 'name', 'description', + 'is_active', 'ignore_user_mute', + 'created_at', 'updated_at', 'popups' + ] \ No newline at end of file diff --git a/houtai/urls.py b/houtai/urls.py new file mode 100644 index 0000000..6301dde --- /dev/null +++ b/houtai/urls.py @@ -0,0 +1,134 @@ +from django.urls import path +from django.views.decorators.csrf import csrf_exempt + +from .view import GetClubConfigView, GetCrossOrderListView, PartnerGetOrderDataView, PartnerRefundNotifyView, \ + CrossPlatformRefundView, GetCrossOrderDetailView, CrossPlatformForceCompleteView, CrossPlatformTransferHallView, \ + PartnerTransferHallNotifyView, GetSettingsView, UpdateSettingsView, GetMappingsView, UpdateMappingsView, \ + PartnerUpdateSelfConfigView, GetPartnerClubsView, GetStatsView, PunishDashouView, PartnerPunishNotifyView, \ + GetClubConfigForPreSettlementView, PreSettlementActionView, GetPreSettlementDataView, GetRolePermissionView, \ + ModifyRolePermissionView, AddRoleView, GetAdminRolesView, GetAdminUserListView, AddAdminUserView, \ + ModifyAdminUserView, KefuGetDashouListView, KefuGetDashouDetailView, KefuUpdateDashouView, KefuGetShangjiaListView, \ + KefuGetShangjiaDetailView, KefuUpdateShangjiaView, GetProductBaseDataView, GetProductListView, SaveProductOrderView, \ + AddProductView, DeleteProductView, GetProductDetailView, UpdateProductView, UpdateMemberView, GetMemberListView, \ + AddMemberView, GetGuanliListView, GetGuanliDetailView, UpdateGuanliView, GetWithdrawSettingsView, \ + UpdateWithdrawSettingsView, GetZuzhangListView, GetZuzhangDetailView, UpdateZuzhangView, GetProductTypeZoneView, \ + ModifyProductTypeZoneView, GetRateView, ModifyRateView, PopupNoticeListAPIView, PopupNoticeModifyAPIView, \ + ShopListView, ShopModifyView, ShopPublicTypeAndAuditView, ShopListForProductView, ShopProductModifyView, \ + ShopProductTypeMappingView, ProductListView, ProductModifyView, KefuChatPermissionsView, PartnerFineNotifyView, \ + FineApplyView, FaKuanTongJiView, FaKuanLieBiaoView, FaKuanChuLiView, FaKuanChuangJianView, HqbkxxView, BkxgView, \ + CaiwuView, CwhybkhqView, HybkjtsjView, SzxxView, CwddhqlxView, CwhqjtddsjView, CwqtczhqView, KhpzhqView, ChzsgcView, \ + KhgglView, ShgxgsjView, ZxkfghdsView, KptxwztjbView + +urlpatterns = [ + + path('kpthq', GetClubConfigView.as_view(), name='跨平台订单页面获取俱乐部数据'), + path('hqddlb', GetCrossOrderListView.as_view(), name='获取跨平台订单'), + path('kpthqtp',csrf_exempt(PartnerGetOrderDataView.as_view()), name='跨平台接受对方服务器获取订单数据'), + # 对方平台退款通知接口 + path('dfddtk', csrf_exempt(PartnerRefundNotifyView.as_view()), name='跨平台接受对方服务器更新订单状态'), + path('kptk', CrossPlatformRefundView.as_view(), name='跨平台订单退款'), + path('hqkptddxq', GetCrossOrderDetailView.as_view(), name='获取跨平台订单数据详情'), + path('kpqzjd', CrossPlatformForceCompleteView.as_view(), name='跨平台订单结算'), + path('kpzydt', CrossPlatformTransferHallView.as_view(), name='跨平台转移大厅'), + path('kpttzzydt', csrf_exempt(PartnerTransferHallNotifyView.as_view()), name='跨平台接受对方转移大厅通知'), + path('hqkptsz', GetSettingsView.as_view(), name='获取俱乐部数据信息'), + path('xgjlbsj', UpdateSettingsView.as_view(), name='更新俱乐部数据信息'), + path('hqqtjlbsj', GetMappingsView.as_view(), name='获取俱乐部订单类型映射'), + path('xgdfddys', UpdateMappingsView.as_view(), name='工薪俱乐部订单类型映射'), + path('xgzjsjcs', csrf_exempt(PartnerUpdateSelfConfigView.as_view()), name='partner_update_self_config'), + path('kpthqpt', GetPartnerClubsView.as_view(), name='前端获取俱乐部数据展示派发数据'), + path('hqpfsj', GetStatsView.as_view(), name='前端派发统计表获取'), + path('kpcf', PunishDashouView.as_view(), name='跨平台处罚打手'), + path('kptcfds', PartnerPunishNotifyView.as_view(), name='接受跨平台对方平台处罚申请'), + path('hqkttjsyjs', GetClubConfigForPreSettlementView.as_view(), name='预处理获取俱乐部数据'), + path('hqyjssj', GetPreSettlementDataView.as_view(), name='获取预处理数据'), + path('yjsjjhdk', PreSettlementActionView.as_view(), name='操作预处理'), + + path('gljshq', GetRolePermissionView.as_view(), name='获取就角色信息'), + path('sctjjsnr', ModifyRolePermissionView.as_view(), name='修改角色数据'), + path('tjjs', AddRoleView.as_view(), name='添加角色'), + + path('hqyhjsgl', GetAdminRolesView.as_view(), name='管理用户页面获取用户角色'), + path('hqjsyhsj', GetAdminUserListView.as_view(), name='管理用户页面获取用户数据'), + path('xghtyhsj', ModifyAdminUserView.as_view(), name='管理用户页面修改用户数据'), + path('tjyhjs', AddAdminUserView.as_view(), name='管理用户页面添加用户'), + path('kefuhqdslb', KefuGetDashouListView.as_view(), name='客服获取打手数据'), + path('kefuhqdsxq', KefuGetDashouDetailView.as_view(), name='客服获取打手具体信息'), + path('kefuxgds', KefuUpdateDashouView.as_view(), name='客服修改打手数据'), + path('hqsjgllb', KefuGetShangjiaListView.as_view(), name='后台获取商家列表'), + path('hthqsjxq', KefuGetShangjiaDetailView.as_view(), name='后台获取商家详情'), + path('xgsjxx', KefuUpdateShangjiaView.as_view(), name='后台修改商家数据'), + + path('htsphqjcsx', GetProductBaseDataView.as_view(), name='后台获取商品类型专区'), + path('hthqsplb', GetProductListView.as_view(), name='后台获取商品数据'), + path('htsppaixu', SaveProductOrderView.as_view(), name='后台修改商品类型排序'), + path('htfbsp', AddProductView.as_view(), name='后台添加商品'), + path('htscsp', DeleteProductView.as_view(), name='后台删除商品'), + path('htsphqxq', GetProductDetailView.as_view(), name='后台获取商品详情'), + path('bcspxg', UpdateProductView.as_view(), name='后台更新商品数据'), + + path('hthqhylb', GetMemberListView.as_view(), name='后台获取会员列表'), + path('htxghyxx', UpdateMemberView.as_view(), name='后台更新会员信息'), + path('httjhy', AddMemberView.as_view(), name='后台添加会员'), + path('hthqgslb', GetGuanliListView.as_view(), name='后台获取管事列表'), + + path('hthqgsxq', GetGuanliDetailView.as_view(), name='后台获取管事详情信息'), + path('htxggsxx', UpdateGuanliView.as_view(), name='后台更新管事数据'), + path('hthqtxpz', GetWithdrawSettingsView.as_view(), name='后台获取提现配置'), + path('htxgtxsz', UpdateWithdrawSettingsView.as_view(), name='后台修改提现配置'), + path('hthqzzlb', GetZuzhangListView.as_view(), name='后台获取组长列表'), + path('hthqzzxq', GetZuzhangDetailView.as_view(), name='后台获取组长详情页面'), + path('htxgzzxx', UpdateZuzhangView.as_view(), name='后台修改组长信息'), + + + path('hthqsplxzq', GetProductTypeZoneView.as_view(), name='后台获取商品类型专区'), + path('htxgsplx', ModifyProductTypeZoneView.as_view(), name='后台修改添加商品类型专区'), + path('hthqfhpz', GetRateView.as_view(), name='后台获取费率'), + path('htxgfl', ModifyRateView.as_view(), name='后台修改费率'), + path('hthqtcxx', PopupNoticeListAPIView.as_view(), name='后台获取弹窗配置'), + path('htxgtcxx', PopupNoticeModifyAPIView.as_view(), name='后台更新创建弹窗配置'), + + path('hqdplbsj', ShopListView.as_view(), name='获取店铺列表数据'), + path('xgdpxx', ShopModifyView.as_view(), name='修改或添加店铺数据'), + + + path('htdphqsplx', ShopPublicTypeAndAuditView.as_view(), name='后台获取店铺公共商品类型，默认审核配置'), + path('htdphqdpys', ShopListForProductView.as_view(), name='后台获取商品店铺'), + path('htdphqyssplx', ShopProductTypeMappingView.as_view(), name='后台获取商品店铺类型'), + path('htxgdpsplx', ShopProductModifyView.as_view(), name='后台修改店铺商品类型和默认审核模式'), + path('hqhtdpsplx', ProductListView.as_view(), name='后台获取店铺商品数据'), + path('htxgdpspsj', ProductModifyView.as_view(), name='后台修改店铺商品数据'), + + path('kfhqltqx', KefuChatPermissionsView.as_view(), name='后台获取客服聊天配置'), + + path('kffkdssq', FineApplyView.as_view(), name='跨平台处罚罚款申请接口'), + path('kffkdssq_notify', PartnerFineNotifyView.as_view(), name='跨屏要对方平台处罚通知接口'), + + path('htglyhqcfsltj', FaKuanTongJiView.as_view(),name='后台罚单统计图片'), # 罚款统计 + path('hthqfklb', FaKuanLieBiaoView.as_view(),name='后台罚单列表'), # 罚款列表 + path('glyclfk', FaKuanChuLiView.as_view(),name='后台罚单操作'), # 处理罚款 + path('htfksc', FaKuanChuangJianView.as_view(),name='后台生成罚单'), # 创建罚款 + + path('hqbkxx', HqbkxxView.as_view(), name='获取板块数据'), # 获取板块数据 + path('bkxg', BkxgView.as_view(), name='板块增删改查'), # 板块增删改 + + path('caiwu', CaiwuView.as_view(), name='财务页面基础数据'), + + path('cwhybkhq', CwhybkhqView.as_view(), name='财务会员模块'), + path('hybkjtsj', HybkjtsjView.as_view(), name='财务会员统计'), + path('szxx', SzxxView.as_view(), name='详细收支记录'), + path('cwddhqlx', CwddhqlxView.as_view(), name='后台财务获取订单类型'), + path('cwhqjtddsj', CwhqjtddsjView.as_view(), name='后台财务获取订单数据'), +# urls.py + path('cwqtczhq', CwqtczhqView.as_view(), name='财务获取其他充值统计'), + + path('khpzhq', KhpzhqView.as_view(), name='后台获取称号配置'), + path('chzsgc', ChzsgcView.as_view(), name='后台对称号增删改查'), + path('khggl', KhgglView.as_view(), name='获取考核管信息'), + path('shgxgsj', ShgxgsjView.as_view(), name='修改考核管数据'), + path('zxkfghds', ZxkfghdsView.as_view(), name='链接换打手或重新下单'), + + path('kptxwztjb', csrf_exempt(KptxwztjbView.as_view()), name='跨平台脚本询问订单状态'), + + +] \ No newline at end of file diff --git a/houtai/utils.py b/houtai/utils.py new file mode 100644 index 0000000..f2a0c69 --- /dev/null +++ b/houtai/utils.py @@ -0,0 +1,436 @@ +# houtai/utils.py +import logging +import json +from django.core.exceptions import ObjectDoesNotExist +from rest_framework.response import Response +from .models import AbnormalUserLog, UserRole, RolePermission, Permission, DashouRiTongji, ShangjiaRiTongji, \ + GuanshiXufeiRiTongji, GuanshiRiTongji, ZuzhangRiTongji, TixianRiTongji + +from django.db import transaction +from django.db.models import F +from datetime import date +from decimal import Decimal + +logger = logging.getLogger(__name__) + + +def _get_real_ip(request): + """获取真实IP（考虑代理）""" + x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR') + if x_forwarded_for: + ip = x_forwarded_for.split(',')[0].strip() + return ip, x_forwarded_for + else: + ip = request.META.get('REMOTE_ADDR') + return ip, '' + + +def _record_abnormal(account_id, request, attempt_type, detail=''): + """记录异常操作（仅用于越权等攻击行为）""" + try: + real_ip, xff = _get_real_ip(request) + headers = {k: v for k, v in request.META.items() if k.startswith('HTTP_')} + headers_json = json.dumps(headers, ensure_ascii=False)[:2000] + + request_params = json.dumps(request.query_params.dict(), ensure_ascii=False) if request.query_params else '' + request_body = request.body.decode('utf-8', errors='ignore')[:5000] + + AbnormalUserLog.objects.create( + account_id=account_id, + ip_address=real_ip, + real_ip=real_ip, + x_forwarded_for=xff, + user_agent=request.META.get('HTTP_USER_AGENT', ''), + request_method=request.method, + request_path=request.path, + request_params=request_params, + request_body=request_body, + request_headers=headers_json, + attempt_type=attempt_type, + detail=detail, + ) + logger.warning(f"记录异常用户: {account_id} IP:{real_ip} 类型:{attempt_type}") + except Exception as e: + logger.error(f"记录异常日志失败: {e}") + + +def verify_kefu_permission(request, username_from_frontend=None): + """ + 验证后台管理员身份，并返回该用户的所有权限列表（基于新RBAC表） + 只有前端传递的username与当前登录用户不匹配时，才记录异常并警告前端。 + + 参数: + request: DRF request 对象 + username_from_frontend: 前端传递的账号（用于防越权） + + 返回: + (kefu_obj, permissions_list) # 验证通过 + (None, Response) # 验证失败，直接返回Response + """ + current_user = request.user + + # ---------- 1. 必须是客服 ---------- + if current_user.user_type != 'kefu': + return None, Response({'code': 403, 'msg': '身份错误，非客服账号'}, status=403) + + # ---------- 2. 客服扩展表存在且状态正常 ---------- + try: + kefu = current_user.kefu_profile + if kefu.zhuangtai != 1: + return None, Response({'code': 403, 'msg': '客服账号已被禁用'}, status=403) + except ObjectDoesNotExist: + return None, Response({'code': 403, 'msg': '客服账号不存在'}, status=403) + + # ---------- 3. 越权检测（只记录前端篡改username的情况） ---------- + if username_from_frontend and current_user.phone != username_from_frontend: + detail = f'前端username: {username_from_frontend}，实际登录账号: {current_user.phone}' + _record_abnormal(current_user.phone, request, '越权尝试篡改username', detail=detail) + return None, Response({ + 'code': 403, + 'msg': '身份错误，无权操作其他账号，相关操作已记录' + }, status=403) + + # ---------- 4. 获取用户的所有权限（通过角色） ---------- + # 步骤1：获取用户的所有角色ID + role_ids = UserRole.objects.filter(account_id=current_user.phone).values_list('role_id', flat=True) + # 步骤2：通过角色ID获取权限编码 + permissions = list(Permission.objects.filter( + rolepermission__role_id__in=role_ids + ).values_list('perm_code', flat=True).distinct()) + + if not permissions: + logger.warning(f"用户 {current_user.phone} 没有任何权限，请检查角色分配") + + return kefu, permissions + + + + + + +def update_dashou_daily_by_action(yonghuid, amount, action): + """ + 根据行为类型更新打手每日统计（接单、成交、退款） + + 参数: + yonghuid: 打手用户ID + amount: 本单涉及的金额（Decimal） + action: 1 = 接单, 2 = 成交（结算）, 3 = 退款 + """ + amount = Decimal(str(amount)) if amount else Decimal('0.00') + if amount <= 0: + return # 金额非正不统计 + + today = date.today() + + with transaction.atomic(): + stat, created = DashouRiTongji.objects.select_for_update().get_or_create( + yonghuid=yonghuid, + riqi=today, + defaults={ + 'yonghuid': yonghuid, + 'riqi': today, + 'jiedan_zongliang': 0, + 'jiedan_zonge': Decimal('0.00'), + 'chengjiao_zongliang': 0, + 'chengjiao_zonge': Decimal('0.00'), + 'tuikuan_liang': 0, + 'tuikuan_jine': Decimal('0.00'), + } + ) + + update_fields = {} + if action == 1: # 接单 + update_fields['jiedan_zongliang'] = F('jiedan_zongliang') + 1 + update_fields['jiedan_zonge'] = F('jiedan_zonge') + amount + elif action == 2: # 成交 + update_fields['chengjiao_zongliang'] = F('chengjiao_zongliang') + 1 + update_fields['chengjiao_zonge'] = F('chengjiao_zonge') + amount + elif action == 3: # 退款 + update_fields['tuikuan_liang'] = F('tuikuan_liang') + 1 + update_fields['tuikuan_jine'] = F('tuikuan_jine') + amount + else: + return # 无效行为 + + if update_fields: + DashouRiTongji.objects.filter(id=stat.id).update(**update_fields) + +def update_shangjia_daily(yonghuid, amount, action): + """ + 根据操作行为更新商家每日统计（派发、结算、退款） + + 参数: + yonghuid: 商家用户ID + amount: 当前订单涉及的金额（Decimal） + action: 操作类型，1 = 派发，2 = 结算（成交），3 = 退款 + + 说明: + - 金额必须大于0，否则不执行任何操作 + - 使用 select_for_update + F() 表达式保证原子性和并发安全 + - 每天每个商家只会有一条统计记录，不存在则自动创建 + """ + amount = Decimal(str(amount)) if amount else Decimal('0.00') + if amount <= 0: + return # 金额非正，不统计 + + today = date.today() + + with transaction.atomic(): + # 获取或创建当天统计记录，同时加锁防止并发 + stat, created = ShangjiaRiTongji.objects.select_for_update().get_or_create( + yonghuid=yonghuid, + riqi=today, + defaults={ + 'yonghuid': yonghuid, + 'riqi': today, + 'paifa_dingdan_shu': 0, + 'paifa_jine': Decimal('0.00'), + 'jiesuan_dingdan_shu': 0, + 'jiesuan_jine': Decimal('0.00'), + 'tuikuan_dingdan_shu': 0, + 'tuikuan_jine': Decimal('0.00'), + } + ) + + # 构建本次更新的字段，使用 F 表达式进行原子累加 + update_fields = {} + if action == 1: # 派发 + update_fields['paifa_dingdan_shu'] = F('paifa_dingdan_shu') + 1 + update_fields['paifa_jine'] = F('paifa_jine') + amount + elif action == 2: # 结算（成交） + update_fields['jiesuan_dingdan_shu'] = F('jiesuan_dingdan_shu') + 1 + update_fields['jiesuan_jine'] = F('jiesuan_jine') + amount + elif action == 3: # 退款 + update_fields['tuikuan_dingdan_shu'] = F('tuikuan_dingdan_shu') + 1 + update_fields['tuikuan_jine'] = F('tuikuan_jine') + amount + else: + # 无效的行为类型，直接返回 + return + + # 执行原子更新 + ShangjiaRiTongji.objects.filter(id=stat.id).update(**update_fields) + +def update_guanshi_daily_by_action(yonghuid, action, amount=Decimal('0.00')): + """ + 根据操作行为更新管事每日统计（邀请打手、充值会员、订单/押金分红） + action: 1 = 邀请打手, 2 = 充值会员, 3 = 商家订单分红, 4 = 押金分红 + """ + from django.db import transaction + from django.db.models import F + from datetime import date + + today = date.today() + + with transaction.atomic(): + stat, created = GuanshiRiTongji.objects.select_for_update().get_or_create( + yonghuid=yonghuid, + riqi=today, + defaults={ + 'yonghuid': yonghuid, + 'riqi': today, + 'yaoqing_dashou_shu': 0, + 'chongzhi_dashou_shu': 0, + 'shouru_zonge': Decimal('0.00'), + } + ) + + if action == 1: + # 邀请打手：无论新创建还是已存在，直接 +1 + if created: + stat.yaoqing_dashou_shu = 1 + stat.save() + else: + GuanshiRiTongji.objects.filter(id=stat.id).update( + yaoqing_dashou_shu=F('yaoqing_dashou_shu') + 1 + ) + + elif action == 2: + amount = Decimal(str(amount)) if amount else Decimal('0.00') + if amount <= 0: + return + if created: + stat.chongzhi_dashou_shu = 1 + stat.shouru_zonge = amount + stat.save() + else: + GuanshiRiTongji.objects.filter(id=stat.id).update( + chongzhi_dashou_shu=F('chongzhi_dashou_shu') + 1, + shouru_zonge=F('shouru_zonge') + amount + ) + + elif action in (3, 4): + amount = Decimal(str(amount)) if amount else Decimal('0.00') + if amount <= 0: + return + if created: + stat.shouru_zonge = amount + stat.save() + else: + GuanshiRiTongji.objects.filter(id=stat.id).update( + shouru_zonge=F('shouru_zonge') + amount + ) + +'''def update_guanshi_daily_by_action(yonghuid, action, amount=Decimal('0.00')): + """ + 根据操作行为更新管事每日统计（邀请打手、充值会员） + + 参数: + yonghuid: 管事用户ID + action: 操作类型 + 1 = 邀请打手（次数自动+1，无需传其他参数） + 2 = 充值会员（需要传 amount 参数） + amount: 充值金额（Decimal），仅在 action=2 时有效 + + 说明: + - 每次调用只代表一次操作，不会批量处理。 + - 使用 select_for_update + F() 保证原子性和并发安全。 + """ + today = date.today() + + # 邀请打手：次数+1，金额不变 + if action == 1: + count_field = 'yaoqing_dashou_shu' + amount = Decimal('0.00') + + # 充值会员：次数+1，金额累加 + elif action == 2: + amount = Decimal(str(amount)) if amount else Decimal('0.00') + if amount <= 0: + return + count_field = 'chongzhi_dashou_shu' + + else: + return # 无效行为，直接返回 + + with transaction.atomic(): + stat, created = GuanshiRiTongji.objects.select_for_update().get_or_create( + yonghuid=yonghuid, + riqi=today, + defaults={ + 'yonghuid': yonghuid, + 'riqi': today, + 'yaoqing_dashou_shu': 0, + 'chongzhi_dashou_shu': 0, + 'shouru_zonge': Decimal('0.00'), + } + ) + + if created: + # 新记录直接赋初值 + if action == 1: + stat.yaoqing_dashou_shu = 1 + else: + # 已存在记录，使用 F 表达式原子累加次数 + update_fields = {count_field: F(count_field) + 1} + + if action == 2: + update_fields['shouru_zonge'] = F('shouru_zonge') + amount + + GuanshiRiTongji.objects.filter(id=stat.id).update(**update_fields)''' + +def update_guanshi_xufei_daily(yonghuid, xufei_jine=Decimal('0.00')): + """ + 管事续费统计（单独表） + 用法: update_guanshi_xufei_daily('300001', Decimal('30')) + """ + today = date.today() + with transaction.atomic(): + stat, created = GuanshiXufeiRiTongji.objects.select_for_update().get_or_create( + yonghuid=yonghuid, + riqi=today, + defaults={ + 'yonghuid': yonghuid, + 'riqi': today, + 'xufei_zongshu': 1, + 'xufei_shouyi': xufei_jine, + } + ) + if not created: + GuanshiXufeiRiTongji.objects.filter(id=stat.id).update( + xufei_zongshu=F('xufei_zongshu') + 1, + xufei_shouyi=F('xufei_shouyi') + xufei_jine + ) + + +def update_zuzhang_daily_by_action(yonghuid, action, amount=Decimal('0.00')): + """ + 根据操作行为更新组长每日统计（邀请管事、分佣收入） + + 参数: + yonghuid: 组长用户ID + action: 操作类型 + 1 = 邀请管事（次数+1，无金额） + 2 = 分佣收入（累加金额） + amount: 分佣金额（Decimal），仅在 action=2 时有效 + """ + today = date.today() + + with transaction.atomic(): + stat, created = ZuzhangRiTongji.objects.select_for_update().get_or_create( + yonghuid=yonghuid, + riqi=today, + defaults={ + 'yonghuid': yonghuid, + 'riqi': today, + 'yaoqing_guanshi_shu': 0, + 'shouru_zonge': Decimal('0.00'), + 'fenyong_jine': Decimal('0.00'), + } + ) + + if created: + # 新记录直接设置初始值 + if action == 1: + stat.yaoqing_guanshi_shu = 1 + elif action == 2: + amount = Decimal(str(amount)) if amount else Decimal('0.00') + stat.shouru_zonge = amount + stat.fenyong_jine = amount + stat.save() + else: + # 已存在记录，使用 F 表达式原子累加 + if action == 1: + ZuzhangRiTongji.objects.filter(id=stat.id).update( + yaoqing_guanshi_shu=F('yaoqing_guanshi_shu') + 1 + ) + elif action == 2: + amount = Decimal(str(amount)) if amount else Decimal('0.00') + if amount > 0: + ZuzhangRiTongji.objects.filter(id=stat.id).update( + shouru_zonge=F('shouru_zonge') + amount, + fenyong_jine=F('fenyong_jine') + amount + ) + + +def update_tixian_daily_stat(leixing, amount): + """ + 更新每日提现统计（平台维度） + leixing: 1=打手, 2=管事, 3=组长 + amount: 本次提现金额（申请金额，含手续费） + """ + today = date.today() + with transaction.atomic(): + stat, created = TixianRiTongji.objects.select_for_update().get_or_create( + riqi=today, + leixing=leixing, + defaults={'total_amount': amount} + ) + if not created: + TixianRiTongji.objects.filter(id=stat.id).update( + total_amount=F('total_amount') + amount + ) + +def decrease_tixian_daily_stat(leixing, amount): + """ + 减少每日提现统计（平台维度），用于提现失败或取消时回滚 + :param leixing: 1=打手,2=管事,3=组长 + :param amount: 要减少的金额（实际到账金额） + """ + today = date.today() + with transaction.atomic(): + # 使用 select_for_update 防止并发回滚时数据错乱 + stat = TixianRiTongji.objects.select_for_update().get(riqi=today, leixing=leixing) + stat.total_amount -= amount + stat.save(update_fields=['total_amount']) + + diff --git a/houtai/view.py b/houtai/view.py new file mode 100644 index 0000000..7c2d00b --- /dev/null +++ b/houtai/view.py @@ -0,0 +1,12894 @@ +import threading +import traceback +from calendar import monthrange + +from django.contrib.auth.hashers import make_password +from django.db.models import Q, Count +from django.core.paginator import Paginator + + +from houtai.utils import update_dashou_daily_by_action +from dingdan.models import Lilubiao + +import uuid + +from rest_framework.parsers import JSONParser, MultiPartParser, FormParser + +from utils.oss_utils import upload_to_oss, validate_image, delete_from_oss +from shangpin.models import Shangpin, ShangpinLeixing, ShangpinZhuanqu,Huiyuan + + +import hashlib +from django.db.models import Q, Sum, F +from rest_framework import status + +from houtai.models import Role, Permission, RolePermission, UserRole, TixianRiTongji +from houtai.utils import verify_kefu_permission +import xmltodict + +from django.conf import settings + +from dingdan.models import Dashoutupian, Chufajilu, PreSettlement, OrderDashouHistory +# apps/houtai/views.py 继续添加 + +from django.views.decorators.csrf import csrf_exempt +from django.utils.decorators import method_decorator + +from houtai.models import Role + +from yonghu.models import UserMain, UserGuanshi, UserBoss, UserZuzhang + +from shangpin.models import DuociFenhong + +import time +import logging +import requests +from datetime import date, datetime, timedelta +from django.utils import timezone + +from decimal import Decimal + +from django.core.exceptions import ObjectDoesNotExist +from rest_framework.views import APIView +from rest_framework.permissions import IsAuthenticated, AllowAny + +from rest_framework.response import Response +from rest_framework.parsers import JSONParser + +from dingdan.utils import update_daily_dispatch_stat +from shangpin.models import ShangpinLeixing, Huiyuangoumai, Huiyuan +from yonghu.models import UserMain, UserKefu, UserDashou, Xiugaijilu, UserShangjia +from peizhi.models import AccountPermission, ClubConfig, Club, DailyDispatchStat, OrderTypeMapping, TixianQuotaDefault +from dingdan.models import Dingdan, Tuikuanjilu, CrossPlatformOrderData + +# views.py +import os +from peizhi.models import PopupPage, PopupConfig, PopupImage +from .serializers import PopupPageSerializer, PopupConfigSerializer, PopupImageSerializer + + +logger = logging.getLogger(__name__) + + +class GetClubConfigView(APIView): + """ + 获取对方俱乐部配置列表（用于跨平台选择） + 权限要求：客服身份 + 权限代码1且开启 + """ + + permission_classes = [IsAuthenticated] + + def post(self, request): + """ + 处理 POST 请求，返回对方俱乐部配置数据（is_self=0） + """ + try: + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '003aa' not in permissions: + return Response({'code': 403, 'msg': '您无权查看俱乐部配置'}) + + # 5. 查询所有对方俱乐部（is_self=0），只取必要字段 + club_configs = ClubConfig.objects.filter( + is_self=0 # 只返回对方俱乐部 + ).only( + 'club_id', + 'club_nickname', + 'club_avatar', + 'storage_bucket_domain' # 如果前端需要存储桶域名，一并返回 + ) + + # 构造返回数据列表 + data_list = [] + for club in club_configs: + data_list.append({ + 'club_id': club.club_id, + 'club_nickname': club.club_nickname or club.club_id, # 若昵称为空，用ID代替 + 'club_avatar': club.club_avatar or '', # 可能为空 + 'storage_bucket_domain': club.storage_bucket_domain or '' # 可选 + }) + + return Response({ + 'code': 0, + 'msg': 'success', + 'data': data_list + }) + + except Exception as e: + logger.error(f"获取俱乐部配置失败: {str(e)}") + return Response({ + 'code': 500, + 'msg': '服务器内部错误' + }) + + + + + +class GetCrossOrderListView(APIView): + """ + 获取跨平台订单列表（客服后台） + 权限要求：客服身份 + 权限代码1且开启 + """ + + permission_classes = [IsAuthenticated] + + def post(self, request): + """ + 处理 POST 请求，返回分页订单数据及统计信息 + """ + try: + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '003aa' not in permissions: + return Response({'code': 403, 'msg': '您无权查看俱乐部订单'}) + + # 5. 获取请求参数 + data = request.data + + + + + # 分页参数 + page = int(data.get('page', 1)) + page_size = int(data.get('pageSize', 20)) + + # 查询参数 + leixing = data.get('leixing') # 订单类型ID + zhuangtai = data.get('zhuangtai') # 状态字符串，如 "1,7" + club_id = data.get('club_id') # 对方俱乐部ID（精确） + direction = data.get('direction') # send/receive/all + dingdan_id = data.get('dingdan_id') # 订单ID模糊搜索 + club_id_search = data.get('club_id_search') # 对方俱乐部ID模糊搜索 + date = data.get('date') # 日期 YYYY-MM-DD + dashou_id = data.get('dashou_id') # 打手ID（接单打手ID） + clkf = data.get('clkf') # 处理客服 + + # 6. 构建基础查询（跨平台订单） + base_q = Q(is_cross=1) + + # 添加筛选条件（非空且非全部） + if leixing and leixing != '': + base_q &= Q(leixing_id=leixing) + + if zhuangtai and zhuangtai != 'all': + # 解析逗号分隔的状态码 + status_list = [int(s.strip()) for s in zhuangtai.split(',') if s.strip().isdigit()] + if status_list: + base_q &= Q(zhuangtai__in=status_list) + + if club_id and club_id != '': + base_q &= Q(partner_club_id=club_id) + + # 方向映射 + if direction == 'send': + base_q &= Q(dispatch_type=1) + elif direction == 'receive': + base_q &= Q(dispatch_type=2) + # direction == 'all' 时不加方向条件 + + if dingdan_id: + base_q &= Q(dingdan_id__icontains=dingdan_id) + + if club_id_search: + base_q &= Q(partner_club_id__icontains=club_id_search) + + if date: + # 按日期精确过滤（假设 create_time 是带时区的 DateTimeField） + base_q &= Q(create_time__date=date) + + if dashou_id: + base_q &= Q(jiedan_dashou_id=dashou_id) + + if clkf: + base_q &= Q(clkf__icontains=clkf) + + # 7. 统计各状态数量（基于相同过滤条件） + # 获取所有符合条件的订单的状态分组统计 + status_counts = Dingdan.objects.filter(base_q).values('zhuangtai').annotate(count=Count('id')).order_by() + + # 转换为字典 {状态码: 数量} + status_map = {item['zhuangtai']: item['count'] for item in status_counts} + + # 定义状态列表（与前端一致） + status_list_map = { + 'all': 0, # 稍后填充总数量 + '1,7': 0, + '2': 0, + '8': 0, + '3': 0, + '4': 0, + '5': 0, + '6': 0, + } + # 填充总数 + status_list_map['all'] = sum(status_map.values()) + # 填充单个状态 + for code, cnt in status_map.items(): + if code == 1 or code == 7: + status_list_map['1,7'] += cnt + elif code in status_list_map: + status_list_map[str(code)] = cnt + # 其他状态暂不处理 + + # 构建 stats 统计 + total_orders = status_list_map['all'] + completed_orders = status_map.get(3, 0) + refund_orders = status_map.get(5, 0) + pending_orders = status_map.get(8, 0) + status_map.get(4, 0) + + stats = { + 'totalOrders': total_orders, + 'completedOrders': completed_orders, + 'refundOrders': refund_orders, + 'pendingOrders': pending_orders, + } + + # 8. 分页获取订单列表 + # 按创建时间倒序，保证分页稳定 + orders_qs = Dingdan.objects.filter(base_q).order_by('-create_time') + + # 使用 Paginator 分页 + paginator = Paginator(orders_qs, page_size) + current_page = paginator.get_page(page) + order_list = current_page.object_list + + # 只返回前端需要的字段，减少数据传输 + data_list = [] + for order in order_list: + data_list.append({ + 'dingdan_id': order.dingdan_id, + 'nicheng': order.nicheng or '', + 'jieshao': order.jieshao or '', + 'jiage': float(order.jine) if order.jine else 0, + 'zhuangtai': order.zhuangtai, + }) + + # 9. 返回结果 + return Response({ + 'code': 0, + 'msg': 'success', + 'data': { + 'list': data_list, + 'total': total_orders, + 'statusCounts': status_list_map, + 'stats': stats, + } + }) + + except Exception as e: + logger.error(f"获取跨平台订单列表失败: {str(e)}") + return Response({'code': 500, 'msg': '服务器内部错误'}) + + + + + + + +class GetCrossOrderDetailView(APIView): + """ + 客服获取跨平台订单详情接口 + 请求：POST /houtai/hqkptddxq + 参数：{"username": "客服手机号", "dingdan_id": "订单ID"} + 认证：JWT，权限码1 + 返回：code=0 + 订单详情数据（包含俱乐部信息、打手图片、处罚记录等） + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + start_time = time.time() + + # 1. 获取参数 + username = request.data.get('username', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + if not username or not dingdan_id: + return Response({'code': 400, 'msg': '参数不完整'}) + + try: + # 2. 身份验证 + current_user = request.user + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '003aa' not in permissions: + return Response({'code': 403, 'msg': '您无权查看俱乐部订单'}) + + # 4. 查询订单 + dingdan_obj = Dingdan.objects.select_related( + 'pingtai_kuozhan', + 'shangjia_kuozhan' + ).get(dingdan_id=dingdan_id) + + # 5. 构建基础响应数据 + response_data = { + 'dingdan_id': dingdan_obj.dingdan_id or '', + 'zhuangtai': dingdan_obj.zhuangtai or 0, + 'fadanpingtai': dingdan_obj.fadan_pingtai or 0, + 'dispatch_type': dingdan_obj.dispatch_type or 0, # 1=我方派单, 2=对方派单 + 'is_cross': dingdan_obj.is_cross or 0, + 'partner_order_id': dingdan_obj.partner_order_id or '', + 'partner_club_id': dingdan_obj.partner_club_id or '', + 'jine': float(dingdan_obj.jine) if dingdan_obj.jine else 0.00, + 'dashou_fencheng': float(dingdan_obj.dashou_fencheng) if dingdan_obj.dashou_fencheng else 0.00, + 'jiedan_dashou_id': dingdan_obj.jiedan_dashou_id or '', + 'dashou_liuyan': dingdan_obj.dashou_liuyan or '', + 'zhiding_id': dingdan_obj.zhiding_id or '', + 'shangpin_id': dingdan_obj.shangpin_id or '', + 'leixing': dingdan_obj.leixing_id or 0, + 'tupian_url': dingdan_obj.tupian or '', + 'jieshao': dingdan_obj.jieshao or '', + 'beizhu': dingdan_obj.beizhu or '', + 'tkly': dingdan_obj.tkly or '', + 'nicheng': dingdan_obj.nicheng or '', + 'clkf': dingdan_obj.clkf or '', + 'chuangjianshijian': dingdan_obj.create_time.strftime('%Y-%m-%d %H:%M:%S') if dingdan_obj.create_time else '', + 'genggaishijian': dingdan_obj.update_time.strftime('%Y-%m-%d %H:%M:%S') if dingdan_obj.update_time else '', + } + + # 6. 扩展表数据 + if dingdan_obj.fadan_pingtai == 1: + if hasattr(dingdan_obj, 'pingtai_kuozhan') and dingdan_obj.pingtai_kuozhan: + response_data['pingtai_kuozhan'] = { + 'laoban_id': dingdan_obj.pingtai_kuozhan.laoban_id or '', + 'laoban_pingjia': dingdan_obj.pingtai_kuozhan.laoban_pingjia or '', + } + else: + response_data['pingtai_kuozhan'] = {'laoban_id': '', 'laoban_pingjia': ''} + elif dingdan_obj.fadan_pingtai == 2: + if hasattr(dingdan_obj, 'shangjia_kuozhan') and dingdan_obj.shangjia_kuozhan: + shangjia = dingdan_obj.shangjia_kuozhan + response_data['shangjia_kuozhan'] = { + 'shangjia_id': shangjia.shangjia_id or '', + 'sjnicheng': shangjia.sjnicheng or '', + 'shangjia_pingjia': shangjia.shangjia_pingjia or '', + 'cfliyou': shangjia.cfliyou or '', + 'sqzhuangtai': shangjia.sqzhuangtai if shangjia.sqzhuangtai is not None else 0, + 'bhliyou': shangjia.bhliyou or '', + } + else: + response_data['shangjia_kuozhan'] = { + 'shangjia_id': '', 'sjnicheng': '', 'shangjia_pingjia': '', + 'cfliyou': '', 'sqzhuangtai': 0, 'bhliyou': '' + } + + # ========== 核心逻辑：判断派单/接单关系 ========== + dispatch_type = dingdan_obj.dispatch_type # 1=我方派单, 2=对方派单 + is_cross = dingdan_obj.is_cross + partner_club_id = dingdan_obj.partner_club_id + partner_order_id = dingdan_obj.partner_order_id + + # 获取我方俱乐部配置（用于本地存储桶域名） + my_club_config = ClubConfig.objects.filter(is_self=1).first() + my_storage_domain = my_club_config.storage_bucket_domain if my_club_config else '' + + # 初始化字段 + response_data['club_info'] = None # 对方俱乐部信息 + response_data['partner_images'] = [] # 打手提交图片（对方平台打手或我方打手） + response_data['punishment_info'] = {} # 处罚信息 + response_data['is_punished'] = False # 是否已处罚（用于前端禁用按钮） + response_data['receive_side'] = '' # 接单方：'self' 我方接单，'partner' 对方接单 + response_data['dispatch_side'] = '' # 派单方：'self' 我方派单，'partner' 对方派单 + + # 设置派单方 + if dispatch_type == 1: + response_data['dispatch_side'] = 'self' + elif dispatch_type == 2: + response_data['dispatch_side'] = 'partner' + else: + # 兼容旧数据：根据 partner_club_id 或 partner_order_id 推断 + if partner_club_id or partner_order_id: + response_data['dispatch_side'] = 'partner' + else: + response_data['dispatch_side'] = 'self' + + # 情况1：对方派单（对方平台发单，我方打手接单） + if response_data['dispatch_side'] == 'partner': + # 接单方为我方 + response_data['receive_side'] = 'self' + + # 获取对方俱乐部信息（用于展示） + if partner_club_id: + partner_config = ClubConfig.objects.filter(club_id=partner_club_id, is_self=0).first() + if partner_config: + response_data['club_info'] = { + 'club_id': partner_config.club_id, + 'club_nickname': partner_config.club_nickname or partner_config.club_id, + 'club_avatar': partner_config.club_avatar or '', + } + else: + response_data['club_info'] = {'club_id': partner_club_id, 'club_nickname': '', 'club_avatar': ''} + else: + response_data['club_info'] = None + + # 查询我方打手提交的图片（本地） + dashou_images = Dashoutupian.objects.filter( + dingdan_id=dingdan_id, + dashou=dingdan_obj.jiedan_dashou_id + ).values_list('tupian', flat=True) + images = [] + for rel_path in dashou_images: + if rel_path: + if rel_path.startswith('http'): + images.append(rel_path) + else: + images.append(my_storage_domain + rel_path) + response_data['partner_images'] = images + + # 查询我方打手处罚记录 + punish_records = Chufajilu.objects.filter( + dingdan_id=dingdan_id, + dashouid=dingdan_obj.jiedan_dashou_id + ).order_by('-create_time') + if punish_records.exists(): + latest = punish_records.first() + response_data['punishment_info'] = { + 'cfliyou': latest.cfliyou or '', + 'sqzhuangtai': latest.sqzhuangtai or 0, + 'bhliyou': latest.bhliyou or '', + 'ssliyou': latest.ssliyou or '', + 'jifen': latest.jifen or 0, + } + response_data['is_punished'] = True + else: + response_data['punishment_info'] = {} + response_data['is_punished'] = False + + # 情况2：我方派单（我方平台发单） + else: + response_data['dispatch_side'] = 'self' + # 根据是否有对方订单ID/俱乐部ID判断接单方 + if partner_club_id or partner_order_id: + # 有对方信息，说明订单派给了对方平台，对方接单 + response_data['receive_side'] = 'partner' + + # 获取对方俱乐部信息 + if partner_club_id: + partner_config = ClubConfig.objects.filter(club_id=partner_club_id, is_self=0).first() + if partner_config: + response_data['club_info'] = { + 'club_id': partner_config.club_id, + 'club_nickname': partner_config.club_nickname or partner_config.club_id, + 'club_avatar': partner_config.club_avatar or '', + } + else: + response_data['club_info'] = {'club_id': partner_club_id, 'club_nickname': '', 'club_avatar': ''} + + # 需要调用对方接口获取图片和处罚记录 + if partner_club_id and partner_order_id: + # 获取对方服务器域名 + if my_club_config: + self_club_id = my_club_config.club_id + else: + logger.error(f"无法获取本俱乐部ID，订单ID: {dingdan_id}") + return Response({'code': 500, 'msg': '系统配置错误，请联系管理员'}) + + try: + club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=partner_club_id) + partner_domain = club_rel.partner_domain + except ObjectDoesNotExist: + logger.error(f"未找到合作关系: {self_club_id} <-> {partner_club_id}") + return Response({'code': 500, 'msg': '未找到对方平台配置'}) + + # 调用对方接口，最多重试3次 + url = partner_domain.rstrip('/') + '/houtai/kpthqtp' + payload = { + 'order_id': partner_order_id, + 'club_id': self_club_id, + } + timeout = 3 + retries = 3 + success = False + for attempt in range(retries): + try: + resp = requests.post(url, json=payload, timeout=timeout) + if resp.status_code == 200: + resp_json = resp.json() + if resp_json.get('code') == 0: + data = resp_json.get('data', {}) + response_data['partner_images'] = data.get('images', []) + response_data['punishment_info'] = data.get('punishment', {}) + response_data['is_punished'] = bool(response_data['punishment_info'].get('cfliyou')) + success = True + break + else: + logger.warning(f"对方接口返回错误 (尝试{attempt+1}): {resp_json.get('msg')}") + else: + logger.warning(f"对方接口HTTP错误 (尝试{attempt+1}): {resp.status_code}") + except requests.exceptions.Timeout: + logger.warning(f"请求对方接口超时 (尝试{attempt+1}): {url}") + except Exception as e: + logger.warning(f"请求对方接口异常 (尝试{attempt+1}): {str(e)}") + if not success: + # 三次失败，返回部分数据，但提示前端对方数据获取失败 + response_data['partner_images'] = [] + response_data['punishment_info'] = {} + response_data['is_punished'] = False + response_data['partner_data_error'] = '获取对方平台数据失败，请稍后重试' + else: + # 对方信息不完整，无法获取数据 + response_data['partner_images'] = [] + response_data['punishment_info'] = {} + response_data['is_punished'] = False + response_data['partner_data_error'] = '对方订单信息不完整' + else: + # 无对方信息，说明我方派单且我方接单 + response_data['receive_side'] = 'self' + # 我方打手提交图片（本地） + dashou_images = Dashoutupian.objects.filter( + dingdan_id=dingdan_id, + dashou=dingdan_obj.jiedan_dashou_id + ).values_list('tupian', flat=True) + images = [] + for rel_path in dashou_images: + if rel_path: + if rel_path.startswith('http'): + images.append(rel_path) + else: + images.append(my_storage_domain + rel_path) + response_data['partner_images'] = images + + # 处罚记录 + punish_records = Chufajilu.objects.filter( + dingdan_id=dingdan_id, + dashouid=dingdan_obj.jiedan_dashou_id + ).order_by('-create_time') + if punish_records.exists(): + latest = punish_records.first() + response_data['punishment_info'] = { + 'cfliyou': latest.cfliyou or '', + 'sqzhuangtai': latest.sqzhuangtai or 0, + 'bhliyou': latest.bhliyou or '', + 'ssliyou': latest.ssliyou or '', + 'jifen': latest.jifen or 0, + } + response_data['is_punished'] = True + else: + response_data['punishment_info'] = {} + response_data['is_punished'] = False + + # 如果是我方派单且我方接单，对方俱乐部信息为空 + response_data['club_info'] = None + + # 7. 查询退款理由 + try: + tuikuan_record = Tuikuanjilu.objects.filter( + dingdan_id=dingdan_id + ).order_by('-create_time').first() + response_data['tuikuan_liyou'] = tuikuan_record.liyou if tuikuan_record else '' + except Exception as e: + logger.warning(f"查询退款记录失败: {str(e)}") + response_data['tuikuan_liyou'] = '' + + # ========== 新增：查询更换打手生成的新订单信息 ========== + try: + from peizhi.models import ShangjiaLianjie + new_lianjie = ShangjiaLianjie.objects.filter( + previous_dingdan_id=dingdan_id + ).order_by('-create_time').first() + if new_lianjie: + response_data['new_dingdan_id'] = new_lianjie.dingdan_id or '' + response_data['new_lianjie'] = new_lianjie.lianjie or '' + else: + response_data['new_dingdan_id'] = '' + response_data['new_lianjie'] = '' + except Exception as e: + logger.warning(f"查询新订单链接失败: {str(e)}") + response_data['new_dingdan_id'] = '' + response_data['new_lianjie'] = '' + # ===================================================== + + elapsed = time.time() - start_time + logger.info(f"获取跨平台订单详情接口耗时: {elapsed:.3f}s, 订单ID: {dingdan_id}") + return Response({'code': 0, 'data': response_data}) + + except Dingdan.DoesNotExist: + logger.warning(f"订单不存在: {dingdan_id}") + return Response({'code': 404, 'msg': '订单不存在'}) + except Exception as e: + logger.error(f"获取跨平台订单详情接口异常: {traceback.format_exc()}") + return Response({'code': 500, 'msg': '服务器内部错误'}) + + + +'''class CrossPlatformRefundView(APIView): + """ + 跨平台订单退款接口（同时支持本地订单和跨平台订单） + 请求：POST /houtai/kptk + 参数：{ + "username": "客服账号ID", + "dingdan_id": "订单ID", + "tuikuan_liyou": "退款理由（可选）" + } + 认证：JWT + 返回：code=0 成功，其他失败 + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数 + username = request.data.get('username', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + tuikuan_liyou = request.data.get('tuikuan_liyou', '').strip() + + if not username or not dingdan_id: + return Response({'code': 400, 'msg': '参数不完整'}) + + # 2. 身份验证 + current_user = request.user + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '003aa' not in permissions: + return Response({'code': 403, 'msg': '您无权处理订单'}) + + # 4. 查询订单（带扩展表） + try: + order = Dingdan.objects.select_related( + 'pingtai_kuozhan', + 'shangjia_kuozhan' + ).get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + logger.warning(f"订单不存在: {dingdan_id}") + return Response({'code': 404, 'msg': '订单不存在'}) + + # 5. 订单状态校验（只有 1,7,2,8,4 可退款） + allowed_statuses = [1, 7, 2, 8, 4] + if order.zhuangtai not in allowed_statuses: + logger.warning(f"订单状态不允许退款: {order.zhuangtai}") + return Response({'code': 400, 'msg': '订单状态不允许退款'}) + + # 6. 根据派单方向分流 + dispatch_type = order.dispatch_type # 1=我方派单，2=对方派单 + + # ---------- 情况一：对方派单（我方打手接对方的单）---------- + if dispatch_type == 2: + # 对方派单，资金在对方平台，我方只处理打手状态和订单状态 + with transaction.atomic(): + # 更新订单状态为已退款 + order.zhuangtai = 5 + order.clkf = current_user.phone + if tuikuan_liyou: + order.tkly = tuikuan_liyou + order.save() + + # 更新打手数据（接单打手） + dashou_id = order.jiedan_dashou_id + if dashou_id: + try: + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.tuikuanliang += 1 + dashou_profile.zhuangtai = 1 # 设为空闲 + dashou_profile.save() + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.warning(f"对方派单退款：打手 {dashou_id} 不存在，跳过更新") + + # 更新退款记录（记录操作） + try: + refund_record, created = Tuikuanjilu.objects.get_or_create( + dingdan_id=dingdan_id, + defaults={ + 'dashouid': dashou_id or '', + 'qingqiuid': '', + 'chuliid': current_user.phone, + 'liyou': tuikuan_liyou or '客服退款（对方派单）', + 'sqzhuangtai': 1, + 'jine': order.jine or 0, + 'dashou_fencheng': order.dashou_fencheng or 0, + 'jieshao': order.jieshao or '', + 'beizhu': '对方派单退款', + 'nicheng': order.nicheng or '', + } + ) + if not created: + refund_record.sqzhuangtai = 1 + refund_record.chuliid = current_user.phone + if tuikuan_liyou: + refund_record.liyou = tuikuan_liyou + refund_record.save() + except Exception as e: + logger.error(f"更新退款记录失败: {str(e)}") + + # 🔥 新增：调用打手每日统计（成交） + try: + update_dashou_daily_by_action( + yonghuid=order.jiedan_dashou_id, + amount=order.dashou_fencheng, + action=3 # 3 表示退款（退款） + ) + logger.info(f"打手 {order.jiedan_dashou_id} 每日统计更新成功") + except Exception as e: + logger.error(f"打手每日统计更新失败: {e}") + # 不影响主流程 + # ✅ 新方法（行为驱动，更安全） + from houtai.utils import update_shangjia_daily + shangjia_ext = order.shangjia_kuozhan + shangjia_id = shangjia_ext.shangjia_id + update_shangjia_daily( + yonghuid=shangjia_id, + amount=Decimal(str(order.jine)), + action=3 # 3 = 退款 + ) + + # 更新客服统计 + kefu.jinrichuli += 1 + kefu.jinyuechuli += 1 + kefu.zongchuli += 1 + kefu.save() + + logger.info(f"对方派单退款成功，订单 {dingdan_id}") + return Response({'code': 0, 'msg': '退款成功'}) + + # ---------- 情况二：我方派单（订单由我方发出）---------- + # 需要进一步判断是本地订单还是跨平台订单 + is_cross = order.is_cross + partner_club_id = order.partner_club_id + partner_order_id = order.partner_order_id + + # 子情况2.1：本地订单（非跨平台） + if not is_cross or not partner_club_id: + # 按原有逻辑处理：平台订单或商家订单 + if order.fadan_pingtai == 1: + # 平台订单退款（调用微信支付） + return self._refund_platform_order(order, current_user, tuikuan_liyou, kefu) + elif order.fadan_pingtai == 2: + # 商家订单退款（直接退余额） + return self._refund_merchant_order(order, current_user, tuikuan_liyou, kefu) + else: + return Response({'code': 400, 'msg': '未知的发单平台类型'}) + + # 子情况2.2：跨平台订单（我方派单给对方） + else: + # 必须先执行本地资金退款（因为钱在我方平台） + # 根据发单平台类型执行退款 + local_refund_success = False + try: + with transaction.atomic(): + if order.fadan_pingtai == 1: + # 平台订单：调用微信退款 + refund_result = self._call_wechat_refund(order) + if refund_result['code'] != 0: + raise Exception(refund_result['msg']) + # 微信退款成功，更新订单状态 + order.zhuangtai = 5 + order.clkf = current_user.phone + if tuikuan_liyou: + order.tkly = tuikuan_liyou + order.save() + local_refund_success = True + elif order.fadan_pingtai == 2: + # 商家订单：退余额给商家 + self._refund_to_merchant(order, current_user.phone, tuikuan_liyou) + order.zhuangtai = 5 + order.clkf = current_user.phone + if tuikuan_liyou: + order.tkly = tuikuan_liyou + order.save() + local_refund_success = True + else: + return Response({'code': 400, 'msg': '未知的发单平台类型'}) + + # 更新打手数据（接单打手） + dashou_id = order.jiedan_dashou_id + if dashou_id: + try: + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.tuikuanliang += 1 + dashou_profile.zhuangtai = 1 + dashou_profile.save() + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.warning(f"跨平台退款：打手 {dashou_id} 不存在，跳过更新") + + # 更新退款记录 + self._update_refund_record(order, dashou_id, current_user.phone, tuikuan_liyou) + + # 更新客服统计 + kefu.jinrichuli += 1 + kefu.jinyuechuli += 1 + kefu.zongchuli += 1 + kefu.save() + + except Exception as e: + logger.error(f"跨平台订单本地退款失败: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': f'本地退款失败: {str(e)}'}) + + # 本地退款成功后，通知对方平台 + if local_refund_success: + # 查询对方平台域名 + try: + # 获取我方俱乐部ID + my_club_config = ClubConfig.objects.filter(is_self=1).first() + if not my_club_config: + logger.error("未配置我方俱乐部信息") + # 本地已成功，仅记录错误，不影响返回 + else: + self_club_id = my_club_config.club_id + club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=partner_club_id) + partner_domain = club_rel.partner_domain + + # 调用对方退款通知接口 + notify_url = partner_domain.rstrip('/') + '/houtai/dfddtk' + payload = { + 'order_id': partner_order_id, # 对方订单ID + 'club_id': self_club_id, # 我方俱乐部ID + 'status': 5, # 通知对方我方已退款 + 'reason': tuikuan_liyou + } + # 设置超时3秒，不阻塞主流程 + try: + resp = requests.post(notify_url, json=payload, timeout=3) + if resp.status_code == 200: + resp_json = resp.json() + if resp_json.get('code') == 0: + # 更新跨平台订单扩展表 + cross_data, _ = CrossPlatformOrderData.objects.get_or_create( + dingdan_id=dingdan_id, + defaults={ + 'partner_order_id': partner_order_id, + 'partner_club_id': partner_club_id, + 'partner_order_status': resp_json.get('data', {}).get('partner_status', 0), + 'partner_dashou_id': resp_json.get('data', {}).get('partner_dashou_id', ''), + 'partner_amount': order.jine or 0, + } + ) + if not _: + cross_data.partner_order_status = resp_json.get('data', {}).get('partner_status', 0) + cross_data.save() + else: + logger.warning(f"对方平台返回错误: {resp_json.get('msg')}") + else: + logger.warning(f"对方平台接口HTTP错误: {resp.status_code}") + except requests.exceptions.Timeout: + logger.error(f"通知对方平台超时: {notify_url}") + except Exception as e: + logger.error(f"通知对方平台异常: {str(e)}") + except Exception as e: + logger.error(f"查询对方平台配置失败: {str(e)}") + + + + return Response({'code': 0, 'msg': '退款成功'}) + + # ========== 辅助方法 ========== + def _refund_platform_order(self, order, current_user, tuikuan_liyou, kefu): + """平台订单退款（调用微信支付）""" + # 调用微信退款 + refund_result = self._call_wechat_refund(order) + if refund_result['code'] != 0: + return Response({'code': 400, 'msg': refund_result['msg']}) + + with transaction.atomic(): + order.zhuangtai = 5 + order.clkf = current_user.phone + if tuikuan_liyou: + order.tkly = tuikuan_liyou + order.save() + + # 更新打手 + dashou_id = order.jiedan_dashou_id + if dashou_id: + try: + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.tuikuanliang += 1 + dashou_profile.zhuangtai = 1 + dashou_profile.save() + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.warning(f"平台退款：打手 {dashou_id} 不存在，跳过更新") + + # 更新退款记录 + self._update_refund_record(order, dashou_id, current_user.phone, tuikuan_liyou) + + is_cross = order.is_cross + partner_club_id = order.partner_club_id + partner_order_id = order.partner_order_id + + if not is_cross or not partner_order_id: + + # 🔥 新增：调用打手每日统计（成交） + try: + update_dashou_daily_by_action( + yonghuid=order.jiedan_dashou_id, + amount=order.dashou_fencheng, + action=3 # 3 表示退款（退款） + ) + logger.info(f"打手 {order.jiedan_dashou_id} 每日统计更新成功") + except Exception as e: + logger.error(f"打手每日统计更新失败: {e}") + # 不影响主流程 + else: + pass + + + # 客服统计 + kefu.jinrichuli += 1 + kefu.jinyuechuli += 1 + kefu.zongchuli += 1 + kefu.save() + + logger.info(f"平台订单退款成功: {order.dingdan_id}") + return Response({'code': 0, 'msg': '退款成功'}) + + def _refund_merchant_order(self, order, current_user, tuikuan_liyou, kefu): + """商家订单退款（退余额给商家）""" + # 获取商家ID + try: + shangjia_ext = order.shangjia_kuozhan + shangjia_id = shangjia_ext.shangjia_id + except ObjectDoesNotExist: + return Response({'code': 400, 'msg': '订单商家信息不存在'}) + + with transaction.atomic(): + # 订单状态改已退款 + order.zhuangtai = 5 + order.clkf = current_user.phone + if tuikuan_liyou: + order.tkly = tuikuan_liyou + order.save() + + # 退余额给商家 + try: + shangjia_user = UserMain.objects.get(yonghuid=shangjia_id) + shangjia_profile = shangjia_user.shop_profile + shangjia_profile.tuikuan += 1 + shangjia_profile.yue += order.jine or 0 + shangjia_profile.save() + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.error(f"商家退款：商家 {shangjia_id} 不存在，无法退余额") + raise Exception("商家账户不存在") + + # 更新打手 + dashou_id = order.jiedan_dashou_id + if dashou_id: + try: + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.tuikuanliang += 1 + dashou_profile.zhuangtai = 1 + dashou_profile.save() + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.warning(f"商家退款：打手 {dashou_id} 不存在，跳过更新") + + # 更新退款记录 + self._update_refund_record(order, dashou_id, current_user.phone, tuikuan_liyou) + + is_cross = order.is_cross + partner_club_id = order.partner_club_id + partner_order_id = order.partner_order_id + + if not is_cross or not partner_order_id: + + # 🔥 新增：调用打手每日统计（成交） + try: + update_dashou_daily_by_action( + yonghuid=order.jiedan_dashou_id, + amount=order.dashou_fencheng, + action=3 # 3 表示退款（退款） + ) + logger.info(f"打手 {order.jiedan_dashou_id} 每日统计更新成功") + except Exception as e: + logger.error(f"打手每日统计更新失败: {e}") + # 不影响主流程 + else: + pass + + # ✅ 新方法（行为驱动，更安全） + from houtai.utils import update_shangjia_daily + update_shangjia_daily( + yonghuid=shangjia_id, + amount=Decimal(str(order.jine)), + action=3 # 3 = 退款 + ) + + # 客服统计 + kefu.jinrichuli += 1 + kefu.jinyuechuli += 1 + kefu.zongchuli += 1 + kefu.save() + + logger.info(f"商家订单退款成功: {order.dingdan_id}") + return Response({'code': 0, 'msg': '退款成功'}) + + def _call_wechat_refund(self, order): + """调用微信支付退款接口，返回 {'code':0, 'msg':'success'} 或错误信息""" + # 获取微信支付配置 + appid = getattr(settings, 'WEIXIN_APPID', '') + mch_id = getattr(settings, 'WEIXIN_MCHID', '') + key = getattr(settings, 'WEIXIN_SHANGHUMIYAO', '') + cert_path = getattr(settings, 'WEIXIN_CERT_PATH', '') + key_path = getattr(settings, 'WEIXIN_KEY_PATH', '') + + if not all([appid, mch_id, key, cert_path, key_path]): + missing = [k for k, v in {'appid': appid, 'mch_id': mch_id, 'key': key, 'cert_path': cert_path, 'key_path': key_path}.items() if not v] + logger.error(f"微信支付配置缺失: {missing}") + return {'code': 500, 'msg': f'系统支付配置缺失: {missing}'} + + # 生成退款单号 + out_refund_no = self._generate_refund_no(order.dingdan_id) + total_fee = int(float(order.jine or 0) * 100) + refund_fee = total_fee + refund_desc = '客服退款' + + params = { + 'appid': appid, + 'mch_id': mch_id, + 'nonce_str': self._generate_nonce_str(), + 'out_refund_no': out_refund_no, + 'total_fee': total_fee, + 'refund_fee': refund_fee, + 'refund_desc': refund_desc, + } + # 优先使用微信交易号 + if order.wechat_transaction_id: + params['transaction_id'] = order.wechat_transaction_id + else: + params['out_trade_no'] = order.dingdan_id + + # 签名 + sorted_keys = sorted(params.keys()) + stringA = '&'.join([f"{k}={params[k]}" for k in sorted_keys]) + stringSignTemp = f"{stringA}&key={key}" + sign = hashlib.md5(stringSignTemp.encode('utf-8')).hexdigest().upper() + params['sign'] = sign + + xml_data = self._dict_to_xml(params) + url = 'https://api.mch.weixin.qq.com/secapi/pay/refund' + + try: + response = requests.post(url, data=xml_data, cert=(cert_path, key_path), timeout=10) + result = xmltodict.parse(response.content)['xml'] + logger.info(f"微信退款响应: {result}") + except Exception as e: + logger.error(f"微信退款请求异常: {str(e)}", exc_info=True) + return {'code': 500, 'msg': '微信退款请求异常'} + + if result.get('return_code') == 'SUCCESS' and result.get('result_code') == 'SUCCESS': + return {'code': 0, 'msg': 'success'} + else: + err_msg = result.get('err_code_des', result.get('return_msg', '未知错误')) + logger.warning(f"微信退款失败: {err_msg}") + return {'code': 400, 'msg': err_msg} + + def _refund_to_merchant(self, order, clkf_phone, tuikuan_liyou): + """给商家退余额（事务内调用，不再独立事务）""" + try: + shangjia_ext = order.shangjia_kuozhan + shangjia_id = shangjia_ext.shangjia_id + except ObjectDoesNotExist: + raise Exception("订单商家信息不存在") + + try: + shangjia_user = UserMain.objects.get(yonghuid=shangjia_id) + shangjia_profile = shangjia_user.shop_profile + shangjia_profile.tuikuan += 1 + shangjia_profile.yue += order.jine or 0 + shangjia_profile.save() + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.error(f"商家退款：商家 {shangjia_id} 不存在") + raise Exception("商家账户不存在") + + def _update_refund_record(self, order, dashou_id, chuli_phone, tuikuan_liyou): + """更新退款记录表""" + try: + #更新支出记录 + if order.fadan_pingtai == 1: + from dingdan.utils import update_daily_payout + update_daily_payout(order.jine) + + + # ========== 新增：商品和店铺每日统计 ========== + try: + from shangdian.utils import update_dianpu_daily_stat + from shangpin.utils import update_shangpin_daily_stat + # 商品每日统计（只要有商品ID就执行） + if order.shangpin_id: + # 从扩展表获取已计算好的收益值（下单时已存储） + pingtai_shouyi = Decimal('0.00') + dianpu_shouyi = Decimal('0.00') + if hasattr(order, 'pingtai_kuozhan'): + pingtai_shouyi = order.pingtai_kuozhan.pingtai_shouyi or Decimal('0.00') + dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + + update_shangpin_daily_stat( + shangpin_id=order.shangpin_id, + caozuo_leixing=3, # 3 = 退款 + dingdan_jiage=order.jine, + pingtai_shouyi=pingtai_shouyi, + dianpu_zongshouyi=dianpu_shouyi + ) + logger.info(f"商品统计更新完成，商品ID: {order.shangpin_id}") + + # 店铺每日统计（仅当存在店铺ID时执行） + dianpu_id = None + if hasattr(order, 'pingtai_kuozhan'): + dianpu_id = order.pingtai_kuozhan.dianpu_id + if dianpu_id: + dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + update_dianpu_daily_stat( + dianpu_id=dianpu_id, + caozuo_leixing=3, # 3 = 退款 + dingdan_jiage=order.jine, + dianpu_shouyi=dianpu_shouyi + ) + logger.info(f"店铺统计更新完成，店铺ID: {dianpu_id}") + except Exception as e: + logger.error(f"商品/店铺统计更新失败: {e}") + logger.error(traceback.format_exc()) + # 统计失败不影响主流程 + # ============================================= + + + + refund_record, created = Tuikuanjilu.objects.get_or_create( + dingdan_id=order.dingdan_id, + defaults={ + 'dashouid': dashou_id or '', + 'qingqiuid': '', + 'chuliid': chuli_phone, + 'liyou': tuikuan_liyou or '客服退款', + 'sqzhuangtai': 1, + 'jine': order.jine or 0, + 'dashou_fencheng': order.dashou_fencheng or 0, + 'jieshao': order.jieshao or '', + 'beizhu': '客服退款', + 'nicheng': order.nicheng or '', + } + ) + if not created: + refund_record.sqzhuangtai = 1 + refund_record.chuliid = chuli_phone + if tuikuan_liyou: + refund_record.liyou = tuikuan_liyou + refund_record.save() + except Exception as e: + logger.error(f"更新退款记录异常: {str(e)}") + + def _generate_nonce_str(self): + return ''.join(random.choices(string.ascii_letters + string.digits, k=32)) + + def _generate_refund_no(self, dingdan_id): + timestamp = str(int(time.time())) + rand = ''.join(random.choices('0123456789', k=4)) + return f"{dingdan_id}REF{timestamp}{rand}" + + def _dict_to_xml(self, data): + xml = [''] + for k, v in data.items(): + xml.append(f'<{k}>{v}') + xml.append('') + return ''.join(xml)''' + +import hmac +import hashlib +import json +import logging +import time +import random +import string +import traceback +import requests +import xmltodict +from decimal import Decimal + +from django.conf import settings +from django.db import transaction +from django.core.cache import cache +from rest_framework.views import APIView +from rest_framework.response import Response +from rest_framework import permissions, status +from rest_framework.parsers import JSONParser +from django.core.exceptions import ObjectDoesNotExist + +from yonghu.models import UserMain +from dingdan.models import Dingdan, Tuikuanjilu, CrossPlatformOrderData +from shangpin.models import Shangpin +from peizhi.models import Szjilu, ClubConfig, Club +from dingdan.utils import ( + update_daily_payout +) +from .utils import verify_kefu_permission + +logger = logging.getLogger(__name__) + + +class CrossPlatformRefundView(APIView): + """ + 跨平台订单退款接口（同时支持本地订单和跨平台订单） + 请求：POST /houtai/kptk + 参数：{ + "username": "客服账号ID", + "dingdan_id": "订单ID", + "tuikuan_liyou": "退款理由（可选）" + } + 认证：JWT + 返回：code=0 成功，其他失败 + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数 + username = request.data.get('username', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + tuikuan_liyou = request.data.get('tuikuan_liyou', '').strip() + + if not username or not dingdan_id: + return Response({'code': 400, 'msg': '参数不完整'}) + + # 2. 身份验证 + current_user = request.user + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + + # 3. 检查是否有跨平台管理权限（003aa） + if '003aa' not in permissions: + return Response({'code': 403, 'msg': '您无权处理订单'}) + + # 4. 查询订单（带扩展表） + try: + order = Dingdan.objects.select_related( + 'pingtai_kuozhan', + 'shangjia_kuozhan' + ).get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + logger.warning(f"订单不存在: {dingdan_id}") + return Response({'code': 404, 'msg': '订单不存在'}) + + # 5. 订单状态校验（只有 1,7,2,8,4 可退款） + allowed_statuses = [1, 7, 2, 8, 4] + if order.zhuangtai not in allowed_statuses: + logger.warning(f"订单状态不允许退款: {order.zhuangtai}") + return Response({'code': 400, 'msg': '订单状态不允许退款'}) + + # 6. 根据派单方向分流 + dispatch_type = order.dispatch_type # 1=我方派单，2=对方派单 + + # ---------- 情况一：对方派单（我方打手接对方的单）---------- + if dispatch_type == 2: + # 对方派单，资金在对方平台，我方只处理打手状态和订单状态 + with transaction.atomic(): + order.zhuangtai = 5 + order.clkf = current_user.phone + if tuikuan_liyou: + order.tkly = tuikuan_liyou + order.save() + + dashou_id = order.jiedan_dashou_id + if dashou_id: + try: + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.tuikuanliang += 1 + dashou_profile.zhuangtai = 1 + dashou_profile.save() + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.warning(f"对方派单退款：打手 {dashou_id} 不存在，跳过更新") + + try: + refund_record, created = Tuikuanjilu.objects.get_or_create( + dingdan_id=dingdan_id, + defaults={ + 'dashouid': dashou_id or '', + 'qingqiuid': '', + 'chuliid': current_user.phone, + 'liyou': tuikuan_liyou or '客服退款（对方派单）', + 'sqzhuangtai': 1, + 'jine': order.jine or 0, + 'dashou_fencheng': order.dashou_fencheng or 0, + 'jieshao': order.jieshao or '', + 'beizhu': '对方派单退款', + 'nicheng': order.nicheng or '', + } + ) + if not created: + refund_record.sqzhuangtai = 1 + refund_record.chuliid = current_user.phone + if tuikuan_liyou: + refund_record.liyou = tuikuan_liyou + refund_record.save() + except Exception as e: + logger.error(f"更新退款记录失败: {str(e)}") + + kefu.jinrichuli += 1 + kefu.jinyuechuli += 1 + kefu.zongchuli += 1 + kefu.save() + + logger.info(f"对方派单退款成功，订单 {dingdan_id}") + return Response({'code': 0, 'msg': '退款成功'}) + + # ---------- 情况二：我方派单（订单由我方发出）---------- + is_cross = order.is_cross + partner_club_id = order.partner_club_id + partner_order_id = order.partner_order_id + + # 子情况2.1：本地订单（非跨平台） + if not is_cross or not partner_club_id: + if order.fadan_pingtai == 1: + # 平台订单退款 + return self._refund_platform_order(order, current_user, tuikuan_liyou, kefu) + elif order.fadan_pingtai == 2: + # 商家订单退款 + return self._refund_merchant_order(order, current_user, tuikuan_liyou, kefu) + else: + return Response({'code': 400, 'msg': '未知的发单平台类型'}) + + # 子情况2.2：跨平台订单（我方派单给对方） + else: + local_refund_success = False + try: + with transaction.atomic(): + if order.fadan_pingtai == 1: + refund_result = self._call_wechat_refund(order) + if refund_result['code'] != 0: + raise Exception(refund_result['msg']) + order.zhuangtai = 5 + order.clkf = current_user.phone + if tuikuan_liyou: + order.tkly = tuikuan_liyou + order.save() + local_refund_success = True + elif order.fadan_pingtai == 2: + self._refund_to_merchant(order, current_user.phone, tuikuan_liyou) + order.zhuangtai = 5 + order.clkf = current_user.phone + if tuikuan_liyou: + order.tkly = tuikuan_liyou + order.save() + local_refund_success = True + else: + return Response({'code': 400, 'msg': '未知的发单平台类型'}) + + dashou_id = order.jiedan_dashou_id + if dashou_id: + try: + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.tuikuanliang += 1 + dashou_profile.zhuangtai = 1 + dashou_profile.save() + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.warning(f"跨平台退款：打手 {dashou_id} 不存在，跳过更新") + + self._update_refund_record(order, dashou_id, current_user.phone, tuikuan_liyou) + kefu.jinrichuli += 1 + kefu.jinyuechuli += 1 + kefu.zongchuli += 1 + kefu.save() + + except Exception as e: + logger.error(f"跨平台订单本地退款失败: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': f'本地退款失败: {str(e)}'}) + + # 本地退款成功后，通知对方平台 + if local_refund_success: + try: + my_club_config = ClubConfig.objects.filter(is_self=1).first() + if not my_club_config: + logger.error("未配置我方俱乐部信息") + else: + self_club_id = my_club_config.club_id + club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=partner_club_id) + partner_domain = club_rel.partner_domain + + notify_url = partner_domain.rstrip('/') + '/houtai/dfddtk' + payload = { + 'order_id': partner_order_id, + 'club_id': self_club_id, + 'status': 5, + 'reason': tuikuan_liyou + } + try: + resp = requests.post(notify_url, json=payload, timeout=3) + if resp.status_code == 200: + resp_json = resp.json() + if resp_json.get('code') == 0: + cross_data, _ = CrossPlatformOrderData.objects.get_or_create( + dingdan_id=dingdan_id, + defaults={ + 'partner_order_id': partner_order_id, + 'partner_club_id': partner_club_id, + 'partner_order_status': resp_json.get('data', {}).get('partner_status', 0), + 'partner_dashou_id': resp_json.get('data', {}).get('partner_dashou_id', ''), + 'partner_amount': order.jine or 0, + } + ) + if not _: + cross_data.partner_order_status = resp_json.get('data', {}).get('partner_status', 0) + cross_data.save() + else: + logger.warning(f"对方平台返回错误: {resp_json.get('msg')}") + else: + logger.warning(f"对方平台接口HTTP错误: {resp.status_code}") + except requests.exceptions.Timeout: + logger.error(f"通知对方平台超时: {notify_url}") + except Exception as e: + logger.error(f"通知对方平台异常: {str(e)}") + except Exception as e: + logger.error(f"查询对方平台配置失败: {str(e)}") + + return Response({'code': 0, 'msg': '退款成功'}) + + # ========== 辅助方法 ========== + def _refund_platform_order(self, order, current_user, tuikuan_liyou, kefu): + """平台订单退款（调用微信支付）""" + refund_result = self._call_wechat_refund(order) + if refund_result['code'] != 0: + return Response({'code': 400, 'msg': refund_result['msg']}) + + with transaction.atomic(): + order.zhuangtai = 5 + order.clkf = current_user.phone + if tuikuan_liyou: + order.tkly = tuikuan_liyou + order.save() + + dashou_id = order.jiedan_dashou_id + if dashou_id: + try: + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.tuikuanliang += 1 + dashou_profile.zhuangtai = 1 + dashou_profile.save() + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.warning(f"平台退款：打手 {dashou_id} 不存在，跳过更新") + + self._update_refund_record(order, dashou_id, current_user.phone, tuikuan_liyou) + kefu.jinrichuli += 1 + kefu.jinyuechuli += 1 + kefu.zongchuli += 1 + kefu.save() + + logger.info(f"平台订单退款成功: {order.dingdan_id}") + return Response({'code': 0, 'msg': '退款成功'}) + + def _refund_merchant_order(self, order, current_user, tuikuan_liyou, kefu): + """商家订单退款（退余额给商家）""" + try: + shangjia_ext = order.shangjia_kuozhan + shangjia_id = shangjia_ext.shangjia_id + except ObjectDoesNotExist: + return Response({'code': 400, 'msg': '订单商家信息不存在'}) + + with transaction.atomic(): + order.zhuangtai = 5 + order.clkf = current_user.phone + if tuikuan_liyou: + order.tkly = tuikuan_liyou + order.save() + + try: + shangjia_user = UserMain.objects.get(yonghuid=shangjia_id) + shangjia_profile = shangjia_user.shop_profile + shangjia_profile.tuikuan += 1 + shangjia_profile.yue += order.jine or 0 + shangjia_profile.save() + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.error(f"商家退款：商家 {shangjia_id} 不存在，无法退余额") + raise Exception("商家账户不存在") + + dashou_id = order.jiedan_dashou_id + if dashou_id: + try: + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.tuikuanliang += 1 + dashou_profile.zhuangtai = 1 + dashou_profile.save() + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.warning(f"商家退款：打手 {dashou_id} 不存在，跳过更新") + + self._update_refund_record(order, dashou_id, current_user.phone, tuikuan_liyou) + kefu.jinrichuli += 1 + kefu.jinyuechuli += 1 + kefu.zongchuli += 1 + kefu.save() + + logger.info(f"商家订单退款成功: {order.dingdan_id}") + return Response({'code': 0, 'msg': '退款成功'}) + + def _call_wechat_refund(self, order): + """ + 调用虚拟支付退款接口 — 完全模仿 KefuPlatformRefundView 的 call_virtual_refund 方法 + 使用 /xpay/refund_order 接口，字段名、请求体结构、签名方式与成功接口保持一致 + """ + uri = "/xpay/refund_order" + base_url = "https://api.weixin.qq.com" + appkey = settings.VP_APPKEY_SANDBOX if settings.VP_ENV == 1 else settings.VP_APPKEY + + # 金额：元 -> 分 + refund_fee = int(float(order.jine or 0) * 100) + + # 获取老板 openid（和成功接口完全相同的路径） + laoban_openid = None + laoban_id = order.pingtai_kuozhan.laoban_id if hasattr(order, 'pingtai_kuozhan') else None + if laoban_id: + laoban_user = UserMain.objects.filter(yonghuid=laoban_id).first() + if laoban_user: + laoban_openid = getattr(laoban_user, 'openid', None) + + if not laoban_openid: + return {'code': 400, 'msg': '未找到用户openid，无法退款'} + + # 退款单号：R + 时间戳 + 6位随机数（和成功接口一模一样） + refund_order_id = f"R{int(time.time())}{random.randint(100000, 999999)}" + + # 请求体：字段名、顺序与成功接口完全一致 + body_data = { + "openid": laoban_openid, + "env": settings.VP_ENV, + "order_id": order.dingdan_id, # 商户订单号（和成功接口一样） + "refund_order_id": refund_order_id, # 本次退款单号（和成功接口一样） + "left_fee": refund_fee, # 订单剩余可退金额（和成功接口一样） + "refund_fee": refund_fee, # 本次退款金额（和成功接口一样） + "biz_meta": "客服退款", # 业务备注（和成功接口一样） + "refund_reason": 5, # 退款原因：5 其他（和成功接口一样） + "req_from": 1 # 退款来源：1 人工客服（和成功接口一样） + } + # 如果有微信支付交易单号，优先传入（和成功接口一样） + if getattr(order, 'wechat_transaction_id', None): + body_data["wx_order_id"] = order.wechat_transaction_id + + body = json.dumps(body_data, separators=(",", ":")) + + # 签名：pay_sig（和成功接口一模一样） + msg = uri + "&" + body + pay_sig = hmac.new(appkey.encode("utf-8"), msg.encode("utf-8"), hashlib.sha256).hexdigest() + + # 获取 access_token + access_token = self._get_access_token() + + # 构建 URL：和成功接口一模一样 + url = f"{base_url}{uri}?access_token={access_token}&pay_sig={pay_sig}" + + headers = {"Content-Type": "application/json"} + try: + response = requests.post(url, data=body, headers=headers, timeout=10) + result = response.json() + + if result.get("errcode") == 0: + return {'code': 0, 'msg': '退款成功', 'refund_id': refund_order_id} + else: + errmsg = result.get("errmsg", "未知错误") + logger.error(f"[退款] 退款失败: errcode={result.get('errcode')}, errmsg={errmsg}") + return {'code': 400, 'msg': f"退款失败: {errmsg}"} + + except requests.exceptions.RequestException as e: + logger.error(f"[退款] 网络请求异常: {e}") + return {'code': 500, 'msg': '微信退款请求网络异常'} + + def _get_access_token(self): + """获取 access_token，带缓存（与成功接口相同）""" + cache_key = "virtual_payment_access_token" + access_token = cache.get(cache_key) + if not access_token: + logger.info("[退款] 缓存无 access_token，重新获取") + resp = requests.get( + "https://api.weixin.qq.com/cgi-bin/token", + params={ + "grant_type": "client_credential", + "appid": settings.WEIXIN_APPID, + "secret": settings.WEIXIN_SECRET, + }, + timeout=10, + ) + data = resp.json() + if "access_token" in data: + access_token = data["access_token"] + cache.set(cache_key, access_token, data.get("expires_in", 7200) - 300) + logger.info(f"[退款] access_token 已更新") + else: + raise Exception(f"获取 access_token 失败: {data}") + return access_token + + def _refund_to_merchant(self, order, clkf_phone, tuikuan_liyou): + """给商家退余额（事务内调用，不再独立事务）""" + try: + shangjia_ext = order.shangjia_kuozhan + shangjia_id = shangjia_ext.shangjia_id + except ObjectDoesNotExist: + raise Exception("订单商家信息不存在") + + try: + shangjia_user = UserMain.objects.get(yonghuid=shangjia_id) + shangjia_profile = shangjia_user.shop_profile + shangjia_profile.tuikuan += 1 + shangjia_profile.yue += order.jine or 0 + shangjia_profile.save() + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.error(f"商家退款：商家 {shangjia_id} 不存在") + raise Exception("商家账户不存在") + + def _update_refund_record(self, order, dashou_id, chuli_phone, tuikuan_liyou): + """更新退款记录表""" + try: + if order.fadan_pingtai == 1: + from dingdan.utils import update_daily_payout + update_daily_payout(order.jine) + + refund_record, created = Tuikuanjilu.objects.get_or_create( + dingdan_id=order.dingdan_id, + defaults={ + 'dashouid': dashou_id or '', + 'qingqiuid': '', + 'chuliid': chuli_phone, + 'liyou': tuikuan_liyou or '客服退款', + 'sqzhuangtai': 1, + 'jine': order.jine or 0, + 'dashou_fencheng': order.dashou_fencheng or 0, + 'jieshao': order.jieshao or '', + 'beizhu': '客服退款', + 'nicheng': order.nicheng or '', + } + ) + if not created: + refund_record.sqzhuangtai = 1 + refund_record.chuliid = chuli_phone + if tuikuan_liyou: + refund_record.liyou = tuikuan_liyou + refund_record.save() + except Exception as e: + logger.error(f"更新退款记录异常: {str(e)}") + + def _generate_nonce_str(self): + return ''.join(random.choices(string.ascii_letters + string.digits, k=32)) + + def _generate_refund_no(self, dingdan_id): + timestamp = str(int(time.time())) + rand = ''.join(random.choices('0123456789', k=4)) + return f"{dingdan_id}REF{timestamp}{rand}" + + def _dict_to_xml(self, data): + xml = [''] + for k, v in data.items(): + xml.append(f'<{k}>{v}') + xml.append('') + return ''.join(xml) + + + + + + + + + + + + + + + +class PartnerGetOrderDataView(APIView): + """ + 对方平台调用，获取我方订单的打手图片和处罚记录 + 请求：POST /houtai/kpthqtp + 参数：{ + "order_id": "对方平台的订单ID", + "club_id": "对方俱乐部ID" + } + 无需认证 + 返回：code=0 + images列表 + punishment信息 + """ + permission_classes = [AllowAny] + parser_classes = [JSONParser] + + def post(self, request): + try: + # 1. 获取参数 + partner_order_id = request.data.get('order_id', '').strip() + partner_club_id = request.data.get('club_id', '').strip() + if not partner_order_id or not partner_club_id: + return Response({'code': 400, 'msg': '参数不完整'}) + + # 2. 查询我方存储桶域名（自己俱乐部的配置） + my_club_config = ClubConfig.objects.filter(is_self=1).first() + if not my_club_config: + logger.error("未配置我方俱乐部存储桶域名") + return Response({'code': 500, 'msg': '系统配置错误'}) + storage_domain = my_club_config.storage_bucket_domain or '' + + # 3. 查询我方订单（通过对方订单ID和对方俱乐部ID） + try: + order = Dingdan.objects.get( + dingdan_id=partner_order_id, + partner_club_id=partner_club_id + ) + except Dingdan.DoesNotExist: + logger.warning(f"订单不存在: partner_order_id={partner_order_id}, partner_club_id={partner_club_id}") + return Response({'code': 404, 'msg': '订单不存在'}) + + dingdan_id = order.dingdan_id + dashou_id = order.jiedan_dashou_id + + # 4. 查询打手图片（绝对URL） + images = [] + if dashou_id: + dashou_images = Dashoutupian.objects.filter( + dingdan_id=dingdan_id, + dashou=dashou_id + ).values_list('tupian', flat=True) + for rel_path in dashou_images: + if rel_path: + if rel_path.startswith('http'): + images.append(rel_path) + else: + images.append(storage_domain + rel_path) + + # 5. 查询处罚记录（最新一条） + punishment = { + 'cfliyou': '', + 'sqzhuangtai': 0, + 'bhliyou': '', + 'ssliyou': '', + 'jifen': 0 + } + if dashou_id: + punish_record = Chufajilu.objects.filter( + dingdan_id=dingdan_id, + dashouid=dashou_id + ).order_by('-create_time').first() + if punish_record: + punishment = { + 'cfliyou': punish_record.cfliyou or '', + 'sqzhuangtai': punish_record.sqzhuangtai or 0, + 'bhliyou': punish_record.bhliyou or '', + 'ssliyou': punish_record.ssliyou or '', + 'jifen': punish_record.jifen or 0, + } + + # 6. 返回数据 + return Response({ + 'code': 0, + 'msg': 'success', + 'data': { + 'images': images, + 'punishment': punishment + } + }) + + except Exception as e: + logger.error(f"对方获取订单数据接口异常: {traceback.format_exc()}") + return Response({'code': 500, 'msg': '服务器内部错误'}) + + +class PartnerRefundNotifyView(APIView): + """ + 接收对方平台推送的订单状态变更通知（完成/退款），同步更新我方数据。 + 请求：POST /houtai/dfddtk + 参数： + { + "order_id": "对方平台订单ID（实际为我方订单ID）", + "club_id": "对方俱乐部ID", + "status": 3 或 5, + "reason": "理由（可选）" + } + 返回：code=0 + data包含我方订单当前状态和打手ID + + 核心职责： + 1. 更新跨平台订单扩展表 + 2. 对于对方派单（我方打手接对方的单）： + a. 状态3（完成）→ 更新订单为已完成，创建预结算（如无） + b. 状态5（退款）→ 更新订单为已退款，将预结算待结算改为已拒绝 + c. 在此过程中，若订单原状态为“进行中(2)”，则将打手状态重置为空闲(1) + """ + + permission_classes = [AllowAny] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 参数校验（事务外执行） + partner_order_id = request.data.get('order_id', '').strip() + partner_club_id = request.data.get('club_id', '').strip() + partner_status = request.data.get('status') + reason = request.data.get('reason', '').strip() + + if not partner_order_id or not partner_club_id: + return Response({'code': 400, 'msg': '参数不完整'}) + if partner_status not in (3, 5): + return Response({'code': 400, 'msg': '不支持的状态码'}) + + # 2. 核心业务在事务内执行 + try: + with transaction.atomic(): + # 2.1 锁定订单行（必须事务内） + try: + order = Dingdan.objects.select_for_update().get( + dingdan_id=partner_order_id, + partner_club_id=partner_club_id + ) + except Dingdan.DoesNotExist: + logger.warning(f"通知订单不存在: order_id={partner_order_id}, club_id={partner_club_id}") + return Response({'code': 404, 'msg': '订单不存在'}) + + my_dingdan_id = order.dingdan_id + dashou_id = order.jiedan_dashou_id or '' + + # 记录原订单状态，用于后续打手状态重置 + original_order_status = order.zhuangtai + + # 2.2 更新跨平台扩展表（记录对方状态） + cross_data, created = CrossPlatformOrderData.objects.get_or_create( + dingdan_id=my_dingdan_id, + defaults={ + 'partner_order_id': partner_order_id, + 'partner_club_id': partner_club_id, + 'partner_order_status': partner_status, + 'partner_dashou_id': '', + 'partner_amount': order.jine or 0, + } + ) + if not created: + cross_data.partner_order_status = partner_status + cross_data.save(update_fields=['partner_order_status', 'update_time']) + + # 2.3 仅处理对方派单（dispatch_type == 2） + if order.dispatch_type == 2: + # ========== 打手状态恢复逻辑 ========== + # 如果原订单状态为“进行中(2)”，且存在接单打手，则将打手状态改为空闲(1) + if original_order_status == 2 and dashou_id: + try: + # 通过打手ID查用户主表，再反向获取打手扩展表 + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.zhuangtai = 1 # 状态置为空闲 + dashou_profile.save(update_fields=['zhuangtai']) + logger.info(f"打手 {dashou_id} 状态已重置为1（空闲）") + + + + except UserMain.DoesNotExist: + logger.warning(f"打手用户不存在: {dashou_id}") + except UserDashou.DoesNotExist: + logger.warning(f"打手扩展信息不存在: {dashou_id}") + + # 🔥 新增：调用打手每日统计（成交） + if partner_status ==3: + + try: + update_dashou_daily_by_action( + yonghuid=order.jiedan_dashou_id, + amount=order.dashou_fencheng, + action=2 # 3 表示退款（退款） + ) + logger.info(f"打手 {order.jiedan_dashou_id} 每日统计更新成功") + except Exception as e: + logger.error(f"打手每日统计更新失败: {e}") + if partner_status ==5: + try: + update_dashou_daily_by_action( + yonghuid=order.jiedan_dashou_id, + amount=order.dashou_fencheng, + action=3 # 3 表示退款（退款） + ) + logger.info(f"打手 {order.jiedan_dashou_id} 每日统计更新成功") + except Exception as e: + logger.error(f"打手每日统计更新失败: {e}") + + # 不影响主流程 + + # ========== 情况A：对方完成（status=3） ========== + if partner_status == 3: + order.zhuangtai = 3 + + order.clkf = partner_club_id # 处理人（对方俱乐部ID） + order.save(update_fields=['zhuangtai', 'update_time','clkf']) + + if dashou_id: + yjs, yjs_created = PreSettlement.objects.get_or_create( + dingdan_id=my_dingdan_id, + dashou_id=dashou_id, + defaults={ + 'partner_order_id': partner_order_id, + 'partner_club_id': partner_club_id, + 'amount': order.dashou_fencheng or 0, + 'order_amount': order.jine or 0, + 'status': 0, # 待结算 + 'operator': '', + } + ) + if yjs_created: + logger.info(f"预结算创建成功: {my_dingdan_id}, 打手 {dashou_id}, 金额 {order.dashou_fencheng}") + else: + logger.info(f"预结算已存在，跳过: {my_dingdan_id}, 打手 {dashou_id}") + else: + logger.warning(f"订单 {my_dingdan_id} 无接单打手，跳过预结算创建") + + # ========== 情况B：对方退款（status=5） ========== + elif partner_status == 5: + order.zhuangtai = 5 + order.tkly = reason if reason else '' # 退款理由 + order.clkf = partner_club_id # 处理人（对方俱乐部ID） + order.save(update_fields=['zhuangtai', 'update_time','clkf','tkly']) + + if dashou_id: + try: + yjs = PreSettlement.objects.get( + dingdan_id=my_dingdan_id, + dashou_id=dashou_id + ) + if yjs.status == 0: # 待结算 → 已拒绝 + yjs.status = 2 + yjs.process_time = timezone.now() + yjs.save(update_fields=['status', 'process_time', 'update_time']) + logger.info(f"预结算状态已改为已拒绝: {my_dingdan_id}") + except PreSettlement.DoesNotExist: + logger.info(f"订单 {my_dingdan_id} 无预结算记录，无需修改") + + logger.info(f"对方通知处理完成: dingdan_id={my_dingdan_id}, partner_status={partner_status}") + + # 返回结果 + return Response({ + 'code': 0, + 'msg': 'success', + 'data': { + 'partner_status': order.zhuangtai, + 'partner_dashou_id': dashou_id + } + }) + + except Exception as e: + logger.error(f"对方通知接口异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}) + + +from houtai.utils import update_dashou_daily_by_action + +class CrossPlatformForceCompleteView(APIView): + """ + 跨平台订单强制结单接口 + 请求：POST /houtai/kpqzjd + 参数：{"username": "客服账号ID", "dingdan_id": "订单ID"} + 认证：JWT + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数 + username = request.data.get('username', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + if not username or not dingdan_id: + return Response({'code': 400, 'msg': '参数不完整'}) + + # 2. 身份验证 + current_user = request.user + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '003aa' not in permissions: + return Response({'code': 403, 'msg': '您无权查处理订单'}) + + # 4. 查询订单并加锁 + try: + with transaction.atomic(): + order = Dingdan.objects.select_for_update().get(dingdan_id=dingdan_id) + + # 5. 校验订单状态必须为8（结算中） + if order.zhuangtai not in (2,8): + return Response({'code': 400, 'msg': f'订单状态不是结算中，当前状态: {order.zhuangtai}'}) + + # 获取关键字段 + dispatch_type = order.dispatch_type # 1=我方派单，2=对方派单 + is_cross = order.is_cross # 0=本地，1=跨平台 + partner_club_id = order.partner_club_id + partner_order_id = order.partner_order_id + dashou_id = order.jiedan_dashou_id + dashou_fencheng = order.dashou_fencheng or Decimal('0') + jine = order.jine or Decimal('0') + fadan_pingtai = order.fadan_pingtai # 1=平台，2=商家 + + # ========== 修复点1：完善跨平台判断 ========== + # 跨平台且被对方打手接单的条件：is_cross==1 且 (partner_club_id 或 partner_order_id 有值) + is_cross_claimed_by_partner = (is_cross == 1 and (partner_club_id or partner_order_id)) + # 如果是跨平台订单但两个字段都为空，则按本地订单处理（即自家打手接单） + + # ========== 修复点2：根据方向处理 ========== + # ---------- 对方派单（我方打手接对方单）---------- + if dispatch_type == 2: + # 创建预结算记录（如果已存在则更新） + pre_settlement, created = PreSettlement.objects.get_or_create( + dingdan_id=dingdan_id, + defaults={ + 'partner_order_id': partner_order_id, + 'partner_club_id': partner_club_id, + 'dashou_id': dashou_id, + 'amount': dashou_fencheng, + 'order_amount': jine, + 'status': 0, # 待结算 + 'operator': current_user.phone, + } + ) + if not created: + pre_settlement.partner_order_id = partner_order_id + pre_settlement.partner_club_id = partner_club_id + pre_settlement.dashou_id = dashou_id + pre_settlement.amount = dashou_fencheng + pre_settlement.order_amount = jine + pre_settlement.status = 0 + pre_settlement.process_time = None + pre_settlement.operator = current_user.phone + pre_settlement.save() + + # 更新订单状态 + order.zhuangtai = 3 + order.clkf = current_user.phone + order.save() + + # 更新每日统计表（对方派单方向，使用订单金额） + if partner_club_id: + # 修复点3：使用公共统计函数 + update_daily_dispatch_stat( + direction=2, + partner_club_id=partner_club_id, + success_amount=jine, + success_count=1 + ) + else: + # 如果没有俱乐部ID，使用默认000001 + update_daily_dispatch_stat( + direction=2, + partner_club_id='000001', + success_amount=jine, + success_count=1 + ) + + # 通知对方平台订单已完成（修复点4：移到事务外） + if partner_club_id and partner_order_id: + transaction.on_commit( + lambda: self._notify_partner_order_status( + partner_club_id=partner_club_id, + partner_order_id=partner_order_id, + new_status=3, + current_user=current_user + ) + ) + + # ---------- 我方派单 ---------- + elif dispatch_type == 1: + # 判断是否为跨平台订单且被对方打手接单（即 partner_club_id 或 partner_order_id 有值） + if is_cross_claimed_by_partner: + # 跨平台订单：我方派单给外平台打手 + # 修复点5：处理只有 partner_order_id 没有 partner_club_id 的情况 + real_partner_club_id = partner_club_id or '000001' + + # 更新订单状态 + order.zhuangtai = 3 + order.clkf = current_user.phone + order.save() + + # 更新每日统计表（我方派单方向，使用打手分成金额） + update_daily_dispatch_stat( + direction=1, + partner_club_id=real_partner_club_id, + success_amount=dashou_fencheng, + success_count=1 + ) + + # ========== 新增：商品和店铺每日统计 ========== + + if order.fadan_pingtai == 1: + try: + from shangdian.utils import update_dianpu_daily_stat + from shangpin.utils import update_shangpin_daily_stat + # 商品每日统计（只要有商品ID就执行） + if order.shangpin_id: + # 从扩展表获取已计算好的收益值（下单时已存储） + pingtai_shouyi = Decimal('0.00') + dianpu_shouyi = Decimal('0.00') + if hasattr(order, 'pingtai_kuozhan'): + pingtai_shouyi = order.pingtai_kuozhan.pingtai_shouyi or Decimal('0.00') + dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + + update_shangpin_daily_stat( + shangpin_id=order.shangpin_id, + caozuo_leixing=3, # 3 = 退款 + dingdan_jiage=order.jine, + pingtai_shouyi=pingtai_shouyi, + dianpu_zongshouyi=dianpu_shouyi + ) + logger.info(f"商品统计更新完成，商品ID: {order.shangpin_id}") + + # 店铺每日统计（仅当存在店铺ID时执行） + dianpu_id = None + if hasattr(order, 'pingtai_kuozhan'): + dianpu_id = order.pingtai_kuozhan.dianpu_id + if dianpu_id: + dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + update_dianpu_daily_stat( + dianpu_id=dianpu_id, + caozuo_leixing=3, # 3 = 退款 + dingdan_jiage=order.jine, + dianpu_shouyi=dianpu_shouyi + ) + logger.info(f"店铺统计更新完成，店铺ID: {dianpu_id}") + except Exception as e: + logger.error(f"商品/店铺统计更新失败: {e}") + logger.error(traceback.format_exc()) + # 统计失败不影响主流程 + # ============================================= + + # 通知对方平台订单已完成（异步） + if partner_order_id: + transaction.on_commit( + lambda: self._notify_partner_order_status( + partner_club_id=real_partner_club_id, + partner_order_id=partner_order_id, + new_status=3, + current_user=current_user + ) + ) + else: + # 本地订单（非跨平台或跨平台但实际是自家打手接单），按原有逻辑给自家打手结算 + if not dashou_id: + return Response({'code': 400, 'msg': '订单无接单打手'}) + if dashou_fencheng < 0: + return Response({'code': 400, 'msg': '打手分成金额无效'}) + # ========== 新增：商品和店铺每日统计 ========== + if order.fadan_pingtai == 1: + try: + from shangdian.utils import update_dianpu_daily_stat + from shangpin.utils import update_shangpin_daily_stat + # 商品每日统计（只要有商品ID就执行） + if order.shangpin_id: + # 从扩展表获取已计算好的收益值（下单时已存储） + pingtai_shouyi = Decimal('0.00') + dianpu_shouyi = Decimal('0.00') + if hasattr(order, 'pingtai_kuozhan'): + pingtai_shouyi = order.pingtai_kuozhan.pingtai_shouyi or Decimal('0.00') + dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + + update_shangpin_daily_stat( + shangpin_id=order.shangpin_id, + caozuo_leixing=3, # 3 = 退款 + dingdan_jiage=order.jine, + pingtai_shouyi=pingtai_shouyi, + dianpu_zongshouyi=dianpu_shouyi + ) + logger.info(f"商品统计更新完成，商品ID: {order.shangpin_id}") + + # 店铺每日统计（仅当存在店铺ID时执行） + dianpu_id = None + if hasattr(order, 'pingtai_kuozhan'): + dianpu_id = order.pingtai_kuozhan.dianpu_id + if dianpu_id: + dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00') + update_dianpu_daily_stat( + dianpu_id=dianpu_id, + caozuo_leixing=3, # 3 = 退款 + dingdan_jiage=order.jine, + dianpu_shouyi=dianpu_shouyi + ) + logger.info(f"店铺统计更新完成，店铺ID: {dianpu_id}") + except Exception as e: + logger.error(f"商品/店铺统计更新失败: {e}") + logger.error(traceback.format_exc()) + # 统计失败不影响主流程 + # ============================================= + + # 更新打手余额和统计 + try: + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.chengjiaozongliang += 1 + dashou_profile.yue += dashou_fencheng + dashou_profile.zonge += dashou_fencheng + dashou_profile.jinrishouyi += dashou_fencheng + dashou_profile.jinyueshouyi += dashou_fencheng + dashou_profile.save() + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.warning(f"本地订单结算：打手 {dashou_id} 不存在，跳过") + + # 如果是商家订单，更新商家成交单量 + if fadan_pingtai == 2: + try: + shangjia_ext = order.shangjia_kuozhan + if shangjia_ext and shangjia_ext.shangjia_id: + shangjia_user = UserMain.objects.get(yonghuid=shangjia_ext.shangjia_id) + shangjia_profile = shangjia_user.shop_profile + shangjia_profile.chengjiao += 1 + shangjia_profile.save() + except Exception as e: + logger.warning(f"商家订单更新失败: {str(e)}") + + # 更新订单状态 + order.zhuangtai = 3 + order.clkf = current_user.phone + order.save() + + # 本地订单不涉及跨平台统计，无需更新 DailyDispatchStat + + else: + return Response({'code': 400, 'msg': '未知的派单方向'}) + + if dispatch_type == 1 and is_cross_claimed_by_partner: + pass + # 判断是否为跨平台订单且被对方打手接单（即 partner_club_id 或 partner_order_id 有值） + elif dispatch_type == 2: + pass + else: + + + # 🔥 新增：调用打手每日统计（成交） + try: + update_dashou_daily_by_action( + yonghuid=order.jiedan_dashou_id, + amount=dashou_fencheng, + action=2 # 2 表示成交（结算） + ) + logger.info(f"打手 {order.jiedan_dashou_id} 每日统计更新成功") + except Exception as e: + logger.error(f"打手每日统计更新失败: {e}") + # 不影响主流程 + + if order.fadan_pingtai == 2: + shangjia_ext = order.shangjia_kuozhan + # ✅ 新方法（行为驱动，更安全） + from houtai.utils import update_shangjia_daily + update_shangjia_daily( + yonghuid=shangjia_ext.shangjia_id, + amount=Decimal(str(order.jine)), + action=2 # 2 = 结算 + ) + else: + pass + + + # 7. 更新客服统计 + kefu.jinrichuli += 1 + kefu.jinyuechuli += 1 + kefu.zongchuli += 1 + kefu.save() + + # 8. 记录操作日志 + logger.info(f"强制结单成功，订单 {dingdan_id}，方向 {dispatch_type}，客服 {username}") + + return Response({'code': 0, 'msg': '强制结单成功'}) + + except Dingdan.DoesNotExist: + logger.warning(f"订单不存在: {dingdan_id}") + return Response({'code': 404, 'msg': '订单不存在'}) + except Exception as e: + logger.error(f"强制结单接口异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}) + + # ========== 辅助方法 ========== + def _notify_partner_order_status(self, partner_club_id, partner_order_id, new_status, current_user): + """ + 通知对方平台订单状态变更（已在事务外调用） + """ + try: + # 获取我方俱乐部ID + my_club_config = ClubConfig.objects.filter(is_self=1).first() + if not my_club_config: + logger.error("未配置我方俱乐部信息，无法通知对方") + return + self_club_id = my_club_config.club_id + + # 查询对方服务器域名 + club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=partner_club_id) + partner_domain = club_rel.partner_domain + if not partner_domain: + logger.error(f"对方俱乐部 {partner_club_id} 未配置域名") + return + + url = partner_domain.rstrip('/') + '/houtai/dfddtk' + payload = { + 'order_id': partner_order_id, + 'club_id': self_club_id, + 'status': new_status + } + resp = requests.post(url, json=payload, timeout=3) + if resp.status_code == 200: + resp_json = resp.json() + if resp_json.get('code') == 0: + # 更新跨平台订单扩展表中的对方状态 + cross_data, _ = CrossPlatformOrderData.objects.get_or_create( + dingdan_id=partner_order_id, + defaults={ + 'partner_order_id': partner_order_id, + 'partner_club_id': partner_club_id, + 'partner_order_status': new_status, + 'partner_dashou_id': '', + 'partner_amount': Decimal('0') + } + ) + if not _: + cross_data.partner_order_status = new_status + cross_data.save(update_fields=['partner_order_status']) + logger.info(f"通知对方订单状态成功: {partner_order_id} -> {new_status}") + else: + logger.warning(f"对方接口返回错误: {resp_json.get('msg')}") + else: + logger.warning(f"对方接口HTTP错误: {resp.status_code}") + except requests.exceptions.Timeout: + logger.error(f"通知对方平台超时: {partner_club_id}") + except Exception as e: + logger.error(f"通知对方平台异常: {str(e)}") + + + + +class CrossPlatformTransferHallView(APIView): + """ + 跨平台订单转移大厅接口 + 请求：POST /houtai/kpzydt + 参数：{"username": "客服账号ID", "dingdan_id": "订单ID"} + 认证：JWT + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数 + username = request.data.get('username', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + if not username or not dingdan_id: + return Response({'code': 400, 'msg': '参数不完整'}) + + # 2. 客服身份验证 + current_user = request.user + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '003aa' not in permissions: + return Response({'code': 403, 'msg': '您无权处理俱乐部订单'}) + + # 4. 查询订单并加锁 + try: + with transaction.atomic(): + order = Dingdan.objects.select_for_update().get(dingdan_id=dingdan_id) + + # 5. 状态校验 + if order.zhuangtai not in [2, 8, 4]: + return Response({'code': 400, 'msg': f'订单状态不允许转移大厅，当前状态: {order.zhuangtai}'}) + + # 获取关键字段 + is_cross = order.is_cross + dispatch_type = order.dispatch_type + partner_club_id = order.partner_club_id + partner_order_id = order.partner_order_id + current_dashou_id = order.jiedan_dashou_id + zhiding_id = order.zhiding_id + + # ========== 判断是否需要通知对方平台 ========== + # 条件：跨平台且我方派单(dispatch_type=1) 且 (partner_club_id 或 partner_order_id 有值) + need_notify = (is_cross == 1 and (partner_club_id or partner_order_id)) + + # ========== 判断是否需要修改本地打手状态 ========== + # 当接单打手是我方打手时，才需要修改状态（改为空闲1） + # 我方打手的情况： + # 1. 非跨平台订单 (is_cross != 1) + # 2. 跨平台且对方派单 (dispatch_type == 2) —— 此时打手是我方 + # 3. 跨平台且我方派单但没有对方信息 (即 need_notify == False) —— 此时打手也是我方 + need_update_dashou_status = (current_dashou_id and + (is_cross != 1 or dispatch_type == 2 or not need_notify)) + + # ========== 记录打手历史（无论打手是谁，只要有ID就记录） ========== + if current_dashou_id: + last_history = OrderDashouHistory.objects.filter( + dingdan_id=dingdan_id + ).order_by('-times').first() + next_times = (last_history.times + 1) if last_history else 1 + OrderDashouHistory.objects.create( + dingdan_id=dingdan_id, + dashou_id=current_dashou_id, + times=next_times, + operator=username + ) + + # ========== 修改本地打手状态（仅当是我方打手时） ========== + if need_update_dashou_status: + try: + dashou_profile = UserDashou.objects.get(user__yonghuid=current_dashou_id) + dashou_profile.zhuangtai = 1 + dashou_profile.save() + logger.info(f"打手 {current_dashou_id} 状态改为空闲") + except ObjectDoesNotExist: + logger.warning(f"打手 {current_dashou_id} 不存在，跳过状态更新") + + # ========== 更新订单状态（清空打手，改为1或7） ========== + if zhiding_id: + order.zhuangtai = 7 # 指定中 + else: + order.zhuangtai = 1 # 下单中 + order.jiedan_dashou_id = None + order.clkf = username + order.save() + + # ========== 如果需要通知对方平台，异步发送通知 ========== + if need_notify: + # 确定对方俱乐部ID（如果没有则用默认000001） + real_partner_club_id = partner_club_id if partner_club_id else '000001' + real_partner_order_id = partner_order_id if partner_order_id else dingdan_id + + # 获取我方俱乐部ID + my_club_config = ClubConfig.objects.filter(is_self=1).first() + if my_club_config: + self_club_id = my_club_config.club_id + # 查询对方域名 + try: + club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=real_partner_club_id) + partner_domain = club_rel.partner_domain + if partner_domain: + url = partner_domain.rstrip('/') + '/houtai/kpttzzydt' + payload = { + 'order_id': real_partner_order_id, + 'club_id': self_club_id + } + + def notify(): + try: + resp = requests.post(url, json=payload, timeout=3) + if resp.status_code == 200: + resp_json = resp.json() + if resp_json.get('code') == 0: + # 更新跨平台订单扩展表中的对方状态 + cross_data, created = CrossPlatformOrderData.objects.get_or_create( + dingdan_id=dingdan_id, + defaults={ + 'partner_order_id': real_partner_order_id, + 'partner_club_id': real_partner_club_id, + 'partner_order_status': resp_json.get('data', {}).get('partner_status', 0), + 'partner_dashou_id': '', + 'partner_amount': order.jine or 0, + } + ) + if not created: + cross_data.partner_order_status = resp_json.get('data', {}).get('partner_status', 0) + cross_data.save(update_fields=['partner_order_status']) + logger.info(f"转移大厅通知对方成功: {dingdan_id}") + + # ========== 新增代码开始 ========== + # 对方成功转移大厅，清空我方订单中的对方相关信息 + # ========== 新增代码开始 ========== + # 只有我方派单时才清空对方平台信息，对方派单则保留 + if dispatch_type == 1: + Dingdan.objects.filter(dingdan_id=dingdan_id).update( + partner_club_id=None, + partner_order_id=None, + jiedan_dashou_id=None, + zhuangtai=1 + ) + logger.info(f"我方派单，已清空订单 {dingdan_id} 的对方信息") + else: + # 对方派单，只清空打手并恢复状态，保留对方信息 + Dingdan.objects.filter(dingdan_id=dingdan_id).update( + jiedan_dashou_id=None, + zhuangtai=1 + ) + logger.info(f"对方派单，只清空打手，保留对方信息，订单 {dingdan_id}") + # ========== 新增代码结束 ========== + # ========== 新增代码结束 ========== + + else: + logger.warning(f"对方平台返回错误: {resp_json.get('msg')}") + else: + logger.warning(f"对方接口HTTP错误: {resp.status_code}") + except Exception as e: + logger.error(f"转移大厅通知对方异常: {str(e)}") + + threading.Thread(target=notify).start() + except Club.DoesNotExist: + logger.error(f"未找到对方俱乐部配置: partner_club_id={real_partner_club_id}") + except Exception as e: + logger.error(f"查询对方平台配置失败: {str(e)}") + + # ========== 更新客服统计 ========== + kefu.jinrichuli += 1 + kefu.jinyuechuli += 1 + kefu.zongchuli += 1 + kefu.save() + + return Response({'code': 0, 'msg': '转移大厅成功'}) + + except Dingdan.DoesNotExist: + return Response({'code': 404, 'msg': '订单不存在'}) + except Exception as e: + logger.error(f"转移大厅接口异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}) + + + + +class PartnerTransferHallNotifyView(APIView): + """ + 对方平台转移大厅通知接口 + 对方调用此接口通知我方订单已转移大厅，我方同步更新订单状态 + 请求：POST /houtai/kpttzzydt + 参数：{ + "order_id": "对方平台的订单ID", + "club_id": "对方俱乐部ID" + } + 无需认证 + 返回：{ + "code": 0, + "msg": "success", + "data": { + "partner_status": 1 # 我方订单当前状态 + } + } + """ + parser_classes = [JSONParser] + permission_classes = [AllowAny] + + def post(self, request): + try: + # 1. 获取参数 + partner_order_id = request.data.get('order_id', '').strip() + partner_club_id = request.data.get('club_id', '').strip() + if not partner_order_id or not partner_club_id: + return Response({'code': 400, 'msg': '参数不完整'}) + + # 2. 查询我方订单 + try: + order = Dingdan.objects.get( + dingdan_id=partner_order_id, + partner_club_id=partner_club_id + ) + except Dingdan.DoesNotExist: + logger.warning(f"对方转移大厅通知：订单不存在 partner_order_id={partner_order_id}, partner_club_id={partner_club_id}") + return Response({'code': 404, 'msg': '订单不存在'}) + + # 3. 加锁处理 + with transaction.atomic(): + order = Dingdan.objects.select_for_update().get(id=order.id) + + current_status = order.zhuangtai + current_dashou_id = order.jiedan_dashou_id + + # 4. 根据订单状态处理 + if current_status == 3: + # 已完成状态，需要检查预结算记录 + try: + pre_settlement = PreSettlement.objects.select_for_update().get( + dingdan_id=order.dingdan_id, + dashou_id=current_dashou_id + ) + # 如果预结算状态是0（待结算），改为2（已拒绝） + if pre_settlement.status == 0: + pre_settlement.status = 2 + pre_settlement.process_time = timezone.now() + pre_settlement.operator = partner_club_id # 记录操作方 + pre_settlement.save() + logger.info(f"预结算记录已拒绝: {order.dingdan_id}") + else: + logger.info(f"预结算记录已是其他状态 {pre_settlement.status}，不重复修改") + except PreSettlement.DoesNotExist: + logger.warning(f"订单 {order.dingdan_id} 已完成但无预结算记录，无法转移大厅") + return Response({'code': 400, 'msg': '订单已完成且无预结算记录，无法转移大厅'}) + + # 5. 记录打手历史（如果有接单打手） + if current_dashou_id: + last_history = OrderDashouHistory.objects.filter( + dingdan_id=order.dingdan_id + ).order_by('-times').first() + next_times = (last_history.times + 1) if last_history else 1 + OrderDashouHistory.objects.create( + dingdan_id=order.dingdan_id, + dashou_id=current_dashou_id, + times=next_times, + operator=partner_club_id # 记录操作方 + ) + # 将打手状态改为空闲 + try: + dashou_profile = UserDashou.objects.get(user__yonghuid=current_dashou_id) + dashou_profile.zhuangtai = 1 + dashou_profile.save() + + # 打手退款每日统计 + if order.dispatch_type == 2: + try: + update_dashou_daily_by_action( + yonghuid=current_dashou_id, + amount=dashou_profile.dashou_fencheng, + action=3 # 退款 + ) + except Exception as e: + logger.error(f"记录错误: {str(e)}") + except ObjectDoesNotExist: + logger.warning(f"打手 {current_dashou_id} 不存在，跳过状态更新") + + # 7. 根据派单方向清理对方信息 + if order.dispatch_type == 1: + # 我方派单：清空对方俱乐部ID和订单ID + order.partner_club_id = None + order.partner_order_id = None + # 对方派单时保留对方信息，不清空 + + # 8. 更新订单状态 + if order.zhiding_id: + order.zhuangtai = 7 # 指定中 + else: + order.zhuangtai = 1 # 下单中 + + + + + + + order.jiedan_dashou_id = None + order.clkf = partner_club_id # 记录操作方 + order.save() + + logger.info(f"对方转移大厅通知成功: 订单 {order.dingdan_id}，新状态 {order.zhuangtai}") + + # 7. 返回我方订单状态 + return Response({ + 'code': 0, + 'msg': 'success', + 'data': { + 'partner_status': order.zhuangtai + } + }) + + except Exception as e: + logger.error(f"对方转移大厅通知接口异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}) + + + + + + + + +logger = logging.getLogger(__name__) + + +# ========== 1. 获取俱乐部设置数据接口 ========== +class GetSettingsView(APIView): + """ + 获取跨平台设置页面数据 + 请求：POST /houtai/hqkptsz + 参数：{"username": "客服账号ID"} + 权限：权限码2且开启 + 返回：包含自己俱乐部信息（含客服字段）和合作俱乐部列表 + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '参数不完整'}) + + # 2. 客服身份验证 + current_user = request.user + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '004aa' not in permissions: + return Response({'code': 403, 'msg': '您无权查看俱乐部配置'}) + + # 4. 查询数据 + try: + # 4.1 自己俱乐部配置（is_self=1） + self_config = ClubConfig.objects.filter(is_self=1).first() + if not self_config: + logger.error("未找到自己俱乐部配置") + return Response({'code': 500, 'msg': '系统配置错误'}) + + self_club = { + 'club_id': self_config.club_id, + 'club_nickname': self_config.club_nickname, + 'club_avatar': self_config.club_avatar, + 'backend_domain': self_config.backend_domain, + 'chat_api_key': self_config.chat_api_key, + 'chat_api_id': self_config.chat_api_id, + 'customer_service_api_url': self_config.customer_service_api_url, + 'customer_service_corp_id': self_config.customer_service_corp_id, + 'storage_bucket_domain': self_config.storage_bucket_domain, + } + + # 4.2 合作俱乐部列表（Club 表中本俱乐部ID = self_config.club_id） + partner_records = Club.objects.filter(club_id=self_config.club_id) + partner_clubs = [] + for record in partner_records: + partner_config = ClubConfig.objects.filter( + club_id=record.partner_club_id, + is_self=0 + ).first() + partner_clubs.append({ + 'club_id': record.partner_club_id, + 'club_nickname': partner_config.club_nickname if partner_config else record.partner_club_id, + 'club_avatar': partner_config.club_avatar if partner_config else '', + 'is_interop_enabled': record.is_interop_enabled, + 'is_receive_enabled': record.is_receive_enabled, + }) + + return Response({'code': 0, 'data': {'self_club': self_club, 'partner_clubs': partner_clubs}}) + + except Exception as e: + logger.error(f"获取设置失败: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}) + + +# ========== 2. 获取订单类型映射接口 ========== +class GetMappingsView(APIView): + """ + 获取指定合作俱乐部的订单类型映射 + 请求：POST /houtai/hqqtjlbsj + 参数：{"username": "客服账号ID", "partner_club_id": "对方俱乐部ID"} + 权限：权限码2 + 返回：对方订单类型列表、我方订单类型列表、当前映射关系 + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数 + username = request.data.get('username', '').strip() + partner_club_id = request.data.get('partner_club_id', '').strip() + if not username or not partner_club_id: + return Response({'code': 400, 'msg': '参数不完整'}) + + # 2. 客服身份验证 + current_user = request.user + + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '004aa' not in permissions: + return Response({'code': 403, 'msg': '您无权查看俱乐部配置'}) + + try: + # 4. 获取我方所有商品类型（订单类型） + our_types = ShangpinLeixing.objects.all().values('id', 'jieshao', 'tupian_url') + our_type_list = [ + {'type_id': t['id'], 'type_name': t['jieshao'], 'icon': t['tupian_url']} + for t in our_types + ] + + # 5. 获取对方订单类型（从映射表去重） + mappings_query = OrderTypeMapping.objects.filter(partner_club_id=partner_club_id) + partner_types_dict = {} + for m in mappings_query: + partner_types_dict[m.partner_type_id] = { + 'type_id': m.partner_type_id, + 'type_name': m.partner_type_name, + 'icon': '' + } + partner_type_list = list(partner_types_dict.values()) + + # 6. 获取当前映射关系 + mapping_list = [ + {'partner_type_id': m.partner_type_id, 'our_type_id': m.our_type_id} + for m in mappings_query + ] + + return Response({ + 'code': 0, + 'data': { + 'partner_types': partner_type_list, + 'our_types': our_type_list, + 'mappings': mapping_list + } + }) + + except Exception as e: + logger.error(f"获取映射失败: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}) + + +# ========== 3. 保存设置接口（自己俱乐部 + 合作俱乐部开关）========== +class UpdateSettingsView(APIView): + """ + 保存俱乐部设置（自己俱乐部信息 + 合作俱乐部开关） + 请求：POST /houtai/xgjlbsj + 参数：{ + "username": "客服账号ID", + "self_club": { + "club_nickname": "...", + "backend_domain": "...", + "chat_api_key": "...", + "chat_api_id": "...", + "customer_service_api_url": "...", + "customer_service_corp_id": "...", + "storage_bucket_domain": "..." + }, + "partner_updates": [ + {"club_id": "654321", "is_interop_enabled": true, "is_receive_enabled": false} + ] + } + 权限：权限码2 + 返回：{"code": 0, "msg": "success"} + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '参数不完整'}) + + # 2. 客服身份验证 + current_user = request.user + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '004aa' not in permissions: + return Response({'code': 403, 'msg': '您无权修改俱乐部配置'}) + + # 4. 获取自己俱乐部当前配置 + try: + self_config = ClubConfig.objects.get(is_self=1) + except ObjectDoesNotExist: + logger.error("未找到自己俱乐部配置") + return Response({'code': 500, 'msg': '系统配置错误'}) + + # 5. 更新自己俱乐部配置（包含客服字段） + self_updates = request.data.get('self_club', {}) + if self_updates: + allowed_fields = [ + 'club_nickname', 'backend_domain', 'chat_api_key', 'chat_api_id', + 'customer_service_api_url', 'customer_service_corp_id', + 'storage_bucket_domain' + ] + fields_to_update = [] + for field in allowed_fields: + if field in self_updates: + setattr(self_config, field, self_updates[field]) + fields_to_update.append(field) + if fields_to_update: + self_config.save(update_fields=fields_to_update) + + # 6. 更新合作俱乐部开关 + partner_updates = request.data.get('partner_updates', []) + for update in partner_updates: + club_id = update.get('club_id') + if not club_id: + continue + try: + partner_record = Club.objects.get(club_id=self_config.club_id, partner_club_id=club_id) + if 'is_interop_enabled' in update: + partner_record.is_interop_enabled = update['is_interop_enabled'] + if 'is_receive_enabled' in update: + partner_record.is_receive_enabled = update['is_receive_enabled'] + partner_record.save(update_fields=['is_interop_enabled', 'is_receive_enabled']) + except ObjectDoesNotExist: + logger.warning(f"合作俱乐部记录不存在: {club_id}") + + # 7. 异步通知所有合作俱乐部（如果自己数据有修改） + if self_updates: + self._notify_all_partners(self_config, self_updates) + + return Response({'code': 0, 'msg': 'success'}) + + def _notify_all_partners(self, self_config, updates): + """异步通知所有合作俱乐部更新我方配置""" + partner_records = Club.objects.filter(club_id=self_config.club_id) + if not partner_records: + return + + data_to_send = { + 'club_id': self_config.club_id, + 'updates': updates + } + + def notify(partner_domain): + try: + url = partner_domain.rstrip('/') + '/houtai/xgzjsjcs' + resp = requests.post(url, json=data_to_send, timeout=3) + if resp.status_code != 200: + logger.warning(f"通知 {partner_domain} 失败，状态码 {resp.status_code}") + except Exception as e: + logger.error(f"通知 {partner_domain} 异常: {str(e)}") + + for record in partner_records: + domain = record.partner_domain + if domain: + threading.Thread(target=notify, args=(domain,)).start() + + + + + +class UpdateMappingsView(APIView): + """ + 保存指定合作俱乐部的订单类型映射 + 请求：POST /houtai/xgdfddys + 参数：{ + "username": "客服手机号", + "partner_club_id": "对方俱乐部ID", + "mappings": [ + {"partner_type_id": 1, "our_type_id": 10}, + {"partner_type_id": 2, "our_type_id": 11} + ] + } + 权限：权限码2 + 返回：{"code": 0, "msg": "success"} + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数 + username = request.data.get('username', '').strip() + partner_club_id = request.data.get('partner_club_id', '').strip() + mappings = request.data.get('mappings', []) + + if not username or not partner_club_id: + return Response({'code': 400, 'msg': '参数不完整'}) + + # 2. 客服身份验证 + current_user = request.user + + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '004aa' not in permissions: + return Response({'code': 403, 'msg': '您无权修改俱乐部配置'}) + + try: + with transaction.atomic(): + # 4. 获取当前该俱乐部所有现有映射（按 partner_type_id 索引） + existing_mappings = { + m.partner_type_id: m + for m in OrderTypeMapping.objects.filter(partner_club_id=partner_club_id) + } + + # 5. 处理前端传来的映射（更新或新增） + processed_partner_ids = set() + for mapping in mappings: + partner_type_id = mapping.get('partner_type_id') + our_type_id = mapping.get('our_type_id') + if partner_type_id is None or our_type_id is None: + continue + processed_partner_ids.add(partner_type_id) + + # 获取我方类型名称 + our_type_name = '' + try: + our_type = ShangpinLeixing.objects.get(id=our_type_id) + our_type_name = our_type.jieshao + except ObjectDoesNotExist: + logger.warning(f"我方订单类型不存在: {our_type_id}") + + # 查找是否存在该对方类型的映射 + if partner_type_id in existing_mappings: + # 更新现有记录 + mapping_obj = existing_mappings[partner_type_id] + mapping_obj.our_type_id = our_type_id + mapping_obj.our_type_name = our_type_name + mapping_obj.save(update_fields=['our_type_id', 'our_type_name']) + # 从字典中移除，以便后续知道哪些被删除了 + del existing_mappings[partner_type_id] + else: + # 新增记录 + # 对方类型名称：优先从现有映射中查找（可能被其他俱乐部共享？不，每个俱乐部独立） + # 由于该对方类型没有映射过，我们暂时无法获取名称，可留空或使用默认值。 + # 但为保证数据完整性，我们尝试从已有记录中查找（如果该俱乐部之前删除过又重建，则可能丢失名称） + # 更稳妥的方式是前端传递 partner_type_name，但当前未要求，因此此处留空并记录警告。 + partner_type_name = '' + logger.warning(f"新增映射时对方类型名称缺失: partner_club_id={partner_club_id}, partner_type_id={partner_type_id}") + + OrderTypeMapping.objects.create( + partner_club_id=partner_club_id, + partner_type_id=partner_type_id, + partner_type_name=partner_type_name, + our_type_id=our_type_id, + our_type_name=our_type_name + ) + + # 6. 删除前端未传入的映射（即用户取消的映射） + for partner_type_id, mapping_obj in existing_mappings.items(): + mapping_obj.delete() + logger.info(f"删除映射: partner_club_id={partner_club_id}, partner_type_id={partner_type_id}") + + return Response({'code': 0, 'msg': 'success'}) + + except Exception as e: + logger.error(f"保存映射失败: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}) +# ========== 5. 接收对方平台修改数据接口 ========== +class PartnerUpdateSelfConfigView(APIView): + """ + 接收对方平台修改自己俱乐部配置的通知 + 请求：POST /houtai/xgzjsjcs + 参数：{ + "club_id": "对方俱乐部ID", + "updates": { + "club_nickname": "新昵称", + "backend_domain": "新域名", + "chat_api_key": "新key", + "chat_api_id": "新id", + "customer_service_api_url": "新URL", + "customer_service_corp_id": "新企业ID", + "storage_bucket_domain": "新存储桶" + } + } + 无需认证，对方平台可信调用 + 返回：{"code": 0, "msg": "success"} + """ + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数 + club_id = request.data.get('club_id', '').strip() + updates = request.data.get('updates', {}) + + if not club_id or not updates: + return Response({'code': 400, 'msg': '参数不完整'}) + + # 2. 查询对方俱乐部的配置记录（is_self=0） + try: + config = ClubConfig.objects.get(club_id=club_id, is_self=0) + except ClubConfig.DoesNotExist: + logger.warning(f"对方俱乐部配置不存在: {club_id}") + return Response({'code': 404, 'msg': '俱乐部不存在'}) + + # 3. 允许修改的字段白名单（包含客服字段） + allowed_fields = [ + 'club_nickname', + 'backend_domain', + 'chat_api_key', + 'chat_api_id', + 'customer_service_api_url', + 'customer_service_corp_id', + 'storage_bucket_domain' + ] + + # 4. 更新字段 + with transaction.atomic(): + fields_updated = [] + for field in allowed_fields: + if field in updates: + new_value = updates[field] + setattr(config, field, new_value) + fields_updated.append(field) + if fields_updated: + config.save(update_fields=fields_updated) + logger.info(f"对方俱乐部 {club_id} 配置已更新: {fields_updated}") + else: + logger.info(f"对方俱乐部 {club_id} 无有效字段更新") + + return Response({'code': 0, 'msg': 'success'}) + + + + +# apps/houtai/views.py + + + + + +# ========== 1. 获取合作俱乐部列表接口（完整） ========== +class GetPartnerClubsView(APIView): + """ + 获取我方合作俱乐部列表（用于统计页面） + 请求：POST /houtai/kpthqpt + 参数：{"username": "客服手机号"} + 权限：权限码2且开启 + 返回：{"code":0, "data":[{"club_id":"xxx","club_nickname":"xxx","club_avatar":"xxx"}]} + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '参数不完整'}) + + # 2. 客服身份验证 + current_user = request.user + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '004bb' not in permissions: + return Response({'code': 403, 'msg': '您无权查看俱乐部配置'}) + + # 4. 获取我方俱乐部ID + try: + self_config = ClubConfig.objects.get(is_self=1) + except ObjectDoesNotExist: + logger.error("未找到自己俱乐部配置") + return Response({'code': 500, 'msg': '系统配置错误'}) + + # 5. 查询所有合作俱乐部 + try: + records = Club.objects.filter(club_id=self_config.club_id) + result = [] + for record in records: + partner_config = ClubConfig.objects.filter( + club_id=record.partner_club_id, + is_self=0 + ).first() + result.append({ + 'club_id': record.partner_club_id, + 'club_nickname': partner_config.club_nickname if partner_config else record.partner_club_id, + 'club_avatar': partner_config.club_avatar if partner_config else '', + }) + return Response({'code': 0, 'data': result}) + except Exception as e: + logger.error(f"查询合作俱乐部失败: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}) + + +# ========== 2. 获取统计数据接口（完整） ========== + + + + + +class GetStatsView(APIView): + """ + 获取派单统计数据（按日或按月） + 请求：POST /houtai/hqpfsj + 参数：{ + "username": "客服手机号", + "club_id": "对方俱乐部ID", + "direction": 1, # 1=我方派单，2=对方派单 + "granularity": "day", # "day" 或 "month" + # 趋势图参数（可选，不传则使用默认值）： + "trend_year_month": "YYYY-MM", # 按日时表示月份，缺省当前月 + "trend_year": "YYYY", # 按月时表示年份，缺省当前年 + # KPI参数（可选，不传则使用默认值）： + "date": "YYYY-MM-DD", # 按日时表示日期，缺省当天 + "year_month": "YYYY-MM" # 按月时表示月份，缺省当前月 + } + 权限：权限码2 + 返回：{ + "code": 0, + "data": { + "summary": { ... }, + "chart": { ... } + } + } + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取基础参数 + username = request.data.get('username', '').strip() + club_id = request.data.get('club_id', '').strip() + direction = request.data.get('direction') + granularity = request.data.get('granularity') + + # 基础参数校验 + if not username: + return Response({'code': 400, 'msg': 'username 不能为空'}) + if not club_id: + return Response({'code': 400, 'msg': 'club_id 不能为空'}) + if direction is None: + return Response({'code': 400, 'msg': 'direction 不能为空'}) + if granularity not in ('day', 'month'): + return Response({'code': 400, 'msg': 'granularity 必须是 day 或 month'}) + try: + direction = int(direction) + except (TypeError, ValueError): + return Response({'code': 400, 'msg': 'direction 必须为整数'}) + + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '004bb' not in permissions: + return Response({'code': 403, 'msg': '您无权查看俱乐部配置'}) + + # 4. 获取当前时间用于默认值 + now = datetime.now() + + # 5. 处理趋势图参数（默认当前月/年） + if granularity == 'day': + trend_year_month = request.data.get('trend_year_month') + if not trend_year_month: + trend_year_month = now.strftime('%Y-%m') + try: + year, month = map(int, trend_year_month.split('-')) + start_date = datetime(year, month, 1).date() + _, days_in_month = monthrange(year, month) + end_date = datetime(year, month, days_in_month).date() + except (ValueError, TypeError): + # 如果格式错误，回退到当前月 + year, month = now.year, now.month + start_date = datetime(year, month, 1).date() + _, days_in_month = monthrange(year, month) + end_date = datetime(year, month, days_in_month).date() + else: + trend_year = request.data.get('trend_year') + if not trend_year: + trend_year = str(now.year) + try: + year = int(trend_year) + except (ValueError, TypeError): + year = now.year + start_date = datetime(year, 1, 1).date() + end_date = datetime(year, 12, 31).date() + + # 6. 处理KPI参数（默认当天/当月） + if granularity == 'day': + date_str = request.data.get('date') + if not date_str: + date_str = now.strftime('%Y-%m-%d') + try: + target_date = datetime.strptime(date_str, '%Y-%m-%d').date() + except (ValueError, TypeError): + target_date = now.date() + else: + year_month_str = request.data.get('year_month') + if not year_month_str: + year_month_str = now.strftime('%Y-%m') + try: + year, month = map(int, year_month_str.split('-')) + start_date_kpi = datetime(year, month, 1).date() + _, days_in_month = monthrange(year, month) + end_date_kpi = datetime(year, month, days_in_month).date() + except (ValueError, TypeError): + year, month = now.year, now.month + start_date_kpi = datetime(year, month, 1).date() + _, days_in_month = monthrange(year, month) + end_date_kpi = datetime(year, month, days_in_month).date() + + # 7. 查询趋势图数据 + response_data = { + 'summary': {'dispatch_count': 0, 'dispatch_amount': 0.0, 'success_count': 0, 'success_amount': 0.0}, + 'chart': {'labels': [], 'dispatch_counts': [], 'dispatch_amounts': [], 'success_counts': [], 'success_amounts': []} + } + + try: + if granularity == 'day': + qs = DailyDispatchStat.objects.filter( + partner_club_id=club_id, + direction=direction, + date__gte=start_date, + date__lte=end_date + ).order_by('date') + data_dict = {} + for item in qs: + data_dict[item.date] = { + 'dispatch_count': item.dispatch_count, + 'dispatch_amount': float(item.dispatch_amount), + 'success_count': item.success_count, + 'success_amount': float(item.success_amount), + } + labels = [] + dispatch_counts = [] + dispatch_amounts = [] + success_counts = [] + success_amounts = [] + current = start_date + while current <= end_date: + labels.append(current.strftime('%d')) + day_data = data_dict.get(current, {}) + dispatch_counts.append(day_data.get('dispatch_count', 0)) + dispatch_amounts.append(day_data.get('dispatch_amount', 0.0)) + success_counts.append(day_data.get('success_count', 0)) + success_amounts.append(day_data.get('success_amount', 0.0)) + current += timedelta(days=1) + response_data['chart'] = { + 'labels': labels, + 'dispatch_counts': dispatch_counts, + 'dispatch_amounts': dispatch_amounts, + 'success_counts': success_counts, + 'success_amounts': success_amounts, + } + else: # month + qs = DailyDispatchStat.objects.filter( + partner_club_id=club_id, + direction=direction, + date__gte=start_date, + date__lte=end_date + ).order_by('date') + month_totals = {m: {'dispatch_count': 0, 'dispatch_amount': 0.0, 'success_count': 0, 'success_amount': 0.0} + for m in range(1, 13)} + for item in qs: + m = item.date.month + month_totals[m]['dispatch_count'] += item.dispatch_count + month_totals[m]['dispatch_amount'] += float(item.dispatch_amount) + month_totals[m]['success_count'] += item.success_count + month_totals[m]['success_amount'] += float(item.success_amount) + labels = [] + dispatch_counts = [] + dispatch_amounts = [] + success_counts = [] + success_amounts = [] + for m in range(1, 13): + labels.append(f"{m}月") + dispatch_counts.append(month_totals[m]['dispatch_count']) + dispatch_amounts.append(month_totals[m]['dispatch_amount']) + success_counts.append(month_totals[m]['success_count']) + success_amounts.append(month_totals[m]['success_amount']) + response_data['chart'] = { + 'labels': labels, + 'dispatch_counts': dispatch_counts, + 'dispatch_amounts': dispatch_amounts, + 'success_counts': success_counts, + 'success_amounts': success_amounts, + } + + # 8. 查询KPI数据 + if granularity == 'day': + try: + stat = DailyDispatchStat.objects.get( + partner_club_id=club_id, + direction=direction, + date=target_date + ) + response_data['summary'] = { + 'dispatch_count': stat.dispatch_count, + 'dispatch_amount': float(stat.dispatch_amount), + 'success_count': stat.success_count, + 'success_amount': float(stat.success_amount), + } + except DailyDispatchStat.DoesNotExist: + response_data['summary'] = { + 'dispatch_count': 0, + 'dispatch_amount': 0.0, + 'success_count': 0, + 'success_amount': 0.0, + } + else: # month + qs_kpi = DailyDispatchStat.objects.filter( + partner_club_id=club_id, + direction=direction, + date__gte=start_date_kpi, + date__lte=end_date_kpi + ) + summary = qs_kpi.aggregate( + dispatch_count=Sum('dispatch_count'), + dispatch_amount=Sum('dispatch_amount'), + success_count=Sum('success_count'), + success_amount=Sum('success_amount') + ) + response_data['summary'] = { + 'dispatch_count': summary['dispatch_count'] or 0, + 'dispatch_amount': float(summary['dispatch_amount'] or 0.0), + 'success_count': summary['success_count'] or 0, + 'success_amount': float(summary['success_amount'] or 0.0), + } + + return Response({'code': 0, 'data': response_data}) + + except Exception as e: + logger.error(f"获取统计数据失败: {traceback.format_exc()}") + return Response({'code': 500, 'msg': '服务器内部错误'}) + + + + + + +class PunishDashouView(APIView): + """ + 客服处罚打手接口 + 请求：POST /houtai/kpcf + 参数：{ + "username": "客服手机号", + "dingdan_id": "订单ID", + "reason": "处罚原因（可选）" + } + 认证：JWT，权限码1 + 返回：code=0 + 处罚结果 + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + start_time = time.time() + + # 1. 获取参数 + username = request.data.get('username', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + reason = request.data.get('reason', '').strip() + + if not username or not dingdan_id: + return Response({'code': 400, 'msg': '参数不完整'}) + + try: + # 2. 身份验证 + current_user = request.user + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '003aa' not in permissions: + return Response({'code': 403, 'msg': '您无权处罚'}) + + # 4. 查询订单并加锁 + with transaction.atomic(): + order = Dingdan.objects.select_for_update().get(dingdan_id=dingdan_id) + + # 5. 订单状态校验（允许处罚的状态：1,2,3,4,5,6,7,8，即除已完成以外的状态？这里宽松处理） + if order.zhuangtai not in [1,2,3,4,5,6,7,8]: + return Response({'code': 400, 'msg': f'订单状态 {order.zhuangtai} 不允许处罚'}) + + # 6. 判断是否已处罚（避免重复） + existing_punish = Chufajilu.objects.filter( + dingdan_id=dingdan_id, + dashouid=order.jiedan_dashou_id + ).exists() + if existing_punish: + return Response({'code': 400, 'msg': '该打手已被处罚过'}) + + # 7. 区分本地处罚还是通知对方平台 + is_cross = order.is_cross + dispatch_type = order.dispatch_type + partner_club_id = order.partner_club_id + partner_order_id = order.partner_order_id + dashou_id = order.jiedan_dashou_id + + # 如果没有接单打手ID，无法处罚 + if not dashou_id: + return Response({'code': 400, 'msg': '订单无接单打手，无法处罚'}) + + # 本地处罚（处罚我方打手） + def local_punish(): + # 扣除打手积分（假设每次扣5分） + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.jifen -= 5 + dashou_profile.save() + + # 创建处罚记录 + Chufajilu.objects.create( + dingdan_id=dingdan_id, + dashouid=dashou_id, + qingqiuid='', # 请求处罚ID，可空 + chuliid=username, + cfliyou=reason or '', + sqzhuangtai=1, # 成功 + bhliyou='', + ssliyou='', + jifen=5, + ) + logger.info(f"本地处罚打手成功: 订单 {dingdan_id}, 打手 {dashou_id}, 扣分5") + + # 情况A：对方派单（dispatch_type=2）或本地订单 + if dispatch_type == 2 or not is_cross: + # 直接本地处罚 + local_punish() + return Response({'code': 0, 'msg': '处罚成功'}) + + # 情况B：我方派单且有对方信息（需要通知对方平台） + elif dispatch_type == 1 and partner_club_id and partner_order_id: + # 需要通知对方平台处罚（对方平台打手） + # 获取我方俱乐部ID + my_club_config = ClubConfig.objects.filter(is_self=1).first() + if not my_club_config: + logger.error("未找到我方俱乐部配置") + return Response({'code': 500, 'msg': '系统配置错误'}) + self_club_id = my_club_config.club_id + + # 获取对方服务器域名 + try: + club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=partner_club_id) + partner_domain = club_rel.partner_domain + except ObjectDoesNotExist: + logger.error(f"未找到合作关系: {self_club_id} <-> {partner_club_id}") + return Response({'code': 500, 'msg': '未找到对方平台配置'}) + + # 调用对方平台处罚接口，最多重试2次 + url = partner_domain.rstrip('/') + '/houtai/kptcfds' + payload = { + 'order_id': partner_order_id, # 对方平台的订单ID + 'club_id': self_club_id, + 'reason': reason, + 'operator': username + } + timeout = 3 + retries = 2 + success = False + for attempt in range(retries): + try: + resp = requests.post(url, json=payload, timeout=timeout) + if resp.status_code == 200: + resp_json = resp.json() + if resp_json.get('code') == 0: + success = True + logger.info(f"通知对方平台处罚成功: {dingdan_id}") + # 可选：在本平台记录处罚记录（标记已通知对方，但不扣分） + Chufajilu.objects.create( + dingdan_id=dingdan_id, + dashouid=dashou_id, + qingqiuid='', + chuliid=username, + cfliyou=reason or '', + sqzhuangtai=1, + bhliyou='', + ssliyou='', + jifen=0, # 对方扣分，本方不扣 + ) + break + else: + logger.warning(f"对方平台返回错误 (尝试{attempt+1}): {resp_json.get('msg')}") + else: + logger.warning(f"对方平台HTTP错误 (尝试{attempt+1}): {resp.status_code}") + except requests.exceptions.Timeout: + logger.warning(f"请求对方平台超时 (尝试{attempt+1}): {url}") + except Exception as e: + logger.warning(f"请求对方平台异常 (尝试{attempt+1}): {str(e)}") + if not success: + return Response({'code': 500, 'msg': '通知对方平台失败，请稍后重试'}) + + return Response({'code': 0, 'msg': '处罚成功'}) + + else: + # 其他情况（例如我方派单但缺少对方信息），视为本地订单，处罚我方打手 + local_punish() + return Response({'code': 0, 'msg': '处罚成功'}) + + except Dingdan.DoesNotExist: + logger.warning(f"订单不存在: {dingdan_id}") + return Response({'code': 404, 'msg': '订单不存在'}) + except Exception as e: + logger.error(f"处罚接口异常: {traceback.format_exc()}") + return Response({'code': 500, 'msg': '服务器内部错误'}) + + + + + + + + +@method_decorator(csrf_exempt, name='dispatch') +class PartnerPunishNotifyView(APIView): + """ + 接收对方平台处罚通知接口 + """ + authentication_classes = [] + permission_classes = [AllowAny] + parser_classes = [JSONParser] + + def post(self, request): + try: + order_id = request.data.get('order_id', '').strip() + club_id = request.data.get('club_id', '').strip() + reason = request.data.get('reason', '').strip() + operator = request.data.get('operator', '').strip() + + if not order_id or not club_id: + return Response({'code': 400, 'msg': '参数不完整'}) + + # 事务开始 + with transaction.atomic(): + # 查询订单并加锁 + try: + order = Dingdan.objects.select_for_update().get(dingdan_id=order_id) + except Dingdan.DoesNotExist: + logger.warning(f"处罚通知：订单不存在 {order_id}") + return Response({'code': 404, 'msg': '订单不存在'}) + + dashou_id = order.jiedan_dashou_id + if not dashou_id: + logger.warning(f"订单 {order_id} 无接单打手，无法处罚") + return Response({'code': 400, 'msg': '订单无接单打手'}) + + # 检查是否已处罚 + existing = Chufajilu.objects.filter( + dingdan_id=order_id, + dashouid=dashou_id + ).exists() + if existing: + logger.info(f"订单 {order_id} 打手 {dashou_id} 已被处罚过，跳过") + return Response({'code': 0, 'msg': 'already punished'}) + + # 扣除积分 + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.jifen -= 5 + dashou_profile.save() + + # 创建处罚记录 + Chufajilu.objects.create( + dingdan_id=order_id, + dashouid=dashou_id, + qingqiuid='', + chuliid=operator, + cfliyou=reason or '', + sqzhuangtai=0, + bhliyou='', + ssliyou='', + jifen=5, + ) + logger.info(f"对方平台处罚成功: 订单 {order_id}, 打手 {dashou_id}") + + return Response({'code': 0, 'msg': 'success'}) + + except Exception as e: + logger.error(f"对方处罚通知接口异常: {traceback.format_exc()}") + return Response({'code': 500, 'msg': '服务器内部错误'}) + + + + + + + + + + +# ==================== 接口1：获取俱乐部列表（权限码2） ==================== +class GetClubConfigForPreSettlementView(APIView): + """ + 获取对方俱乐部配置列表（用于预结算页面） + 权限要求：客服身份 + 权限代码2且开启 + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + user = request.user + # 1. 校验客服身份 + try: + kefu = UserKefu.objects.select_related('user').get(user=user) + except ObjectDoesNotExist: + return Response({'code': 403, 'msg': '身份错误，非客服账号'}) + if kefu.zhuangtai != 1: + return Response({'code': 403, 'msg': '客服账号已被禁用'}) + + # 2. 获取请求参数中的 username 并校验 + data = request.data + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '004aa' not in permissions: + return Response({'code': 403, 'msg': '您无权查看俱乐部配置'}) + + # 4. 查询所有对方俱乐部（is_self=0） + club_configs = ClubConfig.objects.filter(is_self=0).only( + 'club_id', 'club_nickname', 'club_avatar', 'storage_bucket_domain' + ) + data_list = [] + for club in club_configs: + data_list.append({ + 'club_id': club.club_id, + 'club_nickname': club.club_nickname or club.club_id, + 'club_avatar': club.club_avatar or '', + 'storage_bucket_domain': club.storage_bucket_domain or '' + }) + return Response({'code': 0, 'msg': 'success', 'data': data_list}) + + except Exception as e: + logger.error(f"获取俱乐部配置失败: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}) + + +# ==================== 接口2：获取预结算订单列表 ==================== +class GetPreSettlementDataView(APIView): + """获取预结算订单列表（支持筛选、分页、统计）""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + user = request.user + # 1. 客服身份校验 + try: + kefu = UserKefu.objects.select_related('user').get(user=user) + except ObjectDoesNotExist: + return Response({'code': 403, 'msg': '身份错误，非客服账号'}) + if kefu.zhuangtai != 1: + return Response({'code': 403, 'msg': '客服账号已被禁用'}) + + data = request.data + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（003aa） + if '004aa' not in permissions: + return Response({'code': 403, 'msg': '您无权查看俱乐部配置'}) + + # 2. 获取筛选参数 + status_filter = data.get('status_filter') # 0=待处理, 1=已处理（包含已拒绝） + club_id = data.get('club_id') + dingdan_id = data.get('dingdan_id') + partner_order_id = data.get('partner_order_id') + dashou_id = data.get('dashou_id') + clkf = data.get('clkf') + date_str = data.get('date') # 创建日期 YYYY-MM-DD + page = int(data.get('page', 1)) + page_size = int(data.get('pageSize', 20)) + + # 3. 构建查询集 + queryset = PreSettlement.objects.all() + + # 状态筛选：0待处理，1已处理（status=1或2） + if status_filter == 0: + queryset = queryset.filter(status=0) + elif status_filter == 1: + queryset = queryset.filter(status__in=[1, 2]) + # 如果status_filter为其他值（如'all'），则不筛选 + + if club_id: + queryset = queryset.filter(partner_club_id=club_id) + if dingdan_id: + queryset = queryset.filter(dingdan_id__icontains=dingdan_id) + if partner_order_id: + queryset = queryset.filter(partner_order_id__icontains=partner_order_id) + if dashou_id: + queryset = queryset.filter(dashou_id__icontains=dashou_id) + if clkf: + queryset = queryset.filter(operator__icontains=clkf) + if date_str: + try: + target_date = datetime.strptime(date_str, '%Y-%m-%d').date() + queryset = queryset.filter(create_time__date=target_date) + except ValueError: + pass + + # 4. 统计数据（待处理总数量和总金额、已处理总数量） + pending_queryset = PreSettlement.objects.filter(status=0) + # 应用相同的筛选条件（除了状态） + if club_id: + pending_queryset = pending_queryset.filter(partner_club_id=club_id) + if dingdan_id: + pending_queryset = pending_queryset.filter(dingdan_id__icontains=dingdan_id) + if partner_order_id: + pending_queryset = pending_queryset.filter(partner_order_id__icontains=partner_order_id) + if dashou_id: + pending_queryset = pending_queryset.filter(dashou_id__icontains=dashou_id) + if clkf: + pending_queryset = pending_queryset.filter(operator__icontains=clkf) + if date_str: + pending_queryset = pending_queryset.filter(create_time__date=target_date) + + pending_count = pending_queryset.count() + pending_amount = pending_queryset.aggregate(total=Sum('order_amount'))['total'] or Decimal('0.00') + + processed_count = PreSettlement.objects.filter(status__in=[1, 2]) + if club_id: + processed_count = processed_count.filter(partner_club_id=club_id) + if dingdan_id: + processed_count = processed_count.filter(dingdan_id__icontains=dingdan_id) + if partner_order_id: + processed_count = processed_count.filter(partner_order_id__icontains=partner_order_id) + if dashou_id: + processed_count = processed_count.filter(dashou_id__icontains=dashou_id) + if clkf: + processed_count = processed_count.filter(operator__icontains=clkf) + if date_str: + processed_count = processed_count.filter(create_time__date=target_date) + processed_count = processed_count.count() + + # 5. 分页 + total = queryset.count() + start = (page - 1) * page_size + end = start + page_size + items = queryset.order_by('-create_time')[start:end] + + # 6. 构造返回数据 + list_data = [] + for item in items: + list_data.append({ + 'dingdan_id': item.dingdan_id, + 'partner_order_id': item.partner_order_id, + 'partner_club_id': item.partner_club_id, + 'dashou_id': item.dashou_id, + 'amount': float(item.amount), + 'order_amount': float(item.order_amount), + 'operator': item.operator, + 'status': item.status, + 'status_text': dict(PreSettlement.STATUS_CHOICES).get(item.status, '未知'), + 'create_time': item.create_time.strftime('%Y-%m-%d %H:%M:%S') if item.create_time else '', + 'process_time': item.process_time.strftime('%Y-%m-%d %H:%M:%S') if item.process_time else '', + }) + + return Response({ + 'code': 0, + 'msg': 'success', + 'data': { + 'list': list_data, + 'total': total, + 'stats': { + 'pending_count': pending_count, + 'pending_amount': float(pending_amount), + 'processed_count': processed_count + } + } + }) + + except Exception as e: + logger.error(f"获取预结算数据失败: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}) + + +# ==================== 接口3：打款/拒绝操作 ==================== +class PreSettlementActionView(APIView): + """预结算打款/拒绝操作（原子事务，保证资金安全）""" + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + user = request.user + # 1. 客服身份校验 + try: + kefu = UserKefu.objects.select_related('user').get(user=user) + except ObjectDoesNotExist: + return Response({'code': 403, 'msg': '身份错误，非客服账号'}) + if kefu.zhuangtai != 1: + return Response({'code': 403, 'msg': '客服账号已被禁用'}) + + data = request.data + + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 2. 公共权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否有跨平台管理权限（） + if '004aa' not in permissions: + return Response({'code': 403, 'msg': '您无权处理预结算打款'}) + + dingdan_id = data.get('dingdan_id') + action = data.get('action') # 'pay' 或 'reject' + + if not dingdan_id or action not in ['pay', 'reject']: + return Response({'code': 400, 'msg': '参数错误'}) + + with transaction.atomic(): + # 锁定预结算记录（行锁） + pre_settlement = PreSettlement.objects.select_for_update().get(dingdan_id=dingdan_id) + + # 只有状态为0（待处理）才能操作 + if pre_settlement.status != 0: + return Response({'code': 400, 'msg': '该记录已处理，不可重复操作'}) + + if action == 'pay': + # 打款操作：增加打手余额及相关统计 + dashou_id = pre_settlement.dashou_id + amount = pre_settlement.amount + + # 查询打手扩展表 + try: + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + except (UserMain.DoesNotExist, ObjectDoesNotExist): + return Response({'code': 404, 'msg': '打手不存在'}) + + # 使用 F 表达式原子更新余额和统计字段（防止并发覆盖） + dashou_profile.yue = F('yue') + amount + dashou_profile.zonge = F('zonge') + amount + dashou_profile.jinrishouyi = F('jinrishouyi') + amount + dashou_profile.jinyueshouyi = F('jinyueshouyi') + amount + dashou_profile.chengjiaozongliang = F('chengjiaozongliang') + 1 + dashou_profile.save(update_fields=['yue', 'zonge', 'jinrishouyi', 'jinyueshouyi', 'chengjiaozongliang']) + + # 更新预结算状态为已结算 + pre_settlement.status = 1 + pre_settlement.process_time = timezone.now() + pre_settlement.operator = user.phone + pre_settlement.save() + + # ---------- 打手每日统计（成交） ---------- + + try: + dashou_id = pre_settlement.dashou_id + amount = pre_settlement.amount + from houtai.utils import update_dashou_daily_by_action + update_dashou_daily_by_action( + yonghuid=dashou_id, + amount=amount, + action=2 # 2 表示成交（结算） + ) + except Exception as e: + logger.error(f"打手每日统计更新失败: {e}") + + + logger.info(f"预结算打款成功: 订单 {dingdan_id}, 打手 {dashou_id}, 金额 {amount}") + + elif action == 'reject': + # 拒绝操作：仅修改状态，不涉及资金变动 + pre_settlement.status = 2 + pre_settlement.process_time = timezone.now() + pre_settlement.operator = user.phone + pre_settlement.save() + + # ---------- 打手每日统计（成交） ---------- + dashou_id = pre_settlement.dashou_id + amount = pre_settlement.amount + try: + dashou_id = pre_settlement.dashou_id + amount = pre_settlement.amount + from houtai.utils import update_dashou_daily_by_action + update_dashou_daily_by_action( + yonghuid=dashou_id, + amount=amount, + action=3 # 3 表示退款（退款） + ) + except Exception as e: + logger.error(f"打手每日统计更新失败: {e}") + logger.info(f"预结算拒绝: 订单 {dingdan_id}") + + return Response({'code': 0, 'msg': '操作成功'}) + + except PreSettlement.DoesNotExist: + return Response({'code': 404, 'msg': '预结算记录不存在'}) + except Exception as e: + logger.error(f"预结算操作异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}) + + + + + + + + +class GetRolePermissionView(APIView): + """ + 获取所有角色、权限以及角色关联的用户数 + 权限要求：用户必须拥有 000001 权限 + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 1. 权限校验（验证客服身份，并获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 2. 检查是否有 000001 权限 + if '000001' not in permissions: + return Response({'code': 403, 'msg': '您无权访问此页面'}) + + # 3. 获取所有权限 + all_perms = Permission.objects.all().values('perm_code', 'perm_name', 'description') + permissions_list = list(all_perms) + + # 4. 获取所有角色，并统计每个角色下的用户数和关联的权限 + roles = Role.objects.all() + roles_data = [] + for role in roles: + # 统计该角色下的用户数 + user_count = UserRole.objects.filter(role=role).count() + # 获取该角色绑定的权限 + role_perms = RolePermission.objects.filter(role=role).select_related('permission') + perms_of_role = [ + { + 'perm_code': rp.permission.perm_code, + 'perm_name': rp.permission.perm_name, + 'description': rp.permission.description + } + for rp in role_perms + ] + roles_data.append({ + 'role_code': role.role_code, + 'role_name': role.role_name, + 'description': role.description, + 'user_count': user_count, + 'permissions': perms_of_role + }) + + return Response({ + 'code': 0, + 'data': { + 'roles': roles_data, + 'permissions': permissions_list + } + }) + + +class ModifyRolePermissionView(APIView): + """ + 通用接口：支持删除角色、为角色添加权限、移除角色权限 + 操作类型通过 action 字段区分 + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + username = request.data.get('username', '').strip() + action = request.data.get('action') # delete_role, add_permission, remove_permission + if not username or not action: + return Response({'code': 400, 'msg': '缺少必要参数'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '000001' not in permissions: + return Response({'code': 403, 'msg': '您无权进行此操作'}) + + # 获取角色（需要角色编码） + role_code = request.data.get('role_code') + if not role_code: + return Response({'code': 400, 'msg': '缺少角色编码'}) + + try: + role = Role.objects.get(role_code=role_code) + except Role.DoesNotExist: + return Response({'code': 404, 'msg': '角色不存在'}) + + # 超级管理员角色（role_code='000001'）的特殊限制 + if role.role_code == '000001': + if action in ['delete_role']: + return Response({'code': 403, 'msg': '超级管理员角色不能删除'}) + # 修改名称/描述（本接口不涉及名称描述修改，但若后续扩展需限制） + + # 根据 action 处理 + if action == 'delete_role': + # 删除角色：同时删除角色权限关联、用户角色关联 + with transaction.atomic(): + RolePermission.objects.filter(role=role).delete() + UserRole.objects.filter(role=role).delete() + role.delete() + return Response({'code': 0, 'msg': '角色删除成功'}) + + elif action == 'add_permission': + perm_code = request.data.get('perm_code') + if not perm_code: + return Response({'code': 400, 'msg': '缺少权限编码'}) + # 超级管理员角色不能添加 000001 权限（但实际它已拥有，这里防御） + if role.role_code == '000001' and perm_code == '000001': + return Response({'code': 403, 'msg': '此权限已存在，不能重复添加'}) + try: + perm = Permission.objects.get(perm_code=perm_code) + except Permission.DoesNotExist: + return Response({'code': 404, 'msg': '权限不存在'}) + # 检查是否已存在 + if RolePermission.objects.filter(role=role, permission=perm).exists(): + return Response({'code': 400, 'msg': '该角色已拥有此权限'}) + RolePermission.objects.create(role=role, permission=perm) + return Response({'code': 0, 'msg': '权限添加成功'}) + + elif action == 'remove_permission': + perm_code = request.data.get('perm_code') + if not perm_code: + return Response({'code': 400, 'msg': '缺少权限编码'}) + # 超级管理员角色不能删除 000001 权限 + if role.role_code == '000001' and perm_code == '000001': + return Response({'code': 403, 'msg': '不能移除超级管理员的此权限'}) + try: + perm = Permission.objects.get(perm_code=perm_code) + except Permission.DoesNotExist: + return Response({'code': 404, 'msg': '权限不存在'}) + deleted = RolePermission.objects.filter(role=role, permission=perm).delete() + if deleted[0] == 0: + return Response({'code': 400, 'msg': '该角色未拥有此权限'}) + return Response({'code': 0, 'msg': '权限移除成功'}) + + else: + return Response({'code': 400, 'msg': '无效的 action'}) + + +import random +import string +from django.db import transaction + +class AddRoleView(APIView): + """ + 添加角色：自动生成角色编码，前端提供角色名称、描述、选择的权限列表 + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + username = request.data.get('username', '').strip() + role_name = request.data.get('role_name', '').strip() + description = request.data.get('description', '').strip() + perm_codes = request.data.get('perm_codes', []) # 列表 + + if not username or not role_name: + return Response({'code': 400, 'msg': '缺少必要参数'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '000001' not in permissions: + return Response({'code': 403, 'msg': '您无权进行此操作'}) + + # 检查角色名称是否已存在 + if Role.objects.filter(role_name=role_name).exists(): + return Response({'code': 400, 'msg': '角色名称已存在'}) + + # 生成唯一角色编码（格式：ROLE_ + 8位随机字母数字） + while True: + random_str = ''.join(random.choices(string.ascii_uppercase + string.digits, k=8)) + role_code = f"ROLE_{random_str}" + if not Role.objects.filter(role_code=role_code).exists(): + break + + # 创建角色 + with transaction.atomic(): + role = Role.objects.create( + role_code=role_code, + role_name=role_name, + description=description, + + ) + # 绑定权限（过滤掉不存在的权限编码） + for pc in perm_codes: + # 不允许添加 000001 权限（此权限仅供超级管理员） + if pc == '000001': + continue + try: + perm = Permission.objects.get(perm_code=pc) + RolePermission.objects.create(role=role, permission=perm) + except Permission.DoesNotExist: + # 忽略不存在的权限，或记录日志 + logger.warning(f"添加角色时忽略不存在的权限编码: {pc}") + pass + + return Response({'code': 0, 'msg': '角色添加成功', 'data': {'role_code': role_code}}) + + + + + + +class GetAdminRolesView(APIView): + """获取所有角色（用于筛选和分配）""" + permission_classes = [IsAuthenticated] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '000001' not in permissions: + return Response({'code': 403, 'msg': '您无权访问此页面'}) + + roles = Role.objects.all().values('role_code', 'role_name') + return Response({ + 'code': 0, + 'data': { + 'roles': list(roles) + } + }) + + + + +class GetAdminUserListView(APIView): + """获取后台用户列表（支持分页、筛选）""" + permission_classes = [IsAuthenticated] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '000001' not in permissions: + return Response({'code': 403, 'msg': '您无权访问此页面'}) + + # 筛选条件 + phone = request.data.get('phone', '').strip() + nicheng = request.data.get('nicheng', '').strip() + role_code = request.data.get('roleCode', '').strip() + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('pageSize', 20)) + + # 基础查询：user_type='kefu' 且存在客服扩展表 + users = UserMain.objects.filter(user_type='kefu', kefu_profile__isnull=False).select_related('kefu_profile') + if phone: + users = users.filter(phone__icontains=phone) + if nicheng: + users = users.filter(kefu_profile__nicheng__icontains=nicheng) + if role_code: + # 筛选拥有该角色的用户 + user_ids_with_role = UserRole.objects.filter(role__role_code=role_code).values_list('account_id', flat=True) + users = users.filter(phone__in=user_ids_with_role) + + # 排序 + users = users.order_by('-create_time') + + # 分页 + paginator = Paginator(users, page_size) + page_obj = paginator.get_page(page) + + # 构建返回数据 + data_list = [] + for user in page_obj: + # 获取用户的所有角色 + user_roles = UserRole.objects.filter(account_id=user.phone).select_related('role') + roles_data = [{'role_code': ur.role.role_code, 'role_name': ur.role.role_name} for ur in user_roles] + data_list.append({ + 'phone': user.phone, + 'nicheng': user.kefu_profile.nicheng, + 'roles': roles_data, + 'status': user.kefu_profile.zhuangtai, + 'create_time': user.create_time.strftime('%Y-%m-%d %H:%M:%S'), + 'update_time': user.update_time.strftime('%Y-%m-%d %H:%M:%S'), + }) + + return Response({ + 'code': 0, + 'data': { + 'list': data_list, + 'total': paginator.count, + 'page': page, + 'pageSize': page_size + } + }) + + + + +class ModifyAdminUserView(APIView): + """修改后台用户信息（昵称、密码、二级密码、状态、角色）""" + permission_classes = [IsAuthenticated] + + def post(self, request): + username = request.data.get('username', '').strip() + action = request.data.get('action') + if not username or not action: + return Response({'code': 400, 'msg': '缺少参数'}) + + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '000001' not in permissions: + return Response({'code': 403, 'msg': '您无权进行此操作'}) + + target_phone = request.data.get('phone', '').strip() + if not target_phone: + return Response({'code': 400, 'msg': '缺少目标用户账号'}) + + try: + target_user = UserMain.objects.get(phone=target_phone, user_type='kefu') + target_kefu = target_user.kefu_profile + except UserMain.DoesNotExist: + return Response({'code': 404, 'msg': '用户不存在'}) + except UserKefu.DoesNotExist: + return Response({'code': 404, 'msg': '用户扩展信息缺失'}) + + with transaction.atomic(): + if action == 'update_user_info': + # 修改昵称、状态、密码、二级密码 + nicheng = request.data.get('nicheng') + status = request.data.get('status') + password = request.data.get('password') + erjimima = request.data.get('erjimima') + if nicheng is not None: + target_kefu.nicheng = nicheng + if status is not None: + target_kefu.zhuangtai = int(status) + if password: + if len(password) < 6: + return Response({'code': 400, 'msg': '密码至少6位'}) + target_user.password = password + if erjimima: + if len(erjimima) < 6: + return Response({'code': 400, 'msg': '二级密码至少6位'}) + target_kefu.erjimima = erjimima # 假设二级密码也需要加密 + target_user.save() + target_kefu.save() + return Response({'code': 0, 'msg': '修改成功'}) + + elif action == 'add_user_roles': + role_codes = request.data.get('role_codes', []) + if not role_codes: + return Response({'code': 400, 'msg': '请选择角色'}) + for rc in role_codes: + try: + role = Role.objects.get(role_code=rc) + except Role.DoesNotExist: + continue + UserRole.objects.get_or_create(account_id=target_phone, role=role) + return Response({'code': 0, 'msg': '角色添加成功'}) + + elif action == 'remove_user_role': + role_code = request.data.get('role_code') + if not role_code: + return Response({'code': 400, 'msg': '缺少角色编码'}) + try: + role = Role.objects.get(role_code=role_code) + except Role.DoesNotExist: + return Response({'code': 404, 'msg': '角色不存在'}) + UserRole.objects.filter(account_id=target_phone, role=role).delete() + return Response({'code': 0, 'msg': '角色移除成功'}) + + else: + return Response({'code': 400, 'msg': '无效的action'}) + + + + + +class AddAdminUserView(APIView): + """添加后台用户（客服账号）""" + permission_classes = [IsAuthenticated] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '000001' not in permissions: + return Response({'code': 403, 'msg': '您无权进行此操作'}) + + phone = request.data.get('phone', '').strip() + password = request.data.get('password', '').strip() + erjimima = request.data.get('erjimima', '').strip() + nicheng = request.data.get('nicheng', '').strip() + role_codes = request.data.get('role_codes', []) + + if not all([phone, password, erjimima, nicheng]): + return Response({'code': 400, 'msg': '请填写完整信息'}) + if len(password) < 6 or len(erjimima) < 6: + return Response({'code': 400, 'msg': '密码和二级密码至少6位'}) + + # 校验手机号是否已被占用（且 user_type='kefu'） + if UserMain.objects.filter(phone=phone, user_type='kefu').exists(): + return Response({'code': 400, 'msg': '该账号已存在'}) + + # 生成唯一的 yonghuid（7位数字） + while True: + yonghuid = str(random.randint(1000000, 9999999)) + if not UserMain.objects.filter(yonghuid=yonghuid).exists(): + break + + # 生成唯一的 openid（格式：admin_{时间戳}_{随机6位}） + timestamp = str(int(time.time() * 1000)) + random_suffix = ''.join(random.choices(string.ascii_lowercase + string.digits, k=6)) + openid = f"admin_{timestamp}_{random_suffix}" + while UserMain.objects.filter(openid=openid).exists(): + random_suffix = ''.join(random.choices(string.ascii_lowercase + string.digits, k=6)) + openid = f"admin_{timestamp}_{random_suffix}" + + with transaction.atomic(): + user_main = UserMain.objects.create( + yonghuid=yonghuid, + openid=openid, + phone=phone, + password=password, + user_type='kefu' + ) + # 创建客服扩展表（后台用户扩展） + UserKefu.objects.create( + user=user_main, + nicheng=nicheng, + erjimima=erjimima, + zhuangtai=1 + ) + # 分配角色 + for rc in role_codes: + try: + role = Role.objects.get(role_code=rc) + UserRole.objects.create(account_id=phone, role=role) + except Role.DoesNotExist: + pass + + return Response({'code': 0, 'msg': '添加成功'}) + + + + + + + + +class KefuGetDashouListView(APIView): + """ + 客服获取打手列表接口（仅打手类型） + 需要拥有以下任一权限：001aa,001bb,001cc,001dd,001ee,001ff,001gg + 请求：POST /yonghu/kefuhqdslb + 参数： + username: 客服手机号（用于权限校验） + keyword: 搜索关键词（可选，搜索用户ID或昵称） + page: 页码（从1开始） + page_size: 每页数量 + 返回： + code: 0 + data: { + list: [打手对象], + has_more: bool, + total: int, // 总打手数 + valid_dashou_count: int // 有效打手数（有有效会员） + } + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数（前端字段为 username） + username = request.data.get('username', '').strip() + keyword = request.data.get('keyword', '').strip() + try: + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 20)) + except ValueError: + return Response({'code': 400, 'msg': '分页参数错误'}) + + if not username: + return Response({'code': 401, 'msg': '认证失败'}) + + # 2. 公共权限校验（验证客服身份，获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否拥有打手管理相关权限（至少一个） + required_perms = {'001aa', '001bb', '001cc', '001dd', '001ee', '001ff', '001gg'} + if not any(p in permissions for p in required_perms): + return Response({'code': 403, 'msg': '您没有权限查看打手列表'}) + + # 4. 构建打手查询集（仅打手类型） + dashou_qs = UserDashou.objects.select_related('user').all() + + # 关键词筛选（用户ID或昵称） + if keyword: + dashou_qs = dashou_qs.filter( + Q(user__yonghuid__icontains=keyword) | + Q(nicheng__icontains=keyword) + ) + + # 5. 统计打手总数 + total_dashou = dashou_qs.count() + + # 6. 统计有效打手数（有会员且未过期） + dashou_user_ids = dashou_qs.values_list('user__yonghuid', flat=True) + now = timezone.now() + valid_user_ids = Huiyuangoumai.objects.filter( + yonghu_id__in=dashou_user_ids, + huiyuan_zhuangtai=1, + daoqi_time__gt=now + ).values_list('yonghu_id', flat=True).distinct() + valid_dashou_count = valid_user_ids.count() + + # 7. 分页 + offset = (page - 1) * page_size + dashou_list = dashou_qs.order_by('-create_time')[offset:offset + page_size] + + # 8. 构建返回数据 + result = [] + for dashou in dashou_list: + user = dashou.user + result.append({ + 'yonghuid': user.yonghuid, + 'avatar': user.avatar or '', + 'zaixianzhuangtai': dashou.zaixianzhuangtai, + 'zhanghaozhuangtai': dashou.zhanghaozhuangtai, + 'nicheng': dashou.nicheng or '', + 'zhuangtai': dashou.zhuangtai, + }) + + has_more = (offset + len(dashou_list)) < total_dashou + + return Response({ + 'code': 0, + 'data': { + 'list': result, + 'has_more': has_more, + 'total': total_dashou, + 'valid_dashou_count': valid_dashou_count, + } + }) + + + +class KefuGetDashouDetailView(APIView): + """ + 客服获取打手详情接口 + 请求：POST /yonghu/kefuhqdsxq + 参数：{ + "username": "客服手机号", + "uid": "打手ID (yonghuid)" + } + 认证：JWT + 返回：code=0 + 打手信息 + 会员列表 + 所有会员类型 + 客服权限列表 + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数 + username = request.data.get('phone', '').strip() + uid = request.data.get('uid', '').strip() + + if not username or not uid: + return Response({'code': 400, 'msg': '缺少参数'}) + + # 2. 公共权限校验（验证客服身份，获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + + # 3. 检查是否拥有打手管理相关权限（至少一个） + required_perms = {'001aa', '001bb', '001cc', '001dd', '001ee', '001ff', '001gg'} + if not any(p in permissions for p in required_perms): + return Response({'code': 403, 'msg': '您没有权限查看打手详情'}) + + # 4. 查询打手主表和扩展表 + try: + user_main = UserMain.objects.select_related('dashou_profile').get( + yonghuid=uid + ) + except UserMain.DoesNotExist: + return Response({'code': 404, 'msg': '打手不存在'}) + + try: + dashou = user_main.dashou_profile + except ObjectDoesNotExist: + # 用户存在但未注册打手身份，返回基本信息 + user_info = { + 'yonghuid': user_main.yonghuid, + 'avatar': user_main.avatar or '', + 'zaixianzhuangtai': 0, + 'zhanghaozhuangtai': 0, + 'zhuangtai': 0, + 'nicheng': '', + 'chenghao': '', + 'dianhua': '', + 'wechat': '', + 'phone': user_main.phone or '', + 'create_time': user_main.create_time, + 'ip': user_main.ip or '', + 'jiedanzongliang': 0, + 'chengjiaozongliang': 0, + 'tuikuanliang': 0, + 'jinrijiedan': 0, + 'yue': 0.00, + 'zonge': 0.00, + 'jifen': 0, + 'yajin': 0.00, + 'jinrishouyi': 0.00, + 'jinyueshouyi': 0.00, + 'yaoqingren': '', + 'jieshao': '', + } + member_list = [] + # 仍然需要返回 all_members 和 permissions + all_members = list(Huiyuan.objects.all().values('huiyuan_id', 'jieshao')) + return Response({ + 'code': 0, + 'data': { + 'user_info': user_info, + 'member_list': member_list, + 'all_members': all_members, + 'permissions': permissions, + } + }) + + # 5. 构建打手信息 + user_info = { + 'yonghuid': user_main.yonghuid, + 'avatar': user_main.avatar or '', + 'zaixianzhuangtai': dashou.zaixianzhuangtai, + 'zhanghaozhuangtai': dashou.zhanghaozhuangtai, + 'zhuangtai': dashou.zhuangtai, + 'nicheng': dashou.nicheng or '', + 'chenghao': dashou.chenghao or '', + 'dianhua': dashou.dianhua or '', + 'wechat': dashou.wechat or '', + 'phone': user_main.phone or '', + 'create_time': user_main.create_time, + 'ip': user_main.ip or '', + 'jiedanzongliang': dashou.jiedanzongliang, + 'chengjiaozongliang': dashou.chengjiaozongliang, + 'tuikuanliang': dashou.tuikuanliang, + 'jinrijiedan': dashou.jinrijiedan, + 'yue': float(dashou.yue) if dashou.yue else 0.00, + 'zonge': float(dashou.zonge) if dashou.zonge else 0.00, + 'jifen': dashou.jifen, + 'yajin': float(dashou.yajin) if dashou.yajin else 0.00, + 'jinrishouyi': float(dashou.jinrishouyi) if dashou.jinrishouyi else 0.00, + 'jinyueshouyi': float(dashou.jinyueshouyi) if dashou.jinyueshouyi else 0.00, + 'yaoqingren': dashou.yaoqingren or '', + 'jieshao': dashou.jieshao or '', + } + + # 6. 查询打手已拥有的会员（未过期） + member_records = Huiyuangoumai.objects.filter( + yonghu_id=uid + ).order_by('-create_time') + member_list = [] + for record in member_records: + # 检查是否过期 + if hasattr(record, 'jiance_shifou_daoqi'): + is_expired = record.jiance_shifou_daoqi() + else: + is_expired = record.daoqi_time < timezone.now() if record.daoqi_time else True + + if not is_expired: + try: + huiyuan = Huiyuan.objects.get(huiyuan_id=record.huiyuan_id) + huiyuan_name = huiyuan.jieshao + except Huiyuan.DoesNotExist: + huiyuan_name = '未知会员' + member_list.append({ + 'id': record.id, + 'huiyuan_name': huiyuan_name, + 'daoqi_time': record.daoqi_time, + 'is_active': record.huiyuan_zhuangtai == 1, + 'huiyuan_id': record.huiyuan_id, # 用于删除操作 + }) + + # 7. 查询所有会员类型（用于前端添加会员） + all_members = list(Huiyuan.objects.all().values('huiyuan_id', 'jieshao')) + + return Response({ + 'code': 0, + 'data': { + 'user_info': user_info, + 'member_list': member_list, + 'all_members': all_members, + 'permissions': permissions, # 返回当前客服的权限列表 + } + }) + + + + +'''class KefuGetDashouDetailView(APIView): + """ + 客服获取打手详情接口 + 请求：POST /yonghu/kefuhqdsxq + 参数：{ + "phone": "客服手机号", + "uid": "打手ID (yonghuid)" + } + 认证：JWT + 返回：code=0 + 打手信息 + 会员列表 + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数 + username = request.data.get('phone', '').strip() + uid = request.data.get('uid', '').strip() + + if not username or not uid: + return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED) + + # 2. 客服身份验证 + current_user = request.user + + # 2. 公共权限校验（验证客服身份，获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查是否拥有打手管理相关权限（至少一个） + required_perms = {'001aa', '001bb', '001cc', '001dd', '001ee', '001ff', '001gg'} + if not any(p in permissions for p in required_perms): + return Response({'code': 403, 'msg': '您没有权限查看打手列表'}) + + # 3. 查询打手主表和扩展表 + try: + # 使用 select_related 预加载 dashou_profile，减少数据库查询 + user_main = UserMain.objects.select_related('dashou_profile').get( + yonghuid=uid + ) + except UserMain.DoesNotExist: + return Response({'code': 404, 'msg': '打手不存在'}, status=status.HTTP_404_NOT_FOUND) + + # 验证用户类型是否为打手（可选，但建议验证） + # 如果该用户没有打手扩展表，则返回空信息（但前端会显示未注册） + try: + dashou = user_main.dashou_profile + except ObjectDoesNotExist: + # 用户存在但未注册打手身份，返回基本信息 + user_info = { + 'yonghuid': user_main.yonghuid, + 'avatar': user_main.avatar or '', + 'zaixianzhuangtai': 0, + 'zhanghaozhuangtai': 0, + 'zhuangtai': 0, + 'nicheng': '', + 'chenghao': '', + 'dianhua': '', + 'wechat': '', + 'phone': user_main.phone or '', + 'create_time': user_main.create_time, + 'ip': user_main.ip or '', + 'jiedanzongliang': 0, + 'chengjiaozongliang': 0, + 'tuikuanliang': 0, + 'jinrijiedan': 0, + 'yue': 0.00, + 'zonge': 0.00, + 'jifen': 0, + 'yajin': 0.00, + 'jinrishouyi': 0.00, + 'jinyueshouyi': 0.00, + 'yaoqingren': '', + 'jieshao': '', + } + member_list = [] + return Response({ + 'code': 0, + 'data': { + 'user_info': user_info, + 'member_list': member_list + } + }) + + # 4. 构建打手信息 + user_info = { + 'yonghuid': user_main.yonghuid, + 'avatar': user_main.avatar or '', + 'zaixianzhuangtai': dashou.zaixianzhuangtai, + 'zhanghaozhuangtai': dashou.zhanghaozhuangtai, + 'zhuangtai': dashou.zhuangtai, + 'nicheng': dashou.nicheng or '', + 'chenghao': dashou.chenghao or '', + 'dianhua': dashou.dianhua or '', + 'wechat': dashou.wechat or '', + 'phone': user_main.phone or '', + 'create_time': user_main.create_time, + 'ip': user_main.ip or '', + 'jiedanzongliang': dashou.jiedanzongliang, + 'chengjiaozongliang': dashou.chengjiaozongliang, + 'tuikuanliang': dashou.tuikuanliang, + 'jinrijiedan': dashou.jinrijiedan, + 'yue': float(dashou.yue) if dashou.yue else 0.00, + 'zonge': float(dashou.zonge) if dashou.zonge else 0.00, + 'jifen': dashou.jifen, + 'yajin': float(dashou.yajin) if dashou.yajin else 0.00, + 'jinrishouyi': float(dashou.jinrishouyi) if dashou.jinrishouyi else 0.00, + 'jinyueshouyi': float(dashou.jinyueshouyi) if dashou.jinyueshouyi else 0.00, + 'yaoqingren': dashou.yaoqingren or '', + 'jieshao': dashou.jieshao or '', + } + + # 5. 查询打手会员信息（仅未过期） + member_records = Huiyuangoumai.objects.filter( + yonghu_id=uid + ).order_by('-create_time') + + member_list = [] + for record in member_records: + # 调用模型方法检查是否过期 + if hasattr(record, 'jiance_shifou_daoqi'): + is_expired = record.jiance_shifou_daoqi() + else: + # 如果方法不存在，简单判断 + is_expired = record.daoqi_time < timezone.now() if record.daoqi_time else True + + if not is_expired: + # 获取会员详情 + try: + huiyuan = Huiyuan.objects.get(huiyuan_id=record.huiyuan_id) + huiyuan_name = huiyuan.jieshao + except Huiyuan.DoesNotExist: + huiyuan_name = '未知会员' + + member_list.append({ + 'id': record.id, + 'huiyuan_name': huiyuan_name, + 'daoqi_time': record.daoqi_time, + 'is_active': record.huiyuan_zhuangtai == 1, + }) + + return Response({ + 'code': 0, + 'data': { + 'user_info': user_info, + 'member_list': member_list + } + })''' + + + + + + +class KefuUpdateDashouView(APIView): + """ + 客服修改打手信息接口 + 支持操作： + - jian_yue / jia_yue : 减/加打手余额 (权限001aa/001bb) + - jian_yajin / jia_yajin : 减/加打手押金 (权限001aa/001bb) + - jian_jifen / jia_jifen : 减/加打手积分 (权限001cc/001dd) + - gai_zhanghaozhuangtai : 修改打手账号状态（封禁/解封） (权限001ee) + - gai_zaixianzhuangtai : 修改打手在线状态 (权限001ee) + - gai_zhuangtai : 修改打手接单状态（空闲/忙碌） (权限001ee) + - jia_huiyuan / jian_huiyuan : 加/减会员 (权限001ff/001gg) + - gai_chenghao : 修改打手称号（升级/降级金牌） (权限001hh) + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + # 1. 获取前端参数 + username = request.data.get('username', '').strip() + dashou_id = request.data.get('dashou_id', '').strip() + caozuo = request.data.get('caozuo', '').strip() + value = request.data.get('value') # 金额、积分、天数、称号等 + huiyuan_id = request.data.get('huiyuan_id', '').strip() + + if not username or not dashou_id or not caozuo: + return Response({'code': 400, 'msg': '参数不完整'}) + + # 2. 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + + # 3. 查询打手 + try: + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + except UserMain.DoesNotExist: + return Response({'code': 404, 'msg': '打手不存在'}) + except UserDashou.DoesNotExist: + return Response({'code': 404, 'msg': '打手扩展信息缺失'}) + + with transaction.atomic(): + try: + before = { + 'yue': dashou_profile.yue, + 'yajin': dashou_profile.yajin, + 'jifen': dashou_profile.jifen, + 'zhanghaozhuangtai': dashou_profile.zhanghaozhuangtai, + 'zaixianzhuangtai': dashou_profile.zaixianzhuangtai, + 'zhuangtai': dashou_profile.zhuangtai, + 'chenghao': dashou_profile.chenghao, + } + + # ---------- 余额操作 ---------- + if caozuo == 'jian_yue': + if '001aa' not in permissions: + return Response({'code': 403, 'msg': '无权限减打手余额'}) + amount = Decimal(str(value)) + if dashou_profile.yue < amount: + return Response({'code': 400, 'msg': '余额不足'}) + dashou_profile.yue -= amount + dashou_profile.save() + after = dashou_profile.yue + Xiugaijilu.objects.create( + yonghuid=dashou_id, + xiugaiid=kefu.user.phone, + leixing=2, + xiugaitijiao=after, + xiugaitijiaoq=before['yue'], + ) + return Response({'code': 0, 'msg': '减余额成功', 'data': {'new_yue': str(after)}}) + + elif caozuo == 'jia_yue': + if '001bb' not in permissions: + return Response({'code': 403, 'msg': '无权限加打手余额'}) + amount = Decimal(str(value)) + dashou_profile.yue += amount + dashou_profile.save() + after = dashou_profile.yue + Xiugaijilu.objects.create( + yonghuid=dashou_id, + xiugaiid=kefu.user.phone, + leixing=2, + xiugaitijiao=after, + xiugaitijiaoq=before['yue'], + ) + return Response({'code': 0, 'msg': '加余额成功', 'data': {'new_yue': str(after)}}) + + # ---------- 押金操作 ---------- + elif caozuo == 'jian_yajin': + if '001aa' not in permissions: + return Response({'code': 403, 'msg': '无权限减打手押金'}) + amount = Decimal(str(value)) + if dashou_profile.yajin < amount: + return Response({'code': 400, 'msg': '押金不足'}) + dashou_profile.yajin -= amount + dashou_profile.save() + after = dashou_profile.yajin + Xiugaijilu.objects.create( + yonghuid=dashou_id, + xiugaiid=kefu.user.phone, + leixing=2, + yajin=after, + yyajin=before['yajin'], + ) + return Response({'code': 0, 'msg': '减押金成功', 'data': {'new_yajin': str(after)}}) + + elif caozuo == 'jia_yajin': + if '001bb' not in permissions: + return Response({'code': 403, 'msg': '无权限加打手押金'}) + amount = Decimal(str(value)) + dashou_profile.yajin += amount + dashou_profile.save() + after = dashou_profile.yajin + Xiugaijilu.objects.create( + yonghuid=dashou_id, + xiugaiid=kefu.user.phone, + leixing=2, + yajin=after, + yyajin=before['yajin'], + ) + return Response({'code': 0, 'msg': '加押金成功', 'data': {'new_yajin': str(after)}}) + + # ---------- 积分操作 ---------- + elif caozuo == 'jian_jifen': + if '001cc' not in permissions: + return Response({'code': 403, 'msg': '无权限减打手积分'}) + jifen = int(value) + if dashou_profile.jifen < jifen: + return Response({'code': 400, 'msg': '积分不足'}) + dashou_profile.jifen -= jifen + dashou_profile.save() + after = dashou_profile.jifen + Xiugaijilu.objects.create( + yonghuid=dashou_id, + xiugaiid=kefu.user.phone, + leixing=2, + jifen=after, + yjifen=before['jifen'], + ) + return Response({'code': 0, 'msg': '减积分成功', 'data': {'new_jifen': after}}) + + elif caozuo == 'jia_jifen': + if '001dd' not in permissions: + return Response({'code': 403, 'msg': '无权限加打手积分'}) + jifen = int(value) + dashou_profile.jifen += jifen + dashou_profile.save() + after = dashou_profile.jifen + Xiugaijilu.objects.create( + yonghuid=dashou_id, + xiugaiid=kefu.user.phone, + leixing=2, + jifen=after, + yjifen=before['jifen'], + ) + return Response({'code': 0, 'msg': '加积分成功', 'data': {'new_jifen': after}}) + + # ---------- 状态修改 ---------- + elif caozuo == 'gai_zhanghaozhuangtai': + if '001ee' not in permissions: + return Response({'code': 403, 'msg': '无权限修改打手账号状态'}) + new_status = int(value) + if new_status not in [0, 1]: + return Response({'code': 400, 'msg': '状态值无效（0=封禁,1=正常）'}) + dashou_profile.zhanghaozhuangtai = new_status + dashou_profile.save() + Xiugaijilu.objects.create( + yonghuid=dashou_id, + xiugaiid=kefu.user.phone, + leixing=2, + qitashuoming=f'修改账号状态为{new_status}', + ) + return Response({'code': 0, 'msg': '修改账号状态成功', 'data': {'new_zhanghaozhuangtai': new_status}}) + + elif caozuo == 'gai_zaixianzhuangtai': + if '001ee' not in permissions: + return Response({'code': 403, 'msg': '无权限修改打手在线状态'}) + new_status = int(value) + if new_status not in [0, 1]: + return Response({'code': 400, 'msg': '状态值无效（0=离线,1=在线）'}) + dashou_profile.zaixianzhuangtai = new_status + dashou_profile.save() + Xiugaijilu.objects.create( + yonghuid=dashou_id, + xiugaiid=kefu.user.phone, + leixing=2, + qitashuoming=f'修改在线状态为{new_status}', + ) + return Response({'code': 0, 'msg': '修改在线状态成功', 'data': {'new_zaixianzhuangtai': new_status}}) + + elif caozuo == 'gai_zhuangtai': + if '001ee' not in permissions: + return Response({'code': 403, 'msg': '无权限修改打手接单状态'}) + new_status = int(value) + if new_status not in [0, 1]: + return Response({'code': 400, 'msg': '状态值无效（0=忙碌,1=空闲）'}) + dashou_profile.zhuangtai = new_status + dashou_profile.save() + Xiugaijilu.objects.create( + yonghuid=dashou_id, + xiugaiid=kefu.user.phone, + leixing=2, + qitashuoming=f'修改接单状态为{new_status}', + ) + return Response({'code': 0, 'msg': '修改接单状态成功', 'data': {'new_zhuangtai': new_status}}) + + # ---------- 会员操作 ---------- + elif caozuo == 'jia_huiyuan': + if '001ff' not in permissions: + return Response({'code': 403, 'msg': '无权限给打手加会员'}) + if not huiyuan_id: + return Response({'code': 400, 'msg': '缺少会员ID'}) + days = int(value) if value else 30 + try: + huiyuan = Huiyuan.objects.get(huiyuan_id=huiyuan_id) + except Huiyuan.DoesNotExist: + return Response({'code': 404, 'msg': '会员类型不存在'}) + record, created = Huiyuangoumai.objects.select_for_update().get_or_create( + yonghu_id=dashou_id, + huiyuan_id=huiyuan_id, + defaults={ + 'huiyuan_zhuangtai': 1, + 'jieshao': huiyuan.jieshao, + 'daoqi_time': timezone.now() + timedelta(days=days), + } + ) + if not created: + new_daoqi = record.daoqi_time + timedelta(days=days) + record.daoqi_time = new_daoqi + record.huiyuan_zhuangtai = 1 + record.save() + Xiugaijilu.objects.create( + yonghuid=dashou_id, + xiugaiid=kefu.user.phone, + leixing=2, + huiyuants=days, + huiyuan_id=huiyuan_id, + qitashuoming=f'加会员 {huiyuan_id}，增加{days}天', + ) + return Response({'code': 0, 'msg': '加会员成功', 'data': {'new_daoqi': record.daoqi_time.strftime('%Y-%m-%d %H:%M:%S')}}) + + elif caozuo == 'jian_huiyuan': + if '001gg' not in permissions: + return Response({'code': 403, 'msg': '无权限给打手减会员'}) + if not huiyuan_id: + return Response({'code': 400, 'msg': '缺少会员ID'}) + try: + record = Huiyuangoumai.objects.get(yonghu_id=dashou_id, huiyuan_id=huiyuan_id) + except Huiyuangoumai.DoesNotExist: + return Response({'code': 404, 'msg': '该打手未购买此会员'}) + record.delete() + Xiugaijilu.objects.create( + yonghuid=dashou_id, + xiugaiid=kefu.user.phone, + leixing=2, + huiyuan_id=huiyuan_id, + qitashuoming=f'移除会员 {huiyuan_id}', + ) + return Response({'code': 0, 'msg': '减会员成功'}) + + # ---------- 称号修改（金牌打手） ---------- + elif caozuo == 'gai_chenghao': + if '001hh' not in permissions: + return Response({'code': 403, 'msg': '无权限修改打手称号'}) + new_chenghao = str(value).strip() + if not new_chenghao: + return Response({'code': 400, 'msg': '称号不能为空'}) + # 可限制合法值，这里只记录日志 + dashou_profile.chenghao = new_chenghao + dashou_profile.save() + Xiugaijilu.objects.create( + yonghuid=dashou_id, + xiugaiid=kefu.user.phone, + leixing=2, + qitashuoming=f'修改称号：{before["chenghao"] or "无"} → {new_chenghao}', + ) + return Response({'code': 0, 'msg': '修改称号成功', 'data': {'new_chenghao': new_chenghao}}) + + else: + return Response({'code': 400, 'msg': '未知操作类型'}) + + except Exception as e: + logger.error(f"修改打手信息异常: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '服务器内部错误'}) + + + + + + +class KefuGetShangjiaListView(APIView): + """ + 客服/管理员获取商家列表接口 + 需要拥有以下任一权限：1100a, 1100b + 请求：POST /houtai/hqsjgllb + 参数： + username: 客服手机号（用于权限校验，必填） + keyword: 搜索关键词（可选，搜索商家用户ID或昵称） + balance_op: 余额比较符，gte(>=) / lte(<=)（可选） + balance_value: 余额数值（可选，需与balance_op同时存在） + order_count_op: 派单量比较符，gte(>=) / lte(<=)（可选） + order_count_value: 派单量数值（可选，需与order_count_op同时存在） + status: 商家状态，1=正常，2=禁用（可选） + page: 页码，从1开始，默认1 + page_size: 每页数量，默认20 + 返回： + code: 0 成功，其他失败 + data: { + list: [商家对象], + total: int, // 总商家数 + } + """ + permission_classes = [] # 不依赖全局认证，手动校验 + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数 + username = request.data.get('username', '').strip() + keyword = request.data.get('keyword', '').strip() + balance_op = request.data.get('balance_op', '').strip().lower() + balance_value_str = request.data.get('balance_value') + order_count_op = request.data.get('order_count_op', '').strip().lower() + order_count_value_str = request.data.get('order_count_value') + status_str = request.data.get('status') + + try: + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 20)) + if page < 1 or page_size < 1: + raise ValueError + except ValueError: + return Response({'code': 400, 'msg': '分页参数错误'}) + + if not username: + return Response({'code': 401, 'msg': '认证失败，缺少username'}) + + # 2. 公共权限校验（复用现有函数 verify_kefu_permission） + # 假设 verify_kefu_permission 定义在某个公共模块，这里引入 + + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 直接返回错误响应 + + # 3. 检查商家管理权限（1100a 或 1100b） + required_perms = {'1100a', '1100b'} + if not any(p in permissions for p in required_perms): + return Response({'code': 403, 'msg': '您没有权限查看商家列表'}) + + # 4. 构建商家查询集（商家扩展表 + 关联用户主表） + shangjia_qs = UserShangjia.objects.select_related('user').all() + + # 关键词筛选（用户ID或昵称） + if keyword: + shangjia_qs = shangjia_qs.filter( + Q(user__yonghuid__icontains=keyword) | + Q(nicheng__icontains=keyword) + ) + + # 余额筛选 + if balance_op and balance_value_str is not None and balance_value_str != '': + try: + balance_value = Decimal(str(balance_value_str)) + if balance_op == 'gte': + shangjia_qs = shangjia_qs.filter(yue__gte=balance_value) + elif balance_op == 'lte': + shangjia_qs = shangjia_qs.filter(yue__lte=balance_value) + else: + return Response({'code': 400, 'msg': '余额比较符只支持gte或lte'}) + except Exception: + return Response({'code': 400, 'msg': '余额数值格式错误'}) + + # 派单总量筛选（fabu字段） + if order_count_op and order_count_value_str is not None and order_count_value_str != '': + try: + order_count_value = int(order_count_value_str) + if order_count_op == 'gte': + shangjia_qs = shangjia_qs.filter(fabu__gte=order_count_value) + elif order_count_op == 'lte': + shangjia_qs = shangjia_qs.filter(fabu__lte=order_count_value) + else: + return Response({'code': 400, 'msg': '派单量比较符只支持gte或lte'}) + except Exception: + return Response({'code': 400, 'msg': '派单量数值必须为整数'}) + + # 商家状态筛选 + if status_str is not None and status_str != '': + try: + status_val = int(status_str) + if status_val not in [1, 2]: + return Response({'code': 400, 'msg': '商家状态值无效，应为1或2'}) + shangjia_qs = shangjia_qs.filter(zhuangtai=status_val) + except ValueError: + return Response({'code': 400, 'msg': '商家状态格式错误'}) + + # 5. 统计总商家数（应用筛选后） + total = shangjia_qs.count() + + # 6. 分页 + offset = (page - 1) * page_size + shangjia_list = shangjia_qs.order_by('-create_time')[offset:offset + page_size] + + # 7. 构建返回数据 + result = [] + for shangjia in shangjia_list: + user = shangjia.user + result.append({ + 'yonghuid': user.yonghuid, + 'avatar': user.avatar or '', + 'nicheng': shangjia.nicheng or '', + 'yue': str(shangjia.yue), # 转换为字符串，避免前端精度问题 + 'fabu': shangjia.fabu, + 'chengjiao': shangjia.chengjiao, + 'zhuangtai': shangjia.zhuangtai, # 1=正常,2=禁用 + }) + + return Response({ + 'code': 0, + 'data': { + 'list': result, + 'total': total, + } + }) + + + + + + +# yonghu/views.py 中添加 + +class KefuGetShangjiaDetailView(APIView): + """ + 客服/管理员获取商家详情接口 + 需要权限：1100a 或 1100b + 请求：POST /houtai/hthqsjxq + 参数： + username: 客服手机号（用于权限校验，必填） + yonghuid: 商家用户ID（必填） + 返回： + code: 0 成功 + data: 商家所有字段（含主表头像等） + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + yonghuid = request.data.get('yonghuid', '').strip() + + if not username: + return Response({'code': 401, 'msg': '认证失败，缺少username'}) + if not yonghuid: + return Response({'code': 400, 'msg': '缺少商家ID'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + + required_perms = {'1100a', '1100b'} + if not any(p in permissions for p in required_perms): + return Response({'code': 403, 'msg': '您没有权限查看商家详情'}) + + # 查询商家 + try: + shangjia = UserShangjia.objects.select_related('user').get(user__yonghuid=yonghuid) + except UserShangjia.DoesNotExist: + return Response({'code': 404, 'msg': '商家不存在'}) + + user = shangjia.user + + data = { + 'yonghuid': user.yonghuid, + 'avatar': user.avatar or '', + 'nicheng': shangjia.nicheng, + 'zhuangtai': shangjia.zhuangtai, # 1正常，2禁用 + 'dianhua': shangjia.dianhua, + 'wechat': shangjia.wechat, + 'yue': str(shangjia.yue), + 'fabu': shangjia.fabu, + 'chengjiao': shangjia.chengjiao, + 'tuikuan': shangjia.tuikuan, + 'jinridingdan': shangjia.jinridingdan, + 'jinriliushui': str(shangjia.jinriliushui), + 'jinyuedingdan': shangjia.jinyuedingdan, + 'jinyueliushui': str(shangjia.jinyueliushui), + 'create_time': shangjia.create_time.isoformat() if shangjia.create_time else None, + } + + return Response({'code': 0, 'data': data}) + + + + + + + +class KefuUpdateShangjiaView(APIView): + """ + 客服/管理员修改商家信息（余额、状态） + POST /houtai/xgsjxx + 参数： + username, yonghuid, action + action可选：add_balance, sub_balance, ban, unban + amount（add_balance/sub_balance时必填） + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + yonghuid = request.data.get('yonghuid', '').strip() + action = request.data.get('action', '').strip().lower() + + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + if not yonghuid: + return Response({'code': 400, 'msg': '缺少商家ID'}) + if action not in ('add_balance', 'sub_balance', 'ban', 'unban'): + return Response({'code': 400, 'msg': 'action参数无效'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + + # 操作权限校验 + if action in ('add_balance', 'ban', 'unban') and '1100a' not in permissions: + return Response({'code': 403, 'msg': '无权限执行此操作（需要1100a）'}) + if action == 'sub_balance' and '1100b' not in permissions: + return Response({'code': 403, 'msg': '无权限减少商家余额（需要1100b）'}) + + # 使用事务，select_for_update 必须在事务内 + with transaction.atomic(): + try: + shangjia = UserShangjia.objects.select_for_update().get(user__yonghuid=yonghuid) + except UserShangjia.DoesNotExist: + return Response({'code': 404, 'msg': '商家不存在'}) + + # 增加余额 + if action == 'add_balance': + amount_str = request.data.get('amount') + try: + amount = Decimal(str(amount_str)) + if amount <= 0 or amount > 1000000: + return Response({'code': 400, 'msg': '金额需在0.01~1000000之间'}) + except: + return Response({'code': 400, 'msg': '金额格式错误'}) + new_yue = shangjia.yue + amount + if new_yue > 999999999.99: + return Response({'code': 400, 'msg': '增加后余额超出上限'}) + shangjia.yue = new_yue + shangjia.save(update_fields=['yue']) + return Response({'code': 0, 'msg': '余额增加成功', 'data': {'new_balance': str(shangjia.yue)}}) + + # 减少余额 + if action == 'sub_balance': + amount_str = request.data.get('amount') + try: + amount = Decimal(str(amount_str)) + if amount <= 0 or amount > 1000000: + return Response({'code': 400, 'msg': '金额需在0.01~1000000之间'}) + except: + return Response({'code': 400, 'msg': '金额格式错误'}) + if shangjia.yue < amount: + return Response({'code': 400, 'msg': '余额不足'}) + shangjia.yue = shangjia.yue - amount + shangjia.save(update_fields=['yue']) + return Response({'code': 0, 'msg': '余额减少成功', 'data': {'new_balance': str(shangjia.yue)}}) + + # 封禁 + if action == 'ban': + if shangjia.zhuangtai == 2: + return Response({'code': 400, 'msg': '商家已是封禁状态'}) + shangjia.zhuangtai = 2 + shangjia.save(update_fields=['zhuangtai']) + return Response({'code': 0, 'msg': '商家已封禁', 'data': {'zhuangtai': 2}}) + + # 解封 + if action == 'unban': + if shangjia.zhuangtai == 1: + return Response({'code': 400, 'msg': '商家已是正常状态'}) + shangjia.zhuangtai = 1 + shangjia.save(update_fields=['zhuangtai']) + return Response({'code': 0, 'msg': '商家已解封', 'data': {'zhuangtai': 1}}) + + + + + + + +class GetProductBaseDataView(APIView): + """ + 获取商品基础数据（类型、专区、会员） + 权限：2200a + POST /houtai/htsphqjcsx + 参数：username + 返回： + code:0, data: { + type_list: [ {id, jieshao, tupian_url, paixu, shenhezhuangtai, product_count}, ...], + zone_list: [ {id, mingzi, leixing_id, paixu, shenhezhuangtai, product_count}, ...], + member_list: [ {huiyuan_id, jieshao, jiage}, ...] + } + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '2200a' not in permissions: + return Response({'code': 403, 'msg': '无权限管理商品'}) + + # 获取所有商品类型（按 paixu 升序） + type_qs = ShangpinLeixing.objects.all().order_by('paixu') + type_list = [] + for t in type_qs: + # 🔥 修改：统计该类型下的公共商品数量（店铺为空且店铺商品类型为空） + product_count = Shangpin.objects.filter( + leixing_id=t.id, + dianpu__isnull=True, # 所属店铺为空 + dianpu_leixing__isnull=True # 店铺商品类型为空 + ).count() + type_list.append({ + 'id': t.id, + 'jieshao': t.jieshao or '', + 'tupian_url': t.tupian_url or '', + 'paixu': t.paixu, + 'shenhezhuangtai': t.shenhezhuangtai, + 'product_count': product_count, + }) + + # 获取所有专区（按 paixu 升序） + zone_qs = ShangpinZhuanqu.objects.all().order_by('paixu') + zone_list = [] + for z in zone_qs: + # 🔥 修改：统计该专区下的公共商品数量（店铺为空且店铺商品类型为空） + product_count = Shangpin.objects.filter( + zhuanqu_id=z.id, + dianpu__isnull=True, # 所属店铺为空 + dianpu_leixing__isnull=True # 店铺商品类型为空 + ).count() + zone_list.append({ + 'id': z.id, + 'mingzi': z.mingzi or '', + 'leixing_id': z.leixing_id, + 'paixu': z.paixu, + 'shenhezhuangtai': z.shenhezhuangtai, + 'product_count': product_count, + }) + + # 获取所有会员（只需 ID、介绍、价格） + member_list = list(Huiyuan.objects.all().values('huiyuan_id', 'jieshao', 'jiage')) + + return Response({ + 'code': 0, + 'data': { + 'type_list': type_list, + 'zone_list': zone_list, + 'member_list': member_list, + } + }) + + + +class GetProductListView(APIView): + """ + 获取商品列表（支持筛选、排序） + 权限：2200a + POST /houtai/hthqsplb + 参数： + username: 必填 + leixing_id: 类型ID（可选） + zhuanqu_id: 专区ID（可选） + keyword: 搜索关键词（商品标题/介绍） + sales_op: 销量比较符 gte/lte + sales_value: 销量数值 + stock_op: 库存比较符 gte/lte + stock_value: 库存数值 + sort_field: 排序字段 zhenshi_xiaoliang / jiage + sort_order: asc/desc + page: 页码（默认1） + page_size: 每页数量（默认1000，前端说不需要分页，但为性能仍保留） + 返回： + code:0, data: { list: [...], total } + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '2200a' not in permissions: + return Response({'code': 403, 'msg': '无权限管理商品'}) + + # 获取参数 + leixing_id = request.data.get('leixing_id') + zhuanqu_id = request.data.get('zhuanqu_id') + keyword = request.data.get('keyword', '').strip() + sales_op = request.data.get('sales_op', '').strip().lower() + sales_value = request.data.get('sales_value') + stock_op = request.data.get('stock_op', '').strip().lower() + stock_value = request.data.get('stock_value') + sort_field = request.data.get('sort_field', '') # zhenshi_xiaoliang / jiage + sort_order = request.data.get('sort_order', 'desc').lower() + try: + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 1000)) + if page < 1 or page_size < 1: + raise ValueError + except: + return Response({'code': 400, 'msg': '分页参数错误'}) + + # 🔥 修改：构建查询集，增加公共商品筛选（店铺为空且店铺商品类型为空） + qs = Shangpin.objects.filter( + dianpu__isnull=True, # 所属店铺为空 + dianpu_leixing__isnull=True # 店铺商品类型为空 + ) + + if leixing_id: + try: + leixing_id = int(leixing_id) + qs = qs.filter(leixing_id=leixing_id) + except: + pass + if zhuanqu_id: + try: + zhuanqu_id = int(zhuanqu_id) + qs = qs.filter(zhuanqu_id=zhuanqu_id) + except: + pass + if keyword: + qs = qs.filter(Q(biaoqian__icontains=keyword) | Q(jieshao__icontains=keyword)) + + # 销量筛选 + if sales_op and sales_value is not None: + try: + sales_val = int(sales_value) + if sales_op == 'gte': + qs = qs.filter(zhenshi_xiaoliang__gte=sales_val) + elif sales_op == 'lte': + qs = qs.filter(zhenshi_xiaoliang__lte=sales_val) + except: + pass + + # 库存筛选 + if stock_op and stock_value is not None: + try: + stock_val = int(stock_value) + if stock_op == 'gte': + qs = qs.filter(kucun__gte=stock_val) + elif stock_op == 'lte': + qs = qs.filter(kucun__lte=stock_val) + except: + pass + + # 排序 + if sort_field in ('zhenshi_xiaoliang', 'jiage'): + if sort_order == 'asc': + qs = qs.order_by(sort_field) + else: + qs = qs.order_by(f'-{sort_field}') + else: + qs = qs.order_by('-create_time') # 默认按创建时间倒序 + + # 分页 + total = qs.count() + offset = (page - 1) * page_size + products = qs[offset:offset + page_size] + + # 构建返回数据 + product_list = [] + for p in products: + product_list.append({ + 'id': p.id, + 'biaoqian': p.biaoqian or '', + 'jiage': str(p.jiage), + 'kucun': p.kucun, + 'zhenshi_xiaoliang': p.zhenshi_xiaoliang, + 'tupian_url': p.tupian_url or '', + 'jieshao': p.jieshao or '', + }) + + return Response({ + 'code': 0, + 'data': { + 'list': product_list, + 'total': total, + } + }) + + + + +'''class GetProductBaseDataView(APIView): + """ + 获取商品基础数据（类型、专区、会员） + 权限：2200a + POST /houtai/htsphqjcsx + 参数：username + 返回： + code:0, data: { + type_list: [ {id, jieshao, tupian_url, paixu, shenhezhuangtai, product_count}, ...], + zone_list: [ {id, mingzi, leixing_id, paixu, shenhezhuangtai, product_count}, ...], + member_list: [ {huiyuan_id, jieshao, jiage}, ...] + } + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '2200a' not in permissions: + return Response({'code': 403, 'msg': '无权限管理商品'}) + + # 获取所有商品类型（按 paixu 升序） + type_qs = ShangpinLeixing.objects.all().order_by('paixu') + type_list = [] + for t in type_qs: + # 统计该类型下的商品数量（忽略审核状态？通常统计所有商品，可根据需求调整） + product_count = Shangpin.objects.filter(leixing_id=t.id).count() + type_list.append({ + 'id': t.id, + 'jieshao': t.jieshao or '', + 'tupian_url': t.tupian_url or '', + 'paixu': t.paixu, + 'shenhezhuangtai': t.shenhezhuangtai, + 'product_count': product_count, + }) + + # 获取所有专区（按 paixu 升序） + zone_qs = ShangpinZhuanqu.objects.all().order_by('paixu') + zone_list = [] + for z in zone_qs: + product_count = Shangpin.objects.filter(zhuanqu_id=z.id).count() + zone_list.append({ + 'id': z.id, + 'mingzi': z.mingzi or '', + 'leixing_id': z.leixing_id, + 'paixu': z.paixu, + 'shenhezhuangtai': z.shenhezhuangtai, + 'product_count': product_count, + }) + + # 获取所有会员（只需 ID、介绍、价格） + member_list = list(Huiyuan.objects.all().values('huiyuan_id', 'jieshao', 'jiage')) + + return Response({ + 'code': 0, + 'data': { + 'type_list': type_list, + 'zone_list': zone_list, + 'member_list': member_list, + } + }) + + +class GetProductListView(APIView): + """ + 获取商品列表（支持筛选、排序） + 权限：2200a + POST /houtai/hthqsplb + 参数： + username: 必填 + leixing_id: 类型ID（可选） + zhuanqu_id: 专区ID（可选） + keyword: 搜索关键词（商品标题/介绍） + sales_op: 销量比较符 gte/lte + sales_value: 销量数值 + stock_op: 库存比较符 gte/lte + stock_value: 库存数值 + sort_field: 排序字段 zhenshi_xiaoliang / jiage + sort_order: asc/desc + page: 页码（默认1） + page_size: 每页数量（默认1000，前端说不需要分页，但为性能仍保留） + 返回： + code:0, data: { list: [...], total } + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '2200a' not in permissions: + return Response({'code': 403, 'msg': '无权限管理商品'}) + + # 获取参数 + leixing_id = request.data.get('leixing_id') + zhuanqu_id = request.data.get('zhuanqu_id') + keyword = request.data.get('keyword', '').strip() + sales_op = request.data.get('sales_op', '').strip().lower() + sales_value = request.data.get('sales_value') + stock_op = request.data.get('stock_op', '').strip().lower() + stock_value = request.data.get('stock_value') + sort_field = request.data.get('sort_field', '') # zhenshi_xiaoliang / jiage + sort_order = request.data.get('sort_order', 'desc').lower() + try: + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 1000)) + if page < 1 or page_size < 1: + raise ValueError + except: + return Response({'code': 400, 'msg': '分页参数错误'}) + + # 构建查询集 + qs = Shangpin.objects.all() + + if leixing_id: + try: + leixing_id = int(leixing_id) + qs = qs.filter(leixing_id=leixing_id) + except: + pass + if zhuanqu_id: + try: + zhuanqu_id = int(zhuanqu_id) + qs = qs.filter(zhuanqu_id=zhuanqu_id) + except: + pass + if keyword: + qs = qs.filter(Q(biaoqian__icontains=keyword) | Q(jieshao__icontains=keyword)) + + # 销量筛选 + if sales_op and sales_value is not None: + try: + sales_val = int(sales_value) + if sales_op == 'gte': + qs = qs.filter(zhenshi_xiaoliang__gte=sales_val) + elif sales_op == 'lte': + qs = qs.filter(zhenshi_xiaoliang__lte=sales_val) + except: + pass + + # 库存筛选 + if stock_op and stock_value is not None: + try: + stock_val = int(stock_value) + if stock_op == 'gte': + qs = qs.filter(kucun__gte=stock_val) + elif stock_op == 'lte': + qs = qs.filter(kucun__lte=stock_val) + except: + pass + + # 排序 + if sort_field in ('zhenshi_xiaoliang', 'jiage'): + if sort_order == 'asc': + qs = qs.order_by(sort_field) + else: + qs = qs.order_by(f'-{sort_field}') + else: + qs = qs.order_by('-create_time') # 默认按创建时间倒序 + + # 分页 + total = qs.count() + offset = (page - 1) * page_size + products = qs[offset:offset + page_size] + + # 构建返回数据 + product_list = [] + for p in products: + product_list.append({ + 'id': p.id, + 'biaoqian': p.biaoqian or '', + 'jiage': str(p.jiage), + 'kucun': p.kucun, + 'zhenshi_xiaoliang': p.zhenshi_xiaoliang, + 'tupian_url': p.tupian_url or '', + 'jieshao': p.jieshao or '', + }) + + return Response({ + 'code': 0, + 'data': { + 'list': product_list, + 'total': total, + } + })''' + + +class SaveProductOrderView(APIView): + """ + 保存商品类型或专区的排序 + 权限：2200a + POST /houtai/htsppaixu + 参数： + username: 必填 + type: 'leixing' 或 'zhuanqu' + leixing_id: 当 type='zhuanqu' 时必填（用于限定该类型下的专区） + items: [ {id, paixu}, ... ] # 每个项目的新排序值（从1开始） + 返回： + code:0 成功 + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '2200a' not in permissions: + return Response({'code': 403, 'msg': '无权限管理商品'}) + + sort_type = request.data.get('type', '').strip().lower() + if sort_type not in ('leixing', 'zhuanqu'): + return Response({'code': 400, 'msg': 'type参数必须为leixing或zhuanqu'}) + + items = request.data.get('items') + if not isinstance(items, list) or len(items) == 0: + return Response({'code': 400, 'msg': 'items参数无效'}) + + # 校验每个 item 的格式 + for item in items: + if not isinstance(item, dict) or 'id' not in item or 'paixu' not in item: + return Response({'code': 400, 'msg': 'items内每项需包含id和paixu'}) + try: + item['id'] = int(item['id']) + item['paixu'] = int(item['paixu']) + if item['paixu'] < 1: + return Response({'code': 400, 'msg': 'paixu必须为正整数'}) + except: + return Response({'code': 400, 'msg': 'id或paixu格式错误'}) + + with transaction.atomic(): + if sort_type == 'leixing': + # 更新商品类型的排序 + for item in items: + ShangpinLeixing.objects.filter(id=item['id']).update(paixu=item['paixu']) + else: # zhuanqu + leixing_id = request.data.get('leixing_id') + if not leixing_id: + return Response({'code': 400, 'msg': '更新专区排序时必须提供leixing_id'}) + try: + leixing_id = int(leixing_id) + except: + return Response({'code': 400, 'msg': 'leixing_id格式错误'}) + # 可选：检查该专区是否属于该类型，但不强制，由前端保证 + for item in items: + ShangpinZhuanqu.objects.filter(id=item['id']).update(paixu=item['paixu']) + + return Response({'code': 0, 'msg': '排序保存成功'}) + + +class AddProductView(APIView): + """ + 添加商品（含图片上传） + 权限：2200a + POST /houtai/htfbsp + 参数：multipart/form-data，包含所有商品字段及图片文件 + 字段说明见代码 + """ + permission_classes = [] + parser_classes = [MultiPartParser, FormParser] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '2200a' not in permissions: + return Response({'code': 403, 'msg': '无权限管理商品'}) + + # 获取表单字段 + biaoqian = request.data.get('biaoqian', '').strip() + jiage_str = request.data.get('jiage') + kucun_str = request.data.get('kucun') + duiwai_xiaoliang_str = request.data.get('duiwai_xiaoliang', '0') + leixing_id_str = request.data.get('leixing_id') + zhuanqu_id_str = request.data.get('zhuanqu_id') + yaoqiuleixing_str = request.data.get('yaoqiuleixing', '1') + huiyuan_id = request.data.get('huiyuan_id', '').strip() + yongjin_str = request.data.get('yongjin', '0') + fencheng_type = request.data.get('fencheng_type', 'default') + ewai_dashou_fencheng_str = request.data.get('ewai_dashou_fencheng', '0') + jieshao = request.data.get('jieshao', '').strip() + xiadan_xuzhi = request.data.get('xiadan_xuzhi', '').strip() + # 图片文件 + image_file = request.FILES.get('file') # 前端上传时字段名为 'file' + + # 必填字段校验 + if not biaoqian: + return Response({'code': 400, 'msg': '商品标题不能为空'}) + try: + jiage = Decimal(jiage_str) + if jiage <= 0: + return Response({'code': 400, 'msg': '价格必须大于0'}) + except: + return Response({'code': 400, 'msg': '价格格式错误'}) + try: + kucun = int(kucun_str) + if kucun < 0: + return Response({'code': 400, 'msg': '库存不能为负数'}) + except: + return Response({'code': 400, 'msg': '库存格式错误'}) + try: + duiwai_xiaoliang = int(duiwai_xiaoliang_str) + except: + duiwai_xiaoliang = 0 + try: + leixing_id = int(leixing_id_str) + except: + return Response({'code': 400, 'msg': '商品类型ID无效'}) + try: + zhuanqu_id = int(zhuanqu_id_str) + except: + return Response({'code': 400, 'msg': '商品专区ID无效'}) + try: + yaoqiuleixing = int(yaoqiuleixing_str) + if yaoqiuleixing not in (1, 2): + raise ValueError + except: + return Response({'code': 400, 'msg': '抢单要求类型必须为1或2'}) + + # 校验类型和专区的存在性及关联性 + try: + leixing_obj = ShangpinLeixing.objects.get(id=leixing_id) + except ShangpinLeixing.DoesNotExist: + return Response({'code': 400, 'msg': '商品类型不存在'}) + try: + zhuanqu_obj = ShangpinZhuanqu.objects.get(id=zhuanqu_id) + if zhuanqu_obj.leixing_id != leixing_id: + return Response({'code': 400, 'msg': '专区不属于该商品类型'}) + except ShangpinZhuanqu.DoesNotExist: + return Response({'code': 400, 'msg': '商品专区不存在'}) + + # 处理抢单要求相关字段 + huiyuan_id_val = None + yongjin_val = None + if yaoqiuleixing == 1: + # 会员要求 + if not huiyuan_id: + # 未传递时，尝试从商品类型中获取默认会员ID + huiyuan_id_val = leixing_obj.huiyuan_id + if not huiyuan_id_val: + return Response({'code': 400, 'msg': '未指定会员且商品类型无默认会员'}) + else: + huiyuan_id_val = huiyuan_id + # 验证会员是否存在 + if not Huiyuan.objects.filter(huiyuan_id=huiyuan_id_val).exists(): + return Response({'code': 400, 'msg': '指定的会员不存在'}) + else: + # 佣金要求 + try: + yongjin_val = Decimal(yongjin_str) + if yongjin_val < 0: + return Response({'code': 400, 'msg': '佣金不能为负数'}) + except: + # 若未传递或无效，尝试从商品类型中获取默认佣金 + if leixing_obj.yongjin is not None: + yongjin_val = leixing_obj.yongjin + else: + return Response({'code': 400, 'msg': '佣金格式错误且类型无默认佣金'}) + + # 处理打手分成方式 + kaioi_ewai = False + ewai_fencheng = Decimal('0') + if fencheng_type == 'custom': + try: + ewai_fencheng = Decimal(ewai_dashou_fencheng_str) + if ewai_fencheng < 0: + return Response({'code': 400, 'msg': '自定义分成金额不能为负数'}) + kaioi_ewai = True + except: + return Response({'code': 400, 'msg': '自定义分成金额格式错误'}) + + # 图片上传处理 + tupian_url = '' + if image_file: + # 验证图片 + valid, msg = validate_image(image_file) + if not valid: + return Response({'code': 400, 'msg': f'图片无效：{msg}'}) + # 生成唯一文件名 + ext = image_file.name.split('.')[-1].lower() + if ext not in ['jpg', 'jpeg', 'png', 'gif', 'webp', 'bmp']: + return Response({'code': 400, 'msg': '不支持的图片格式'}) + timestamp = datetime.now().strftime('%Y%m%d%H%M%S') + random_str = uuid.uuid4().hex[:8] + filename = f"shangpin/shangpintupian/{timestamp}_{random_str}.{ext}" + # 上传到 OSS + uploaded_url = upload_to_oss(image_file, filename) + if not uploaded_url: + return Response({'code': 500, 'msg': '图片上传失败，请稍后重试'}) + tupian_url = filename # 存储相对路径，前端拼接域名 + else: + return Response({'code': 400, 'msg': '商品图片不能为空'}) + + # 创建商品 + try: + with transaction.atomic(): + product = Shangpin.objects.create( + biaoqian=biaoqian, + jiage=jiage, + kucun=kucun, + leixing_id=leixing_id, + zhuanqu_id=zhuanqu_id, + zhenshi_xiaoliang=0, # 初始真实销量为0 + duiwai_xiaoliang=duiwai_xiaoliang, + jieshao=jieshao, + xiadan_xuzhi=xiadan_xuzhi, + tupian_url=tupian_url, + yaoqiuleixing=yaoqiuleixing, + huiyuan_id=huiyuan_id_val, + yongjin=yongjin_val, + kaioi_ewai_dashou_fencheng=kaioi_ewai, + ewai_dashou_fencheng=ewai_fencheng, + paixu=0, # 新商品默认排序最后 + shenhezhuangtai=1, # 正常状态 + ) + except Exception as e: + logger.error(f"创建商品失败: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '创建商品失败，请稍后重试'}) + + return Response({ + 'code': 0, + 'msg': '商品发布成功', + 'data': { + 'id': product.id, + 'tupian_url': tupian_url, + } + }) + + +# houtai/views_product.py 中添加 + +class DeleteProductView(APIView): + """ + 删除商品（物理删除，同时删除OSS图片） + 权限：2200a + POST /houtai/htscsp + 参数： + username: 客服/管理员账号 + id: 商品ID + 返回： + code:0 成功 + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + product_id = request.data.get('id') + + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + if not product_id: + return Response({'code': 400, 'msg': '缺少商品ID'}) + try: + product_id = int(product_id) + except: + return Response({'code': 400, 'msg': '商品ID格式错误'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '2200a' not in permissions: + return Response({'code': 403, 'msg': '无权限管理商品'}) + + # 查询商品是否存在 + try: + product = Shangpin.objects.get(id=product_id) + except Shangpin.DoesNotExist: + return Response({'code': 404, 'msg': '商品不存在'}) + + # 先删除OSS上的图片 + tupian_url = product.tupian_url + if tupian_url: + # 调用已有的 delete_from_oss 函数 + from utils.oss_utils import delete_from_oss + delete_success = delete_from_oss(tupian_url) + if not delete_success: + logger.warning(f"删除商品图片失败: {tupian_url}, 商品ID: {product_id}") + # 注意：即使图片删除失败，也应继续删除数据库记录，避免数据不一致 + # 但可以记录日志供后续人工处理 + + # 删除数据库记录 + product.delete() + + logger.info(f"商品删除成功: id={product_id}, 图片路径={tupian_url}, 操作人={username}") + return Response({'code': 0, 'msg': '商品删除成功'}) + + + + + + + +class GetProductDetailView(APIView): + """ + 获取商品详情（包含商品类型、专区、会员列表） + 权限：2200a + POST /houtai/htsphqxq + 参数： + username: 客服/管理员账号 + id: 商品ID + 返回： + code:0, data: { product, type_list, zone_list, member_list } + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + product_id = request.data.get('id') + + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + if not product_id: + return Response({'code': 400, 'msg': '缺少商品ID'}) + try: + product_id = int(product_id) + except ValueError: + return Response({'code': 400, 'msg': '商品ID格式错误'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '2200a' not in permissions: + return Response({'code': 403, 'msg': '无权限管理商品'}) + + # 查询商品 + try: + product = Shangpin.objects.get(id=product_id) + except Shangpin.DoesNotExist: + return Response({'code': 404, 'msg': '商品不存在'}) + + # 查询所有商品类型、专区、会员（用于前端下拉选择） + type_list = list(ShangpinLeixing.objects.all().values( + 'id', 'jieshao', 'tupian_url', 'shenhezhuangtai' + )) + zone_list = list(ShangpinZhuanqu.objects.all().values( + 'id', 'mingzi', 'leixing_id', 'shenhezhuangtai' + )) + member_list = list(Huiyuan.objects.all().values( + 'huiyuan_id', 'jieshao', 'jiage' + )) + + # 构建商品返回数据 + product_data = { + 'id': product.id, + 'biaoqian': product.biaoqian, + 'jiage': str(product.jiage), + 'kucun': product.kucun, + 'leixing_id': product.leixing_id, + 'zhuanqu_id': product.zhuanqu_id, + 'zhenshi_xiaoliang': product.zhenshi_xiaoliang, + 'duiwai_xiaoliang': product.duiwai_xiaoliang, + 'jieshao': product.jieshao, + 'xiadan_xuzhi': product.xiadan_xuzhi, + 'guize_tupian': product.guize_tupian, + 'yaoqiuleixing': product.yaoqiuleixing, + 'huiyuan_id': product.huiyuan_id, + 'yongjin': str(product.yongjin) if product.yongjin is not None else None, + 'tupian_url': product.tupian_url, + 'kaioi_ewai_dashou_fencheng': product.kaioi_ewai_dashou_fencheng, + 'ewai_dashou_fencheng': str(product.ewai_dashou_fencheng) if product.ewai_dashou_fencheng is not None else '0', + 'create_time': product.create_time.isoformat() if product.create_time else None, + 'shenhezhuangtai': product.shenhezhuangtai, + } + + return Response({ + 'code': 0, + 'data': { + 'product': product_data, + 'type_list': type_list, + 'zone_list': zone_list, + 'member_list': member_list, + } + }) + + + +class UpdateProductView(APIView): + """ + 修改商品（支持商品图片和规则图片的更新） + 权限：2200a + POST /houtai/bcspxg + """ + permission_classes = [] + parser_classes = [MultiPartParser, FormParser] + + def post(self, request): + username = request.data.get('username', '').strip() + product_id = request.data.get('id') + + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + if not product_id: + return Response({'code': 400, 'msg': '缺少商品ID'}) + try: + product_id = int(product_id) + except ValueError: + return Response({'code': 400, 'msg': '商品ID格式错误'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '2200a' not in permissions: + return Response({'code': 403, 'msg': '无权限管理商品'}) + + # 使用事务，将 select_for_update 放在事务内 + with transaction.atomic(): + try: + product = Shangpin.objects.select_for_update().get(id=product_id) + except Shangpin.DoesNotExist: + return Response({'code': 404, 'msg': '商品不存在'}) + + # ---------- 1. 基础字段 ---------- + biaoqian = request.data.get('biaoqian', '').strip() + if not biaoqian: + return Response({'code': 400, 'msg': '商品标题不能为空'}) + + try: + jiage = Decimal(str(request.data.get('jiage', 0))) + if jiage <= 0: + return Response({'code': 400, 'msg': '价格必须大于0'}) + except: + return Response({'code': 400, 'msg': '价格格式错误'}) + + try: + kucun = int(request.data.get('kucun', 0)) + if kucun < 0: + return Response({'code': 400, 'msg': '库存不能为负数'}) + except: + return Response({'code': 400, 'msg': '库存格式错误'}) + + try: + duiwai_xiaoliang = int(request.data.get('duiwai_xiaoliang', 0)) + except: + duiwai_xiaoliang = 0 + + try: + leixing_id = int(request.data.get('leixing_id')) + except: + return Response({'code': 400, 'msg': '商品类型ID无效'}) + + try: + zhuanqu_id = int(request.data.get('zhuanqu_id')) + except: + return Response({'code': 400, 'msg': '商品专区ID无效'}) + + try: + yaoqiuleixing = int(request.data.get('yaoqiuleixing', 1)) + if yaoqiuleixing not in (1, 2): + raise ValueError + except: + return Response({'code': 400, 'msg': '抢单要求类型必须为1或2'}) + + try: + shenhezhuangtai = int(request.data.get('shenhezhuangtai', 1)) + except: + shenhezhuangtai = 1 + + # 校验类型和专区存在性 + if not ShangpinLeixing.objects.filter(id=leixing_id).exists(): + return Response({'code': 400, 'msg': '商品类型不存在'}) + if not ShangpinZhuanqu.objects.filter(id=zhuanqu_id, leixing_id=leixing_id).exists(): + return Response({'code': 400, 'msg': '专区不存在或不属于该类型'}) + + # ---------- 2. 会员/佣金 ---------- + huiyuan_id = None + yongjin = None + if yaoqiuleixing == 1: + huiyuan_id = request.data.get('huiyuan_id', '').strip() or None + if huiyuan_id and not Huiyuan.objects.filter(huiyuan_id=huiyuan_id).exists(): + return Response({'code': 400, 'msg': '指定的会员不存在'}) + else: + try: + yongjin = Decimal(str(request.data.get('yongjin', 0))) + if yongjin < 0: + return Response({'code': 400, 'msg': '佣金不能为负数'}) + except: + yongjin = Decimal('0') + + # ---------- 3. 打手分成 ---------- + kaioi_ewai = request.data.get('kaioi_ewai_dashou_fencheng') == 'true' + ewai_fencheng = Decimal('0') + if kaioi_ewai: + try: + ewai_fencheng = Decimal(str(request.data.get('ewai_dashou_fencheng', 0))) + if ewai_fencheng < 0: + return Response({'code': 400, 'msg': '分成金额不能为负数'}) + except: + return Response({'code': 400, 'msg': '分成金额格式错误'}) + + jieshao = request.data.get('jieshao', '').strip() + xiadan_xuzhi = request.data.get('xiadan_xuzhi', '').strip() + + # ---------- 4. 商品图片更新 ---------- + tupian_url = product.tupian_url + tupian_file = request.FILES.get('tupian_file') + if tupian_file: + valid, msg = validate_image(tupian_file) + if not valid: + return Response({'code': 400, 'msg': f'商品图片无效：{msg}'}) + ext = tupian_file.name.split('.')[-1].lower() + if ext not in ['jpg', 'jpeg', 'png', 'gif', 'webp', 'bmp']: + return Response({'code': 400, 'msg': '不支持的图片格式'}) + timestamp = datetime.now().strftime('%Y%m%d%H%M%S') + random_str = uuid.uuid4().hex[:8] + new_filename = f"shangpin/shangpintupian/{timestamp}_{random_str}.{ext}" + uploaded_url = upload_to_oss(tupian_file, new_filename) + if not uploaded_url: + return Response({'code': 500, 'msg': '商品图片上传失败'}) + if product.tupian_url: + delete_from_oss(product.tupian_url) + tupian_url = new_filename + + # ---------- 5. 规则图片更新 ---------- + guize_tupian = product.guize_tupian + guize_file = request.FILES.get('guize_file') + if guize_file: + valid, msg = validate_image(guize_file) + if not valid: + return Response({'code': 400, 'msg': f'规则图片无效：{msg}'}) + ext = guize_file.name.split('.')[-1].lower() + if ext not in ['jpg', 'jpeg', 'png', 'gif', 'webp', 'bmp']: + return Response({'code': 400, 'msg': '不支持的图片格式'}) + timestamp = datetime.now().strftime('%Y%m%d%H%M%S') + random_str = uuid.uuid4().hex[:8] + new_filename = f"shangpin/guizetupian/{timestamp}_{random_str}.{ext}" + uploaded_url = upload_to_oss(guize_file, new_filename) + if not uploaded_url: + return Response({'code': 500, 'msg': '规则图片上传失败'}) + if product.guize_tupian: + delete_from_oss(product.guize_tupian) + guize_tupian = new_filename + + # ---------- 6. 更新数据库 ---------- + product.biaoqian = biaoqian + product.jiage = jiage + product.kucun = kucun + product.duiwai_xiaoliang = duiwai_xiaoliang + product.leixing_id = leixing_id + product.zhuanqu_id = zhuanqu_id + product.yaoqiuleixing = yaoqiuleixing + product.huiyuan_id = huiyuan_id + product.yongjin = yongjin + product.kaioi_ewai_dashou_fencheng = kaioi_ewai + product.ewai_dashou_fencheng = ewai_fencheng + product.jieshao = jieshao + product.xiadan_xuzhi = xiadan_xuzhi + product.tupian_url = tupian_url + product.guize_tupian = guize_tupian + product.shenhezhuangtai = shenhezhuangtai + product.save() + + return Response({'code': 0, 'msg': '商品修改成功', 'data': {'id': product.id}}) + + + + + +class GetMemberListView(APIView): + """ + 获取会员列表 + 权限：3300a + POST /houtai/hthqhylb + 参数：username + 返回：code:0, data: { list: [...] } + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '3300a' not in permissions: + return Response({'code': 403, 'msg': '无权限查看会员列表'}) + + members = Huiyuan.objects.all().order_by('-create_time') + member_list = [] + for m in members: + member_list.append({ + 'huiyuan_id': m.huiyuan_id, + 'jieshao': m.jieshao, + 'jtjieshao': m.jtjieshao, + 'jiage': str(m.jiage), + 'guanshifc': str(m.guanshifc), + 'zuzhangfc': str(m.zuzhangfc), + 'goumai_cishu': m.goumai_cishu, + 'create_time': m.create_time.isoformat() if m.create_time else None, + 'update_time': m.update_time.isoformat() if m.update_time else None, + }) + return Response({'code': 0, 'data': {'list': member_list}}) + + +class UpdateMemberView(APIView): + """ + 修改会员信息 + 权限：3300a + POST /houtai/htxghyxx + 参数： + username, huiyuan_id, jieshao, jiage, guanshifc, zuzhangfc, jtjieshao + 返回：code:0 成功 + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + huiyuan_id = request.data.get('huiyuan_id', '').strip() + jieshao = request.data.get('jieshao', '').strip() + jiage = request.data.get('jiage') + guanshifc = request.data.get('guanshifc') + zuzhangfc = request.data.get('zuzhangfc') + jtjieshao = request.data.get('jtjieshao', '').strip() + + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + if not huiyuan_id: + return Response({'code': 400, 'msg': '缺少会员ID'}) + if not jieshao: + return Response({'code': 400, 'msg': '会员名称不能为空'}) + + try: + jiage = Decimal(str(jiage)) + guanshifc = Decimal(str(guanshifc)) + zuzhangfc = Decimal(str(zuzhangfc)) + if jiage < 0 or guanshifc < 0 or zuzhangfc < 0: + raise ValueError + except: + return Response({'code': 400, 'msg': '金额格式错误'}) + + if guanshifc + zuzhangfc > jiage: + return Response({'code': 400, 'msg': '管事分成+组长分成不能大于会员价格'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '3300a' not in permissions: + return Response({'code': 403, 'msg': '无权限修改会员'}) + + with transaction.atomic(): + try: + member = Huiyuan.objects.select_for_update().get(huiyuan_id=huiyuan_id) + except Huiyuan.DoesNotExist: + return Response({'code': 404, 'msg': '会员不存在'}) + + member.jieshao = jieshao + member.jiage = jiage + member.guanshifc = guanshifc + member.zuzhangfc = zuzhangfc + member.jtjieshao = jtjieshao + member.save() + + return Response({'code': 0, 'msg': '修改成功'}) + + + + +import random +import string + +class AddMemberView(APIView): + """ + 添加会员 + 权限：3300a + POST /houtai/httjhy + 参数： + username, jieshao, jiage, guanshifc, zuzhangfc, jtjieshao + 返回：code:0, data: { huiyuan_id } + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + jieshao = request.data.get('jieshao', '').strip() + jiage = request.data.get('jiage') + guanshifc = request.data.get('guanshifc') + zuzhangfc = request.data.get('zuzhangfc') + jtjieshao = request.data.get('jtjieshao', '').strip() + + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + if not jieshao: + return Response({'code': 400, 'msg': '会员名称不能为空'}) + + try: + jiage = Decimal(str(jiage)) + guanshifc = Decimal(str(guanshifc)) + zuzhangfc = Decimal(str(zuzhangfc)) + if jiage <= 0 or guanshifc < 0 or zuzhangfc < 0: + raise ValueError + except: + return Response({'code': 400, 'msg': '金额格式错误'}) + + if guanshifc + zuzhangfc > jiage: + return Response({'code': 400, 'msg': '管事分成+组长分成不能大于会员价格'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '3300a' not in permissions: + return Response({'code': 403, 'msg': '无权限添加会员'}) + + # 生成唯一6位会员ID（数字+字母） + def generate_huiyuan_id(): + while True: + new_id = ''.join(random.choices(string.ascii_uppercase + string.digits, k=6)) + if not Huiyuan.objects.filter(huiyuan_id=new_id).exists(): + return new_id + + with transaction.atomic(): + new_id = generate_huiyuan_id() + member = Huiyuan.objects.create( + huiyuan_id=new_id, + jieshao=jieshao, + jiage=jiage, + guanshifc=guanshifc, + zuzhangfc=zuzhangfc, + jtjieshao=jtjieshao, + goumai_cishu=0 + ) + + return Response({'code': 0, 'msg': '添加成功', 'data': {'huiyuan_id': member.huiyuan_id}}) + + + + + +class GetGuanliListView(APIView): + """ + 获取管事列表 + 权限：4400a,4400b,4400c,4400d,4400e,4400f 任一 + POST /houtai/hthqgslb + 参数： + username, keyword(可选), balance_op/balance_value, commission_op/commission_value, + invite_count_op/invite_count_value, status, page, page_size + 返回： + code:0, data: { list: [...], total } + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + + # 权限校验（需要任一权限） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + required_perms = {'4400a', '4400b', '4400c', '4400d', '4400e', '4400f'} + if not any(p in permissions for p in required_perms): + return Response({'code': 403, 'msg': '您没有权限查看管事列表'}) + + # 分页参数 + try: + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 20)) + if page < 1 or page_size < 1: + raise ValueError + except: + return Response({'code': 400, 'msg': '分页参数错误'}) + + # 筛选参数 + keyword = request.data.get('keyword', '').strip() + balance_op = request.data.get('balance_op', '').strip().lower() + balance_value = request.data.get('balance_value') + commission_op = request.data.get('commission_op', '').strip().lower() + commission_value = request.data.get('commission_value') + invite_count_op = request.data.get('invite_count_op', '').strip().lower() + invite_count_value = request.data.get('invite_count_value') + status = request.data.get('status') + + # 构建查询：从 UserMain 开始，关联 UserGuanshi 和 UserBoss（左连接获取昵称） + qs = UserMain.objects.filter( + guanshi_profile__isnull=False # 确保是管事 + ).select_related('guanshi_profile').select_related('boss_profile') + + # 关键词搜索（用户ID 或昵称来自 boss_profile.nickname） + if keyword: + qs = qs.filter( + Q(yonghuid__icontains=keyword) | + Q(boss_profile__nickname__icontains=keyword) + ) + + # 余额筛选（使用 guanshi_profile.yue） + if balance_op and balance_value is not None and balance_value != '': + try: + balance_val = Decimal(str(balance_value)) + if balance_op == 'gte': + qs = qs.filter(guanshi_profile__yue__gte=balance_val) + elif balance_op == 'lte': + qs = qs.filter(guanshi_profile__yue__lte=balance_val) + else: + return Response({'code': 400, 'msg': '余额比较符无效'}) + except: + return Response({'code': 400, 'msg': '余额数值格式错误'}) + + # 分佣总额筛选（guanshi_profile.chongzhifenrun） + if commission_op and commission_value is not None and commission_value != '': + try: + commission_val = Decimal(str(commission_value)) + if commission_op == 'gte': + qs = qs.filter(guanshi_profile__chongzhifenrun__gte=commission_val) + elif commission_op == 'lte': + qs = qs.filter(guanshi_profile__chongzhifenrun__lte=commission_val) + else: + return Response({'code': 400, 'msg': '分佣比较符无效'}) + except: + return Response({'code': 400, 'msg': '分佣数值格式错误'}) + + # 邀请打手总数筛选（guanshi_profile.yaogingshuliang） + if invite_count_op and invite_count_value is not None and invite_count_value != '': + try: + invite_val = int(invite_count_value) + if invite_count_op == 'gte': + qs = qs.filter(guanshi_profile__yaogingshuliang__gte=invite_val) + elif invite_count_op == 'lte': + qs = qs.filter(guanshi_profile__yaogingshuliang__lte=invite_val) + else: + return Response({'code': 400, 'msg': '邀请数量比较符无效'}) + except: + return Response({'code': 400, 'msg': '邀请数量格式错误'}) + + # 状态筛选 + if status is not None and status != '': + try: + status_val = int(status) + if status_val not in (0, 1): + raise ValueError + qs = qs.filter(guanshi_profile__zhuangtai=status_val) + except: + return Response({'code': 400, 'msg': '状态值无效'}) + + # 计算总数 + total = qs.count() + + # 分页 + offset = (page - 1) * page_size + users = qs.order_by('-create_time')[offset:offset + page_size] + + # 构建返回数据 + result = [] + for user in users: + guanshi = user.guanshi_profile + boss = user.boss_profile if hasattr(user, 'boss_profile') else None + result.append({ + 'yonghuid': user.yonghuid, + 'avatar': user.avatar or '', + 'nickname': boss.nickname if boss else '', + 'zhuangtai': guanshi.zhuangtai, + 'yaogingshuliang': guanshi.yaogingshuliang, + 'yue': str(guanshi.yue), + 'chongzhifenrun': str(guanshi.chongzhifenrun), + }) + + return Response({'code': 0, 'data': {'list': result, 'total': total}}) + + + + + + + + +class GetGuanliDetailView(APIView): + """ + 获取管事详情 + 权限：4400a,4400b,4400c,4400d,4400e,4400f 任一 + POST /houtai/hthqgsxq + 参数：username, yonghuid + 返回： + code:0, data: { + base: {...}, + balance: {...}, + permanent_enabled, permanent_amount, + custom_first_dividend: {}, + extra_dividend_map: {}, + all_members: [] + } + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + yonghuid = request.data.get('yonghuid', '').strip() + + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + if not yonghuid: + return Response({'code': 400, 'msg': '缺少用户ID'}) + + # 权限校验（需要任一权限） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + required_perms = {'4400a', '4400b', '4400c', '4400d', '4400e', '4400f'} + if not any(p in permissions for p in required_perms): + return Response({'code': 403, 'msg': '您没有权限查看管事详情'}) + + # 查询用户主表和管事扩展表 + try: + user = UserMain.objects.select_related('guanshi_profile', 'boss_profile').get(yonghuid=yonghuid) + guanshi = user.guanshi_profile + boss = user.boss_profile if hasattr(user, 'boss_profile') else None + except UserMain.DoesNotExist: + return Response({'code': 404, 'msg': '管事不存在'}) + except UserGuanshi.DoesNotExist: + return Response({'code': 404, 'msg': '用户不是管事'}) + + # 基础信息 + base_data = { + 'yonghuid': user.yonghuid, + 'nickname': boss.nickname if boss else '', + 'avatar': user.avatar or '', + 'dianhua': guanshi.dianhua or '', + 'wechat': guanshi.wechat or '', + 'zhuangtai': guanshi.zhuangtai, + 'yaoqingma': guanshi.yaoqingma, + 'yaoqingren': guanshi.yaoqingren, + 'invite_qrcode_url': guanshi.invite_qrcode_url or '', + 'yaogingshuliang': guanshi.yaogingshuliang, + 'jinrichongzhi': guanshi.jinrichongzhi, + 'jinyuechongzhi': guanshi.jinyuechongzhi, + 'chongzhifenrun': str(guanshi.chongzhifenrun), + 'create_time': guanshi.create_time.isoformat() if guanshi.create_time else None, + } + + # 余额提现相关 + balance_data = { + 'yue': str(guanshi.yue), + 'jinritixian_jine': str(guanshi.jinritixian_jine), + 'last_tixian_date': guanshi.last_tixian_date.isoformat() if guanshi.last_tixian_date else None, + 'kaioi_ewai_xiane': guanshi.kaioi_ewai_xiane, + 'ewai_xiane': str(guanshi.ewai_xiane), + } + + # 永久分红（二次分红） + permanent_enabled = guanshi.fenghong_erci_enabled + permanent_amount = str(guanshi.fenghong_erci) if guanshi.fenghong_erci else '0' + + # 获取所有会员（用于前端选择） + all_members = list(Huiyuan.objects.all().values('huiyuan_id', 'jieshao', 'jiage', 'guanshifc')) + for m in all_members: + m['jiage'] = str(m['jiage']) + m['guanshifc'] = str(m['guanshifc']) + + # 获取多次分红配置（按次数和会员组织） + # 查询该管事的所有多次分红记录 + duoci_records = DuociFenhong.objects.filter(yonghuid=yonghuid).order_by('cishu') + custom_first = {} # 首次分红定制（cishu=1） + extra_map = {} # 其他次数 { cishu: { huiyuan_id: { guanshi_fenhong, jieshao, jiage } } } + + for record in duoci_records: + # 获取会员信息 + member = Huiyuan.objects.filter(huiyuan_id=record.huiyuan).first() + if not member: + continue + member_info = { + 'jieshao': member.jieshao, + 'jiage': str(member.jiage), + } + if record.cishu == 1: + custom_first[record.huiyuan] = float(record.guanshi_fenhong) + else: + times = record.cishu + if times not in extra_map: + extra_map[times] = {} + extra_map[times][record.huiyuan] = { + 'guanshi_fenhong': float(record.guanshi_fenhong), + **member_info + } + + # 注意：首次分红定制只存储有定制记录的会员，没有定制的会员使用默认值（前端通过会员表展示） + # 额外次数分红按次数返回 + + return Response({ + 'code': 0, + 'data': { + 'base': base_data, + 'balance': balance_data, + 'permanent_enabled': permanent_enabled, + 'permanent_amount': permanent_amount, + 'custom_first_dividend': custom_first, + 'extra_dividend_map': extra_map, + 'all_members': all_members, + } + }) + + + + + +class UpdateGuanliView(APIView): + """ + 修改管事信息（基础信息、余额、提现限额、分红策略） + 权限细分： + - 修改状态（封禁/解封）及昵称/电话/微信：需要4400a + - 增加余额：需要4400c + - 减少余额：需要4400b + - 修改提现限额（kaioi_ewai_xiane/ewai_xiane）：需要4400e + - 修改分红相关（永久分红、定制首次、额外次数）：需要4400f + POST /houtai/htxggsxx + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + yonghuid = request.data.get('yonghuid', '').strip() + + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + if not yonghuid: + return Response({'code': 400, 'msg': '缺少用户ID'}) + + # 权限校验（先获取权限列表） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + + # 查询管事对象（不在事务外加锁，事务内加锁） + try: + user = UserMain.objects.get(yonghuid=yonghuid) + guanshi = user.guanshi_profile + boss = user.boss_profile if hasattr(user, 'boss_profile') else None + except UserMain.DoesNotExist: + return Response({'code': 404, 'msg': '用户不存在'}) + except UserGuanshi.DoesNotExist: + return Response({'code': 404, 'msg': '用户不是管事'}) + + # 开始事务，内部使用 select_for_update + with transaction.atomic(): + # 重新获取加锁对象 + user = UserMain.objects.select_for_update().get(yonghuid=yonghuid) + guanshi = user.guanshi_profile + boss = user.boss_profile if hasattr(user, 'boss_profile') else None + + # ---------- 1. 基础信息修改（需要4400a）---------- + nickname = request.data.get('nickname') + dianhua = request.data.get('dianhua') + wechat = request.data.get('wechat') + zhuangtai = request.data.get('zhuangtai') + avatar = request.data.get('avatar') + + if any(v is not None for v in [nickname, dianhua, wechat, zhuangtai, avatar]): + if '4400a' not in permissions: + return Response({'code': 403, 'msg': '无权限修改管事基础信息（需要4400a）'}) + # 处理昵称（在老板扩展表中） + if nickname is not None: + if not boss: + boss = UserBoss.objects.create(user=user, nickname=nickname) + else: + boss.nickname = nickname + boss.save() + # 处理其他字段 + if dianhua is not None: + guanshi.dianhua = dianhua + if wechat is not None: + guanshi.wechat = wechat + if zhuangtai is not None: + try: + zt = int(zhuangtai) + if zt in (0, 1): + guanshi.zhuangtai = zt + except: + pass + if avatar is not None: + user.avatar = avatar + user.save() + guanshi.save() + + # ---------- 2. 余额修改（加：4400c；减：4400b）---------- + new_yue = request.data.get('yue') + if new_yue is not None: + try: + new_yue = Decimal(str(new_yue)) + if new_yue < 0: + return Response({'code': 400, 'msg': '余额不能为负数'}) + except: + return Response({'code': 400, 'msg': '余额格式错误'}) + + old_yue = guanshi.yue + if new_yue > old_yue: + if '4400c' not in permissions: + return Response({'code': 403, 'msg': '无权限增加余额（需要4400c）'}) + elif new_yue < old_yue: + if '4400b' not in permissions: + return Response({'code': 403, 'msg': '无权限减少余额（需要4400b）'}) + guanshi.yue = new_yue + guanshi.save() + + # ---------- 3. 提现限额修改（需要4400e）---------- + kaioi_ewai = request.data.get('kaioi_ewai_xiane') + ewai_val = request.data.get('ewai_xiane') + if kaioi_ewai is not None or ewai_val is not None: + if '4400e' not in permissions: + return Response({'code': 403, 'msg': '无权限修改提现限额（需要4400e）'}) + if kaioi_ewai is not None: + guanshi.kaioi_ewai_xiane = bool(kaioi_ewai) + if ewai_val is not None: + try: + guanshi.ewai_xiane = Decimal(str(ewai_val)) + except: + return Response({'code': 400, 'msg': '额外限额金额格式错误'}) + guanshi.save() + + # ---------- 4. 分红相关修改（需要4400f）---------- + perm_enabled = request.data.get('permanent_enabled') + perm_amount = request.data.get('permanent_amount') + custom_first = request.data.get('custom_first_dividend') + extra_map = request.data.get('extra_dividend_map') + + if any(v is not None for v in [perm_enabled, perm_amount, custom_first, extra_map]): + if '4400f' not in permissions: + return Response({'code': 403, 'msg': '无权限修改分红策略（需要4400f）'}) + + # 4.1 永久分红 + if perm_enabled is not None: + guanshi.fenghong_erci_enabled = bool(perm_enabled) + if perm_amount is not None: + try: + guanshi.fenghong_erci = Decimal(str(perm_amount)) + except: + return Response({'code': 400, 'msg': '永久分红金额格式错误'}) + guanshi.save() + + # 4.2 首次定制分红（cishu=1） + if custom_first is not None and isinstance(custom_first, dict): + # 获取当前所有首次定制记录 + existing_first = DuociFenhong.objects.filter(yonghuid=yonghuid, cishu=1) + # 前端传来的定制字典 {会员ID: 金额} + for huiyuan_id, amount in custom_first.items(): + try: + amount = Decimal(str(amount)) + except: + continue + if amount <= 0: + # 金额为0或负数表示删除定制 + DuociFenhong.objects.filter(yonghuid=yonghuid, huiyuan=huiyuan_id, cishu=1).delete() + else: + DuociFenhong.objects.update_or_create( + yonghuid=yonghuid, + huiyuan=huiyuan_id, + cishu=1, + defaults={ + 'guanshi_fenhong': amount, + 'zuzhang_fenhong': Decimal('0') + } + ) + # 删除那些在前端字典中不存在的首次定制记录（即已取消定制） + for record in existing_first: + if record.huiyuan not in custom_first: + record.delete() + + # 4.3 额外次数分红（cishu >= 2） + if extra_map is not None and isinstance(extra_map, dict): + # 收集需要保留的记录 + keep_set = set() + for times_str, members in extra_map.items(): + try: + cishu = int(times_str) + if cishu < 2: + continue + except: + continue + if not isinstance(members, dict): + continue + for huiyuan_id, data in members.items(): + if not isinstance(data, dict): + continue + amount = data.get('guanshi_fenhong') + if amount is None: + continue + try: + amount = Decimal(str(amount)) + except: + continue + keep_set.add((cishu, huiyuan_id)) + # 更新或创建 + DuociFenhong.objects.update_or_create( + yonghuid=yonghuid, + huiyuan=huiyuan_id, + cishu=cishu, + defaults={ + 'guanshi_fenhong': amount, + 'zuzhang_fenhong': Decimal('0') + } + ) + # 删除不在 keep_set 中的额外次数记录 + existing_extra = DuociFenhong.objects.filter(yonghuid=yonghuid, cishu__gte=2) + for record in existing_extra: + if (record.cishu, record.huiyuan) not in keep_set: + record.delete() + + return Response({'code': 0, 'msg': '修改成功'}) + + + + + + + + + + +class GetWithdrawSettingsView(APIView): + """ + 获取提现设置（手续费利率、每日限额、当日已提现总额） + 权限：需要 5500a 或 5500b 或 5500c 任一 + POST /houtai/hthqtxpz + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + # 需要5500a/b/c任一 + if not any(p in permissions for p in ('5500a', '5500b', '5500c')): + return Response({'code': 403, 'msg': '无权限查看提现设置'}) + + # 1. 手续费利率（Lilubiao：5打手/6管事/8组长/9审核官/10商家/11打手押金） + rate_map = {} + for leixing, code in [(1, '5'), (2, '6'), (3, '8'), (4, '9'), (5, '11'), (6, '10')]: + obj = Lilubiao.objects.filter(fadanpingtai=code).first() + rate_map[leixing] = float(obj.lilu) if obj and obj.lilu is not None else 0.0 + + # 1b. 订单/押金分红费率（Lilubiao：1平台订单/3商家订单/12押金管事/13商家订单管事分红） + order_rate_map = {} + for leixing, code in [(1, '1'), (3, '3'), (12, '12'), (13, '13')]: + obj = Lilubiao.objects.filter(fadanpingtai=code).first() + order_rate_map[leixing] = float(obj.lilu) if obj and obj.lilu is not None else 0.0 + + # 2. 个人每日限额 (leixing=1,2,3) + quota_map = {} + for leixing in [1, 2, 3]: + obj = TixianQuotaDefault.objects.filter(leixing=leixing).first() + quota_map[leixing] = float(obj.default_quota) if obj else 20.0 + + # 3. 每日总限额（提现类型1~6 → 配置表4~9） + total_limit_map = {} + for withdraw_leixing, quota_leixing in [(1, 4), (2, 5), (3, 6), (4, 7), (5, 8), (6, 9)]: + obj = TixianQuotaDefault.objects.filter(leixing=quota_leixing).first() + total_limit_map[withdraw_leixing] = float(obj.default_quota) if obj else 0.0 + + # 4. 当日已提现总额（按提现类型 leixing 1~6） + today = date.today() + today_totals = {i: 0.0 for i in range(1, 7)} + records = TixianRiTongji.objects.filter(riqi=today) + for rec in records: + if rec.leixing in today_totals: + today_totals[rec.leixing] = float(rec.total_amount) + + # 🆕 获取提现模式（自动1 / 手动2），默认2 + from peizhi.models import WithdrawConfig # 确保导入模型 + config = WithdrawConfig.objects.filter(id=1).first() + withdraw_mode = config.mode if config else 2 + + return Response({ + 'code': 0, + 'data': { + 'withdraw_mode': withdraw_mode, + 'rates': rate_map, + 'order_rates': order_rate_map, + 'quotas': quota_map, + 'total_limits': total_limit_map, + 'today_totals': today_totals, + } + }) + + +class UpdateWithdrawSettingsView(APIView): + """ + 修改提现设置（权限细分）： + - 修改打手相关（利率、个人限额、总限额）需要5500a + - 修改管事相关需要5500b + - 修改组长相关需要5500c + 注意：修改每日总限额时，会联动影响“当日已提现总额”的显示（由前端实时计算）， + 后端不直接修改 TixianRiTongji，该表由提现流程自动累加。 + POST /houtai/htxgtxsz + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + + # 权限映射：要修改的角色需要对应的权限 + # 前端传来 rates, quotas, total_limits 三个对象，每个包含 1,2,3 + rates = request.data.get('rates', {}) + order_rates = request.data.get('order_rates', request.data.get('commission_rates', {})) + quotas = request.data.get('quotas', {}) + total_limits = request.data.get('total_limits', {}) + + # 角色类型映射 + role_perms = {1: '5500a', 2: '5500b', 3: '5500c'} + # 利率代码映射（1-3 有水缸限额；4审核官/5打手押金/6商家余额仅费率） + rate_code_map = {1: '5', 2: '6', 3: '8', 4: '9', 5: '11', 6: '10'} + # 订单/押金分红（1平台订单/3商家订单/12押金管事/13商家订单管事分红） + order_rate_code_map = {1: '1', 3: '3', 12: '12', 13: '13'} + # 总限额：提现类型 → TixianQuotaDefault.leixing（4~9） + total_code_map = {1: 4, 2: 5, 3: 6, 4: 7, 5: 8, 6: 9} + + def _rate_key_present(data, role): + return (str(role) in data and data[str(role)] is not None) or \ + (role in data and data[role] is not None) + + with transaction.atomic(): + # 遍历三个角色（限额相关） + for role in [1, 2, 3]: + perm_needed = role_perms[role] + if perm_needed not in permissions: + if _rate_key_present(rates, role) or \ + (str(role) in quotas and quotas[str(role)] is not None) or \ + (role in quotas and quotas.get(role) is not None) or \ + (str(role) in total_limits and total_limits[str(role)] is not None) or \ + (role in total_limits and total_limits.get(role) is not None): + return Response({'code': 403, 'msg': f'无权限修改{["","打手","管事","组长"][role]}相关设置（需要{perm_needed}）'}) + + # 其他提现手续费（审核官/打手押金/商家余额）：需 5500a/b/c 任一 + extra_role_names = {4: '考核官', 5: '打手押金', 6: '商家余额'} + for role in [4, 5, 6]: + if _rate_key_present(rates, role) and not any(p in permissions for p in ('5500a', '5500b', '5500c')): + return Response({'code': 403, 'msg': f'无权限修改{extra_role_names[role]}提现手续费率'}) + if (str(role) in total_limits and total_limits[str(role)] is not None) or \ + (role in total_limits and total_limits.get(role) is not None): + if not any(p in permissions for p in ('5500a', '5500b', '5500c')): + return Response({'code': 403, 'msg': f'无权限修改{extra_role_names[role]}总限额'}) + + # 订单/押金分红费率：需 5500a/b/c 任一 + for role in [1, 3, 12, 13]: + if _rate_key_present(order_rates, role) and not any(p in permissions for p in ('5500a', '5500b', '5500c')): + order_names = { + 1: '平台订单打手分红', 3: '商家订单打手分红', + 12: '押金管事分红', 13: '管事订单分红', + } + return Response({'code': 403, 'msg': f'无权限修改{order_names[role]}费率'}) + + # 1. 修改手续费利率 + for role in [1, 2, 3, 4, 5, 6]: + val = rates.get(str(role), rates.get(role)) + if val is not None: + rate = Decimal(str(val)) + code = rate_code_map[role] + obj, created = Lilubiao.objects.select_for_update().get_or_create( + fadanpingtai=code, + defaults={'lilu': rate} + ) + if not created: + obj.lilu = rate + obj.save() + + # 1b. 修改订单/押金分红费率 + for role in [1, 3, 12, 13]: + val = order_rates.get(str(role), order_rates.get(role)) + if val is not None: + rate = Decimal(str(val)) + code = order_rate_code_map[role] + obj, created = Lilubiao.objects.select_for_update().get_or_create( + fadanpingtai=code, + defaults={'lilu': rate} + ) + if not created: + obj.lilu = rate + obj.save() + + # 2. 修改个人每日限额 + for role in [1, 2, 3]: + if str(role) in quotas: + val = quotas[str(role)] + if val is not None: + quota = Decimal(str(val)) + obj, created = TixianQuotaDefault.objects.select_for_update().get_or_create( + leixing=role, + defaults={'default_quota': quota} + ) + if not created: + obj.default_quota = quota + obj.save() + + # 3. 修改每日总限额（1打手/2管事/3组长/4考核官/5押金/6商家） + for role in [1, 2, 3, 4, 5, 6]: + val = total_limits.get(str(role), total_limits.get(role)) + if val is not None: + limit = Decimal(str(val)) + code = total_code_map[role] + obj, created = TixianQuotaDefault.objects.select_for_update().get_or_create( + leixing=code, + defaults={'default_quota': limit} + ) + if not created: + obj.default_quota = limit + obj.save() + + # 🆕 修改提现模式（有5500a/b/c任一即可） + from peizhi.models import WithdrawConfig + withdraw_mode = request.data.get('withdraw_mode') + if withdraw_mode is not None: + if not any(p in permissions for p in ('5500a', '5500b', '5500c')): + return Response({'code': 403, 'msg': '无权限修改提现模式'}) + # 更新或创建 id=1 的配置 + WithdrawConfig.objects.update_or_create( + id=1, + defaults={'mode': int(withdraw_mode)} + ) + + # 注意：TixianRiTongji 表由提现流程自动更新，此处不直接修改 + return Response({'code': 0, 'msg': '设置修改成功'}) + + + + + +class GetZuzhangListView(APIView): + """ + 组长列表接口（分页 + 多条件筛选） + 路由：POST /houtai/hthqzzlb + 权限：需要登录，且拥有 6600a~6600e 任一权限 + """ + permission_classes = [IsAuthenticated] + + @transaction.atomic # 保证查询的一致性（可选，对只读查询影响不大但无坏处） + def post(self, request): + # 1. 获取前端传递的 username（用于防越权） + frontend_username = request.data.get('username', '') + + # 2. 调用公共校验方法，验证身份并获取权限列表 + result = verify_kefu_permission(request, username_from_frontend=frontend_username) + + # 重要：verify_kefu_permission 返回格式为 (user_obj, permissions_list) 或 (None, Response) + # 如果第二个元素是 Response 对象，说明校验失败，直接返回该 Response + if isinstance(result, tuple) and len(result) == 2: + user_obj, second = result + if isinstance(second, Response): + return second # 校验失败，直接返回错误响应 + else: + permissions = second # 正常情况：permissions 是列表 + else: + # 防止意外返回格式，视为失败 + return Response({'code': 500, 'msg': '权限校验模块异常'}) + + # 3. 检查是否拥有组长管理所需权限（6600a ~ 6600e 任一） + required_perms = ['6600a', '6600b', '6600c', '6600d', '6600e'] + if not any(perm in permissions for perm in required_perms): + logger.warning(f"用户 {request.user.phone} 尝试访问组长列表但缺少必要权限，已有权限: {permissions}") + return Response({'code': 403, 'msg': '您无权访问组长管理页面'}) + + # 4. 提取请求参数（分页 + 筛选） + try: + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 20)) + except ValueError: + page, page_size = 1, 20 + + keyword = request.data.get('keyword', '').strip() + status = request.data.get('status') # 1=正常, 0=禁用 + invite_count_op = request.data.get('invite_count_op') # gte / lte + invite_count_value = request.data.get('invite_count_value') + amount_op = request.data.get('amount_op') + amount_value = request.data.get('amount_value') + commission_op = request.data.get('commission_op') + commission_value = request.data.get('commission_value') + + # 5. 构建基础 QuerySet（预加载关联表） + queryset = UserZuzhang.objects.select_related('user', 'user__boss_profile').all() + + # 6. 应用筛选条件（使用 ORM 安全过滤） + if keyword: + queryset = queryset.filter( + Q(user__yonghuid__icontains=keyword) | + Q(user__boss_profile__nickname__icontains=keyword) + ) + + if status is not None and status != '': + try: + queryset = queryset.filter(zhuangtai=int(status)) + except ValueError: + pass + + # 邀请总数筛选 + if invite_count_value not in (None, ''): + try: + val = float(invite_count_value) + op = invite_count_op if invite_count_op in ('gte', 'lte') else 'gte' + queryset = queryset.filter(**{f'yaoqing_zongshu__{op}': val}) + except (ValueError, TypeError): + pass + + # 可提现金额筛选 + if amount_value not in (None, ''): + try: + val = float(amount_value) + op = amount_op if amount_op in ('gte', 'lte') else 'gte' + queryset = queryset.filter(**{f'ketixian_jine__{op}': val}) + except (ValueError, TypeError): + pass + + # 分佣总额筛选 + if commission_value not in (None, ''): + try: + val = float(commission_value) + op = commission_op if commission_op in ('gte', 'lte') else 'gte' + queryset = queryset.filter(**{f'fenyong_zonge__{op}': val}) + except (ValueError, TypeError): + pass + + # 7. 总数统计 + total = queryset.count() + + # 8. 分页 + offset = (page - 1) * page_size + paged_queryset = queryset[offset:offset + page_size] + + # 9. 构造返回数据 + data_list = [] + for zu in paged_queryset: + user = zu.user + nickname = '' + if hasattr(user, 'boss_profile') and user.boss_profile: + nickname = user.boss_profile.nickname or '' + + data_list.append({ + 'yonghuid': user.yonghuid, + 'avatar': user.avatar or '', + 'nickname': nickname, + 'fenyong_zonge': float(zu.fenyong_zonge), + 'ketixian_jine': float(zu.ketixian_jine), + 'yaoqing_zongshu': zu.yaoqing_zongshu, + 'zhuangtai': zu.zhuangtai, + }) + + return Response({ + 'code': 0, + 'msg': 'success', + 'data': { + 'list': data_list, + 'total': total, + } + }) + + + + + + + + + + +class GetZuzhangDetailView(APIView): + """ + 获取组长详情 + 权限：6600a,6600b,6600c,6600d,6600e 任一 + POST /houtai/hthqzzxq + 参数：username, yonghuid + 返回： + code:0, data: { + base: {...}, + balance: {...}, + permanent_enabled, permanent_amount, + custom_first_dividend: {}, + extra_dividend_map: {}, + all_members: [] + } + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + yonghuid = request.data.get('yonghuid', '').strip() + + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + if not yonghuid: + return Response({'code': 400, 'msg': '缺少用户ID'}) + + # 权限校验（需要任一权限） + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + required_perms = {'6600a', '6600b', '6600c', '6600d', '6600e'} + if not any(p in permissions for p in required_perms): + return Response({'code': 403, 'msg': '您没有权限查看组长详情'}) + + # 查询组长主表、扩展表、老板扩展表（昵称） + try: + user = UserMain.objects.select_related('zuzhang_profile', 'boss_profile').get(yonghuid=yonghuid) + zuzhang = user.zuzhang_profile + boss = user.boss_profile if hasattr(user, 'boss_profile') else None + except UserMain.DoesNotExist: + return Response({'code': 404, 'msg': '组长不存在'}) + except UserZuzhang.DoesNotExist: + return Response({'code': 404, 'msg': '用户不是组长'}) + + # 基础信息 + base_data = { + 'yonghuid': user.yonghuid, + 'nickname': boss.nickname if boss else '', + 'avatar': user.avatar or '', + 'dianhua': '', # 组长表无电话字段？组长扩展表没有电话/微信，但前端可能需要，可从UserMain关联？实际上组长表无电话字段，这里留空或从其他表获取 + 'wechat': '', + 'zhuangtai': zuzhang.zhuangtai, + 'yaoqingma': zuzhang.yaoqingma, + 'yaoqingren': '', # 组长表没有邀请人字段 + 'haibao_url': zuzhang.haibao_url or '', + 'yaoqing_zongshu': zuzhang.yaoqing_zongshu, + 'jinri_fenyong': str(zuzhang.jinri_fenyong), + 'jinyue_fenyong': str(zuzhang.jinyue_fenyong), + 'fenyong_zonge': str(zuzhang.fenyong_zonge), + 'create_time': zuzhang.create_time.isoformat() if zuzhang.create_time else None, + } + + # 余额提现相关 + balance_data = { + 'ketixian_jine': str(zuzhang.ketixian_jine), + 'jinri_tixian': str(zuzhang.jinri_tixian), + 'last_tixian_time': zuzhang.last_tixian_time.isoformat() if zuzhang.last_tixian_time else None, + 'kaioi_ewai_tixian': zuzhang.kaioi_ewai_tixian, + 'ewai_tixian_xiane': str(zuzhang.ewai_tixian_xiane), + } + + # 永久分红（额外分红开关和金额） + permanent_enabled = zuzhang.kaioi_ewai_fenhong + permanent_amount = str(zuzhang.ewai_fenhong_jine) if zuzhang.ewai_fenhong_jine else '0' + + # 获取所有会员（用于前端选择） + all_members = list(Huiyuan.objects.all().values('huiyuan_id', 'jieshao', 'jiage', 'zuzhangfc')) + for m in all_members: + m['jiage'] = str(m['jiage']) + m['zuzhangfc'] = str(m['zuzhangfc']) + + # 获取多次分红配置（按次数和会员组织） + duoci_records = DuociFenhong.objects.filter(yonghuid=yonghuid).order_by('cishu') + custom_first = {} # 首次分红定制（cishu=1） + extra_map = {} # 其他次数 { cishu: { huiyuan_id: { zuzhang_fenhong, jieshao, jiage } } } + + for record in duoci_records: + # 获取会员信息 + member = Huiyuan.objects.filter(huiyuan_id=record.huiyuan).first() + if not member: + continue + member_info = { + 'jieshao': member.jieshao, + 'jiage': str(member.jiage), + } + if record.cishu == 1: + custom_first[record.huiyuan] = float(record.zuzhang_fenhong) + else: + times = record.cishu + if times not in extra_map: + extra_map[times] = {} + extra_map[times][record.huiyuan] = { + 'zuzhang_fenhong': float(record.zuzhang_fenhong), + **member_info + } + + return Response({ + 'code': 0, + 'data': { + 'base': base_data, + 'balance': balance_data, + 'permanent_enabled': permanent_enabled, + 'permanent_amount': permanent_amount, + 'custom_first_dividend': custom_first, + 'extra_dividend_map': extra_map, + 'all_members': all_members, + } + }) + + + + +class UpdateZuzhangView(APIView): + """ + 修改组长信息（基础信息、余额、提现限额、分红策略） + 权限细分： + - 增加可提现金额：6600a + - 减少可提现金额：6600b + - 修改状态（封禁/解封）：6600c + - 修改提现限额（kaioi_ewai_tixian/ewai_tixian_xiane）：6600d + - 修改分红相关（永久分红、定制首次、额外次数）：6600e + POST /houtai/htxgzzxx + 参数： + username, yonghuid, + nickname, avatar, dianhua, wechat, zhuangtai, # 基础 + ketixian_jine, kaioi_ewai_tixian, ewai_tixian_xiane, # 余额提现 + permanent_enabled, permanent_amount, # 永久分红 + custom_first_dividend: {}, # 首次定制分红 {会员ID: 金额} + extra_dividend_map: {} # 额外次数分红 {次数: {会员ID: {zuzhang_fenhong}}} + """ + permission_classes = [] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + yonghuid = request.data.get('yonghuid', '').strip() + + if not username: + return Response({'code': 401, 'msg': '缺少username'}) + if not yonghuid: + return Response({'code': 400, 'msg': '缺少用户ID'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + + # 查询组长对象 + try: + user = UserMain.objects.get(yonghuid=yonghuid) + zuzhang = user.zuzhang_profile + boss = user.boss_profile if hasattr(user, 'boss_profile') else None + except UserMain.DoesNotExist: + return Response({'code': 404, 'msg': '用户不存在'}) + except UserZuzhang.DoesNotExist: + return Response({'code': 404, 'msg': '用户不是组长'}) + + # 获取原始数据（用于对比金额变化） + old_ketixian_jine = zuzhang.ketixian_jine + + # 开始事务 + with transaction.atomic(): + # ---------- 1. 基础信息修改（需要6600c？按需求，基础信息修改通常用6600c，但为了安全，暂不校验，如有需要可加）---------- + nickname = request.data.get('nickname', '').strip() + avatar = request.data.get('avatar', '').strip() + dianhua = request.data.get('dianhua', '').strip() + wechat = request.data.get('wechat', '').strip() + zhuangtai = request.data.get('zhuangtai') + # 状态修改需要6600c + if zhuangtai is not None: + if '6600c' not in permissions: + return Response({'code': 403, 'msg': '无权限修改组长状态（需要6600c）'}) + try: + zt = int(zhuangtai) + if zt in (0, 1): + zuzhang.zhuangtai = zt + except: + pass + if nickname: + if not boss: + boss = UserBoss.objects.create(user=user, nickname=nickname) + else: + boss.nickname = nickname + boss.save() + if avatar: + user.avatar = avatar + user.save() + # 组长表没有电话/微信字段，如需存储可暂存到UserMain或忽略 + # 这里不处理 + + # ---------- 2. 可提现金额修改（加：6600a；减：6600b）---------- + new_ketixian_jine = request.data.get('ketixian_jine') + if new_ketixian_jine is not None: + try: + new_val = Decimal(str(new_ketixian_jine)) + if new_val < 0: + return Response({'code': 400, 'msg': '可提现金额不能为负数'}) + except: + return Response({'code': 400, 'msg': '金额格式错误'}) + if new_val > old_ketixian_jine: + if '6600a' not in permissions: + return Response({'code': 403, 'msg': '无权限增加可提现金额（需要6600a）'}) + elif new_val < old_ketixian_jine: + if '6600b' not in permissions: + return Response({'code': 403, 'msg': '无权限减少可提现金额（需要6600b）'}) + zuzhang.ketixian_jine = new_val + zuzhang.save(update_fields=['ketixian_jine']) + + # ---------- 3. 提现限额修改（需要6600d）---------- + kaioi_ewai = request.data.get('kaioi_ewai_tixian') + ewai_val = request.data.get('ewai_tixian_xiane') + if kaioi_ewai is not None or ewai_val is not None: + if '6600d' not in permissions: + return Response({'code': 403, 'msg': '无权限修改提现限额（需要6600d）'}) + if kaioi_ewai is not None: + zuzhang.kaioi_ewai_tixian = bool(kaioi_ewai) + if ewai_val is not None: + try: + zuzhang.ewai_tixian_xiane = Decimal(str(ewai_val)) + except: + return Response({'code': 400, 'msg': '额外限额金额格式错误'}) + zuzhang.save() + + # ---------- 4. 分红相关修改（需要6600e）---------- + perm_enabled = request.data.get('permanent_enabled') + perm_amount = request.data.get('permanent_amount') + custom_first = request.data.get('custom_first_dividend') + extra_map = request.data.get('extra_dividend_map') + + if any(v is not None for v in [perm_enabled, perm_amount, custom_first, extra_map]): + if '6600e' not in permissions: + return Response({'code': 403, 'msg': '无权限修改分红策略（需要6600e）'}) + + # 4.1 永久分红（额外分红开关和金额） + if perm_enabled is not None: + zuzhang.kaioi_ewai_fenhong = bool(perm_enabled) + if perm_amount is not None: + try: + zuzhang.ewai_fenhong_jine = Decimal(str(perm_amount)) + except: + return Response({'code': 400, 'msg': '永久分红金额格式错误'}) + zuzhang.save() + + # 4.2 首次定制分红（cishu=1） + if custom_first is not None and isinstance(custom_first, dict): + existing_first = DuociFenhong.objects.filter(yonghuid=yonghuid, cishu=1) + for huiyuan_id, amount in custom_first.items(): + try: + amount = Decimal(str(amount)) + except: + continue + if amount <= 0: + # 删除定制（恢复默认） + DuociFenhong.objects.filter(yonghuid=yonghuid, huiyuan=huiyuan_id, cishu=1).delete() + else: + DuociFenhong.objects.update_or_create( + yonghuid=yonghuid, + huiyuan=huiyuan_id, + cishu=1, + defaults={ + 'zuzhang_fenhong': amount, + 'guanshi_fenhong': Decimal('0') # 组长表只关心组长分红 + } + ) + # 删除那些在前端字典中不存在的首次定制记录（即已取消定制） + for record in existing_first: + if record.huiyuan not in custom_first: + record.delete() + + # 4.3 额外次数分红（cishu >= 2） + if extra_map is not None and isinstance(extra_map, dict): + keep_set = set() + for times_str, members in extra_map.items(): + try: + cishu = int(times_str) + if cishu < 2: + continue + except: + continue + if not isinstance(members, dict): + continue + for huiyuan_id, data in members.items(): + if not isinstance(data, dict): + continue + amount = data.get('zuzhang_fenhong') + if amount is None: + continue + try: + amount = Decimal(str(amount)) + except: + continue + keep_set.add((cishu, huiyuan_id)) + DuociFenhong.objects.update_or_create( + yonghuid=yonghuid, + huiyuan=huiyuan_id, + cishu=cishu, + defaults={ + 'zuzhang_fenhong': amount, + 'guanshi_fenhong': Decimal('0') + } + ) + # 删除不在 keep_set 中的额外次数记录 + existing_extra = DuociFenhong.objects.filter(yonghuid=yonghuid, cishu__gte=2) + for record in existing_extra: + if (record.cishu, record.huiyuan) not in keep_set: + record.delete() + + # 保存组长其他可能修改的字段（例如电话、微信没有，忽略） + + return Response({'code': 0, 'msg': '修改成功'}) + + + + +class GetProductTypeZoneView(APIView): + """ + 获取商品类型、专区及会员列表 + 权限：需要拥有 7007a + 请求：POST /houtai/hthqsplxzq + 参数：{"username": "客服手机号"} + 返回： + code: 0 + data: { + type_list: [{id, jieshao, tupian_url, yaoqiuleixing, huiyuan_id, yongjin, shenhezhuangtai, is_cross_enabled, paixu, product_count}, ...], + zone_list: [{id, mingzi, leixing_id, shenhezhuangtai, paixu}, ...], + member_list: [{huiyuan_id, jieshao, jiage}, ...] + } + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '7007a' not in permissions: + return Response({'code': 403, 'msg': '您无权访问此页面'}) + + # 查询所有商品类型（含专区数量） + types = ShangpinLeixing.objects.all().order_by('-paixu') # paixu 越大越靠前 + type_list = [] + for t in types: + # 统计该类型下的专区数量 + zone_count = ShangpinZhuanqu.objects.filter(leixing_id=t.id).count() + type_list.append({ + 'id': t.id, + 'jieshao': t.jieshao or '', + 'tupian_url': t.tupian_url or '', + 'yaoqiuleixing': t.yaoqiuleixing, + 'huiyuan_id': t.huiyuan_id or '', + 'yongjin': float(t.yongjin) if t.yongjin is not None else None, + 'shenhezhuangtai': t.shenhezhuangtai, + 'is_cross_enabled': t.is_cross_enabled, + 'is_special_type': t.is_special_type, + 'paixu': t.paixu, + 'product_count': zone_count, + }) + + # 查询所有专区 + zones = ShangpinZhuanqu.objects.all().order_by('-paixu') + zone_list = [ + { + 'id': z.id, + 'mingzi': z.mingzi or '', + 'leixing_id': z.leixing_id, + 'shenhezhuangtai': z.shenhezhuangtai, + 'paixu': z.paixu, + } + for z in zones + ] + + # 查询所有会员（只返回 id、介绍、价格） + members = Huiyuan.objects.all().values('huiyuan_id', 'jieshao', 'jiage') + member_list = [ + { + 'huiyuan_id': m['huiyuan_id'], + 'jieshao': m['jieshao'], + 'jiage': float(m['jiage']), + } + for m in members + ] + + return Response({ + 'code': 0, + 'data': { + 'type_list': type_list, + 'zone_list': zone_list, + 'member_list': member_list, + } + }) + + + + + + + + +'''class ModifyProductTypeZoneView(APIView): + """ + 统一修改商品类型/专区（增、删、改） + 权限：需要拥有 7007a + 请求：POST /houtai/htxgsplx + 支持 multipart/form-data 和 application/json + 参数（通用）： + username: 客服账号 + type: 'leixing' 或 'zhuanqu' + action: 'add' / 'update' / 'delete' + 类型专用参数： + - add/update: id (update时必填), jieshao, tupian_url(可不上传), file(图片文件), yaoqiuleixing, huiyuan_id, yongjin, shenhezhuangtai, is_cross_enabled, sync_to_products (可选) + - delete: id, delete_products (布尔) + 专区专用参数： + - add/update: id (update时必填), mingzi, leixing_id, shenhezhuangtai + - delete: id, delete_products (布尔) + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser, MultiPartParser, FormParser] + + def post(self, request): + username = request.data.get('username', '').strip() + obj_type = request.data.get('type') # 'leixing' 或 'zhuanqu' + action = request.data.get('action') # 'add', 'update', 'delete' + + if not username or not obj_type or not action: + return Response({'code': 400, 'msg': '缺少必要参数'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '7007a' not in permissions: + return Response({'code': 403, 'msg': '您无权进行此操作'}) + + if obj_type == 'leixing': + return self.handle_leixing(request, action) + elif obj_type == 'zhuanqu': + return self.handle_zhuanqu(request, action) + else: + return Response({'code': 400, 'msg': '无效的type参数'}) + + # ---------- 商品类型处理 ---------- + def handle_leixing(self, request, action): + if action == 'add': + return self.add_leixing(request) + elif action == 'update': + return self.update_leixing(request) + elif action == 'delete': + return self.delete_leixing(request) + else: + return Response({'code': 400, 'msg': '无效的action'}) + + def add_leixing(self, request): + # 获取表单字段 + jieshao = request.data.get('jieshao', '').strip() + yaoqiuleixing = request.data.get('yaoqiuleixing') + huiyuan_id = request.data.get('huiyuan_id', '').strip() or None + yongjin = request.data.get('yongjin') + shenhezhuangtai = request.data.get('shenhezhuangtai', 1) + is_cross_enabled = request.data.get('is_cross_enabled', False) + image_file = request.FILES.get('file') # 上传的图片文件 + + if not jieshao: + return Response({'code': 400, 'msg': '类型名称不能为空'}) + if yaoqiuleixing not in [1, 2]: + return Response({'code': 400, 'msg': '抢单要求类型无效'}) + if not image_file: + return Response({'code': 400, 'msg': '请上传类型图片'}) + + # 校验图片 + try: + from utils.oss_utils import validate_image + valid, msg = validate_image(image_file) + if not valid: + return Response({'code': 400, 'msg': msg}) + except ImportError: + pass + + # 上传图片到OSS + ext = image_file.name.split('.')[-1].lower() + new_filename = f"{uuid.uuid4().hex}.{ext}" + oss_path = f"a_long/shangpin/shangpinleixing/{new_filename}" + url = upload_to_oss(image_file, oss_path) + if not url: + return Response({'code': 500, 'msg': '图片上传失败'}) + + # 创建类型 + try: + with transaction.atomic(): + leixing = ShangpinLeixing.objects.create( + jieshao=jieshao, + tupian_url=oss_path, # 存储相对路径 + yaoqiuleixing=yaoqiuleixing, + huiyuan_id=huiyuan_id, + yongjin=Decimal(yongjin) if yongjin else None, + shenhezhuangtai=int(shenhezhuangtai), + is_cross_enabled=is_cross_enabled in [True, 'true', '1'], + paixu=0 # 新添加的类型排序默认0，前端可再调整 + ) + return Response({'code': 0, 'msg': '添加成功', 'data': {'id': leixing.id}}) + except Exception as e: + logger.error(f"添加类型失败: {e}", exc_info=True) + # 删除已上传的图片 + delete_from_oss(oss_path) + return Response({'code': 500, 'msg': '数据库错误'}) + + def update_leixing(self, request): + type_id = request.data.get('id') + if not type_id: + return Response({'code': 400, 'msg': '缺少类型ID'}) + try: + leixing = ShangpinLeixing.objects.get(id=type_id) + except ShangpinLeixing.DoesNotExist: + return Response({'code': 404, 'msg': '类型不存在'}) + + # 收集修改字段 + changes = {} + jieshao = request.data.get('jieshao') + if jieshao is not None and jieshao != leixing.jieshao: + changes['jieshao'] = jieshao.strip() + + yaoqiuleixing = request.data.get('yaoqiuleixing') + if yaoqiuleixing is not None and int(yaoqiuleixing) != leixing.yaoqiuleixing: + changes['yaoqiuleixing'] = int(yaoqiuleixing) + + huiyuan_id = request.data.get('huiyuan_id', '').strip() or None + if huiyuan_id != leixing.huiyuan_id: + changes['huiyuan_id'] = huiyuan_id + + yongjin = request.data.get('yongjin') + if yongjin is not None: + new_yongjin = Decimal(yongjin) if yongjin else None + if new_yongjin != leixing.yongjin: + changes['yongjin'] = new_yongjin + + shenhezhuangtai = request.data.get('shenhezhuangtai') + if shenhezhuangtai is not None and int(shenhezhuangtai) != leixing.shenhezhuangtai: + changes['shenhezhuangtai'] = int(shenhezhuangtai) + + is_cross = request.data.get('is_cross_enabled') + if is_cross is not None: + new_cross = is_cross in [True, 'true', '1'] + if new_cross != leixing.is_cross_enabled: + changes['is_cross_enabled'] = new_cross + + # 图片处理 + image_file = request.FILES.get('file') + old_image_path = leixing.tupian_url + if image_file: + # 验证并上传新图片 + try: + from utils.oss_utils import validate_image + valid, msg = validate_image(image_file) + if not valid: + return Response({'code': 400, 'msg': msg}) + except ImportError: + pass + ext = image_file.name.split('.')[-1].lower() + new_filename = f"{uuid.uuid4().hex}.{ext}" + oss_path = f"a_long/shangpin/shangpinleixing/{new_filename}" + url = upload_to_oss(image_file, oss_path) + if not url: + return Response({'code': 500, 'msg': '图片上传失败'}) + changes['tupian_url'] = oss_path + + if not changes and not image_file: + return Response({'code': 400, 'msg': '未做任何修改'}) + + # 执行更新 + sync_to_products = request.data.get('sync_to_products') in [True, 'true', '1'] + try: + with transaction.atomic(): + # 更新类型 + for field, value in changes.items(): + setattr(leixing, field, value) + leixing.save() + + # 如果修改了抢单要求相关字段且需要同步商品 + if sync_to_products and ('yaoqiuleixing' in changes or 'huiyuan_id' in changes or 'yongjin' in changes): + # 更新所有关联此类型的商品 + product_updates = {} + if 'yaoqiuleixing' in changes: + product_updates['yaoqiuleixing'] = changes['yaoqiuleixing'] + if 'huiyuan_id' in changes: + product_updates['huiyuan_id'] = changes['huiyuan_id'] + if 'yongjin' in changes: + product_updates['yongjin'] = changes['yongjin'] + Shangpin.objects.filter(leixing_id=type_id).update(**product_updates) + + # 删除旧图片（新图片上传成功后才删除） + if image_file and old_image_path: + delete_from_oss(old_image_path) + + return Response({'code': 0, 'msg': '修改成功'}) + except Exception as e: + logger.error(f"更新类型失败: {e}", exc_info=True) + # 如果上传了新图片，尝试删除 + if image_file and 'oss_path' in locals(): + delete_from_oss(oss_path) + return Response({'code': 500, 'msg': '修改失败'}) + + def delete_leixing(self, request): + type_id = request.data.get('id') + if not type_id: + return Response({'code': 400, 'msg': '缺少类型ID'}) + delete_products = request.data.get('delete_products') in [True, 'true', '1'] + + try: + leixing = ShangpinLeixing.objects.get(id=type_id) + except ShangpinLeixing.DoesNotExist: + return Response({'code': 404, 'msg': '类型不存在'}) + + with transaction.atomic(): + # 删除该类型下的所有专区 + zones = ShangpinZhuanqu.objects.filter(leixing_id=type_id) + if delete_products: + # 删除专区下的所有商品 + for zone in zones: + Shangpin.objects.filter(zhuanqu_id=zone.id).delete() + # 删除所有专区 + zones.delete() + # 删除该类型下的所有商品（可能还有直接关联类型但无专区的商品） + Shangpin.objects.filter(leixing_id=type_id).delete() + else: + # 只删除专区，不删除商品 + zones.delete() + # 商品保持原样（leixing_id 保留，但类型已删除，可能导致数据不一致，按需求不处理） + # 也可以将商品的 leixing_id 置空 + Shangpin.objects.filter(leixing_id=type_id).update(leixing_id=None) + + # 删除类型本身 + leixing.delete() + + # 删除类型图片 + if leixing.tupian_url: + delete_from_oss(leixing.tupian_url) + + return Response({'code': 0, 'msg': '删除成功'}) + + # ---------- 商品专区处理 ---------- + def handle_zhuanqu(self, request, action): + if action == 'add': + return self.add_zhuanqu(request) + elif action == 'update': + return self.update_zhuanqu(request) + elif action == 'delete': + return self.delete_zhuanqu(request) + else: + return Response({'code': 400, 'msg': '无效的action'}) + + def add_zhuanqu(self, request): + mingzi = request.data.get('mingzi', '').strip() + leixing_id = request.data.get('leixing_id') + shenhezhuangtai = request.data.get('shenhezhuangtai', 1) + + if not mingzi: + return Response({'code': 400, 'msg': '专区名称不能为空'}) + if not leixing_id: + return Response({'code': 400, 'msg': '请选择所属类型'}) + # 校验类型是否存在 + if not ShangpinLeixing.objects.filter(id=leixing_id).exists(): + return Response({'code': 404, 'msg': '所属类型不存在'}) + + try: + with transaction.atomic(): + zhuanqu = ShangpinZhuanqu.objects.create( + mingzi=mingzi, + leixing_id=int(leixing_id), + shenhezhuangtai=int(shenhezhuangtai), + paixu=0 + ) + return Response({'code': 0, 'msg': '添加成功', 'data': {'id': zhuanqu.id}}) + except Exception as e: + logger.error(f"添加专区失败: {e}", exc_info=True) + return Response({'code': 500, 'msg': '数据库错误'}) + + def update_zhuanqu(self, request): + zone_id = request.data.get('id') + if not zone_id: + return Response({'code': 400, 'msg': '缺少专区ID'}) + try: + zhuanqu = ShangpinZhuanqu.objects.get(id=zone_id) + except ShangpinZhuanqu.DoesNotExist: + return Response({'code': 404, 'msg': '专区不存在'}) + + changes = {} + mingzi = request.data.get('mingzi') + if mingzi is not None and mingzi != zhuanqu.mingzi: + changes['mingzi'] = mingzi.strip() + leixing_id = request.data.get('leixing_id') + if leixing_id is not None and int(leixing_id) != zhuanqu.leixing_id: + # 校验新类型存在 + if not ShangpinLeixing.objects.filter(id=leixing_id).exists(): + return Response({'code': 404, 'msg': '新所属类型不存在'}) + changes['leixing_id'] = int(leixing_id) + shenhezhuangtai = request.data.get('shenhezhuangtai') + if shenhezhuangtai is not None and int(shenhezhuangtai) != zhuanqu.shenhezhuangtai: + changes['shenhezhuangtai'] = int(shenhezhuangtai) + + if not changes: + return Response({'code': 400, 'msg': '未做任何修改'}) + + try: + with transaction.atomic(): + for field, value in changes.items(): + setattr(zhuanqu, field, value) + zhuanqu.save() + return Response({'code': 0, 'msg': '修改成功'}) + except Exception as e: + logger.error(f"更新专区失败: {e}", exc_info=True) + return Response({'code': 500, 'msg': '修改失败'}) + + def delete_zhuanqu(self, request): + zone_id = request.data.get('id') + if not zone_id: + return Response({'code': 400, 'msg': '缺少专区ID'}) + delete_products = request.data.get('delete_products') in [True, 'true', '1'] + + try: + zhuanqu = ShangpinZhuanqu.objects.get(id=zone_id) + except ShangpinZhuanqu.DoesNotExist: + return Response({'code': 404, 'msg': '专区不存在'}) + + with transaction.atomic(): + if delete_products: + Shangpin.objects.filter(zhuanqu_id=zone_id).delete() + else: + Shangpin.objects.filter(zhuanqu_id=zone_id).update(zhuanqu_id=None) + zhuanqu.delete() + + return Response({'code': 0, 'msg': '删除成功'})''' + +class ModifyProductTypeZoneView(APIView): + """ + 统一修改商品类型/专区（增、删、改） + 权限：需要拥有 7007a + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser, MultiPartParser, FormParser] + + def post(self, request): + username = request.data.get('username', '').strip() + obj_type = request.data.get('type') # 'leixing' 或 'zhuanqu' + action = request.data.get('action') # 'add', 'update', 'delete' + + if not username or not obj_type or not action: + return Response({'code': 400, 'msg': '缺少必要参数'}) + + # 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '7007a' not in permissions: + return Response({'code': 403, 'msg': '您无权进行此操作'}) + + if obj_type == 'leixing': + return self.handle_leixing(request, action) + elif obj_type == 'zhuanqu': + return self.handle_zhuanqu(request, action) + else: + return Response({'code': 400, 'msg': '无效的type参数'}) + + # ---------- 商品类型处理 ---------- + def handle_leixing(self, request, action): + if action == 'add': + return self.add_leixing(request) + elif action == 'update': + return self.update_leixing(request) + elif action == 'delete': + return self.delete_leixing(request) + else: + return Response({'code': 400, 'msg': '无效的action'}) + + def add_leixing(self, request): + # 获取并校验字段 + jieshao = request.data.get('jieshao', '').strip() + if not jieshao: + return Response({'code': 400, 'msg': '类型名称不能为空'}) + + # 强制转为整数 + try: + yaoqiuleixing = int(request.data.get('yaoqiuleixing', 0)) + if yaoqiuleixing not in [1, 2]: + raise ValueError + except (TypeError, ValueError): + return Response({'code': 400, 'msg': '抢单要求类型无效（必须为1或2）'}) + + try: + shenhezhuangtai = int(request.data.get('shenhezhuangtai', 1)) + if shenhezhuangtai not in [1, 2]: + raise ValueError + except (TypeError, ValueError): + return Response({'code': 400, 'msg': '审核状态无效（必须为1或2）'}) + + is_cross_enabled = request.data.get('is_cross_enabled', False) + is_cross_enabled = is_cross_enabled in [True, 'true', '1', 'on'] + is_special_type = request.data.get('is_special_type', False) + is_special_type = is_special_type in [True, 'true', '1', 'on'] + + huiyuan_id = request.data.get('huiyuan_id', '').strip() or None + yongjin = request.data.get('yongjin') + if yongjin is not None and yongjin != '': + try: + yongjin = Decimal(str(yongjin)) + except: + return Response({'code': 400, 'msg': '佣金金额格式错误'}) + else: + yongjin = None + + # 图片校验 + image_file = request.FILES.get('file') + if not image_file: + return Response({'code': 400, 'msg': '请上传类型图片'}) + + # 验证图片 + try: + from utils.oss_utils import validate_image + valid, msg = validate_image(image_file) + if not valid: + return Response({'code': 400, 'msg': msg}) + except ImportError: + pass + + # 上传图片 + ext = image_file.name.split('.')[-1].lower() + new_filename = f"{uuid.uuid4().hex}.{ext}" + oss_path = f"a_long/shangpin/shangpinleixing/{new_filename}" + url = upload_to_oss(image_file, oss_path) + if not url: + return Response({'code': 500, 'msg': '图片上传失败'}) + + # 创建类型 + try: + with transaction.atomic(): + leixing = ShangpinLeixing.objects.create( + jieshao=jieshao, + tupian_url=oss_path, + yaoqiuleixing=yaoqiuleixing, + huiyuan_id=huiyuan_id, + yongjin=yongjin, + shenhezhuangtai=shenhezhuangtai, + is_cross_enabled=is_cross_enabled, + is_special_type=is_special_type, + paixu=0 + ) + return Response({'code': 0, 'msg': '添加成功', 'data': {'id': leixing.id}}) + except Exception as e: + logger.error(f"添加类型失败: {e}", exc_info=True) + delete_from_oss(oss_path) + return Response({'code': 500, 'msg': '数据库错误'}) + + def update_leixing(self, request): + type_id = request.data.get('id') + if not type_id: + return Response({'code': 400, 'msg': '缺少类型ID'}) + try: + leixing = ShangpinLeixing.objects.get(id=type_id) + except ShangpinLeixing.DoesNotExist: + return Response({'code': 404, 'msg': '类型不存在'}) + + changes = {} + # 名称 + jieshao = request.data.get('jieshao') + if jieshao is not None and jieshao.strip() != leixing.jieshao: + changes['jieshao'] = jieshao.strip() + + # 抢单要求类型（强制转整数） + yaoqiuleixing = request.data.get('yaoqiuleixing') + if yaoqiuleixing is not None: + try: + new_val = int(yaoqiuleixing) + if new_val not in [1, 2]: + raise ValueError + if new_val != leixing.yaoqiuleixing: + changes['yaoqiuleixing'] = new_val + except (TypeError, ValueError): + return Response({'code': 400, 'msg': '抢单要求类型无效（必须为1或2）'}) + + # 会员ID + huiyuan_id = request.data.get('huiyuan_id', '').strip() or None + if huiyuan_id != leixing.huiyuan_id: + changes['huiyuan_id'] = huiyuan_id + + # 佣金金额 + yongjin = request.data.get('yongjin') + if yongjin is not None: + if yongjin == '': + new_val = None + else: + try: + new_val = Decimal(str(yongjin)) + except: + return Response({'code': 400, 'msg': '佣金金额格式错误'}) + if new_val != leixing.yongjin: + changes['yongjin'] = new_val + + # 审核状态 + shenhezhuangtai = request.data.get('shenhezhuangtai') + if shenhezhuangtai is not None: + try: + new_val = int(shenhezhuangtai) + if new_val not in [1, 2,3]: + raise ValueError + if new_val != leixing.shenhezhuangtai: + changes['shenhezhuangtai'] = new_val + except (TypeError, ValueError): + return Response({'code': 400, 'msg': '审核状态无效（必须为1或2）'}) + + # 跨平台互通 + is_cross = request.data.get('is_cross_enabled') + if is_cross is not None: + new_cross = is_cross in [True, 'true', '1', 'on'] + if new_cross != leixing.is_cross_enabled: + changes['is_cross_enabled'] = new_cross + + # 吃龙虾特殊类型 + is_special = request.data.get('is_special_type') + if is_special is not None: + new_special = is_special in [True, 'true', '1', 'on'] + if new_special != leixing.is_special_type: + changes['is_special_type'] = new_special + + # 图片处理 + image_file = request.FILES.get('file') + old_image_path = leixing.tupian_url + if image_file: + try: + from utils.oss_utils import validate_image + valid, msg = validate_image(image_file) + if not valid: + return Response({'code': 400, 'msg': msg}) + except ImportError: + pass + ext = image_file.name.split('.')[-1].lower() + new_filename = f"{uuid.uuid4().hex}.{ext}" + oss_path = f"a_long/shangpin/shangpinleixing/{new_filename}" + url = upload_to_oss(image_file, oss_path) + if not url: + return Response({'code': 500, 'msg': '图片上传失败'}) + changes['tupian_url'] = oss_path + + if not changes and not image_file: + return Response({'code': 400, 'msg': '未做任何修改'}) + + sync_to_products = request.data.get('sync_to_products') in [True, 'true', '1', 'on'] + try: + with transaction.atomic(): + for field, value in changes.items(): + setattr(leixing, field, value) + leixing.save() + + # 同步商品 + if sync_to_products and ('yaoqiuleixing' in changes or 'huiyuan_id' in changes or 'yongjin' in changes): + product_updates = {} + if 'yaoqiuleixing' in changes: + product_updates['yaoqiuleixing'] = changes['yaoqiuleixing'] + if 'huiyuan_id' in changes: + product_updates['huiyuan_id'] = changes['huiyuan_id'] + if 'yongjin' in changes: + product_updates['yongjin'] = changes['yongjin'] + if product_updates: + Shangpin.objects.filter(leixing_id=type_id).update(**product_updates) + + # 删除旧图片 + if image_file and old_image_path: + delete_from_oss(old_image_path) + + return Response({'code': 0, 'msg': '修改成功'}) + except Exception as e: + logger.error(f"更新类型失败: {e}", exc_info=True) + if image_file and 'oss_path' in locals(): + delete_from_oss(oss_path) + return Response({'code': 500, 'msg': '修改失败'}) + + def delete_leixing(self, request): + type_id = request.data.get('id') + if not type_id: + return Response({'code': 400, 'msg': '缺少类型ID'}) + delete_products = request.data.get('delete_products') in [True, 'true', '1', 'on'] + + try: + leixing = ShangpinLeixing.objects.get(id=type_id) + except ShangpinLeixing.DoesNotExist: + return Response({'code': 404, 'msg': '类型不存在'}) + + with transaction.atomic(): + # 删除该类型下的所有专区 + zones = ShangpinZhuanqu.objects.filter(leixing_id=type_id) + if delete_products: + # 删除专区下的所有商品 + for zone in zones: + Shangpin.objects.filter(zhuanqu_id=zone.id).delete() + zones.delete() + # 删除直接关联该类型的商品 + Shangpin.objects.filter(leixing_id=type_id).delete() + else: + zones.delete() + # 仅清除商品的类型关联 + Shangpin.objects.filter(leixing_id=type_id).update(leixing_id=None) + + leixing.delete() + + if leixing.tupian_url: + delete_from_oss(leixing.tupian_url) + + return Response({'code': 0, 'msg': '删除成功'}) + + # ---------- 商品专区处理 ---------- + def handle_zhuanqu(self, request, action): + if action == 'add': + return self.add_zhuanqu(request) + elif action == 'update': + return self.update_zhuanqu(request) + elif action == 'delete': + return self.delete_zhuanqu(request) + else: + return Response({'code': 400, 'msg': '无效的action'}) + + def add_zhuanqu(self, request): + mingzi = request.data.get('mingzi', '').strip() + leixing_id = request.data.get('leixing_id') + if not mingzi: + return Response({'code': 400, 'msg': '专区名称不能为空'}) + if not leixing_id: + return Response({'code': 400, 'msg': '请选择所属类型'}) + + try: + leixing_id = int(leixing_id) + if not ShangpinLeixing.objects.filter(id=leixing_id).exists(): + return Response({'code': 404, 'msg': '所属类型不存在'}) + except (TypeError, ValueError): + return Response({'code': 400, 'msg': '所属类型ID无效'}) + + try: + shenhezhuangtai = int(request.data.get('shenhezhuangtai', 1)) + if shenhezhuangtai not in [1, 2]: + raise ValueError + except (TypeError, ValueError): + return Response({'code': 400, 'msg': '审核状态无效（必须为1或2）'}) + + try: + with transaction.atomic(): + zhuanqu = ShangpinZhuanqu.objects.create( + mingzi=mingzi, + leixing_id=leixing_id, + shenhezhuangtai=shenhezhuangtai, + paixu=0 + ) + return Response({'code': 0, 'msg': '添加成功', 'data': {'id': zhuanqu.id}}) + except Exception as e: + logger.error(f"添加专区失败: {e}", exc_info=True) + return Response({'code': 500, 'msg': '数据库错误'}) + + def update_zhuanqu(self, request): + zone_id = request.data.get('id') + if not zone_id: + return Response({'code': 400, 'msg': '缺少专区ID'}) + try: + zhuanqu = ShangpinZhuanqu.objects.get(id=zone_id) + except ShangpinZhuanqu.DoesNotExist: + return Response({'code': 404, 'msg': '专区不存在'}) + + changes = {} + mingzi = request.data.get('mingzi') + if mingzi is not None and mingzi.strip() != zhuanqu.mingzi: + changes['mingzi'] = mingzi.strip() + + leixing_id = request.data.get('leixing_id') + if leixing_id is not None: + try: + new_id = int(leixing_id) + if not ShangpinLeixing.objects.filter(id=new_id).exists(): + return Response({'code': 404, 'msg': '新所属类型不存在'}) + if new_id != zhuanqu.leixing_id: + changes['leixing_id'] = new_id + except (TypeError, ValueError): + return Response({'code': 400, 'msg': '所属类型ID无效'}) + + shenhezhuangtai = request.data.get('shenhezhuangtai') + if shenhezhuangtai is not None: + try: + new_val = int(shenhezhuangtai) + if new_val not in [1, 2]: + raise ValueError + if new_val != zhuanqu.shenhezhuangtai: + changes['shenhezhuangtai'] = new_val + except (TypeError, ValueError): + return Response({'code': 400, 'msg': '审核状态无效（必须为1或2）'}) + + if not changes: + return Response({'code': 400, 'msg': '未做任何修改'}) + + try: + with transaction.atomic(): + for field, value in changes.items(): + setattr(zhuanqu, field, value) + zhuanqu.save() + return Response({'code': 0, 'msg': '修改成功'}) + except Exception as e: + logger.error(f"更新专区失败: {e}", exc_info=True) + return Response({'code': 500, 'msg': '修改失败'}) + + def delete_zhuanqu(self, request): + zone_id = request.data.get('id') + if not zone_id: + return Response({'code': 400, 'msg': '缺少专区ID'}) + delete_products = request.data.get('delete_products') in [True, 'true', '1', 'on'] + + try: + zhuanqu = ShangpinZhuanqu.objects.get(id=zone_id) + except ShangpinZhuanqu.DoesNotExist: + return Response({'code': 404, 'msg': '专区不存在'}) + + with transaction.atomic(): + if delete_products: + Shangpin.objects.filter(zhuanqu_id=zone_id).delete() + else: + Shangpin.objects.filter(zhuanqu_id=zone_id).update(zhuanqu_id=None) + zhuanqu.delete() + + return Response({'code': 0, 'msg': '删除成功'}) + + +# 继续在 houtai/views_product.py 中添加 +class GetRateView(APIView): + """ + 获取打手分成费率（平台订单和商家订单） + 权限：需要拥有 7007b + 请求：POST /houtai/hthqfhpz + 参数：{"username": "客服手机号"} + 返回：{"code":0, "data": {"platform_rate": xx, "merchant_rate": xx}} + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '缺少username'}) + + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '7007b' not in permissions: + return Response({'code': 403, 'msg': '您无权查看费率'}) + + from dingdan.models import Lilubiao + try: + platform_rate_obj = Lilubiao.objects.get(fadanpingtai='1') + merchant_rate_obj = Lilubiao.objects.get(fadanpingtai='3') + except Lilubiao.DoesNotExist as e: + logger.error(f"费率记录缺失: {e}") + return Response({'code': 500, 'msg': '费率配置缺失'}) + + return Response({ + 'code': 0, + 'data': { + 'platform_rate': float(platform_rate_obj.lilu) if platform_rate_obj.lilu else 0, + 'merchant_rate': float(merchant_rate_obj.lilu) if merchant_rate_obj.lilu else 0, + } + }) + + +class ModifyRateView(APIView): + """ + 修改打手分成费率 + 权限：需要拥有 7007b + 请求：POST /houtai/htxgfl + 参数：{"username": "客服手机号", "type": "platform" / "merchant", "value": 费率(百分比数字)} + 返回：{"code":0, "msg":"修改成功"} + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + rate_type = request.data.get('type') + value = request.data.get('value') + + if not username or not rate_type or value is None: + return Response({'code': 400, 'msg': '缺少参数'}) + + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '7007b' not in permissions: + return Response({'code': 403, 'msg': '您无权修改费率'}) + + try: + rate_value = Decimal(str(value)) + except: + return Response({'code': 400, 'msg': '费率值格式错误'}) + + + if rate_type == 'platform': + fadanpingtai = '1' + elif rate_type == 'merchant': + fadanpingtai = '3' + else: + return Response({'code': 400, 'msg': '无效的type参数'}) + + try: + with transaction.atomic(): + rate_obj = Lilubiao.objects.select_for_update().get(fadanpingtai=fadanpingtai) + rate_obj.lilu = rate_value + rate_obj.save() + except Lilubiao.DoesNotExist: + return Response({'code': 404, 'msg': '费率记录不存在'}) + except Exception as e: + logger.error(f"修改费率失败: {e}", exc_info=True) + return Response({'code': 500, 'msg': '修改失败'}) + + return Response({'code': 0, 'msg': '修改成功'}) + + + + + + +# 权限码（根据你要求，使用 '8080a'） +REQUIRED_PERMISSION = '8080a' +class PopupNoticeListAPIView(APIView): + """ + 获取所有弹窗配置（页面 + 弹窗 + 图片） + URL: POST /houtai/hthqtcxx + 请求参数: { "username": "客服账号" } + 响应格式: { "code": 0, "data": { "pages": [...] } } + 注意：所有响应均使用默认 HTTP 200 状态码，业务成功/失败通过 code 字段区分 + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + # 1. 获取前端传递的 username（用于防越权） + username_frontend = request.data.get('username') + # 2. 调用公共权限验证方法，返回 (客服对象, 权限列表) + kefu, permissions = verify_kefu_permission(request, username_frontend) + if kefu is None: + # 身份验证失败，返回业务码 403，但 HTTP 状态码仍是 200 + return Response({'code': 403, 'msg': '身份验证失败，请检查登录状态'}) + + # 3. 检查是否拥有所需权限码 '8080a' + if REQUIRED_PERMISSION not in permissions: + return Response({'code': 403, 'msg': '您没有权限访问弹窗管理功能'}) + + # 4. 查询所有页面，并预加载关联的弹窗和图片（避免N+1查询） + pages = PopupPage.objects.all().prefetch_related('popups__images').order_by('id') + + # 5. 序列化输出 + serializer = PopupPageSerializer(pages, many=True) + return Response({'code': 0, 'data': {'pages': serializer.data}}) + + +class PopupNoticeModifyAPIView(APIView): + """ + 统一修改接口：支持页面、弹窗、图片的增删改 + URL: POST /houtai/htxgtcxx + 请求中必须包含 action 字段，用于区分操作类型。 + 所有响应均使用默认 HTTP 200 状态码，业务成功/失败通过 code 字段体现。 + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + # ---------- 1. 权限验证 ---------- + username_frontend = request.data.get('username') + kefu, permissions = verify_kefu_permission(request, username_frontend) + if kefu is None: + return Response({'code': 403, 'msg': '身份验证失败，请检查登录状态'}) + if REQUIRED_PERMISSION not in permissions: + return Response({'code': 403, 'msg': '您没有权限操作弹窗管理'}) + + # ---------- 2. 获取 action 并分发 ---------- + action = request.data.get('action') + if not action: + return Response({'code': 400, 'msg': '缺少action参数'}) + + try: + if action == 'add_page': + return self.add_page(request) + elif action == 'update_page': + return self.update_page(request) + elif action == 'delete_page': + return self.delete_page(request) + elif action == 'add_popup': + return self.add_popup(request) + elif action == 'update_popup': + return self.update_popup(request) + elif action == 'delete_popup': + return self.delete_popup(request) + elif action == 'add_image': + return self.add_image(request) + elif action == 'update_image': + return self.update_image(request) + elif action == 'delete_image': + return self.delete_image(request) + else: + return Response({'code': 400, 'msg': f'未知的action: {action}'}) + except Exception as e: + # 捕获未预期的异常，返回服务器错误 + import traceback + traceback.print_exc() + return Response({'code': 500, 'msg': f'服务器错误: {str(e)}'}) + + # ==================== 页面相关操作 ==================== + + def add_page(self, request): + """添加新页面""" + data = request.data + # 必填字段校验 + if not data.get('page_key') or not data.get('name'): + return Response({'code': 400, 'msg': '缺少 page_key 或 name'}) + # 唯一性校验 + if PopupPage.objects.filter(page_key=data['page_key']).exists(): + return Response({'code': 400, 'msg': '页面标识已存在'}) + + page = PopupPage.objects.create( + page_key=data['page_key'], + name=data['name'], + description=data.get('description', ''), + is_active=data.get('is_active', True), + ignore_user_mute=data.get('ignore_user_mute', False) + ) + return Response({'code': 0, 'msg': '添加成功', 'data': {'id': page.id}}) + + def update_page(self, request): + """更新页面信息""" + page_id = request.data.get('id') + if not page_id: + return Response({'code': 400, 'msg': '缺少页面id'}) + try: + page = PopupPage.objects.get(id=page_id) + except PopupPage.DoesNotExist: + return Response({'code': 404, 'msg': '页面不存在'}) + + # 更新允许修改的字段 + page.page_key = request.data.get('page_key', page.page_key) + page.name = request.data.get('name', page.name) + page.description = request.data.get('description', page.description) + page.is_active = request.data.get('is_active', page.is_active) + page.ignore_user_mute = request.data.get('ignore_user_mute', page.ignore_user_mute) + page.save() + return Response({'code': 0, 'msg': '更新成功'}) + + def delete_page(self, request): + """删除页面，可级联删除其下所有弹窗和图片""" + page_id = request.data.get('id') + cascade = request.data.get('cascade_delete_popups', True) # 默认级联 + if not page_id: + return Response({'code': 400, 'msg': '缺少页面id'}) + try: + page = PopupPage.objects.get(id=page_id) + except PopupPage.DoesNotExist: + return Response({'code': 404, 'msg': '页面不存在'}) + + if cascade: + # 级联删除：使用事务保证原子性 + with transaction.atomic(): + popups = page.popups.all() + for popup in popups: + # 删除弹窗下的所有图片文件 + for img in popup.images.all(): + if img.image_url: + delete_from_oss(img.image_url) + popups.delete() + page.delete() + else: + # 非级联删除：如果页面下还有弹窗，则拒绝删除 + if page.popups.exists(): + return Response({'code': 400, 'msg': '该页面下存在弹窗，请先删除弹窗或使用级联删除'}) + page.delete() + + return Response({'code': 0, 'msg': '删除成功'}) + + # ==================== 弹窗相关操作 ==================== + + def add_popup(self, request): + """为指定页面添加新弹窗""" + data = request.data + page_id = data.get('page_id') + popup_id = data.get('popup_id') + if not page_id or not popup_id: + return Response({'code': 400, 'msg': '缺少 page_id 或 popup_id'}) + try: + page = PopupPage.objects.get(id=page_id) + except PopupPage.DoesNotExist: + return Response({'code': 404, 'msg': '页面不存在'}) + + # 同一页面下 popup_id 必须唯一 + if PopupConfig.objects.filter(page=page, popup_id=popup_id).exists(): + return Response({'code': 400, 'msg': '该页面下已存在相同的弹窗ID'}) + + popup = PopupConfig.objects.create( + page=page, + popup_id=popup_id, + title=data.get('title', ''), + description=data.get('description', ''), + strategy_type=data.get('strategy_type', 'daily'), + max_count=data.get('max_count', 1), + reset_interval=data.get('reset_interval', 'day'), + duration=data.get('duration', 0), + force_even_muted=data.get('force_even_muted', False), + sort_order=data.get('sort_order', 0), + is_active=data.get('is_active', True), + start_time=data.get('start_time') or None, + end_time=data.get('end_time') or None + ) + return Response({'code': 0, 'msg': '添加成功', 'data': {'id': popup.id}}) + + def update_popup(self, request): + """更新弹窗信息""" + popup_id = request.data.get('id') + if not popup_id: + return Response({'code': 400, 'msg': '缺少弹窗id'}) + try: + popup = PopupConfig.objects.get(id=popup_id) + except PopupConfig.DoesNotExist: + return Response({'code': 404, 'msg': '弹窗不存在'}) + + # 更新弹窗字段 + popup.popup_id = request.data.get('popup_id', popup.popup_id) + popup.title = request.data.get('title', popup.title) + popup.description = request.data.get('description', popup.description) + popup.strategy_type = request.data.get('strategy_type', popup.strategy_type) + popup.max_count = request.data.get('max_count', popup.max_count) + popup.reset_interval = request.data.get('reset_interval', popup.reset_interval) + popup.duration = request.data.get('duration', popup.duration) + popup.force_even_muted = request.data.get('force_even_muted', popup.force_even_muted) + popup.sort_order = request.data.get('sort_order', popup.sort_order) + popup.is_active = request.data.get('is_active', popup.is_active) + popup.start_time = request.data.get('start_time') or None + popup.end_time = request.data.get('end_time') or None + popup.save() + return Response({'code': 0, 'msg': '更新成功'}) + + def delete_popup(self, request): + """删除弹窗，同时删除其下所有图片（包括OSS文件）""" + popup_id = request.data.get('id') + if not popup_id: + return Response({'code': 400, 'msg': '缺少弹窗id'}) + try: + popup = PopupConfig.objects.get(id=popup_id) + except PopupConfig.DoesNotExist: + return Response({'code': 404, 'msg': '弹窗不存在'}) + + with transaction.atomic(): + for img in popup.images.all(): + if img.image_url: + delete_from_oss(img.image_url) + popup.images.all().delete() + popup.delete() + return Response({'code': 0, 'msg': '删除成功'}) + + # ==================== 图片相关操作 ==================== + + def _upload_image_file(self, file_obj, page_key): + """ + 内部方法：将图片上传到OSS指定目录 + 目录: a_long/tanchuang/tanchuang/ + 文件名: {page_key}_{时间戳}_{uuid8}.{ext} + 返回: 相对路径（例如 a_long/tanchuang/tanchuang/dashouzhongxin_20250419120000_abc12345.jpg） + """ + # 验证图片格式和大小 + valid, msg = validate_image(file_obj) + if not valid: + raise ValueError(msg) + + # 生成唯一文件名 + ext = os.path.splitext(file_obj.name)[1].lower() + timestamp = datetime.now().strftime('%Y%m%d%H%M%S') + unique_id = str(uuid.uuid4())[:8] + filename = f"{page_key}_{timestamp}_{unique_id}{ext}" + relative_path = f"a_long/tanchuang/tanchuang/{filename}" + + # 上传到OSS + url = upload_to_oss(file_obj, relative_path) + if not url: + raise ValueError("图片上传失败") + return relative_path + + def add_image(self, request): + """为指定弹窗添加图片（支持上传文件）""" + popup_id = request.data.get('popup_id') + if not popup_id: + return Response({'code': 400, 'msg': '缺少 popup_id'}) + try: + popup = PopupConfig.objects.get(id=popup_id) + except PopupConfig.DoesNotExist: + return Response({'code': 404, 'msg': '弹窗不存在'}) + + # 获取上传的文件 + file_obj = request.FILES.get('file') + if not file_obj: + return Response({'code': 400, 'msg': '未提供图片文件'}) + + try: + page_key = popup.page.page_key + relative_path = self._upload_image_file(file_obj, page_key) + except ValueError as e: + return Response({'code': 400, 'msg': str(e)}) + + # 保存图片记录 + image = PopupImage.objects.create( + popup_config=popup, + image_url=relative_path, + text=request.data.get('text', ''), + sort_order=request.data.get('sort_order', 0) + ) + return Response({'code': 0, 'msg': '添加成功', 'data': {'id': image.id}}) + + def update_image(self, request): + """更新图片信息（可替换图片文件、修改文字、排序）""" + image_id = request.data.get('id') + if not image_id: + return Response({'code': 400, 'msg': '缺少图片id'}) + try: + image = PopupImage.objects.get(id=image_id) + except PopupImage.DoesNotExist: + return Response({'code': 404, 'msg': '图片不存在'}) + + # 更新文字和排序 + image.text = request.data.get('text', image.text) + image.sort_order = request.data.get('sort_order', image.sort_order) + + # 如果提供了新图片文件，则替换 + file_obj = request.FILES.get('file') + if file_obj: + try: + page_key = image.popup_config.page.page_key + new_path = self._upload_image_file(file_obj, page_key) + except ValueError as e: + return Response({'code': 400, 'msg': str(e)}) + # 删除旧图片 + if image.image_url: + delete_from_oss(image.image_url) + image.image_url = new_path + + image.save() + return Response({'code': 0, 'msg': '更新成功'}) + + def delete_image(self, request): + """删除图片（同时删除OSS文件）""" + image_id = request.data.get('id') + if not image_id: + return Response({'code': 400, 'msg': '缺少图片id'}) + try: + image = PopupImage.objects.get(id=image_id) + except PopupImage.DoesNotExist: + return Response({'code': 404, 'msg': '图片不存在'}) + + if image.image_url: + delete_from_oss(image.image_url) + image.delete() + return Response({'code': 0, 'msg': '删除成功'}) + + + +from shangdian.models import Dianpu, DianpuMorenPeizhi, YonghuPingzheng +class ShopListView(APIView): + permission_classes = [IsAuthenticated] + + def post(self, request): + # 1. 调用公共权限验证（与您给的示例完全一致） + username_frontend = request.data.get('username') + kefu, permissions = verify_kefu_permission(request, username_frontend) + if kefu is None: + return Response({'code': 403, 'msg': '身份验证失败，请检查登录状态'}) + + # 2. 检查是否拥有所需权限（999a~999e 任意一个） + required_perms = {'999a', '999b', '999c', '999d', '999e'} + if not required_perms.intersection(set(permissions)): + return Response({'code': 403, 'msg': '您没有权限访问店铺管理功能'}) + + # 3. 解析请求参数 + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 10)) + dianpu_mingcheng = request.data.get('dianpu_mingcheng', '').strip() + zhuangtai = request.data.get('zhuangtai') + lianxi_dianhua = request.data.get('lianxi_dianhua', '').strip() + user_id = request.data.get('user_id', '').strip() + ketixian_yue_min = request.data.get('ketixian_yue_min') + ketixian_yue_max = request.data.get('ketixian_yue_max') + zhengqu_zonge_min = request.data.get('zhengqu_zonge_min') + zhengqu_zonge_max = request.data.get('zhengqu_zonge_max') + + # 4. 构建查询集（先查店铺，预加载关联凭证） + queryset = Dianpu.objects.select_related('pingzheng').all() + + if dianpu_mingcheng: + queryset = queryset.filter(dianpu_mingcheng__icontains=dianpu_mingcheng) + if zhuangtai is not None: + queryset = queryset.filter(zhuangtai=zhuangtai) + if lianxi_dianhua: + queryset = queryset.filter(lianxi_dianhua__icontains=lianxi_dianhua) + if user_id: + queryset = queryset.filter(pingzheng__yonghu=user_id) + + # 金额范围过滤 + if ketixian_yue_min is not None: + queryset = queryset.filter(ketixian_yue__gte=ketixian_yue_min) + if ketixian_yue_max is not None: + queryset = queryset.filter(ketixian_yue__lte=ketixian_yue_max) + if zhengqu_zonge_min is not None: + queryset = queryset.filter(zhengqu_zonge__gte=zhengqu_zonge_min) + if zhengqu_zonge_max is not None: + queryset = queryset.filter(zhengqu_zonge__lte=zhengqu_zonge_max) + + # 5. 分页 + paginator = Paginator(queryset, page_size) + page_obj = paginator.get_page(page) + + # 6. 构造返回数据 + shop_list = [] + for dianpu in page_obj: + pingzheng = dianpu.pingzheng + shop_list.append({ + 'id': dianpu.id, + 'dianpu_mingcheng': dianpu.dianpu_mingcheng, + 'dianpu_touxiang': dianpu.dianpu_touxiang or '', + 'lianxi_dianhua': dianpu.lianxi_dianhua or '', + 'weixinhao': dianpu.weixinhao or '', + 'zhuangtai': dianpu.zhuangtai, + 'bangding_yonghushu': dianpu.bangding_yonghushu, + 'erweima_url': dianpu.erweima_url or '', + 'kaiqi_shouyi_choucheng': dianpu.kaiqi_shouyi_choucheng, + 'shouyi_choucheng_feilv': dianpu.shouyi_choucheng_feilv or 0, + 'ketixian_yue': dianpu.ketixian_yue, + 'zhengqu_zonge': dianpu.zhengqu_zonge, + 'meiri_tixian_xiane': dianpu.meiri_tixian_xiane or 0, + 'kaiqi_meiri_xiane': dianpu.kaiqi_meiri_xiane, + 'pingzheng__yonghu': pingzheng.yonghu, # 用户ID + 'pingzheng__zhanghao': pingzheng.zhanghao, # 登录账号 + }) + + # 获取默认配置（ID=1，不存在则创建） + default_config, _ = DianpuMorenPeizhi.objects.get_or_create(id=1, defaults={ + 'moren_choucheng_feilv': 0.1, + 'moren_tixian_xiane': 1000.00 + }) + + return Response({ + 'code': 0, + 'msg': 'success', + 'data': { + 'list': shop_list, + 'total': paginator.count, + 'default_config': { + 'moren_choucheng_feilv': default_config.moren_choucheng_feilv, + 'moren_tixian_xiane': default_config.moren_tixian_xiane, + } + } + }) + +from django.db import transaction, IntegrityError +class ShopModifyView(APIView): + permission_classes = [IsAuthenticated] + + def post(self, request): + # 1. 身份验证 + username_frontend = request.data.get('username') + kefu, permissions = verify_kefu_permission(request, username_frontend) + if kefu is None: + return Response({'code': 403, 'msg': '身份验证失败，请检查登录状态'}) + + # 转换权限为集合方便判断 + user_perms = set(permissions) + action = request.data.get('action', '') + + # 2. 根据 action 分派任务 + if action == 'update_dianpu': + return self._update_dianpu(request, user_perms) + elif action == 'add_dianpu': + return self._add_dianpu(request, user_perms) + elif action == 'update_default': + return self._update_default(request, user_perms) + else: + return Response({'code': 400, 'msg': '未知操作类型'}) + + def _update_dianpu(self, request, user_perms): + """修改店铺信息，精确权限控制""" + dianpu_id = request.data.get('dianpu_id') + if not dianpu_id: + return Response({'code': 400, 'msg': '缺少店铺ID'}) + + try: + with transaction.atomic(): + dianpu = Dianpu.objects.select_for_update().get(id=dianpu_id) + + # 基础信息修改 (999e) + if any(k in request.data for k in ['dianpu_mingcheng', 'lianxi_dianhua', 'weixinhao']): + if '999e' not in user_perms: + return Response({'code': 403, 'msg': '无权限修改店铺基本信息(999e)'}) + if 'dianpu_mingcheng' in request.data: + dianpu.dianpu_mingcheng = request.data['dianpu_mingcheng'] + if 'lianxi_dianhua' in request.data: + dianpu.lianxi_dianhua = request.data['lianxi_dianhua'] + if 'weixinhao' in request.data: + dianpu.weixinhao = request.data['weixinhao'] + + # 店铺状态 (999a) + if 'zhuangtai' in request.data: + if '999a' not in user_perms: + return Response({'code': 403, 'msg': '无权限修改店铺状态(999a)'}) + new_status = int(request.data['zhuangtai']) + if new_status not in (0, 1): + return Response({'code': 400, 'msg': '店铺状态无效'}) + dianpu.zhuangtai = new_status + + # 可提现余额 (999b) + if 'ketixian_yue' in request.data: + if '999b' not in user_perms: + return Response({'code': 403, 'msg': '无权限修改可提现余额(999b)'}) + dianpu.ketixian_yue = request.data['ketixian_yue'] + + # 提现限额相关 (999c) + if 'kaiqi_meiri_xiane' in request.data or 'meiri_tixian_xiane' in request.data: + if '999c' not in user_perms: + return Response({'code': 403, 'msg': '无权限修改提现限额配置(999c)'}) + if 'kaiqi_meiri_xiane' in request.data: + dianpu.kaiqi_meiri_xiane = request.data['kaiqi_meiri_xiane'] + if 'meiri_tixian_xiane' in request.data: + dianpu.meiri_tixian_xiane = request.data['meiri_tixian_xiane'] + + # 抽成相关 (999d) + if 'kaiqi_shouyi_choucheng' in request.data or 'shouyi_choucheng_feilv' in request.data: + if '999d' not in user_perms: + return Response({'code': 403, 'msg': '无权限修改抽成配置(999d)'}) + if 'kaiqi_shouyi_choucheng' in request.data: + dianpu.kaiqi_shouyi_choucheng = request.data['kaiqi_shouyi_choucheng'] + if 'shouyi_choucheng_feilv' in request.data: + dianpu.shouyi_choucheng_feilv = request.data['shouyi_choucheng_feilv'] + + dianpu.save() # Django 会自动判断更新哪些字段 + return Response({'code': 0, 'msg': '店铺信息更新成功'}) + + except Dianpu.DoesNotExist: + return Response({'code': 404, 'msg': '店铺不存在'}) + except Exception as e: + logger.exception("修改店铺失败") + return Response({'code': 500, 'msg': '修改失败，请稍后重试'}) + + def _add_dianpu(self, request, user_perms): + """添加店铺，需要权限 999b""" + if '999b' not in user_perms: + return Response({'code': 403, 'msg': '无权限添加店铺(999b)'}) + + yonghu_id = request.data.get('yonghu_id') + zhanghao = request.data.get('zhanghao') + mima = request.data.get('mima') + dianpu_mingcheng = request.data.get('dianpu_mingcheng') + + if not all([yonghu_id, zhanghao, mima, dianpu_mingcheng]): + return Response({'code': 400, 'msg': '必填字段缺失（用户ID、账号、密码、店铺名称）'}) + + # 检查用户是否存在 + if not UserMain.objects.filter(yonghuid=yonghu_id).exists(): + return Response({'code': 404, 'msg': '用户不存在'}) + + # 检查凭证是否已存在 + if YonghuPingzheng.objects.filter(zhanghao=zhanghao).exists(): + return Response({'code': 400, 'msg': '登录账号已存在'}) + if YonghuPingzheng.objects.filter(yonghu=yonghu_id).exists(): + return Response({'code': 400, 'msg': '该用户ID已有店铺凭证'}) + + try: + with transaction.atomic(): + pingzheng = YonghuPingzheng.objects.create( + yonghu=yonghu_id, + zhanghao=zhanghao, + mima=mima, + is_active=True + ) + dianpu = Dianpu.objects.create( + pingzheng=pingzheng, + dianpu_mingcheng=dianpu_mingcheng, + lianxi_dianhua=request.data.get('lianxi_dianhua', ''), + weixinhao=request.data.get('weixinhao', ''), + kaiqi_shouyi_choucheng=request.data.get('kaiqi_shouyi_choucheng', False), + shouyi_choucheng_feilv=request.data.get('shouyi_choucheng_feilv', 0), + kaiqi_meiri_xiane=request.data.get('kaiqi_meiri_xiane', False), + meiri_tixian_xiane=request.data.get('meiri_tixian_xiane', 0), + ) + return Response({'code': 0, 'msg': '店铺创建成功', 'dianpu_id': dianpu.id}) + except IntegrityError as e: + logger.error("创建店铺违反唯一性约束: %s", e) + return Response({'code': 400, 'msg': '数据冲突，请检查账号或用户ID'}) + except Exception as e: + logger.exception("创建店铺失败") + return Response({'code': 500, 'msg': '创建失败，请稍后重试'}) + + def _update_default(self, request, user_perms): + """修改默认配置，按修改内容校验权限""" + feilv = request.data.get('moren_choucheng_feilv') + xiane = request.data.get('moren_tixian_xiane') + modify_commission = feilv is not None + modify_withdraw = xiane is not None + + if modify_commission and '999d' not in user_perms: + return Response({'code': 403, 'msg': '无权限修改默认抽成费率(999d)'}) + if modify_withdraw and '999c' not in user_perms: + return Response({'code': 403, 'msg': '无权限修改默认可提现限额(999c)'}) + + try: + config, _ = DianpuMorenPeizhi.objects.get_or_create(id=1) + if modify_commission: + config.moren_choucheng_feilv = feilv + if modify_withdraw: + config.moren_tixian_xiane = xiane + config.save(update_fields=(['moren_choucheng_feilv'] if modify_commission else []) + + (['moren_tixian_xiane'] if modify_withdraw else [])) + return Response({'code': 0, 'msg': '默认配置更新成功'}) + except Exception as e: + logger.exception("更新默认配置失败") + return Response({'code': 500, 'msg': '更新失败'}) + + + + + + + +# houtai/views.py (完整新增接口，可直接追加到文件末尾) +import logging +from django.db import models # Q 查询必须导入 +from django.core.paginator import Paginator +from django.db import transaction +from rest_framework.views import APIView +from rest_framework.permissions import IsAuthenticated +from rest_framework.response import Response +from shangpin.models import ShangpinLeixing # 公共商品类型 +from shangdian.models import ( + Dianpu, ShangpinLeixingDianpu, + DianpuShangpinShenheShezhi, YonghuPingzheng +) +from .utils import verify_kefu_permission # 已提供的公共身份校验方法 + +logger = logging.getLogger(__name__) + +# 店铺商品管理所需权限组（拥有任意一个即可访问列表类接口） +SHOP_PRODUCT_PERMS = ['1199ab', '1199abc', '1199abd'] + + +# ==================== 1. 公共商品类型 + 审核模式 ==================== +class ShopPublicTypeAndAuditView(APIView): + """ + 返回：①正常状态的公共商品类型列表 ②全局商品审核模式开关 + 前端请求路径：/houtai/htdphqsplx + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + # ---------- 身份与权限校验 ---------- + username = request.data.get('username') + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return Response({'code': 403, 'msg': '身份验证失败，请检查登录状态'}) + + # 拥有 1199ab/1199abc/1199abd 任一个即可访问 + if not set(permissions).intersection(SHOP_PRODUCT_PERMS): + return Response({'code': 403, 'msg': '无权访问店铺商品管理功能'}) + + # ---------- 查询公共商品类型（仅正常审核状态的） ---------- + try: + # shenhezhuangtai = 1 表示正常 (根据模型默认值) + types_qs = ShangpinLeixing.objects.filter(shenhezhuangtai=1).values( + 'id', 'jieshao', 'tupian_url', 'yaoqiuleixing', 'huiyuan_id', 'yongjin', 'is_cross_enabled' + ) + type_list = [] + for t in types_qs: + type_list.append({ + 'id': t['id'], + 'jieshao': t['jieshao'] or '', + 'tupian_url': t['tupian_url'] or '', + 'yaoqiuleixing': t['yaoqiuleixing'], + 'huiyuan_id': t['huiyuan_id'], + 'yongjin': t['yongjin'], + 'is_cross_enabled': t['is_cross_enabled'], + }) + except Exception as e: + logger.exception("查询公共商品类型失败") + return Response({'code': 500, 'msg': '服务器错误，请稍后重试'}) + + # ---------- 获取审核模式配置 ---------- + audit_config = DianpuShangpinShenheShezhi.objects.filter(id=1).first() + kaiqi_shenhe = audit_config.kaiqi_shenhe if audit_config else False + + return Response({ + 'code': 0, + 'data': { + 'public_types': type_list, + 'kaiqi_shenhe': kaiqi_shenhe + } + }) + + +# ==================== 2. 店铺列表（支持搜索、筛选、分页） ==================== +class ShopListForProductView(APIView): + """ + 返回店铺列表，用于商品管理页面选择店铺。 + 支持：关键词搜索（店铺ID/名称/用户ID）、店铺状态筛选、分页。 + 前端请求路径：/houtai/htdphqdpys + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + username = request.data.get('username') + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return Response({'code': 403, 'msg': '身份验证失败'}) + if not set(permissions).intersection(SHOP_PRODUCT_PERMS): + return Response({'code': 403, 'msg': '无权访问店铺列表'}) + + # ---------- 安全解析分页参数 ---------- + try: + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 10)) + except (TypeError, ValueError): + return Response({'code': 400, 'msg': '分页参数格式错误'}) + + # 搜索关键词（字符串，ORM 自动防注入） + keyword = str(request.data.get('keyword', '')).strip() + # 店铺状态筛选（1正常，0封禁，不传则全部） + zhuangtai = request.data.get('zhuangtai') + + # ---------- 构建查询集（关联凭证表获取用户ID） ---------- + shops = Dianpu.objects.select_related('pingzheng').all() + + # 状态筛选：只接受 0 或 1 + if zhuangtai is not None: + try: + zhuangtai = int(zhuangtai) + if zhuangtai in [0, 1]: + shops = shops.filter(zhuangtai=zhuangtai) + else: + return Response({'code': 400, 'msg': '状态参数只能为0或1'}) + except (TypeError, ValueError): + return Response({'code': 400, 'msg': '状态参数必须为整数'}) + + # 关键词搜索（店铺ID/名称/用户ID） + if keyword: + shops = shops.filter( + models.Q(id__icontains=keyword) | + models.Q(dianpu_mingcheng__icontains=keyword) | + models.Q(pingzheng__yonghu__icontains=keyword) + ) + + # ---------- 分页 ---------- + paginator = Paginator(shops, page_size) + page_obj = paginator.get_page(page) + + shop_list = [] + for shop in page_obj: + shop_list.append({ + 'id': shop.id, + 'dianpu_mingcheng': shop.dianpu_mingcheng, + 'zhuangtai': shop.zhuangtai, + 'yonghu_id': shop.pingzheng.yonghu if shop.pingzheng else '', + 'lianxi_dianhua': shop.lianxi_dianhua or '', + 'weixinhao': shop.weixinhao or '', + }) + + return Response({ + 'code': 0, + 'data': { + 'list': shop_list, + 'total': paginator.count + } + }) + + +# ==================== 3. 店铺商品类型映射列表（含筛选、待审核计数） ==================== +class ShopProductTypeMappingView(APIView): + """ + 返回店铺商品类型映射（ShangpinLeixingDianpu）列表。 + 支持：店铺ID、公共类型ID、上架/封禁/审核状态筛选，关键字搜索（介绍/ID/店铺名/公共类型名）。 + 每次请求同时返回“待审核总数”（shenhe_zhuangtai=False 的记录数）。 + 前端请求路径：/houtai/htdphqyssplx + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + username = request.data.get('username') + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return Response({'code': 403, 'msg': '身份验证失败'}) + if not set(permissions).intersection(SHOP_PRODUCT_PERMS): + return Response({'code': 403, 'msg': '无权访问商品类型映射'}) + + # ---------- 安全解析参数 ---------- + try: + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 10)) + except (TypeError, ValueError): + return Response({'code': 400, 'msg': '分页参数格式错误'}) + + keyword = str(request.data.get('keyword', '')).strip() + shop_id = request.data.get('shop_id') + public_type_id = request.data.get('public_type_id') + + # 布尔型筛选字段处理：None 表示不筛选，否则转为布尔值 + def parse_bool(val): + if val is None: + return None + return bool(val) + + shangjia = parse_bool(request.data.get('shangjia_zhuangtai')) + fengjin = parse_bool(request.data.get('fengjin_zhuangtai')) + shenhe = parse_bool(request.data.get('shenhe_zhuangtai')) + + # ---------- 查询（连表店铺和公共类型） ---------- + mappings = ShangpinLeixingDianpu.objects.select_related('dianpu', 'gonggong_leixing').all() + + # 筛选条件：均为参数化，完全防注入 + if shop_id is not None: + mappings = mappings.filter(dianpu_id=int(shop_id)) + if public_type_id is not None: + mappings = mappings.filter(gonggong_leixing_id=int(public_type_id)) + if shangjia is not None: + mappings = mappings.filter(shangjia_zhuangtai=shangjia) + if fengjin is not None: + mappings = mappings.filter(fengjin_zhuangtai=fengjin) + if shenhe is not None: + mappings = mappings.filter(shenhe_zhuangtai=shenhe) + + # 关键字搜索（介绍、ID、店铺名、公共类型名） + if keyword: + mappings = mappings.filter( + models.Q(jieshao__icontains=keyword) | + models.Q(id__icontains=keyword) | + models.Q(dianpu__dianpu_mingcheng__icontains=keyword) | + models.Q(gonggong_leixing__jieshao__icontains=keyword) + ) + + # ---------- 待审核总数（不受分页影响） ---------- + pending_total = mappings.filter(shenhe_zhuangtai=False).count() + + # ---------- 分页 ---------- + paginator = Paginator(mappings, page_size) + page_obj = paginator.get_page(page) + + mapping_list = [] + for m in page_obj: + mapping_list.append({ + 'id': m.id, + 'dianpu_id': m.dianpu_id, + 'dianpu_name': m.dianpu.dianpu_mingcheng if m.dianpu else '', + 'gonggong_leixing_id': m.gonggong_leixing_id, + 'gonggong_leixing_name': m.gonggong_leixing.jieshao if m.gonggong_leixing else '', + 'jieshao': m.jieshao, + 'tupian_url': m.tupian_url or '', + 'paixu': m.paixu, + 'shangjia_zhuangtai': m.shangjia_zhuangtai, + 'fengjin_zhuangtai': m.fengjin_zhuangtai, + 'shenhe_zhuangtai': m.shenhe_zhuangtai, + }) + + return Response({ + 'code': 0, + 'data': { + 'list': mapping_list, + 'total': paginator.count, + 'pending_total': pending_total + } + }) + + +# ==================== 统一修改接口（已修正事务） ==================== +class ShopProductModifyView(APIView): + permission_classes = [IsAuthenticated] + + def post(self, request): + username = request.data.get('username') + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return Response({'code': 403, 'msg': '身份验证失败'}) + + user_perms = set(permissions) + action = request.data.get('action') + + if action == 'update_audit_mode': + return self._update_audit_mode(request, user_perms) + elif action == 'update_mapping_status': + return self._update_mapping_status(request, user_perms) + else: + return Response({'code': 400, 'msg': '未知操作'}) + + @transaction.atomic # ✅ 事务修复点 + def _update_audit_mode(self, request, user_perms): + if '1199ab' not in user_perms: + return Response({'code': 403, 'msg': '无权限修改审核模式'}) + + kaiqi = request.data.get('kaiqi_shenhe') + if kaiqi is None: + return Response({'code': 400, 'msg': '缺少参数 kaiqi_shenhe'}) + + try: + config, _ = DianpuShangpinShenheShezhi.objects.select_for_update().get_or_create(id=1) + config.kaiqi_shenhe = bool(kaiqi) + config.save(update_fields=['kaiqi_shenhe']) + return Response({'code': 0, 'msg': '审核模式已更新'}) + except Exception as e: + logger.exception("更新审核模式失败") + return Response({'code': 500, 'msg': '服务器错误'}) + + @transaction.atomic + def _update_mapping_status(self, request, user_perms): + mapping_id = request.data.get('mapping_id') + if not mapping_id: + return Response({'code': 400, 'msg': '缺少 mapping_id'}) + + try: + mapping = ShangpinLeixingDianpu.objects.select_for_update().get(id=int(mapping_id)) + except (ShangpinLeixingDianpu.DoesNotExist, ValueError): + return Response({'code': 404, 'msg': '映射不存在'}) + + fengjin = request.data.get('fengjin_zhuangtai') + shangjia = request.data.get('shangjia_zhuangtai') + shenhe = request.data.get('shenhe_zhuangtai') + + # 权限判断 + if fengjin is not None: + if fengjin: + if '1199abc' not in user_perms: + return Response({'code': 403, 'msg': '无权限封禁'}) + else: + if '1199abd' not in user_perms: + return Response({'code': 403, 'msg': '无权限解封'}) + mapping.fengjin_zhuangtai = bool(fengjin) + + if shangjia is not None: + if not shangjia: + if '1199abc' not in user_perms: + return Response({'code': 403, 'msg': '无权限下架'}) + else: + if '1199abd' not in user_perms: + return Response({'code': 403, 'msg': '无权限上架'}) + mapping.shangjia_zhuangtai = bool(shangjia) + + if shenhe is not None: + if shenhe: + if '1199abd' not in user_perms: + return Response({'code': 403, 'msg': '无权限审核通过'}) + mapping.shenhe_zhuangtai = bool(shenhe) + + mapping.save() + return Response({'code': 0, 'msg': '修改成功'}) + + + + +# 商品管理相关权限组（拥有任意一个即可查看列表） +PRODUCT_PERMS = ['1199ab', '1199abc', '1199abd', '1199abe'] + + +class ProductListView(APIView): + """ + 商品列表接口，支持多条件筛选与分页。 + 请求路径: /houtai/hqhtdpsplx + 权限要求: 1199ab / 1199abc / 1199abd / 1199abe 任一即可 + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + # ----- 身份与权限验证 ----- + username = request.data.get('username') + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return Response({'code': 403, 'msg': '身份验证失败'}) + + if not set(permissions).intersection(PRODUCT_PERMS): + return Response({'code': 403, 'msg': '无商品管理权限'}) + + # ----- 安全解析分页与筛选参数 ----- + try: + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 15)) + except (TypeError, ValueError): + return Response({'code': 400, 'msg': '分页参数格式错误'}) + + keyword = str(request.data.get('keyword', '')).strip() + shop_id = request.data.get('shop_id') # 店铺ID (可选) + shop_product_type_id = request.data.get('shop_product_type_id') # 店铺商品类型映射ID (可选) + public_type_id = request.data.get('public_type_id') # 公共商品类型ID (可选) + + # 布尔型状态筛选 + def parse_bool(val): + if val is None: + return None + return bool(val) + + shenhe = parse_bool(request.data.get('shenhe_zhuangtai')) + shangjia = parse_bool(request.data.get('shangjia_zhuangtai')) + fengjin = parse_bool(request.data.get('fengjin_zhuangtai')) + + # ----- 构建查询（预加载店铺和店铺商品类型） ----- + products = Shangpin.objects.select_related('dianpu', 'dianpu_leixing').all() + + # 按店铺筛选 + if shop_id is not None: + try: + products = products.filter(dianpu_id=int(shop_id)) + except (ValueError, TypeError): + return Response({'code': 400, 'msg': 'shop_id 格式错误'}) + + # 按店铺商品类型映射筛选 + if shop_product_type_id is not None: + try: + products = products.filter(dianpu_leixing_id=int(shop_product_type_id)) + except (ValueError, TypeError): + return Response({'code': 400, 'msg': 'shop_product_type_id 格式错误'}) + + # 按公共商品类型筛选（leixing_id 存储的是公共类型的ID） + if public_type_id is not None: + try: + products = products.filter(leixing_id=int(public_type_id)) + except (ValueError, TypeError): + return Response({'code': 400, 'msg': 'public_type_id 格式错误'}) + + # 平台审核状态筛选 (BooleanField) + if shenhe is not None: + products = products.filter(shenhe_zhuangtai=shenhe) + + # 上架状态筛选 + if shangjia is not None: + products = products.filter(shangjia_zhuangtai=shangjia) + + # 封禁状态筛选 + if fengjin is not None: + products = products.filter(fengjin_zhuangtai=fengjin) + + # 关键词搜索：商品ID或商品标题（搜索具有模糊性，使用icontains） + if keyword: + # 尝试纯数字可能是商品ID，使用精确匹配与标题模糊搜索 + products = products.filter( + models.Q(id__icontains=keyword) | + models.Q(biaoqian__icontains=keyword) + ) + + # ----- 获取待审核总数（平台审核未通过的数量） ----- + pending_total = products.filter(shenhe_zhuangtai=False).count() + + # ----- 分页 ----- + paginator = Paginator(products, page_size) + page_obj = paginator.get_page(page) + + # ----- 构造返回数据（批量获取公共类型名称，避免N+1） ----- + # 提取所有公共商品类型ID + type_ids = {p.leixing_id for p in page_obj if p.leixing_id is not None} + public_type_map = {} + if type_ids: + public_types = ShangpinLeixing.objects.filter(id__in=type_ids).values('id', 'jieshao') + public_type_map = {t['id']: t['jieshao'] for t in public_types} + + product_list = [] + for p in page_obj: + product_list.append({ + 'id': p.id, + 'biaoqian': p.biaoqian or '', + 'jiage': p.jiage, + 'kucun': p.kucun, + 'leixing_id': p.leixing_id, + 'public_type_name': public_type_map.get(p.leixing_id, ''), + 'zhenshi_xiaoliang': p.zhenshi_xiaoliang, + 'duiwai_xiaoliang': p.duiwai_xiaoliang, + 'jieshao': p.jieshao or '', + 'xiadan_xuzhi': p.xiadan_xuzhi or '', + 'guize_tupian': p.guize_tupian or '', + 'yaoqiuleixing': p.yaoqiuleixing, + 'huiyuan_id': p.huiyuan_id or '', + 'yongjin': p.yongjin, + 'kaioi_ewai_dashou_fencheng': p.kaioi_ewai_dashou_fencheng, + 'ewai_dashou_fencheng': p.ewai_dashou_fencheng, + 'create_time': p.create_time.isoformat() if p.create_time else '', + 'update_time': p.update_time.isoformat() if p.update_time else '', + 'paixu': p.paixu, + 'dianpu_id': p.dianpu_id, + 'dianpu_name': p.dianpu.dianpu_mingcheng if p.dianpu else '', + 'dianpu_leixing_id': p.dianpu_leixing_id, + 'dianpu_leixing_name': p.dianpu_leixing.jieshao if p.dianpu_leixing else '', + 'shangjia_zhuangtai': p.shangjia_zhuangtai, + 'fengjin_zhuangtai': p.fengjin_zhuangtai, + 'shenhe_zhuangtai': p.shenhe_zhuangtai, + }) + + return Response({ + 'code': 0, + 'data': { + 'list': product_list, + 'total': paginator.count, + 'pending_total': pending_total, # 待审核商品总数 + } + }) + + +class ProductModifyView(APIView): + """ + 商品修改接口，根据修改内容细粒度鉴权。 + 请求路径: /houtai/htxgdpspsj + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + username = request.data.get('username') + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return Response({'code': 403, 'msg': '身份验证失败'}) + + user_perms = set(permissions) + action = request.data.get('action', '') + + if action != 'update_product': + return Response({'code': 400, 'msg': '未知操作'}) + + return self._update_product(request, user_perms) + + @transaction.atomic + def _update_product(self, request, user_perms): + """执行商品修改，严格校验权限""" + product_id = request.data.get('product_id') + if not product_id: + return Response({'code': 400, 'msg': '缺少商品ID'}) + + try: + # 行级锁防止并发修改 + product = Shangpin.objects.select_for_update().get(id=int(product_id)) + except (Shangpin.DoesNotExist, ValueError): + return Response({'code': 404, 'msg': '商品不存在'}) + + # 需要修改的字段 + fields_to_update = {} + # 将要修改的状态标志用于后续权限判断 + status_changes = { + 'shangjia': request.data.get('shangjia_zhuangtai'), + 'fengjin': request.data.get('fengjin_zhuangtai'), + 'shenhe': request.data.get('shenhe_zhuangtai'), + } + + # ---------- 权限分类检查 ---------- + # 1. 封禁/下架操作 (消极操作) -> 1199abc + if any(status_changes.get(k) is not None and status_changes[k] == False for k in ['shangjia', 'shenhe']): + if '1199abc' not in user_perms: + return Response({'code': 403, 'msg': '无权限执行下架/封禁/驳回审核操作(1199abc)'}) + if status_changes.get('fengjin') is not None and status_changes['fengjin'] == True: + if '1199abc' not in user_perms: + return Response({'code': 403, 'msg': '无权限执行封禁操作(1199abc)'}) + + # 2. 解封/上架/过审 (积极操作) -> 1199abd + if any(status_changes.get(k) is not None and status_changes[k] == True for k in ['shangjia', 'shenhe']): + if '1199abd' not in user_perms: + return Response({'code': 403, 'msg': '无权限执行上架/解封/审核通过操作(1199abd)'}) + if status_changes.get('fengjin') is not None and status_changes['fengjin'] == False: + if '1199abd' not in user_perms: + return Response({'code': 403, 'msg': '无权限执行解封操作(1199abd)'}) + + # 3. 修改其他数据（非状态字段）-> 1199abe + # 除了上架、封禁、审核之外的字段都属于“其他数据” + other_fields = [k for k in request.data.keys() if k not in ['action', 'product_id', 'username', + 'shangjia_zhuangtai', 'fengjin_zhuangtai', + 'shenhe_zhuangtai']] + if other_fields and '1199abe' not in user_perms: + return Response({'code': 403, 'msg': '无权限修改商品基本信息(1199abe)'}) + + # ---------- 应用修改 ---------- + # 允许修改的字段白名单（防止注入） + allowed_fields = [ + 'biaoqian', 'jiage', 'kucun', 'leixing_id', 'duiwai_xiaoliang', + 'jieshao', 'xiadan_xuzhi', 'yaoqiuleixing', 'yongjin', + 'kaioi_ewai_dashou_fencheng', 'ewai_dashou_fencheng', + 'shangjia_zhuangtai', 'fengjin_zhuangtai', 'shenhe_zhuangtai' + ] + + for field in allowed_fields: + value = request.data.get(field) + if value is not None: + # 简单类型校验（根据字段类型） + if field in ['jiage', 'kucun', 'duiwai_xiaoliang', 'yongjin', 'ewai_dashou_fencheng', 'paixu']: + try: + value = float(value) if 'jiage' in field or 'yongjin' in field or 'ewai' in field else int(value) + except (ValueError, TypeError): + return Response({'code': 400, 'msg': f'字段 {field} 值格式错误'}) + setattr(product, field, value) + + product.save(update_fields=allowed_fields) + return Response({'code': 0, 'msg': '商品修改成功'}) + + + +# 与前端约定的聊天权限码 +CHAT_PERM_CODES = ['abca1', 'baac2', 'cabc3', 'cb3a2', 'bcaa4'] + +class KefuChatPermissionsView(APIView): + """ + 获取客服聊天权限及GoEasy配置 + POST /houtai/kfhqltqx + Body: { "phone": "客服手机号" } + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + # 1. 从前端获取传递的账号，用于防越权校验 + username_from_frontend = request.data.get('phone', None) + + # 2. 调用公共验证方法。 + # 返回 (kefu_obj, permissions) 或 (None, Response) + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + + # 3. 如果第一个返回值为 None，说明验证失败，直接返回第二个值（错误Response） + if kefu_obj is None: + return permissions + + # ---------- 验证通过，permissions 已经是权限码列表 ---------- + # 4. 检查是否拥有至少一个聊天权限 + has_chat_perm = any(p in CHAT_PERM_CODES for p in permissions) + + # 5. 若有聊天权限，查询我方俱乐部的 chat_api_key + goeasy_appkey = '' + if has_chat_perm: + config = ClubConfig.objects.filter(is_self=1).first() + if config: + goeasy_appkey = config.chat_api_key or '' + + # 6. 返回数据 + return Response({ + 'code': 0, + 'msg': 'ok', + 'data': { + 'permissions': permissions, + 'goeasy_appkey': goeasy_appkey + } + }) + + + + + +from dingdan.models import Dingdan, Fadan, CrossPlatformOrderData # 按实际路径 +class FineApplyView(APIView): + """ + 客服申请罚款接口（金额罚款，非积分） + 路径：POST /houtai/kffkdssq + 参数： + username: 客服手机号 + dingdan_id: 订单ID + chufaliyou: 罚款原因 + fakuanjine: 罚款金额（元） + yingxiang_qiangdan: 1影响抢单 / 0不影响抢单 + shenqingren_shenfen: 操作人身份 (1客服/2售后/3管理员等) + 权限：JWT + 权限码99933abs + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # 1. 提取参数 + username = request.data.get('username', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + chufaliyou = request.data.get('chufaliyou', '').strip() + fakuanjine = request.data.get('fakuanjine', 0) + yingxiang_qiangdan = request.data.get('yingxiang_qiangdan', 1) + shenqingren_shenfen = request.data.get('shenqingren_shenfen', 2) + + if not all([username, dingdan_id, chufaliyou, fakuanjine]): + return Response({'code': 400, 'msg': '参数不完整'}) + + try: + # 2. 权限校验 + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if '99933abs' not in permissions: + return Response({'code': 403, 'msg': '您无罚款权限'}) + + # 3. 获取订单（无需 select_for_update，因不修改订单） + try: + order = Dingdan.objects.get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + return Response({'code': 404, 'msg': '订单不存在'}) + + dashou_id = order.jiedan_dashou_id + if not dashou_id: + return Response({'code': 400, 'msg': '该订单无接单打手，无法罚款'}) + + # 4. 重复罚单检查 + if Fadan.objects.filter(beichufa_id=dashou_id, guanliandingdan_id=dingdan_id).exists(): + return Response({'code': 400, 'msg': '该打手已被罚款过'}) + + # 5. 跨平台相关字段 + partner_order_id = order.partner_order_id or '' + partner_club_id = order.partner_club_id or '' + dispatch_type = order.dispatch_type or 0 + + # 本地创建罚单的可复用函数 + def create_local_fadan(): + Fadan.objects.create( + beichufa_id=dashou_id, + shenqing_chufa=username, + shenfen=1, # 1 代表打手 + chufaliyou=chufaliyou, + fakuanjine=fakuanjine, + guanliandingdan_id=dingdan_id, + zhuangtai=1, # 待缴纳 + yingxiang_qiangdan=yingxiang_qiangdan, + shenqingren_shenfen=shenqingren_shenfen, + partner_club_id='', + ) + + # 6. 判断：没有对方订单ID，或对方派单 → 本地处罚 + if not partner_order_id or dispatch_type == 2: + with transaction.atomic(): + create_local_fadan() + logger.info(f"本地罚款成功: 订单 {dingdan_id}, 打手 {dashou_id}, 金额 {fakuanjine}") + return Response({'code': 0, 'msg': '罚款已生成'}) + + # 7. 我方派单且有对方订单ID → 通知对方平台 + # 获取我方俱乐部ID + try: + my_club = ClubConfig.objects.filter(is_self=1).first() + if not my_club: + return Response({'code': 500, 'msg': '系统配置错误'}) + self_club_id = my_club.club_id + club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=partner_club_id) + partner_domain = club_rel.partner_domain + except ObjectDoesNotExist: + return Response({'code': 500, 'msg': '对方平台信息未配置'}) + + url = partner_domain.rstrip('/') + '/houtai/kffkdssq_notify' + payload = { + 'order_id': partner_order_id, + 'club_id': self_club_id, + 'chufaliyou': chufaliyou, + 'fakuanjine': fakuanjine, + 'yingxiang_qiangdan': yingxiang_qiangdan, + 'shenqingren_shenfen': shenqingren_shenfen, + 'operator': username, + } + timeout = 3 + retries = 2 + success = False + for attempt in range(retries): + try: + resp = requests.post(url, json=payload, timeout=timeout) + if resp.status_code == 200 and resp.json().get('code') == 0: + success = True + break + except Exception: + continue + + if not success: + return Response({'code': 500, 'msg': '通知对方平台失败，请稍后重试'}) + + # 通知成功后，本地也记录一笔（标记为跨平台） + with transaction.atomic(): + Fadan.objects.create( + beichufa_id=dashou_id, + shenqing_chufa=username, + shenfen=1, + chufaliyou=chufaliyou, + fakuanjine=fakuanjine, + guanliandingdan_id=dingdan_id, + zhuangtai=1, + yingxiang_qiangdan=yingxiang_qiangdan, + shenqingren_shenfen=shenqingren_shenfen, + partner_club_id=partner_club_id, + ) + logger.info(f"跨平台罚款通知成功: {dingdan_id}") + return Response({'code': 0, 'msg': '罚款已提交至对方平台'}) + + except Exception as e: + logger.error(f"罚款申请异常: {traceback.format_exc()}") + return Response({'code': 500, 'msg': '服务器内部错误'}) + + + +from rest_framework.permissions import AllowAny + +class PartnerFineNotifyView(APIView): + """ + 接收对方平台罚款通知（无认证） + 路径：POST /houtai/kffkdssq_notify + 参数： + order_id: 对方平台的订单ID（需通过这个找到我方订单） + club_id: 对方俱乐部ID + chufaliyou: 罚款原因 + fakuanjine: 罚款金额 + yingxiang_qiangdan: 1影响抢单 / 0不影响 + shenqingren_shenfen: 申请处罚人身份 + operator: 操作人标识 + """ + authentication_classes = [] + permission_classes = [AllowAny] + parser_classes = [JSONParser] + + def post(self, request): + try: + order_id = request.data.get('order_id', '').strip() # 对方平台订单ID + club_id = request.data.get('club_id', '').strip() + chufaliyou = request.data.get('chufaliyou', '').strip() + fakuanjine = request.data.get('fakuanjine', 0) + yingxiang_qiangdan = request.data.get('yingxiang_qiangdan', 1) + shenqingren_shenfen = request.data.get('shenqingren_shenfen', 2) + operator = request.data.get('operator', '').strip() + + if not all([order_id, chufaliyou]): + return Response({'code': 400, 'msg': '参数不完整'}) + + # 通过对方订单ID查找我方订单 + try: + cross = CrossPlatformOrderData.objects.get(partner_order_id=order_id) + my_dingdan_id = cross.dingdan_id + order = Dingdan.objects.get(dingdan_id=my_dingdan_id) + dashou_id = order.jiedan_dashou_id + except CrossPlatformOrderData.DoesNotExist: + return Response({'code': 404, 'msg': '未找到关联订单'}) + except Dingdan.DoesNotExist: + return Response({'code': 404, 'msg': '我方订单不存在'}) + + if not dashou_id: + return Response({'code': 400, 'msg': '订单无接单打手'}) + + # 重复检查 + if Fadan.objects.filter(beichufa_id=dashou_id, guanliandingdan_id=my_dingdan_id).exists(): + return Response({'code': 0, 'msg': '已存在罚单'}) + + # 创建罚单 + Fadan.objects.create( + beichufa_id=dashou_id, + shenqing_chufa=operator, + shenfen=1, + chufaliyou=chufaliyou, + fakuanjine=fakuanjine, + guanliandingdan_id=my_dingdan_id, + zhuangtai=1, + yingxiang_qiangdan=yingxiang_qiangdan, + shenqingren_shenfen=shenqingren_shenfen, + partner_club_id=club_id, + ) + logger.info(f"接收对方罚款成功: 订单 {my_dingdan_id}, 打手 {dashou_id}") + return Response({'code': 0, 'msg': 'success'}) + + except Exception as e: + logger.error(f"接收罚款通知异常: {traceback.format_exc()}") + return Response({'code': 500, 'msg': '服务器内部错误'}) + + + + + + + + + + + + + +from dingdan.models import Fadan, FadanShensuTupian + + +# 权限码到身份的映射 +PERMISSION_TO_SHENFEN = { + '66693a': 1, # 打手 + '66693b': 3, # 商家 + '66693c': 2, # 管事 + '66694c': 4, # 组长 +} + +# 身份对应的用户扩展关系名 +SHENFEN_PROFILE_MAP = { + 1: 'dashou_profile', + 2: 'guanshi_profile', + 3: 'shop_profile', + 4: 'zuzhang_profile', +} + + +def check_fadan_permission(permissions, shenfen): + """检查是否有处理指定身份罚单的权限""" + perm_code = {1: '66693a', 2: '66693c', 3: '66693b', 4: '66694c'}.get(shenfen) + return perm_code in permissions + + +class FaKuanTongJiView(APIView): + """ + 罚款统计接口 + POST /houtai/htglyhqcfsltj + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '参数不完整'}) + + try: + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + + # 至少有一个罚款管理权限 + if not any(p in permissions for p in PERMISSION_TO_SHENFEN.keys()): + return Response({'code': 403, 'msg': '无权限查看罚款统计'}) + + stats = Fadan.objects.aggregate( + total=Count('id'), + daijiaona=Count('id', filter=Q(zhuangtai=1)), + shensuzhong=Count('id', filter=Q(zhuangtai=3)), + yijiaona=Count('id', filter=Q(zhuangtai=2)), + yibohui=Count('id', filter=Q(zhuangtai=4)), + ) + data = {k: v or 0 for k, v in stats.items()} + return Response({'code': 0, 'msg': '成功', 'data': data}) + except Exception as e: + logger.error(f"罚款统计异常: {traceback.format_exc()}") + return Response({'code': 500, 'msg': '系统繁忙'}) + + +class FaKuanLieBiaoView(APIView): + """ + 罚款列表接口 + POST /houtai/hthqfklb + """ + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + username = request.data.get('username', '').strip() + if not username: + return Response({'code': 400, 'msg': '参数不完整'}) + + try: + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + if not any(p in permissions for p in PERMISSION_TO_SHENFEN.keys()): + return Response({'code': 403, 'msg': '无权限查看罚款列表'}) + + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 20)) + if page_size > 100: + page_size = 100 + + qs = Fadan.objects.all() + + # 状态筛选 + zhuangtai = request.data.get('zhuangtai') + if zhuangtai is not None and int(zhuangtai) in [1, 2, 3, 4]: + qs = qs.filter(zhuangtai=int(zhuangtai)) + + # 被处罚人ID + beichufa_id = request.data.get('beichufa_id', '').strip() + if beichufa_id: + qs = qs.filter(beichufa_id=beichufa_id) + + # 被处罚人身份 + beichufa_shenfen = request.data.get('beichufa_shenfen') + if beichufa_shenfen is not None and int(beichufa_shenfen) in [1, 2, 3, 4]: + qs = qs.filter(shenfen=int(beichufa_shenfen)) + + # 模糊搜索（订单ID、被罚人ID、申请人ID） + sousuo = request.data.get('sousuo', '').strip() + if sousuo: + qs = qs.filter( + Q(guanliandingdan_id__icontains=sousuo) | + Q(beichufa_id__icontains=sousuo) | + Q(shenqing_chufa__icontains=sousuo) + ) + + qs = qs.order_by('-create_time') + paginator = Paginator(qs, page_size) + try: + page_obj = paginator.page(page) + except Exception: + return Response({ + 'code': 0, 'msg': '成功', + 'data': {'list': [], 'total': 0, 'page': page, 'page_size': page_size} + }) + + records = list(page_obj) + fadan_ids = [r.id for r in records] + + # 批量获取图片并分组 + zhengju_map = {} + shensu_map = {} + if fadan_ids: + tupians = FadanShensuTupian.objects.filter( + fadan_id__in=fadan_ids + ).values('fadan_id', 'tupian_url', 'yongtu') + for t in tupians: + fid = t['fadan_id'] + url = t['tupian_url'] + if t['yongtu'] == 1: + zhengju_map.setdefault(fid, []).append(url) + else: + shensu_map.setdefault(fid, []).append(url) + + # 组装列表数据 + results = [] + for r in records: + results.append({ + 'id': r.id, + 'beichufa_id': r.beichufa_id, + 'shenfen': r.shenfen, + 'shenfen_text': dict(Fadan._meta.get_field('shenfen').choices).get(r.shenfen, ''), + 'shenqing_chufa': r.shenqing_chufa or '', + 'shenqingren_shenfen': r.shenqingren_shenfen, + 'chufaliyou': r.chufaliyou or '', + 'fakuanjine': str(r.fakuanjine), + 'guanliandingdan_id': r.guanliandingdan_id or '', + 'zhuangtai': r.zhuangtai, + 'yingxiang_qiangdan': r.yingxiang_qiangdan, + 'shensuliyou': r.shensuliyou or '', + 'bohuiliyou': r.bohuiliyou or '', + 'chulizhe': r.chulizhe or '', + 'chulizhe_shenfen': r.chulizhe_shenfen, + 'zhengju_tupian': zhengju_map.get(r.id, []), + 'shensu_tupian': shensu_map.get(r.id, []), + 'create_time': r.create_time.strftime('%Y-%m-%d %H:%M:%S') if r.create_time else '', + 'update_time': r.update_time.strftime('%Y-%m-%d %H:%M:%S') if r.update_time else '', + }) + + return Response({ + 'code': 0, 'msg': '成功', + 'data': { + 'list': results, + 'total': paginator.count, + 'page': page, + 'page_size': page_size, + } + }) + except Exception as e: + logger.error(f"罚款列表异常: {traceback.format_exc()}") + return Response({'code': 500, 'msg': '系统繁忙'}) + + +class FaKuanChuLiView(APIView): + """ + 处理罚款申诉（同意/拒绝） + POST /houtai/glyclfk + """ + permission_classes = [IsAuthenticated] + parser_classes = [MultiPartParser, FormParser, JSONParser] + + def post(self, request): + try: + username = request.data.get('username', '').strip() + fadan_id = request.data.get('fadan_id') + action = request.data.get('action', '').strip() + chuli_liyou = request.data.get('chuli_liyou', '').strip() + + if not all([username, fadan_id, action]): + return Response({'code': 400, 'msg': '参数不完整'}) + + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + + with transaction.atomic(): + try: + fadan = Fadan.objects.select_for_update().get(id=fadan_id) + except Fadan.DoesNotExist: + return Response({'code': 404, 'msg': '罚单不存在'}) + + if fadan.zhuangtai != 3: + return Response({'code': 400, 'msg': '当前状态不可处理'}) + + if not check_fadan_permission(permissions, fadan.shenfen): + return Response({'code': 403, 'msg': '无权限处理该类罚单'}) + + # 处理上传的图片 + uploaded_urls = [] + files = request.FILES.getlist('tupian') or [] + if not files: + single = request.FILES.get('tupian') + if single: + files = [single] + for file in files: + valid, msg = validate_image(file) + if not valid: + return Response({'code': 400, 'msg': msg}) + ext = file.name.split('.')[-1] if '.' in file.name else 'jpg' + file_name = f"chufa_{fadan_id}_{int(time.time() * 1000)}.{ext}" + file_path = f"chufatupian/kechufatupian/{file_name}" + url = upload_to_oss(file, file_path) + if not url: + return Response({'code': 500, 'msg': '图片上传失败'}) + uploaded_urls.append(file_path) + + # 更新状态 + if action == 'agree': # 同意申诉 → 驳回处罚 + fadan.zhuangtai = 4 + fadan.bohuiliyou = chuli_liyou + elif action == 'reject': # 拒绝申诉 → 回到待缴纳 + fadan.zhuangtai = 1 + fadan.bohuiliyou = chuli_liyou + else: + return Response({'code': 400, 'msg': '无效的操作类型'}) + + # 记录处理者（使用 request.user 的 phone） + fadan.chulizhe = request.user.phone + fadan.chulizhe_shenfen = 2 # 这里假设处理者是售后身份，可根据实际业务获取 + fadan.save() + + # 保存图片（证据图片，用途1） + for relative_url in uploaded_urls: + FadanShensuTupian.objects.create( + fadan_id=fadan_id, + beichufa_id=fadan.beichufa_id, + tupian_url=relative_url, + yongtu=1 + ) + + logger.info(f"罚款处理成功: {fadan_id}, 操作: {action}") + return Response({'code': 0, 'msg': '处理成功'}) + + except Exception as e: + logger.error(f"罚款处理异常: {traceback.format_exc()}") + return Response({'code': 500, 'msg': '系统繁忙'}) + + +class FaKuanChuangJianView(APIView): + """ + 管理员创建罚款 + POST /houtai/htfksc + """ + permission_classes = [IsAuthenticated] + parser_classes = [MultiPartParser, FormParser, JSONParser] + + def post(self, request): + try: + username = request.data.get('username', '').strip() + beichufa_id = request.data.get('beichufa_id', '').strip() + shenfen = request.data.get('shenfen') + chufaliyou = request.data.get('chufaliyou', '').strip() + fakuanjine = request.data.get('fakuanjine') + yingxiang_qiangdan = request.data.get('yingxiang_qiangdan', 1) + + if not all([username, beichufa_id, shenfen, chufaliyou, fakuanjine]): + return Response({'code': 400, 'msg': '参数不完整'}) + + try: + shenfen = int(shenfen) + fakuanjine = float(fakuanjine) + except (ValueError, TypeError): + return Response({'code': 400, 'msg': '参数格式错误'}) + + if shenfen not in [1, 2, 3, 4]: + return Response({'code': 400, 'msg': '无效的被罚人身份'}) + + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions + + if not check_fadan_permission(permissions, shenfen): + return Response({'code': 403, 'msg': '无权限创建该类罚单'}) + + # 验证用户是否存在对应的扩展表 + try: + user = UserMain.objects.get(yonghuid=beichufa_id) + profile_attr = SHENFEN_PROFILE_MAP.get(shenfen) + if not profile_attr or not hasattr(user, profile_attr): + return Response({'code': 400, 'msg': '该用户不是所选身份'}) + except UserMain.DoesNotExist: + return Response({'code': 404, 'msg': '用户不存在'}) + + # 处理图片上传 + uploaded_urls = [] + files = request.FILES.getlist('tupian') or [] + if not files: + single = request.FILES.get('tupian') + if single: + files = [single] + for file in files: + valid, msg = validate_image(file) + if not valid: + return Response({'code': 400, 'msg': msg}) + ext = file.name.split('.')[-1] if '.' in file.name else 'jpg' + file_name = f"chufa_{int(time.time() * 1000)}.{ext}" + file_path = f"chufatupian/kechufatupian/{file_name}" + url = upload_to_oss(file, file_path) + if not url: + return Response({'code': 500, 'msg': '图片上传失败'}) + uploaded_urls.append(file_path) + + with transaction.atomic(): + fadan = Fadan.objects.create( + beichufa_id=beichufa_id, + shenfen=shenfen, + shenqing_chufa=request.user.phone, # 申请人（客服）手机号 + shenqingren_shenfen=2, # 售后身份 + chufaliyou=chufaliyou, + fakuanjine=fakuanjine, + yingxiang_qiangdan=yingxiang_qiangdan, + zhuangtai=1, # 待缴纳 + ) + for relative_url in uploaded_urls: + FadanShensuTupian.objects.create( + fadan=fadan, + beichufa_id=beichufa_id, + tupian_url=relative_url, + yongtu=1 + ) + + logger.info(f"罚款创建成功: {fadan.id}") + return Response({'code': 0, 'msg': '罚款已创建', 'data': {'id': fadan.id}}) + + except Exception as e: + logger.error(f"创建罚款异常: {traceback.format_exc()}") + return Response({'code': 500, 'msg': '系统繁忙'}) + + + + +from dengji.models import Bankuai + + + +class HqbkxxView(APIView): + """ + 获取板块配置所需全部数据 + POST /houtai/hqbkxx + Body: { "phone": "管理员手机号" } + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + # 1. 从前端获取传递的账号，用于防越权校验 + username_from_frontend = request.data.get('phone', None) + + # 2. 调用公共验证方法 + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + + # 3. 如果第一个返回值为 None，说明验证失败，直接返回第二个值 + if kefu_obj is None: + return permissions + + # ---------- 验证通过 ---------- + # 4. 检查是否有板块管理权限 + if 'bankuai' not in permissions: + return Response({'code': 403, 'msg': '无板块管理权限'}, status=403) + + # 5. 查询所有板块 + bankuai_list = [] + for bk in Bankuai.objects.all(): + bankuai_list.append({ + 'bankuai_id': bk.bankuai_id, + 'mingcheng': bk.mingcheng, + 'create_time': bk.create_time.strftime('%Y-%m-%d %H:%M:%S') if bk.create_time else '' + }) + + # 6. 查询所有商品类型 + shangpin_leixing_list = [] + for sp in ShangpinLeixing.objects.all(): + shangpin_leixing_list.append({ + 'id': sp.id, + 'jieshao': sp.jieshao, + 'tupian_url': sp.tupian_url or '', + 'bankuai_id': sp.bankuai_id + }) + + # 7. 查询所有会员 + huiyuan_list = [] + for hy in Huiyuan.objects.all(): + huiyuan_list.append({ + 'huiyuan_id': hy.huiyuan_id, + 'jieshao': hy.jieshao, + 'bankuai_id': hy.bankuai_id + }) + + return Response({ + 'code': 0, + 'msg': 'ok', + 'data': { + 'bankuai': bankuai_list, + 'shangpin_leixing': shangpin_leixing_list, + 'huiyuan': huiyuan_list + } + }) + + +class BkxgView(APIView): + """ + 板块增删改统一接口 + POST /houtai/bkxg + Body: { + "phone": "管理员手机号", + "action": "create | update | delete | add_items | remove_items", + "bankuai_id": int, + "bankuai_name": str, + "item_type": "shangpin_leixing | huiyuan", + "item_ids": [1,2,3] + } + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + # 1. 从前端获取传递的账号 + username_from_frontend = request.data.get('phone', None) + + # 2. 调用公共验证方法 + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + + # 3. 验证失败直接返回 + if kefu_obj is None: + return permissions + + # 4. 检查板块管理权限 + if 'bankuai' not in permissions: + return Response({'code': 403, 'msg': '无板块管理权限'}, status=403) + + # 5. 获取操作类型 + action = request.data.get('action') + if not action: + return Response({'code': 1, 'msg': '缺少 action 参数'}, status=400) + + # ==================== 创建板块 ==================== + if action == 'create': + bankuai_name = request.data.get('bankuai_name', '').strip() + if not bankuai_name: + return Response({'code': 1, 'msg': '板块名称不能为空'}, status=400) + if Bankuai.objects.filter(mingcheng=bankuai_name).exists(): + return Response({'code': 1, 'msg': '板块名称已存在'}, status=400) + + shangpin_ids = request.data.get('shangpin_ids', []) + huiyuan_ids = request.data.get('huiyuan_ids', []) + + with transaction.atomic(): + new_bk = Bankuai.objects.create(mingcheng=bankuai_name) + if shangpin_ids: + ShangpinLeixing.objects.filter( + id__in=shangpin_ids, + bankuai__isnull=True + ).update(bankuai=new_bk) + if huiyuan_ids: + Huiyuan.objects.filter( + huiyuan_id__in=huiyuan_ids, + bankuai__isnull=True + ).update(bankuai=new_bk) + + return Response({ + 'code': 0, + 'msg': '创建成功', + 'data': {'bankuai_id': new_bk.bankuai_id} + }) + + # ==================== 以下操作需要 bankuai_id ==================== + bankuai_id = request.data.get('bankuai_id') + if not bankuai_id: + return Response({'code': 1, 'msg': '缺少 bankuai_id'}, status=400) + + try: + bk = Bankuai.objects.get(bankuai_id=bankuai_id) + except Bankuai.DoesNotExist: + return Response({'code': 1, 'msg': '板块不存在'}, status=404) + + # ==================== 修改板块名称 ==================== + if action == 'update': + new_name = request.data.get('bankuai_name', '').strip() + if not new_name: + return Response({'code': 1, 'msg': '板块名称不能为空'}, status=400) + if Bankuai.objects.filter(mingcheng=new_name).exclude(bankuai_id=bankuai_id).exists(): + return Response({'code': 1, 'msg': '板块名称已存在'}, status=400) + bk.mingcheng = new_name + bk.save() + return Response({'code': 0, 'msg': '修改成功'}) + + # ==================== 删除板块 ==================== + elif action == 'delete': + with transaction.atomic(): + ShangpinLeixing.objects.filter(bankuai=bk).update(bankuai=None) + Huiyuan.objects.filter(bankuai=bk).update(bankuai=None) + bk.delete() + return Response({'code': 0, 'msg': '删除成功'}) + + # ==================== 添加绑定 ==================== + elif action == 'add_items': + item_type = request.data.get('item_type') + item_ids = request.data.get('item_ids', []) + if not item_type or not item_ids: + return Response({'code': 1, 'msg': '缺少 item_type 或 item_ids'}, status=400) + + if item_type == 'shangpin_leixing': + ShangpinLeixing.objects.filter( + id__in=item_ids, + bankuai__isnull=True + ).update(bankuai=bk) + elif item_type == 'huiyuan': + Huiyuan.objects.filter( + huiyuan_id__in=item_ids, + bankuai__isnull=True + ).update(bankuai=bk) + else: + return Response({'code': 1, 'msg': '无效的 item_type'}, status=400) + return Response({'code': 0, 'msg': '添加成功'}) + + # ==================== 移除绑定 ==================== + elif action == 'remove_items': + item_type = request.data.get('item_type') + item_ids = request.data.get('item_ids', []) + if not item_type or not item_ids: + return Response({'code': 1, 'msg': '缺少 item_type 或 item_ids'}, status=400) + + if item_type == 'shangpin_leixing': + ShangpinLeixing.objects.filter( + id__in=item_ids, + bankuai=bk + ).update(bankuai=None) + elif item_type == 'huiyuan': + Huiyuan.objects.filter( + huiyuan_id__in=item_ids, + bankuai=bk + ).update(bankuai=None) + else: + return Response({'code': 1, 'msg': '无效的 item_type'}, status=400) + return Response({'code': 0, 'msg': '移除成功'}) + + else: + return Response({'code': 1, 'msg': '未知操作'}, status=400) + + + + + +from rest_framework.permissions import IsAuthenticated +from rest_framework.views import APIView +from rest_framework.response import Response +from django.db.models import Sum +from django.utils import timezone +from datetime import date, timedelta +from peizhi.models import ( + DailyIncomeStat, DailyPayoutStat +) +from shangpin.models import ( + Czjilu +) +from .utils import verify_kefu_permission + + +class CaiwuView(APIView): + permission_classes = [IsAuthenticated] + + def post(self, request): + username_from_frontend = request.data.get('phone', None) + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + + if kefu_obj is None: + return permissions + + if 'caiwu' not in permissions: + return Response({'code': 403, 'msg': '无财务查看权限'}, status=403) + + today = date.today() + today_start = datetime.combine(today, datetime.min.time()) + today_end = today_start + timedelta(days=1) + + # 今日收入 + today_income = DailyIncomeStat.objects.filter(date=today).first() + today_income_amount = float(today_income.total_amount) if today_income else 0.00 + today_income_count = today_income.total_count if today_income else 0 + + # 今日支出 + today_payout = DailyPayoutStat.objects.filter(date=today).first() + today_payout_amount = float(today_payout.total_amount) if today_payout else 0.00 + today_payout_count = today_payout.total_count if today_payout else 0 + + # 今日订单（已付款及之后的状态） + today_orders = Dingdan.objects.filter( + create_time__gte=today_start, + create_time__lt=today_end, + zhuangtai__in=[1,2,3,4,5,6,7,8] + ) + today_order_count = today_orders.count() + today_order_amount = float(today_orders.aggregate(total=Sum('jine'))['total'] or 0.00) + + # 今日成交（zhuangtai=3） + today_completed = Dingdan.objects.filter( + create_time__gte=today_start, + create_time__lt=today_end, + zhuangtai=3 + ) + today_completed_count = today_completed.count() + today_completed_amount = float(today_completed.aggregate(total=Sum('jine'))['total'] or 0.00) + + # 今日退款（zhuangtai=5） + today_tuikuan = Dingdan.objects.filter( + create_time__gte=today_start, + create_time__lt=today_end, + zhuangtai=5 + ) + today_tuikuan_count = today_tuikuan.count() + today_tuikuan_amount = float(today_tuikuan.aggregate(total=Sum('jine'))['total'] or 0.00) + + # 今日充值（会员充值，leixing=1, zhuangtai=3） + today_chongzhi = Czjilu.objects.filter( + create_time__gte=today_start, + create_time__lt=today_end, + leixing=1, + zhuangtai=3 + ) + today_chongzhi_count = today_chongzhi.count() + today_chongzhi_amount = float(today_chongzhi.aggregate(total=Sum('jine'))['total'] or 0.00) + + # 今日新增会员：从购买记录表统计今天创建的用户（去重） + new_huiyuan_user_ids = Huiyuangoumai.objects.filter( + create_time__gte=today_start, + create_time__lt=today_end + ).values_list('yonghu_id', flat=True).distinct() + today_new_huiyuan = len(new_huiyuan_user_ids) + + # 新增会员充值总额（这些用户今天的会员充值金额） + today_new_huiyuan_amount = 0.0 + if new_huiyuan_user_ids: + amount_sum = Czjilu.objects.filter( + create_time__gte=today_start, + create_time__lt=today_end, + yonghuid__in=new_huiyuan_user_ids, + leixing=1, + zhuangtai=3 + ).aggregate(total=Sum('jine')) + today_new_huiyuan_amount = float(amount_sum['total'] or 0.0) + + # 各角色可提现余额总和 + all_guanshi_yue = float(UserGuanshi.objects.aggregate(total=Sum('yue'))['total'] or 0.00) + all_dashou_yue = float(UserDashou.objects.aggregate(total=Sum('yue'))['total'] or 0.00) + all_zuzhang_yue = float(UserZuzhang.objects.aggregate(total=Sum('ketixian_jine'))['total'] or 0.00) + all_shangjia_yue = float(UserShangjia.objects.aggregate(total=Sum('yue'))['total'] or 0.00) + + # 平台总收支及利润 + total_income = float(DailyIncomeStat.objects.aggregate(total=Sum('total_amount'))['total'] or 0.00) + total_payout = float(DailyPayoutStat.objects.aggregate(total=Sum('total_amount'))['total'] or 0.00) + platform_profit = round(total_income - total_payout, 2) + + # 近30天每日收支明细 + daily_stats = [] + income_qs = DailyIncomeStat.objects.order_by('-date')[:30] + payout_dict = { + str(p.date): float(p.total_amount) + for p in DailyPayoutStat.objects.filter(date__gte=today - timedelta(days=30)) + } + for inc in income_qs: + d = str(inc.date) + daily_stats.append({ + 'date': d, + 'income': float(inc.total_amount), + 'income_count': inc.total_count, + 'payout': payout_dict.get(d, 0.00), + 'profit': round(float(inc.total_amount) - payout_dict.get(d, 0.00), 2) + }) + + return Response({ + 'code': 0, + 'msg': 'ok', + 'data': { + 'today_income': round(today_income_amount, 2), + 'today_income_count': today_income_count, + 'today_payout': round(today_payout_amount, 2), + 'today_payout_count': today_payout_count, + 'today_order_count': today_order_count, + 'today_order_amount': round(today_order_amount, 2), + 'today_completed_count': today_completed_count, + 'today_completed_amount': round(today_completed_amount, 2), + 'today_tuikuan_count': today_tuikuan_count, + 'today_tuikuan_amount': round(today_tuikuan_amount, 2), + 'today_chongzhi_count': today_chongzhi_count, + 'today_chongzhi_amount': round(today_chongzhi_amount, 2), + 'today_new_huiyuan': today_new_huiyuan, + 'today_new_huiyuan_amount': round(today_new_huiyuan_amount, 2), + 'all_guanshi_yue': round(all_guanshi_yue, 2), + 'all_dashou_yue': round(all_dashou_yue, 2), + 'all_zuzhang_yue': round(all_zuzhang_yue, 2), + 'all_shangjia_yue': round(all_shangjia_yue, 2), + 'total_income': round(total_income, 2), + 'total_payout': round(total_payout, 2), + 'platform_profit': platform_profit, + 'daily_stats': daily_stats + } + }) + + + + + + +class CwhybkhqView(APIView): + """ + 获取所有板块及对应会员列表 + POST /houtai/cwhybkhq + Body: { "phone": "管理员手机号" } + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + username_from_frontend = request.data.get('phone', None) + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + if kefu_obj is None: + return permissions + + if 'huiyuancaiwu' not in permissions: + return Response({'code': 403, 'msg': '无财务查看权限'}, status=403) + + # 查询所有板块 + bankuai_list = [] + for bk in Bankuai.objects.all(): + # 获取该板块下所有会员 + members = Huiyuan.objects.filter(bankuai=bk).values('huiyuan_id', 'jieshao', 'bankuai_id') + bankuai_list.append({ + 'bankuai_id': bk.bankuai_id, + 'mingcheng': bk.mingcheng, + 'members': list(members) + }) + + return Response({ + 'code': 0, + 'msg': 'ok', + 'data': bankuai_list + }) + + + +from django.db.models.functions import TruncDate, TruncMonth, TruncYear +from shangpin.models import Czjilu, Gsfenhong +from .utils import verify_kefu_permission + +from django.db.models.functions import TruncDate, TruncMonth, TruncYear +from shangpin.models import Czjilu, Gsfenhong # 请根据实际路径调整 +class HybkjtsjView(APIView): + """ + 会员详细统计数据 + POST /houtai/hybkjtsj + Body: { + "phone": "管理员手机号", + "huiyuan_id": "会员ID", + "granularity": "day" | "month" | "year", + "year": 2026, + "month": 5, + "include_guanshi": true, + "include_zuzhang": true, + "summary_date": "2026-05-16" + } + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + username_from_frontend = request.data.get('phone', None) + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + if kefu_obj is None: + return permissions + + if 'huiyuancaiwu' not in permissions: + return Response({'code': 403, 'msg': '无会员财务查看权限'}, status=403) + + huiyuan_id = request.data.get('huiyuan_id') + granularity = request.data.get('granularity', 'day') + year = request.data.get('year') + month = request.data.get('month') + include_guanshi = request.data.get('include_guanshi', False) + include_zuzhang = request.data.get('include_zuzhang', False) + summary_date = request.data.get('summary_date') + + if not huiyuan_id: + return Response({'code': 1, 'msg': '缺少会员ID'}, status=400) + + # 🔧 直接使用 date.today() 避免模块名冲突 + from datetime import date, datetime, timedelta + now = date.today() + + # ---------- 构造时间范围 ---------- + if granularity == 'day': + if not year or not month: + return Response({'code': 1, 'msg': '按日统计需要年份和月份'}, status=400) + start_date = date(year, month, 1) + if month == 12: + end_date = date(year + 1, 1, 1) + else: + end_date = date(year, month + 1, 1) + trunc_func = TruncDate('create_time') + if not summary_date: + summary_date = now.strftime('%Y-%m-%d') + summary_q = datetime.strptime(summary_date, '%Y-%m-%d').date() + elif granularity == 'month': + if not year: + return Response({'code': 1, 'msg': '按月统计需要年份'}, status=400) + start_date = date(year, 1, 1) + end_date = date(year + 1, 1, 1) + trunc_func = TruncMonth('create_time') + if not summary_date: + summary_date = now.strftime('%Y-%m') + summary_q = datetime.strptime(summary_date + '-01', '%Y-%m-%d').date() + elif granularity == 'year': + year = year or now.year + start_date = date(year, 1, 1) + end_date = date(year + 1, 1, 1) + trunc_func = TruncYear('create_time') + if not summary_date: + summary_date = str(year) + summary_q = date(year, 1, 1) + else: + return Response({'code': 1, 'msg': '无效的颗粒度'}, status=400) + + # 生成 naive datetime（避免 USE_TZ=False 报错） + start_dt = datetime.combine(start_date, datetime.min.time()) + end_dt = datetime.combine(end_date, datetime.min.time()) + + # ---------- 充值过滤 ---------- + chongzhi_filter = { + 'huiyuan_id': huiyuan_id, # 会员ID筛选 + 'leixing': 1, + 'zhuangtai': 3, + 'create_time__gte': start_dt, + 'create_time__lt': end_dt + } + + # ---------- 分红过滤 ---------- + fenhong_filter = { + 'huiyuan_id': huiyuan_id, # 分红表会员ID筛选 + 'create_time__gte': start_dt, + 'create_time__lt': end_dt + } + + # 充值分组查询 + chongzhi_qs = Czjilu.objects.filter(**chongzhi_filter) \ + .annotate(period=trunc_func) \ + .values('period') \ + .annotate( + chongzhi_count=Count('id'), + chongzhi_amount=Sum('jine') + ).order_by('period') + + # 分红分组查询 + fenhong_qs = None + if include_guanshi or include_zuzhang: + fenhong_agg = {} + if include_guanshi: + fenhong_agg['guanshi_amount'] = Sum('fenhong') + if include_zuzhang: + fenhong_agg['zuzhang_amount'] = Sum('zuzhang_fenhong') + fenhong_qs = Gsfenhong.objects.filter(**fenhong_filter) \ + .annotate(period=trunc_func) \ + .values('period') \ + .annotate(**fenhong_agg) \ + .order_by('period') + + # 合并数据 + data_map = {} + for item in chongzhi_qs: + period_str = item['period'].strftime('%Y-%m-%d') if granularity == 'day' else \ + item['period'].strftime('%Y-%m') if granularity == 'month' else \ + item['period'].strftime('%Y') + data_map[period_str] = { + 'chongzhi_count': item['chongzhi_count'], + 'chongzhi_amount': float(item['chongzhi_amount'] or 0) + } + + if fenhong_qs: + for item in fenhong_qs: + period_str = item['period'].strftime('%Y-%m-%d') if granularity == 'day' else \ + item['period'].strftime('%Y-%m') if granularity == 'month' else \ + item['period'].strftime('%Y') + if period_str not in data_map: + data_map[period_str] = {'chongzhi_count': 0, 'chongzhi_amount': 0.0} + if include_guanshi: + data_map[period_str]['guanshi_amount'] = float(item.get('guanshi_amount') or 0) + if include_zuzhang: + data_map[period_str]['zuzhang_amount'] = float(item.get('zuzhang_amount') or 0) + + time_series = [] + for period_str, vals in data_map.items(): + guanshi = vals.get('guanshi_amount', 0) if include_guanshi else 0 + zuzhang = vals.get('zuzhang_amount', 0) if include_zuzhang else 0 + vals['shouyi'] = round(vals['chongzhi_amount'] - guanshi - zuzhang, 2) + vals['date'] = period_str + time_series.append(vals) + time_series.sort(key=lambda x: x['date']) + + # ---------- 汇总数据 ---------- + summary_chongzhi_filter = chongzhi_filter.copy() + if granularity == 'day': + summary_chongzhi_filter['create_time__date'] = summary_q + elif granularity == 'month': + summary_chongzhi_filter['create_time__year'] = summary_q.year + summary_chongzhi_filter['create_time__month'] = summary_q.month + else: + summary_chongzhi_filter['create_time__year'] = summary_q.year + + summary_chongzhi = Czjilu.objects.filter(**summary_chongzhi_filter).aggregate( + total_count=Count('id'), + total_amount=Sum('jine') + ) + total_chongzhi_count = summary_chongzhi['total_count'] or 0 + total_chongzhi_amount = float(summary_chongzhi['total_amount'] or 0) + + total_guanshi = 0.0 + total_zuzhang = 0.0 + if include_guanshi or include_zuzhang: + summary_fenhong_filter = fenhong_filter.copy() + if granularity == 'day': + summary_fenhong_filter['create_time__date'] = summary_q + elif granularity == 'month': + summary_fenhong_filter['create_time__year'] = summary_q.year + summary_fenhong_filter['create_time__month'] = summary_q.month + else: + summary_fenhong_filter['create_time__year'] = summary_q.year + + fenhong_agg = {} + if include_guanshi: + fenhong_agg['guanshi_sum'] = Sum('fenhong') + if include_zuzhang: + fenhong_agg['zuzhang_sum'] = Sum('zuzhang_fenhong') + summary_fenhong = Gsfenhong.objects.filter(**summary_fenhong_filter).aggregate(**fenhong_agg) + total_guanshi = float(summary_fenhong.get('guanshi_sum') or 0) + total_zuzhang = float(summary_fenhong.get('zuzhang_sum') or 0) + + total_shouyi = round(total_chongzhi_amount - total_guanshi - total_zuzhang, 2) + + return Response({ + 'code': 0, + 'msg': 'ok', + 'data': { + 'time_series': time_series, + 'summary': { + 'total_chongzhi_count': total_chongzhi_count, + 'total_chongzhi_amount': total_chongzhi_amount, + 'total_guanshi_fenhong': total_guanshi, + 'total_zuzhang_fenhong': total_zuzhang, + 'total_shouyi': total_shouyi + } + } + }) + except Exception as e: + logger.exception("HybkjtsjView 接口错误") + return Response({'code': 1, 'msg': f'服务器内部错误: {str(e)}'}, status=500) + + + + + + +class SzxxView(APIView): + """ + 每日收支详细统计数据 + POST /houtai/szxx + Body: { + "phone": "管理员手机号", + "granularity": "day" | "month" | "year", + "year": 2026, // day/month 时必填 + "month": 5, // day 时必填 + "summary_date": "2026-05-16" // 可选，格式随颗粒度 + } + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + # 避免模块名冲突，局部导入 + from datetime import date, datetime + + username_from_frontend = request.data.get('phone', None) + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + if kefu_obj is None: + return permissions + + if 'caiwu' not in permissions: + return Response({'code': 403, 'msg': '无财务查看权限'}, status=403) + + granularity = request.data.get('granularity', 'day') + year = request.data.get('year') + month = request.data.get('month') + summary_date = request.data.get('summary_date') + + now = date.today() + + # ---------- 时间范围与分组字段 ---------- + if granularity == 'day': + if not year or not month: + return Response({'code': 1, 'msg': '按日统计需要年份和月份'}, status=400) + # 分组字段 + group_field = 'day' + # 过滤条件 + income_filter = {'year': year, 'month': month} + payout_filter = {'year': year, 'month': month} + # 默认汇总日期 + if not summary_date: + summary_date = now.strftime('%Y-%m-%d') + summary_parts = summary_date.split('-') + summary_filter = {'year': int(summary_parts[0]), 'month': int(summary_parts[1]), 'day': int(summary_parts[2])} + # 用于构造返回的日期字符串 + date_format = '%Y-%m-%d' + + elif granularity == 'month': + if not year: + return Response({'code': 1, 'msg': '按月统计需要年份'}, status=400) + group_field = 'month' + income_filter = {'year': year} + payout_filter = {'year': year} + if not summary_date: + summary_date = now.strftime('%Y-%m') + summary_parts = summary_date.split('-') + summary_filter = {'year': int(summary_parts[0]), 'month': int(summary_parts[1])} + date_format = '%Y-%m' + + elif granularity == 'year': + group_field = 'year' + income_filter = {} + payout_filter = {} + if not summary_date: + summary_date = str(now.year) + summary_filter = {'year': int(summary_date)} + date_format = '%Y' + else: + return Response({'code': 1, 'msg': '无效的颗粒度'}, status=400) + + # ---------- 收入分组查询 ---------- + income_qs = DailyIncomeStat.objects.filter(**income_filter) \ + .values(group_field) \ + .annotate(total_income=Sum('total_amount'), total_count=Sum('total_count')) \ + .order_by(group_field) + + # ---------- 支出分组查询 ---------- + payout_qs = DailyPayoutStat.objects.filter(**payout_filter) \ + .values(group_field) \ + .annotate(total_payout=Sum('total_amount'), total_count=Sum('total_count')) \ + .order_by(group_field) + + # ---------- 合并数据 ---------- + data_map = {} + for item in income_qs: + key = item[group_field] + data_map[key] = { + 'income': float(item['total_income'] or 0), + 'income_count': item['total_count'] or 0, + 'payout': 0.0, + 'payout_count': 0 + } + + for item in payout_qs: + key = item[group_field] + if key not in data_map: + data_map[key] = {'income': 0.0, 'income_count': 0, 'payout': 0.0, 'payout_count': 0} + data_map[key]['payout'] = float(item['total_payout'] or 0) + data_map[key]['payout_count'] = item['total_count'] or 0 + + time_series = [] + for key, vals in data_map.items(): + # 构造日期字符串 + if granularity == 'day': + date_str = f"{year}-{month:02d}-{key:02d}" + elif granularity == 'month': + date_str = f"{year}-{key:02d}" + else: + date_str = str(key) + profit = round(vals['income'] - vals['payout'], 2) + time_series.append({ + 'date': date_str, + 'income': vals['income'], + 'payout': vals['payout'], + 'profit': profit + }) + time_series.sort(key=lambda x: x['date']) + + # ---------- 汇总数据 ---------- + income_summary = DailyIncomeStat.objects.filter(**summary_filter).aggregate( + total_income=Sum('total_amount'), total_count=Sum('total_count') + ) + payout_summary = DailyPayoutStat.objects.filter(**summary_filter).aggregate( + total_payout=Sum('total_amount'), total_count=Sum('total_count') + ) + total_income = float(income_summary['total_income'] or 0) + total_payout = float(payout_summary['total_payout'] or 0) + total_profit = round(total_income - total_payout, 2) + + return Response({ + 'code': 0, + 'msg': 'ok', + 'data': { + 'time_series': time_series, + 'summary': { + 'total_income': total_income, + 'total_income_count': income_summary['total_count'] or 0, + 'total_payout': total_payout, + 'total_payout_count': payout_summary['total_count'] or 0, + 'total_profit': total_profit + } + } + }) + + except Exception as e: + logger.exception("SzxxView 接口错误") + return Response({'code': 1, 'msg': f'服务器内部错误: {str(e)}'}, status=500) + + + + + + + + + +class CwddhqlxView(APIView): + """ + 获取订单类型（商品类型）用于筛选 + POST /houtai/cwddhqlx + Body: { "phone": "管理员手机号" } + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + username_from_frontend = request.data.get('phone', None) + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + if kefu_obj is None: + return permissions + + if 'dingdancaiwu' not in permissions: + return Response({'code': 403, 'msg': '无订单财务查看权限'}, status=403) + + # 获取非审核状态（shenhezhuangtai=1）的商品类型，只返回ID和名称 + types = ShangpinLeixing.objects.filter(shenhezhuangtai=1).values('id', 'jieshao') + return Response({ + 'code': 0, + 'msg': 'ok', + 'data': list(types) + }) + except Exception as e: + logger.exception("CwddhqlxView 接口错误") + return Response({'code': 1, 'msg': f'服务器内部错误: {str(e)}'}, status=500) + + + +class CwhqjtddsjView(APIView): + """ + 订单详细统计数据（修正版） + POST /houtai/cwhqjtddsj + Body: { + "phone": "管理员手机号", + "granularity": "day" | "month" | "year", + "year": 2026, + "month": 5, + "type_id": 1, # 商品类型ID，0表示全部 + "order_source": 1, # 1=平台单，2=商家单，0=全部 + "summary_date": "2026-05-16" + } + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + username_from_frontend = request.data.get('phone', None) + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + if kefu_obj is None: + return permissions + if 'dingdancaiwu' not in permissions: + return Response({'code': 403, 'msg': '无订单财务查看权限'}, status=403) + + granularity = request.data.get('granularity', 'day') + year = request.data.get('year') + month = request.data.get('month') + type_id = request.data.get('type_id', 0) + order_source = request.data.get('order_source', 0) + summary_date = request.data.get('summary_date') + + now = date.today() + + # ---------- 时间范围 ---------- + if granularity == 'day': + if not year or not month: + return Response({'code': 1, 'msg': '按日统计需要年份和月份'}, status=400) + start_date = date(year, month, 1) + end_date = date(year, month + 1, 1) if month < 12 else date(year + 1, 1, 1) + trunc_func = TruncDate('create_time') + if not summary_date: + summary_date = now.strftime('%Y-%m-%d') + summary_q = datetime.strptime(summary_date, '%Y-%m-%d').date() + elif granularity == 'month': + if not year: + return Response({'code': 1, 'msg': '按月统计需要年份'}, status=400) + start_date = date(year, 1, 1) + end_date = date(year + 1, 1, 1) + trunc_func = TruncMonth('create_time') + if not summary_date: + summary_date = now.strftime('%Y-%m') + summary_q = datetime.strptime(summary_date + '-01', '%Y-%m-%d').date() + elif granularity == 'year': + year = year or now.year + start_date = date(year, 1, 1) + end_date = date(year + 1, 1, 1) + trunc_func = TruncYear('create_time') + if not summary_date: + summary_date = str(year) + summary_q = date(year, 1, 1) + else: + return Response({'code': 1, 'msg': '无效的颗粒度'}, status=400) + + start_dt = datetime.combine(start_date, datetime.min.time()) + end_dt = datetime.combine(end_date, datetime.min.time()) + + # ---------- 基础过滤 ---------- + filters = { + 'create_time__gte': start_dt, + 'create_time__lt': end_dt, + 'zhuangtai__in': [1, 2, 3, 4, 5, 6, 7, 8] # 只统计有效订单状态 + } + if int(type_id) != 0: + filters['leixing_id'] = type_id + if int(order_source) in [1, 2]: + filters['fadan_pingtai'] = order_source + + # ---------- 时间序列分组查询 ---------- + qs = Dingdan.objects.filter(**filters) \ + .annotate(period=trunc_func) \ + .values('period') \ + .annotate( + # 订单总量（所有符合条件的状态） + order_count=Count('id'), + # 订单总额 + order_amount=Sum('jine'), + # 成交单量 (zhuangtai=3) + success_count=Count('id', filter=Q(zhuangtai=3)), + # 成交订单总额 + success_amount=Sum('jine', filter=Q(zhuangtai=3)), + # 退款单量 (zhuangtai=5) + refund_count=Count('id', filter=Q(zhuangtai=5)), + # 打手分成总额（仅成交订单） + dashou_fencheng_sum=Sum('dashou_fencheng', filter=Q(zhuangtai=3)), + # 平台成交订单的店铺分红 + dianpu_fenhong_sum=Sum('pingtai_kuozhan__dianpu_shouyi', + filter=Q(zhuangtai=3, fadan_pingtai=1)), + # 成交订单中：平台单金额、商家单金额、各自打手分成 + platform_success_amount=Sum('jine', filter=Q(zhuangtai=3, fadan_pingtai=1)), + merchant_success_amount=Sum('jine', filter=Q(zhuangtai=3, fadan_pingtai=2)), + platform_dashou=Sum('dashou_fencheng', filter=Q(zhuangtai=3, fadan_pingtai=1)), + merchant_dashou=Sum('dashou_fencheng', filter=Q(zhuangtai=3, fadan_pingtai=2)), + ).order_by('period') + + time_series = [] + for item in qs: + period_str = item['period'].strftime('%Y-%m-%d') if granularity == 'day' else \ + item['period'].strftime('%Y-%m') if granularity == 'month' else \ + item['period'].strftime('%Y') + + # 平台收益计算 + platform_profit = (item['platform_success_amount'] or 0) \ + - (item['platform_dashou'] or 0) \ + - (item['dianpu_fenhong_sum'] or 0) + merchant_profit = (item['merchant_success_amount'] or 0) \ + - (item['merchant_dashou'] or 0) + total_profit = platform_profit + merchant_profit + + time_series.append({ + 'date': period_str, + 'order_count': item['order_count'], + 'order_amount': float(item['order_amount'] or 0), + 'success_count': item['success_count'], + 'success_amount': float(item['success_amount'] or 0), + 'refund_count': item['refund_count'], + 'dashou_fencheng': float(item['dashou_fencheng_sum'] or 0), + 'dianpu_fenhong': float(item['dianpu_fenhong_sum'] or 0), + 'profit': round(total_profit, 2) + }) + + # ---------- 汇总数据 ---------- + summary_qs = Dingdan.objects.filter(**filters) + total_order_count = summary_qs.count() + total_order_amount = summary_qs.aggregate(s=Sum('jine'))['s'] or 0 + total_success_count = summary_qs.filter(zhuangtai=3).count() + total_success_amount = summary_qs.filter(zhuangtai=3).aggregate(s=Sum('jine'))['s'] or 0 + total_refund_count = summary_qs.filter(zhuangtai=5).count() + total_dashou = summary_qs.filter(zhuangtai=3).aggregate(s=Sum('dashou_fencheng'))['s'] or 0 + total_dianpu_fenhong = summary_qs.filter(zhuangtai=3, fadan_pingtai=1).aggregate( + s=Sum('pingtai_kuozhan__dianpu_shouyi'))['s'] or 0 + + platform_amount = summary_qs.filter(zhuangtai=3, fadan_pingtai=1).aggregate(s=Sum('jine'))['s'] or 0 + merchant_amount = summary_qs.filter(zhuangtai=3, fadan_pingtai=2).aggregate(s=Sum('jine'))['s'] or 0 + platform_dashou_sum = \ + summary_qs.filter(zhuangtai=3, fadan_pingtai=1).aggregate(s=Sum('dashou_fencheng'))['s'] or 0 + merchant_dashou_sum = \ + summary_qs.filter(zhuangtai=3, fadan_pingtai=2).aggregate(s=Sum('dashou_fencheng'))['s'] or 0 + + profit_platform = platform_amount - platform_dashou_sum - total_dianpu_fenhong + profit_merchant = merchant_amount - merchant_dashou_sum + total_profit = profit_platform + profit_merchant + + summary = { + 'total_order_count': total_order_count, + 'total_order_amount': round(float(total_order_amount), 2), + 'total_success_count': total_success_count, + 'total_success_amount': round(float(total_success_amount), 2), + 'total_refund_count': total_refund_count, + 'total_dashou_fencheng': round(float(total_dashou), 2), + 'total_dianpu_fenhong': round(float(total_dianpu_fenhong), 2), + 'total_profit': round(total_profit, 2) + } + + return Response({ + 'code': 0, + 'msg': 'ok', + 'data': { + 'time_series': time_series, + 'summary': summary + } + }) + except Exception as e: + logger.exception("CwhqjtddsjView 接口错误") + return Response({'code': 1, 'msg': f'服务器内部错误: {str(e)}'}, status=500) + + + + + +from dingdan.models import Fadan, FadanFenhong # 罚单和罚款分红表，根据实际路径调整 +import logging +from datetime import date, datetime +from django.db.models import Count, Sum, Q + + + + + +class CwqtczhqView(APIView): + """ + 其他充值/罚款数据统计（非会员充值） + POST /houtai/cwqtczhq + Body: { + "phone": "管理员手机号", + "granularity": "day" | "month" | "year", + "year": 2026, + "month": 5, // day时必填 + "types": [2,3,4,5,6], // 2=押金,3=积分,4=商家,5=考核,6=罚款 + "summary_date": "2026-05-17" // 汇总日期，格式随颗粒度（day:YYYY-MM-DD, month:YYYY-MM, year:YYYY） + } + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + username_from_frontend = request.data.get('phone', None) + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + if kefu_obj is None: + return permissions + if 'qtczcaiwu' not in permissions: + return Response({'code': 403, 'msg': '无其他充值财务查看权限'}, status=403) + + granularity = request.data.get('granularity', 'day') + year = request.data.get('year') + month = request.data.get('month') + types = request.data.get('types', [2, 3, 4, 5, 6]) # 默认全部 + summary_date = request.data.get('summary_date') + + if isinstance(types, list) and len(types) == 0: + types = [2, 3, 4, 5, 6] + + now = date.today() + + # ---------- 时间范围（用于曲线图） ---------- + if granularity == 'day': + if not year or not month: + return Response({'code': 1, 'msg': '按日统计需要年份和月份'}, status=400) + start_date = date(year, month, 1) + end_date = date(year, month + 1, 1) if month < 12 else date(year + 1, 1, 1) + trunc_func = TruncDate('create_time') + # 默认汇总日期 + if not summary_date: + summary_date = now.strftime('%Y-%m-%d') + summary_q = datetime.strptime(summary_date, '%Y-%m-%d').date() + elif granularity == 'month': + if not year: + return Response({'code': 1, 'msg': '按月统计需要年份'}, status=400) + start_date = date(year, 1, 1) + end_date = date(year + 1, 1, 1) + trunc_func = TruncMonth('create_time') + if not summary_date: + summary_date = now.strftime('%Y-%m') + summary_q = datetime.strptime(summary_date + '-01', '%Y-%m-%d').date() + elif granularity == 'year': + year = year or now.year + start_date = date(year, 1, 1) + end_date = date(year + 1, 1, 1) + trunc_func = TruncYear('create_time') + if not summary_date: + summary_date = str(year) + summary_q = date(year, 1, 1) + else: + return Response({'code': 1, 'msg': '无效的颗粒度'}, status=400) + + start_dt = datetime.combine(start_date, datetime.min.time()) + end_dt = datetime.combine(end_date, datetime.min.time()) + + # ---------- 构建时间序列 ---------- + time_series_map = {} # period_str -> { type_code: {count, amount, profit, fenhong_count, fenhong_amount} } + + def ensure_date(ds): + if ds not in time_series_map: + time_series_map[ds] = {} + return time_series_map[ds] + + # 1. 处理充值记录（Czjilu）—— 完全不变 + cz_types = [t for t in types if t in [2, 3, 4, 5]] + if cz_types: + cz_qs = Czjilu.objects.filter( + create_time__gte=start_dt, + create_time__lt=end_dt, + leixing__in=cz_types, + zhuangtai=3 # 只统计支付成功的 + ).annotate( + period=trunc_func + ).values('period', 'leixing').annotate( + total_count=Count('id'), + total_amount=Sum('jine') + ).order_by('period', 'leixing') + + for item in cz_qs: + period_str = item['period'].strftime('%Y-%m-%d') if granularity == 'day' else \ + item['period'].strftime('%Y-%m') if granularity == 'month' else \ + item['period'].strftime('%Y') + lx = item['leixing'] + amount = float(item['total_amount'] or 0) + count = item['total_count'] + # 收益：积分(3)收益为金额本身，其他为0 + profit = amount if lx == 3 else 0.0 + + day_data = ensure_date(period_str) + day_data[str(lx)] = { + 'count': count, + 'amount': amount, + 'profit': profit, + 'fenhong_count': 0, # 充值类型无分红 + 'fenhong_amount': 0.0 + } + + # 2. 处理罚款（Fadan）—— 修改：直接从 Fadan 表获取分红总额和分红笔数 + if 6 in types: + # 使用一次聚合查询，同时获取罚款笔数、罚款金额、分红总额、分红笔数 + penalty_qs = Fadan.objects.filter( + create_time__gte=start_dt, + create_time__lt=end_dt, + zhuangtai=2 # 已缴纳 + ).annotate( + period=trunc_func + ).values('period').annotate( + penalty_count=Count('id'), + penalty_amount=Sum('fakuanjine'), + # 直接使用罚单表中的申请人分红金额字段 + fenhong_amount=Sum('shenqingren_fenhong_jine'), + fenhong_count=Count('id', filter=Q(shenqingren_fenhong_jine__gt=0)) + ).order_by('period') + + for item in penalty_qs: + period_str = item['period'].strftime('%Y-%m-%d') if granularity == 'day' else \ + item['period'].strftime('%Y-%m') if granularity == 'month' else \ + item['period'].strftime('%Y') + day_data = ensure_date(period_str) + penalty_amt = float(item['penalty_amount'] or 0) + fenhong_amt = float(item['fenhong_amount'] or 0) + profit = round(penalty_amt - fenhong_amt, 2) + day_data['6'] = { + 'count': item['penalty_count'], + 'amount': penalty_amt, + 'profit': profit, + 'fenhong_count': item['fenhong_count'], + 'fenhong_amount': fenhong_amt + } + + # 构造有序时间序列列表 + time_series = [] + for period_str in sorted(time_series_map.keys()): + entry = {'date': period_str, 'types': {}} + for type_code in sorted(time_series_map[period_str].keys()): + entry['types'][type_code] = time_series_map[period_str][type_code] + time_series.append(entry) + + # ---------- 汇总指定日期（summary）—— 完全保留原逻辑，仅将罚款部分改为从 Fadan 表直接取分红 ---------- + summary_result = {'by_type': {}, 'total_count': 0, 'total_amount': 0.0, 'total_profit': 0.0} + + # 汇总充值类型（完全不变） + for lx in cz_types: + filter_kwargs = { + 'leixing': lx, + 'zhuangtai': 3, + } + if granularity == 'day': + filter_kwargs['create_time__date'] = summary_q + elif granularity == 'month': + filter_kwargs['create_time__year'] = summary_q.year + filter_kwargs['create_time__month'] = summary_q.month + else: + filter_kwargs['create_time__year'] = summary_q.year + agg = Czjilu.objects.filter(**filter_kwargs).aggregate(count=Count('id'), amount=Sum('jine')) + count = agg['count'] or 0 + amount = float(agg['amount'] or 0) + profit = amount if lx == 3 else 0.0 + summary_result['by_type'][str(lx)] = { + 'count': count, + 'amount': round(amount, 2), + 'profit': round(profit, 2), + 'fenhong_count': 0, + 'fenhong_amount': 0.0 + } + summary_result['total_count'] += count + summary_result['total_amount'] += amount + summary_result['total_profit'] += profit + + # 汇总罚款（修改：从 Fadan 表直接取分红，不再查询 FadanFenhong） + if 6 in types: + penalty_filter = { + 'zhuangtai': 2, + } + if granularity == 'day': + penalty_filter['create_time__date'] = summary_q + elif granularity == 'month': + penalty_filter['create_time__year'] = summary_q.year + penalty_filter['create_time__month'] = summary_q.month + else: + penalty_filter['create_time__year'] = summary_q.year + + # 一次聚合：罚款笔数、金额、分红总额、分红笔数 + agg = Fadan.objects.filter(**penalty_filter).aggregate( + count=Count('id'), + amount=Sum('fakuanjine'), + fenhong_amount=Sum('shenqingren_fenhong_jine'), + fenhong_count=Count('id', filter=Q(shenqingren_fenhong_jine__gt=0)) + ) + penalty_count = agg['count'] or 0 + penalty_amount = float(agg['amount'] or 0) + fh_amount = float(agg['fenhong_amount'] or 0) + fh_count = agg['fenhong_count'] or 0 + profit = round(penalty_amount - fh_amount, 2) + + summary_result['by_type']['6'] = { + 'count': penalty_count, + 'amount': round(penalty_amount, 2), + 'profit': profit, + 'fenhong_count': fh_count, + 'fenhong_amount': round(fh_amount, 2) + } + summary_result['total_count'] += penalty_count + summary_result['total_amount'] += penalty_amount + summary_result['total_profit'] += profit + + summary_result['total_amount'] = round(summary_result['total_amount'], 2) + summary_result['total_profit'] = round(summary_result['total_profit'], 2) + + return Response({ + 'code': 0, + 'msg': 'ok', + 'data': { + 'time_series': time_series, + 'summary': summary_result + } + }) + except Exception as e: + logger.exception("CwqtczhqView 接口错误") + return Response({'code': 1, 'msg': f'服务器内部错误: {str(e)}'}, status=500) + +'''class CwqtczhqView(APIView): + """ + 其他充值/罚款数据统计（非会员充值） + POST /houtai/cwqtczhq + Body: { + "phone": "管理员手机号", + "granularity": "day" | "month" | "year", + "year": 2026, + "month": 5, // granularity=day 时必填 + "types": [2,3,4,5] // 充值类型：2=押金，3=积分，4=商家，5=考核；包含 -1 或 [2,3,4,5] 表示全部；罚款始终单独统计（前端控制是否展示） + } + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + username_from_frontend = request.data.get('phone', None) + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + if kefu_obj is None: + return permissions + if 'qtczcaiwu' not in permissions: + return Response({'code': 403, 'msg': '无其他充值财务查看权限'}, status=403) + + granularity = request.data.get('granularity', 'day') + year = request.data.get('year') + month = request.data.get('month') + types = request.data.get('types', [2, 3, 4, 5]) # 默认全部非会员类型 + + if isinstance(types, list) and len(types) == 0: + types = [2, 3, 4, 5] + + now = date.today() + + # ---------- 时间范围 ---------- + if granularity == 'day': + if not year or not month: + return Response({'code': 1, 'msg': '按日统计需要年份和月份'}, status=400) + start_date = date(year, month, 1) + end_date = date(year, month + 1, 1) if month < 12 else date(year + 1, 1, 1) + trunc_func = TruncDate('create_time') + elif granularity == 'month': + if not year: + return Response({'code': 1, 'msg': '按月统计需要年份'}, status=400) + start_date = date(year, 1, 1) + end_date = date(year + 1, 1, 1) + trunc_func = TruncMonth('create_time') + elif granularity == 'year': + year = year or now.year + start_date = date(year, 1, 1) + end_date = date(year + 1, 1, 1) + trunc_func = TruncYear('create_time') + else: + return Response({'code': 1, 'msg': '无效的颗粒度'}, status=400) + + start_dt = datetime.combine(start_date, datetime.min.time()) + end_dt = datetime.combine(end_date, datetime.min.time()) + + # ---------- 定义收益计算规则 ---------- + # 商家充值(4)、押金(2)、考核(5)：平台收益为 0 + # 积分充值(3)：收益 = 充值总额 + # 罚款：收益 = 罚款总额 - 分红总额 + + # 最终返回的时间序列结构： + # { "2026-05-01": { "2": {count, amount, profit}, "3": {...}, ... } } + + time_series_map = {} # date_str -> { type_code: {count, amount, profit} } + + # 公共函数：初始化日期条目 + def ensure_date(ds): + if ds not in time_series_map: + time_series_map[ds] = {} + return time_series_map[ds] + + # ---------- 1. 处理充值记录表（Czjilu） ---------- + cz_types = [t for t in types if t in [2, 3, 4, 5]] # 只取充值类型 + if cz_types: + cz_qs = Czjilu.objects.filter( + create_time__gte=start_dt, + create_time__lt=end_dt, + leixing__in=cz_types, + zhuangtai=3 # 支付成功状态（根据你之前的设置） + ).annotate( + period=trunc_func + ).values('period', 'leixing').annotate( + total_count=Count('id'), + total_amount=Sum('jine') + ).order_by('period', 'leixing') + + for item in cz_qs: + period_str = item['period'].strftime('%Y-%m-%d') if granularity == 'day' else \ + item['period'].strftime('%Y-%m') if granularity == 'month' else \ + item['period'].strftime('%Y') + lx = item['leixing'] + amount = float(item['total_amount'] or 0) + count = item['total_count'] + # 计算收益 + if lx == 3: # 积分 + profit = amount + else: # 商家、押金、考核 + profit = 0.0 + + day_data = ensure_date(period_str) + day_data[str(lx)] = { + 'count': count, + 'amount': amount, + 'profit': profit + } + + # ---------- 2. 处理罚款（Fadan） ---------- + # 罚款统计是否展示由前端 types 是否包含 6 决定？约定 types 数组可以包含 6 代表罚款，或不包含则默认返回罚款数据（由前端决定隐藏） + # 简单处理：只要 types 中包含 6 或不指定时默认返回罚款（因为我们把 types 默认值设为全部，而罚款不是一个 leixing，我们约定前端传递 types 中包含 6 表示需要罚款数据） + # 但为了保持一致性，我们在 types 数组中用 6 代表“罚款”。接口支持 types = [2,3,4,5,6]。 + # 后端根据 types 是否含有 6 来决定是否统计罚款。 + include_penalty = (6 in types) if isinstance(types, list) else True + + if include_penalty: + # 已缴纳罚款记录 + penalty_qs = Fadan.objects.filter( + create_time__gte=start_dt, + create_time__lt=end_dt, + zhuangtai=2 # 已缴纳 + ).annotate( + period=trunc_func + ).values('period').annotate( + penalty_count=Count('id'), + penalty_amount=Sum('fakuanjine') + ).order_by('period') + + # 罚款分红（按创建时间分组） + fenhong_qs = FadanFenhong.objects.filter( + create_time__gte=start_dt, + create_time__lt=end_dt + ).annotate( + period=trunc_func + ).values('period').annotate( + fenhong_count=Count('id'), + fenhong_amount=Sum('ketixian_fenhong') + ).order_by('period') + + # 填充到 time_series_map + for item in penalty_qs: + period_str = item['period'].strftime('%Y-%m-%d') if granularity == 'day' else \ + item['period'].strftime('%Y-%m') if granularity == 'month' else \ + item['period'].strftime('%Y') + day_data = ensure_date(period_str) + # 罚款可能之前已有其他类型数据 + penalty_data = day_data.get('6', {'count': 0, 'amount': 0.0, 'profit': 0.0}) + penalty_data['count'] = item['penalty_count'] + penalty_data['amount'] = float(item['penalty_amount'] or 0) + day_data['6'] = penalty_data + + for item in fenhong_qs: + period_str = item['period'].strftime('%Y-%m-%d') if granularity == 'day' else \ + item['period'].strftime('%Y-%m') if granularity == 'month' else \ + item['period'].strftime('%Y') + day_data = ensure_date(period_str) + pen = day_data.get('6', {'count': 0, 'amount': 0.0, 'profit': 0.0}) + # 分红字段单独存储 + pen['fenhong_count'] = item['fenhong_count'] + pen['fenhong_amount'] = float(item['fenhong_amount'] or 0) + # 计算收益 = 罚款金额 - 分红金额 + pen['profit'] = round(pen.get('amount', 0.0) - pen.get('fenhong_amount', 0.0), 2) + day_data['6'] = pen + + # 确保没有罚款但有分红的日子也有记录（上面已处理） + # 还需要对只有分红没有罚款的日子补全罚款数据 + for period_str, day_data in time_series_map.items(): + if '6' in day_data and 'amount' not in day_data['6']: + day_data['6']['amount'] = 0.0 + day_data['6']['count'] = 0 + day_data['6']['profit'] = round(0.0 - day_data['6'].get('fenhong_amount', 0.0), 2) + + # ---------- 构造有序 time_series 列表 ---------- + time_series = [] + for period_str in sorted(time_series_map.keys()): + entry = {'date': period_str, 'types': {}} + for type_code in sorted(time_series_map[period_str].keys()): + entry['types'][type_code] = time_series_map[period_str][type_code] + time_series.append(entry) + + # ---------- 汇总数据 ---------- + summary = {'by_type': {}, 'total_count': 0, 'total_amount': 0.0, 'total_profit': 0.0} + # 汇总各类型数据 + for type_code in [str(t) for t in types]: + total_count = 0 + total_amount = 0.0 + total_profit = 0.0 + for day in time_series: + if type_code in day['types']: + total_count += day['types'][type_code].get('count', 0) + total_amount += day['types'][type_code].get('amount', 0.0) + total_profit += day['types'][type_code].get('profit', 0.0) + summary['by_type'][type_code] = { + 'count': total_count, + 'amount': round(total_amount, 2), + 'profit': round(total_profit, 2) + } + summary['total_count'] += total_count + summary['total_amount'] += total_amount + summary['total_profit'] += total_profit + + summary['total_amount'] = round(summary['total_amount'], 2) + summary['total_profit'] = round(summary['total_profit'], 2) + + return Response({ + 'code': 0, + 'msg': 'ok', + 'data': { + 'time_series': time_series, + 'summary': summary + } + }) + + except Exception as e: + logger.exception("CwqtczhqView 接口错误") + return Response({'code': 1, 'msg': f'服务器内部错误: {str(e)}'}, status=500)''' + + + + +# ==================== 后端接口 ==================== +# 文件：views.py （添加以下两个视图类） + +from dengji.models import ( + Chenghao, KaoheCishuFeiyong, Bankuai, + YonghuChenghao, ShenheJilu, ShenheGuize, # 可能不需要用到但导入无妨 +) + + + +class KhpzhqView(APIView): + """ + 获取所有考核配置数据（称号列表、板块、费用） + POST /houtai/khpzhq + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + username_from_frontend = request.data.get('phone', None) + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + if kefu_obj is None: + return permissions + if 'kaohepeizhi' not in permissions: + return Response({'code': 403, 'msg': '无考核配置权限'}, status=403) + + bankuai_list = list(Bankuai.objects.values('bankuai_id', 'mingcheng')) + + chenghao_qs = Chenghao.objects.prefetch_related('kaohecishufeiyong_set').all() + chenghao_list = [] + for ch in chenghao_qs: + # 获取费用：按次数排序，转为 {cishu: feiyong} 字典 + feiyong_dict = { + item.cishu: float(item.feiyong) + for item in ch.kaohecishufeiyong_set.order_by('cishu') + } + max_cishu = max(feiyong_dict.keys()) if feiyong_dict else 0 + + chenghao_list.append({ + 'id': ch.id, + 'mingcheng': ch.mingcheng, + 'leixing': ch.leixing, + 'leixing_name': ch.get_leixing_display(), + 'bankuai_id': ch.bankuai_id, + 'tubiao_url': ch.tubiao_url or '', + 'texiao_miaoshu': ch.texiao_miaoshu or '', + 'create_time': ch.create_time.strftime('%Y-%m-%d %H:%M:%S') if ch.create_time else '', + 'kaohe_guize': ch.kaohe_guize or '', + 'kaioi_jinpai': ch.kaioi_jinpai, + 'feiyong': feiyong_dict, # {1:100.0, 2:200.0} + 'max_cishu': max_cishu + }) + + return Response({ + 'code': 0, + 'msg': 'ok', + 'data': { + 'bankuai': bankuai_list, + 'chenghao': chenghao_list + } + }) + except Exception as e: + logger.exception("KhpzhqView 接口错误") + return Response({'code': 1, 'msg': f'服务器内部错误: {str(e)}'}, status=500) + + + + +class ChzsgcView(APIView): + """ + 称号（标签）增删改查统一接口 + POST /houtai/chzsgc + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + username_from_frontend = request.data.get('phone', None) + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + if kefu_obj is None: + return permissions + if 'kaohepeizhi' not in permissions: + return Response({'code': 403, 'msg': '无考核配置权限'}, status=403) + + action = request.data.get('action') + if not action: + return Response({'code': 1, 'msg': '缺少 action 参数'}, status=400) + + # ========== 创建称号 ========== + if action == 'create': + mingcheng = request.data.get('mingcheng', '').strip() + leixing = request.data.get('leixing', 'dashou') + bankuai_id = request.data.get('bankuai_id') + texiao_miaoshu = request.data.get('texiao_miaoshu', '') + kaohe_guize = request.data.get('kaohe_guize', '') + kaioi_jinpai = request.data.get('kaioi_jinpai', False) + feiyong_list = request.data.get('feiyong_list', []) + + if not mingcheng: + return Response({'code': 1, 'msg': '称号名称不能为空'}, status=400) + if leixing not in ['dashou','boss','shangjia','guanshi','zuzhang']: + return Response({'code': 1, 'msg': '无效的称号类型'}, status=400) + if Chenghao.objects.filter(mingcheng=mingcheng).exists(): + return Response({'code': 1, 'msg': '称号名称已存在'}, status=400) + + with transaction.atomic(): + ch = Chenghao.objects.create( + mingcheng=mingcheng, + leixing=leixing, + bankuai_id=bankuai_id, + texiao_miaoshu=texiao_miaoshu, + kaohe_guize=kaohe_guize, + kaioi_jinpai=kaioi_jinpai + ) + # 处理费用：前端传来 [{cishu:1, feiyong:100}, ...] + if feiyong_list: + for item in feiyong_list: + cishu = int(item.get('cishu', 1)) + feiyong = float(item.get('feiyong', 0)) + KaoheCishuFeiyong.objects.update_or_create( + chenghao=ch, cishu=cishu, + defaults={'feiyong': feiyong} + ) + else: + # 默认添加第一次免费 + KaoheCishuFeiyong.objects.create(chenghao=ch, cishu=1, feiyong=0) + + return Response({'code': 0, 'msg': '创建成功', 'data': {'chenghao_id': ch.id}}) + + # ========== 修改称号 ========== + elif action == 'update': + ch_id = request.data.get('chenghao_id') + if not ch_id: + return Response({'code': 1, 'msg': '缺少称号ID'}, status=400) + try: + ch = Chenghao.objects.get(id=ch_id) + except Chenghao.DoesNotExist: + return Response({'code': 1, 'msg': '称号不存在'}, status=404) + + mingcheng = request.data.get('mingcheng', ch.mingcheng).strip() + leixing = request.data.get('leixing', ch.leixing) + bankuai_id = request.data.get('bankuai_id', ch.bankuai_id) + texiao_miaoshu = request.data.get('texiao_miaoshu', ch.texiao_miaoshu) + kaohe_guize = request.data.get('kaohe_guize', ch.kaohe_guize) + kaioi_jinpai = request.data.get('kaioi_jinpai', ch.kaioi_jinpai) + + if not mingcheng: + return Response({'code': 1, 'msg': '称号名称不能为空'}, status=400) + if leixing not in ['dashou','boss','shangjia','guanshi','zuzhang']: + return Response({'code': 1, 'msg': '无效的称号类型'}, status=400) + if Chenghao.objects.filter(mingcheng=mingcheng).exclude(id=ch_id).exists(): + return Response({'code': 1, 'msg': '称号名称已存在'}, status=400) + + ch.mingcheng = mingcheng + ch.leixing = leixing + ch.bankuai_id = bankuai_id + ch.texiao_miaoshu = texiao_miaoshu + ch.kaohe_guize = kaohe_guize + ch.kaioi_jinpai = kaioi_jinpai + ch.save() + + # 如果前端传递了 feiyong_list，则全量替换费用 + feiyong_list = request.data.get('feiyong_list') + if feiyong_list is not None: + with transaction.atomic(): + ch.kaohecishufeiyong_set.all().delete() + for item in feiyong_list: + KaoheCishuFeiyong.objects.create( + chenghao=ch, + cishu=int(item.get('cishu', 1)), + feiyong=float(item.get('feiyong', 0)) + ) + + return Response({'code': 0, 'msg': '修改成功'}) + + # ========== 删除称号 ========== + elif action == 'delete': + ch_id = request.data.get('chenghao_id') + if not ch_id: + return Response({'code': 1, 'msg': '缺少称号ID'}, status=400) + try: + ch = Chenghao.objects.get(id=ch_id) + except Chenghao.DoesNotExist: + return Response({'code': 1, 'msg': '称号不存在'}, status=404) + ch.delete() + return Response({'code': 0, 'msg': '删除成功'}) + + # ========== 添加/修改某次费用 ========== + elif action == 'add_feiyong': + ch_id = request.data.get('chenghao_id') + cishu = request.data.get('cishu') + feiyong = request.data.get('feiyong', 0) + if not ch_id or not cishu: + return Response({'code': 1, 'msg': '缺少称号ID或次数'}, status=400) + try: + ch = Chenghao.objects.get(id=ch_id) + except Chenghao.DoesNotExist: + return Response({'code': 1, 'msg': '称号不存在'}, status=404) + if int(cishu) < 1: + return Response({'code': 1, 'msg': '次数必须>=1'}, status=400) + KaoheCishuFeiyong.objects.update_or_create( + chenghao=ch, cishu=cishu, + defaults={'feiyong': feiyong} + ) + return Response({'code': 0, 'msg': '添加/修改费用成功'}) + + # ========== 删除某次费用 ========== + elif action == 'remove_feiyong': + ch_id = request.data.get('chenghao_id') + cishu = request.data.get('cishu') + if not ch_id or not cishu: + return Response({'code': 1, 'msg': '缺少称号ID或次数'}, status=400) + if int(cishu) == 1: + return Response({'code': 1, 'msg': '不能删除第1次考核费用'}, status=400) + try: + ch = Chenghao.objects.get(id=ch_id) + except Chenghao.DoesNotExist: + return Response({'code': 1, 'msg': '称号不存在'}, status=404) + KaoheCishuFeiyong.objects.filter(chenghao=ch, cishu=cishu).delete() + return Response({'code': 0, 'msg': '删除成功'}) + + # ========== 修改某次费用（等价于add） ========== + elif action == 'update_feiyong': + return self.add_feiyong(request) # 复用逻辑 + + else: + return Response({'code': 1, 'msg': '未知操作'}, status=400) + + except Exception as e: + logger.exception("ChzsgcView 接口错误") + return Response({'code': 1, 'msg': f'服务器内部错误: {str(e)}'}, status=500) + + + +# ==================== 后端 views.py ==================== +# 请确保已有以下导入，如果没有请在文件头部添加 + +from yonghu.models import ( + UserMain, UserShenheguan +) + +from dengji.models import ( + KaoheguanBankuai, Bankuai +) + + + + + + + +class KhgglView(APIView): + """ + 考核官管理数据接口（列表、筛选、分页） + POST /houtai/khggl + Body: { + "phone": "管理员手机号", + "page": 1, // 可选，默认1 + "page_size": 15, // 可选，默认15 + "yonghuid": "1234567", // 按用户ID筛选，可选 + "zhuangtai": 1, // 账号状态 0=禁用,1=正常，可选 + "shenhe_zhuangtai": 0, // 审核官状态 0=空闲,1=审核中，可选 + "bankuai_name": "王者" // 板块名称模糊筛选，可选 + } + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + username_from_frontend = request.data.get('phone', None) + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + if kefu_obj is None: + return permissions + + if 'kaohepeizhi' not in permissions: + return Response({'code': 403, 'msg': '无考核管理权限'}, status=403) + + # 分页参数 + page = int(request.data.get('page', 1)) + page_size = int(request.data.get('page_size', 15)) + if page < 1: page = 1 + if page_size < 1: page_size = 15 + + # 筛选条件 + filter_yonghuid = request.data.get('yonghuid', '').strip() + filter_zhuangtai = request.data.get('zhuangtai') + filter_shenhe_zhuangtai = request.data.get('shenhe_zhuangtai') + filter_bankuai_name = request.data.get('bankuai_name', '').strip() + + # 基础查询：所有审核官，预加载用户及打手扩展表 + queryset = UserShenheguan.objects.select_related('user__dashou_profile') + + if filter_yonghuid: + queryset = queryset.filter(user__yonghuid=filter_yonghuid) + if filter_zhuangtai is not None: + queryset = queryset.filter(zhuangtai=filter_zhuangtai) + if filter_shenhe_zhuangtai is not None: + queryset = queryset.filter(shenhe_zhuangtai=filter_shenhe_zhuangtai) + + # 如果填写了板块名称，筛选出关联该板块的审核官 + if filter_bankuai_name: + bankuai_ids = Bankuai.objects.filter( + mingcheng__icontains=filter_bankuai_name + ).values_list('bankuai_id', flat=True) + shenheguan_ids = KaoheguanBankuai.objects.filter( + bankuai_id__in=bankuai_ids + ).values_list('kaoheguan_id', flat=True) + queryset = queryset.filter(user__yonghuid__in=shenheguan_ids) + + total = queryset.count() + start = (page - 1) * page_size + end = start + page_size + shenheguan_list = queryset.order_by('-create_time')[start:end] + + # ---------- 预计算每个板块的打手数量 ---------- + bankuai_dashou_count_map = {} + all_banquai = Bankuai.objects.all() + for bk in all_banquai: + tag_ids = Chenghao.objects.filter(bankuai=bk, leixing='dashou').values_list('id', flat=True) + count = YonghuChenghao.objects.filter( + chenghao_id__in=tag_ids, + yonghu__dashou_profile__isnull=False + ).values('yonghu').distinct().count() + bankuai_dashou_count_map[bk.bankuai_id] = count + + # ---------- 新增：板块标签统计 ---------- + bankuai_tags_data = [] + for bk in all_banquai: + tags = Chenghao.objects.filter(bankuai=bk, leixing='dashou') + tag_list = [] + for tag in tags: + user_count = YonghuChenghao.objects.filter(chenghao=tag).values('yonghu').distinct().count() + tag_list.append({ + 'id': tag.id, + 'name': tag.mingcheng, + 'user_count': user_count, + }) + bankuai_tags_data.append({ + 'bankuai_id': bk.bankuai_id, + 'mingcheng': bk.mingcheng, + 'tags': tag_list, + }) + + # 构造返回数据（审核官列表） + data_list = [] + for sg in shenheguan_list: + user = sg.user + # 获取该审核官关联的板块 + bk_qs = KaoheguanBankuai.objects.filter(kaoheguan_id=user.yonghuid).select_related('bankuai') + bankuai_info = [] + for bk in bk_qs: + bid = bk.bankuai.bankuai_id + bankuai_info.append({ + 'bankuai_id': bid, + 'mingcheng': bk.bankuai.mingcheng, + 'dashou_count': bankuai_dashou_count_map.get(bid, 0) + }) + + dashou_nick = user.dashou_profile.nicheng if hasattr(user, 'dashou_profile') and user.dashou_profile else '' + + data_list.append({ + 'yonghuid': user.yonghuid, + 'avatar': user.avatar or '', + 'phone': user.phone or '', + 'zhuangtai': sg.zhuangtai, + 'shenhe_zhuangtai': sg.shenhe_zhuangtai, + 'shenhe_zongshu': sg.shenhe_zongshu, + 'tongguo_zongshu': sg.tongguo_zongshu, + 'yue': float(sg.yue), + 'zonge': float(sg.zonge), + 'create_time': sg.create_time.strftime('%Y-%m-%d %H:%M:%S') if sg.create_time else '', + 'update_time': sg.update_time.strftime('%Y-%m-%d %H:%M:%S') if sg.update_time else '', + 'bankuai': bankuai_info, + 'nicheng': dashou_nick, + 'is_renzheng': sg.is_renzheng, + }) + + all_bankuai = list(Bankuai.objects.values('bankuai_id', 'mingcheng')) + + return Response({ + 'code': 0, + 'msg': 'ok', + 'data': { + 'total': total, + 'page': page, + 'page_size': page_size, + 'list': data_list, + 'all_bankuai': all_bankuai, + 'bankuai_tags': bankuai_tags_data, # 新增板块标签统计 + } + }) + + except Exception as e: + logger.exception("KhgglView 接口错误") + return Response({'code': 1, 'msg': f'服务器内部错误: {str(e)}'}, status=500) + +class ShgxgsjView(APIView): + """ + 审核官信息修改（余额、状态、板块关联） + POST /houtai/shgxgsj + """ + permission_classes = [IsAuthenticated] + + def post(self, request): + try: + username_from_frontend = request.data.get('phone', None) + kefu_obj, permissions = verify_kefu_permission(request, username_from_frontend) + if kefu_obj is None: + return permissions + if 'kaohepeizhi' not in permissions: + return Response({'code': 403, 'msg': '无考核管理权限'}, status=403) + + yonghuid = request.data.get('yonghuid') + if not yonghuid: + return Response({'code': 1, 'msg': '缺少用户ID'}, status=400) + + try: + shenheguan = UserShenheguan.objects.select_related('user').get(user__yonghuid=yonghuid) + except UserShenheguan.DoesNotExist: + return Response({'code': 1, 'msg': '审核官不存在'}, status=404) + + action = request.data.get('action') + + if action == 'update_info': + if 'yue' in request.data: + shenheguan.yue = float(request.data.get('yue', 0)) + if 'zhuangtai' in request.data: + zt = int(request.data.get('zhuangtai')) + if zt not in [0, 1]: + return Response({'code': 1, 'msg': '无效的账号状态'}, status=400) + shenheguan.zhuangtai = zt + if 'shenhe_zhuangtai' in request.data: + szt = int(request.data.get('shenhe_zhuangtai')) + if szt not in [0, 1]: + return Response({'code': 1, 'msg': '无效的审核官状态'}, status=400) + shenheguan.shenhe_zhuangtai = szt + # 新增认证状态编辑 + if 'is_renzheng' in request.data: + shenheguan.is_renzheng = bool(request.data.get('is_renzheng')) + shenheguan.save() + return Response({'code': 0, 'msg': '修改成功'}) + + elif action == 'add_bankuai': + bankuai_id = request.data.get('bankuai_id') + if not bankuai_id: + return Response({'code': 1, 'msg': '缺少板块ID'}, status=400) + if not Bankuai.objects.filter(bankuai_id=bankuai_id).exists(): + return Response({'code': 1, 'msg': '板块不存在'}, status=400) + if KaoheguanBankuai.objects.filter(kaoheguan_id=yonghuid, bankuai_id=bankuai_id).exists(): + return Response({'code': 1, 'msg': '已关联该板块'}, status=400) + KaoheguanBankuai.objects.create(kaoheguan_id=yonghuid, bankuai_id=bankuai_id) + return Response({'code': 0, 'msg': '板块关联成功'}) + + elif action == 'remove_bankuai': + bankuai_id = request.data.get('bankuai_id') + if not bankuai_id: + return Response({'code': 1, 'msg': '缺少板块ID'}, status=400) + deleted, _ = KaoheguanBankuai.objects.filter( + kaoheguan_id=yonghuid, bankuai_id=bankuai_id + ).delete() + if not deleted: + return Response({'code': 1, 'msg': '未找到该板块关联'}, status=400) + return Response({'code': 0, 'msg': '板块移除成功'}) + + else: + return Response({'code': 1, 'msg': '未知操作'}, status=400) + + except Exception as e: + logger.exception("ShgxgsjView 接口错误") + return Response({'code': 1, 'msg': f'服务器内部错误: {str(e)}'}, status=500) + + + + + + + + + + + + + + + + + +import secrets +from dingdan.models import Dingdan, DingdanShangjia +from dingdan.tongzhi_tasks import dingdan_guangbo + +from peizhi.models import ShangjiaLianjie + +class ZxkfghdsView(APIView): + """ + 客服更换打手接口 + 路径：POST /houtai/zxkfghds + 功能： + 1. 将当前订单状态改为已退款（5），释放接单打手（若有） + 2. 如需跨平台通知，则调用对方平台退款通知接口 + 3. 基于原订单信息生成全新订单（状态直接为 1，已替老板填写） + 4. 生成新的派单链接，并标记为已使用 + 5. 新链接记录上一个链接ID和上一个订单ID + 6. 【关键】不操作商家余额、退款次数、每日统计，因新订单是替换而非新增扣款 + 权限：需要'003aa'（跨平台管理）权限，与退款接口一致 + """ + + permission_classes = [IsAuthenticated] + parser_classes = [JSONParser] + + def post(self, request): + # ========== 1. 参数提取 ========== + username = request.data.get('username', '').strip() + dingdan_id = request.data.get('dingdan_id', '').strip() + if not username or not dingdan_id: + logger.warning("更换打手参数不完整") + return Response({'code': 400, 'msg': '参数不完整'}) + + # ========== 2. 权限校验（与跨平台退款相同） ========== + kefu, permissions = verify_kefu_permission(request, username) + if kefu is None: + return permissions # 返回错误响应 + if '003aa' not in permissions: + return Response({'code': 403, 'msg': '您无权处理订单'}) + + current_user = request.user + + # ========== 3. 查询原订单及关联信息 ========== + try: + old_order = Dingdan.objects.select_related('shangjia_kuozhan').get(dingdan_id=dingdan_id) + except Dingdan.DoesNotExist: + logger.warning(f"订单不存在: {dingdan_id}") + return Response({'code': 404, 'msg': '订单不存在'}) + + # 仅允许状态为 2（进行中）或 8（结算中）更换打手 + if old_order.zhuangtai not in [1,7,2, 8]: + return Response({'code': 400, 'msg': '当前订单状态不允许更换打手'}) + + # 本接口仅处理商家发单（fadan_pingtai=2） + if old_order.fadan_pingtai != 2: + return Response({'code': 400, 'msg': '仅支持商家发单的更换操作'}) + + # 获取原链接（用于模板ID等） + try: + old_lianjie = ShangjiaLianjie.objects.get(dingdan_id=dingdan_id) + except ShangjiaLianjie.DoesNotExist: + logger.error(f"原链接记录不存在，订单: {dingdan_id}") + return Response({'code': 500, 'msg': '链接数据异常'}) + + # 商家信息（仅用于记录关联，不操作余额） + try: + shangjia_ext = old_order.shangjia_kuozhan + shangjia_id = shangjia_ext.shangjia_id + # 获取商家昵称用于新订单扩展表 + shangjia_user = UserMain.objects.get(yonghuid=shangjia_id) + shangjia_nicheng = shangjia_user.shop_profile.nicheng or f"商家{shangjia_id}" + except (ObjectDoesNotExist, UserShangjia.DoesNotExist): + logger.error(f"商家信息缺失，订单: {dingdan_id}") + return Response({'code': 500, 'msg': '商家数据异常'}) + + # ========== 4. 判断是否需要跨平台退款通知 ========== + is_cross = old_order.is_cross + partner_club_id = old_order.partner_club_id + partner_order_id = old_order.partner_order_id + need_notify_partner = is_cross and partner_club_id and partner_order_id + + # ========== 5. 退款处理（仅打手侧，不碰商家） ========== + with transaction.atomic(): + # 5.1 订单状态改为已退款 + old_order.zhuangtai = 5 + old_order.clkf = current_user.phone + old_order.save() + + # 5.2 处理接单打手（若有） + dashou_id = old_order.jiedan_dashou_id + if dashou_id: + try: + dashou_user = UserMain.objects.get(yonghuid=dashou_id) + dashou_profile = dashou_user.dashou_profile + dashou_profile.tuikuanliang += 1 # 退款次数+1 + dashou_profile.zhuangtai = 1 # 设为空闲 + dashou_profile.save() + except (UserMain.DoesNotExist, ObjectDoesNotExist): + logger.warning(f"打手 {dashou_id} 不存在，跳过更新") + + # 5.3 更新退款记录表 + Tuikuanjilu.objects.update_or_create( + dingdan_id=dingdan_id, + defaults={ + 'dashouid': dashou_id or '', + 'qingqiuid': '', + 'chuliid': current_user.phone, + 'liyou': '客服更换打手退款', + 'sqzhuangtai': 1, + 'jine': old_order.jine or 0, + 'dashou_fencheng': old_order.dashou_fencheng or 0, + 'jieshao': old_order.jieshao or '', + 'beizhu': '更换打手自动退款', + 'nicheng': old_order.nicheng or '', + } + ) + + # 5.4 打手每日统计（退款） + if dashou_id: + try: + update_dashou_daily_by_action( + yonghuid=dashou_id, + amount=old_order.dashou_fencheng, + action=3 # 3=退款 + ) + except Exception as e: + logger.error(f"打手每日统计更新失败: {e}") + + # 5.5 客服处理统计 + kefu.jinrichuli += 1 + kefu.jinyuechuli += 1 + kefu.zongchuli += 1 + kefu.save() + + # 5.6 跨平台退款通知（需要时） + if need_notify_partner: + try: + # 获取我方俱乐部ID + my_club_config = ClubConfig.objects.filter(is_self=1).first() + if not my_club_config: + raise Exception("我方俱乐部配置不存在") + self_club_id = my_club_config.club_id + club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=partner_club_id) + partner_domain = club_rel.partner_domain + + notify_url = partner_domain.rstrip('/') + '/houtai/dfddtk' + payload = { + 'order_id': partner_order_id, + 'club_id': self_club_id, + 'status': 5, + 'reason': '客服更换打手退款' + } + + # 调用对方接口（必须成功，否则整个事务回滚） + resp = requests.post(notify_url, json=payload, timeout=5) + if resp.status_code == 200: + resp_json = resp.json() + if resp_json.get('code') != 0: + transaction.set_rollback(True) + logger.error(f"对方平台退款通知失败: {resp_json.get('msg')}") + return Response({'code': 500, 'msg': f'对方平台通知失败: {resp_json.get("msg")}'}) + else: + transaction.set_rollback(True) + logger.error(f"对方平台接口HTTP错误: {resp.status_code}") + return Response({'code': 500, 'msg': '通知对方平台失败'}) + + # 更新跨平台扩展表（如果存在） + from dingdan.models import CrossPlatformOrderData + CrossPlatformOrderData.objects.update_or_create( + dingdan_id=dingdan_id, + defaults={ + 'partner_order_id': partner_order_id, + 'partner_club_id': partner_club_id, + 'partner_order_status': 5, + } + ) + except Exception as e: + transaction.set_rollback(True) + logger.error(f"通知对方平台异常: {e}") + return Response({'code': 500, 'msg': f'通知对方平台失败: {str(e)}'}) + + # 至此，原订单已退款，事务提交 + + # ========== 6. 生成新订单和链接（不扣商家余额） ========== + try: + with transaction.atomic(): + # ---- 6.1 生成新的订单ID和Token ---- + def generate_dingdan_id(): + timestamp = int(time.time() * 1000) + process_id = os.getpid() % 1000 + random_num = random.randint(1000, 9999) + return f"SJ{timestamp}{process_id:03d}{random_num}" + + def generate_secure_token(dd_id, uid): + timestamp = int(time.time() * 1_000_000) + salt = secrets.token_hex(8) + raw = f"{timestamp}:{dd_id}:{uid}:{salt}" + token = hashlib.sha256(raw.encode()).hexdigest()[:24] + if ShangjiaLianjie.objects.filter(lianjie_token=token).exists(): + return generate_secure_token(dd_id, uid) + return token + + def generate_link_url(token): + base = getattr(settings, 'H5_DOMAIN', 'https://h5.yourdomain.com').rstrip('/') + return f"{base}/order/{token}" + + new_dingdan_id = generate_dingdan_id() + secure_token = generate_secure_token(new_dingdan_id, shangjia_id) + + # ---- 6.2 创建新订单（复制核心数据，状态直接为1） ---- + new_order = Dingdan.objects.create( + dingdan_id=new_dingdan_id, + zhuangtai=1, # 下单中 + fadan_pingtai=2, + jine=old_order.jine, + dashou_fencheng=old_order.dashou_fencheng, + leixing_id=old_order.leixing_id, + yaoqiuleixing=old_order.yaoqiuleixing, + huiyuan_id=old_order.huiyuan_id, + yongjin=old_order.yongjin, + jieshao=old_order.jieshao, + nicheng=old_order.nicheng, # 继承游戏昵称 + beizhu=old_order.beizhu, + user1_id=old_order.user1_id, # 商家标识 + tupian=old_order.tupian, + # 注意：不继承 zhiding_id、jiedan_dashou_id + ) + + # ---- 6.3 创建商家扩展表 ---- + DingdanShangjia.objects.create( + dingdan=new_order, + shangjia_id=shangjia_id, + sjnicheng=shangjia_nicheng, + ) + + # ---- 6.4 生成新链接并关联旧链接信息 ---- + link_url = generate_link_url(secure_token) + new_lianjie = ShangjiaLianjie.objects.create( + yonghu_id=shangjia_id, + leixing_id=old_lianjie.leixing_id, + moban_id=old_lianjie.moban_id, + lianjie=link_url, + lianjie_token=secure_token, + dingdan_id=new_dingdan_id, + is_used=True, # 直接标记已使用 + youxiao_shijian=timezone.now() + timezone.timedelta(days=1), + previous_lianjie_id=old_lianjie.id, # 记录旧链接ID + previous_dingdan_id=old_order.dingdan_id, # 记录旧订单ID + ) + + # ---- 6.5 异步通知（广播新订单、跨平台同步） ---- + try: + order_info = { + 'dingdan_id': new_dingdan_id, + 'game_type': self._get_game_type_name(new_order.leixing_id), + 'amount': str(new_order.jine), + 'order_desc': (new_order.jieshao or '')[:50], + } + dingdan_guangbo.delay(order_info) + except Exception as e: + logger.error(f"广播通知失败: {e}") + + # 跨平台同步（与客户填写接口保持一致） + try: + from dingdan.utils import sync_order_to_partners + sync_order_to_partners(new_dingdan_id) + except Exception as e: + logger.error(f"跨平台同步失败: {e}") + + # 注意：此处不更新商家余额、发布量、每日统计，因为这是替换订单 + + logger.info(f"更换打手成功：旧订单{dingdan_id}→退款，新订单{new_dingdan_id}已生成") + + return Response({ + 'code': 0, + 'msg': '更换成功', + 'data': { + 'new_dingdan_id': new_dingdan_id, + 'new_lianjie': link_url, + } + }) + + except Exception as e: + logger.error(f"生成新订单事务失败: {str(e)}", exc_info=True) + return Response({'code': 500, 'msg': '生成新订单失败'}) + + def _get_game_type_name(self, leixing_id): + """根据类型ID获取游戏类型名称""" + try: + from shangpin.models import ShangpinLeixing + gt = ShangpinLeixing.objects.filter(id=leixing_id).first() + return gt.jieshao if gt else '游戏订单' + except Exception: + return '游戏订单' + + + + + + + +import logging + +from django.conf import settings +from django.db.models import ObjectDoesNotExist +from rest_framework import status +from rest_framework.parsers import JSONParser +from rest_framework.response import Response +from rest_framework.views import APIView + +from dingdan.models import Dingdan + +logger = logging.getLogger('houtai') + + +class KptxwztjbView(APIView): + """ + 跨平台订单状态同步接口（对方平台调用） + 请求：POST /houtai/kptxwztjb + 参数： + - token: 同步专用令牌（明文） + - partner_order_id: 我方订单ID（在对方眼中是partner_order_id，实际查本库dingdan_id） + - our_order_id: 对方订单ID（在本库中为partner_order_id） + - club_id: 俱乐部ID（可选验证） + 返回： + code=0 成功，data.status 为订单状态 + 其他 code 为错误 + 注意：此接口仅用于查询对方订单状态，不做任何修改 + """ + + authentication_classes = [] # 无需JWT等认证 + permission_classes = [] # 公开接口 + parser_classes = [JSONParser] + + def post(self, request): + # 1. 获取参数 + token = request.data.get('token', '').strip() + partner_order_id = request.data.get('partner_order_id', '').strip() + our_order_id = request.data.get('our_order_id', '').strip() + club_id = request.data.get('club_id', '').strip() + + if not all([token, partner_order_id, our_order_id]): + logger.warning("跨平台状态同步参数缺失") + return Response({'code': 400, 'msg': '参数不完整'}, status=status.HTTP_400_BAD_REQUEST) + + # 2. 验证同步令牌 + SYNC_TOKEN = getattr(settings, 'CROSS_PLATFORM_SYNC_TOKEN', 'xK9mP2vL8qW5rT7y') + if token != SYNC_TOKEN: + logger.warning(f"无效的同步令牌: {token[:8]}...") + return Response({'code': 403, 'msg': '无效令牌'}, status=status.HTTP_403_FORBIDDEN) + + # 3. 查询订单 + # partner_order_id 在对方视角是“我方订单ID”，在本库中应匹配 dingdan_id + try: + order = Dingdan.objects.get(dingdan_id=partner_order_id) + except Dingdan.DoesNotExist: + logger.warning(f"订单不存在, partner_order_id: {partner_order_id}") + return Response({'code': 404, 'msg': '订单不存在'}, status=status.HTTP_404_NOT_FOUND) + + # 4. 验证订单关联关系：本库中的 partner_order_id 应等于传入的 our_order_id + if order.partner_order_id != our_order_id: + logger.warning( + f"订单关联不匹配: partner_order_id={order.partner_order_id}, our_order_id={our_order_id}" + ) + return Response({'code': 400, 'msg': '订单关联信息不匹配'}, status=status.HTTP_400_BAD_REQUEST) + + + + # 6. 返回订单状态 + status_code = order.zhuangtai + logger.info( + f"跨平台状态查询成功, dingdan_id={order.dingdan_id}, status={status_code}" + ) + return Response({ + 'code': 0, + 'msg': 'success', + 'data': { + 'dingdan_id': order.dingdan_id, + 'status': status_code, + } + }) \ No newline at end of file diff --git a/images/dingdan.png b/images/dingdan.png new file mode 100644 index 0000000..b9a3a9c Binary files /dev/null and b/images/dingdan.png differ diff --git a/images/fenlei.png b/images/fenlei.png new file mode 100644 index 0000000..4753795 Binary files /dev/null and b/images/fenlei.png differ diff --git a/images/gonggao.png b/images/gonggao.png new file mode 100644 index 0000000..19cc52c Binary files /dev/null and b/images/gonggao.png differ diff --git a/images/goumai.png b/images/goumai.png new file mode 100644 index 0000000..a2ec8ed Binary files /dev/null and b/images/goumai.png differ diff --git a/images/jiedanchi.png b/images/jiedanchi.png new file mode 100644 index 0000000..16e2b9f Binary files /dev/null and b/images/jiedanchi.png differ diff --git a/images/jieshao.png b/images/jieshao.png new file mode 100644 index 0000000..c713f53 Binary files /dev/null and b/images/jieshao.png differ diff --git a/images/jinpaidashou.png b/images/jinpaidashou.png new file mode 100644 index 0000000..b54a971 Binary files /dev/null and b/images/jinpaidashou.png differ diff --git a/images/role-switch.png b/images/role-switch.png new file mode 100644 index 0000000..bbd4afe Binary files /dev/null and b/images/role-switch.png differ diff --git a/images/shuaxin.png b/images/shuaxin.png new file mode 100644 index 0000000..15ad08d Binary files /dev/null and b/images/shuaxin.png differ diff --git a/images/sousuo.png b/images/sousuo.png new file mode 100644 index 0000000..2a8f235 Binary files /dev/null and b/images/sousuo.png differ diff --git a/images/tiaoxuan.png b/images/tiaoxuan.png new file mode 100644 index 0000000..ffcf298 Binary files /dev/null and b/images/tiaoxuan.png differ diff --git a/images/tuichu.png b/images/tuichu.png new file mode 100644 index 0000000..01553b5 Binary files /dev/null and b/images/tuichu.png differ diff --git a/images/weixinzhifu.png b/images/weixinzhifu.png new file mode 100644 index 0000000..f2551fd Binary files /dev/null and b/images/weixinzhifu.png differ diff --git a/images/wode.png b/images/wode.png new file mode 100644 index 0000000..1fec6b3 Binary files /dev/null and b/images/wode.png differ diff --git a/images/xiaoxi.png b/images/xiaoxi.png new file mode 100644 index 0000000..e6cda27 Binary files /dev/null and b/images/xiaoxi.png differ diff --git a/images/yituikuan.png b/images/yituikuan.png new file mode 100644 index 0000000..62c8fee Binary files /dev/null and b/images/yituikuan.png differ diff --git a/images/yiwancheng.png b/images/yiwancheng.png new file mode 100644 index 0000000..e1c333e Binary files /dev/null and b/images/yiwancheng.png differ diff --git a/images/zhuanqu.png b/images/zhuanqu.png new file mode 100644 index 0000000..2cb7945 Binary files /dev/null and b/images/zhuanqu.png differ diff --git a/images/zhuye.png b/images/zhuye.png new file mode 100644 index 0000000..b2fe9ae Binary files /dev/null and b/images/zhuye.png differ diff --git a/manage.py b/manage.py new file mode 100644 index 0000000..df91779 --- /dev/null +++ b/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'a_long_dianjing.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..b3d9125 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "a_long_dianjing", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/package.json @@ -0,0 +1 @@ +{} diff --git a/pages/cfss/cfss/cfss.js b/pages/cfss/cfss/cfss.js new file mode 100644 index 0000000..abdec80 --- /dev/null +++ b/pages/cfss/cfss/cfss.js @@ -0,0 +1,100 @@ +// pages/cfss/cfss.js +import request from '../../../utils/request.js'; // 向上4级就是根目录 +// 如果有 COS： + +const app = getApp(); + +Page({ + data: { + // 统计数字（由接口 /yonghu/cffktjhq 返回） + stats: { + fakuan: { total: 0, daijiaona: 0, shensuzhong: 0, yijiaona: 0, yibohui: 0 }, + jifen: { total: 0, daichuli: 0, yichuli: 0, daichuli_0: 0, shensuzhong_3: 0, yichufa_1: 0, yibohui_2: 0 } + }, + + // 当前选中的主标签：'fakuan' 或 'jifen' + activeTab: 'fakuan', + + // 子标签状态值 + activeFakuanStatus: 1, // 罚款默认展示“待缴纳” + activeJifenStatus: 0, // 积分默认展示“待处理” + + // 搜索关键词（订单号） + searchDingdan: '', + + // 刷新触发器，传给子组件 + trigger: { + fakuan: 0, + jifen: 0 + } + }, + + onLoad() { + this.fetchTongji(); + }, + + onShow() { + // 每次显示页面都重新拉取统计，确保数字最新 + this.fetchTongji(); + }, + + // 获取综合统计 + async fetchTongji() { + try { + const res = await request({ + url: '/yonghu/cffktjhq', + method: 'POST' + }); + if (res.statusCode === 200 && res.data.code === 0) { + this.setData({ stats: res.data.data }); + } + } catch (error) { + console.error('获取处罚统计失败', error); + } + }, + + // 切换主Tab（罚款 / 积分） + switchMainTab(e) { + const tab = e.currentTarget.dataset.tab; + if (tab === this.data.activeTab) return; + this.setData({ activeTab: tab }); + }, + + // 切换罚款状态子标签 + switchFakuanStatus(e) { + const status = Number(e.currentTarget.dataset.status); + if (status === this.data.activeFakuanStatus) return; + this.setData({ activeFakuanStatus: status }); + this.bumpTrigger('fakuan'); // 通知罚款列表组件刷新 + }, + + // 切换积分状态子标签 + switchJifenStatus(e) { + const status = Number(e.currentTarget.dataset.status); + if (status === this.data.activeJifenStatus) return; + this.setData({ activeJifenStatus: status }); + this.bumpTrigger('jifen'); // 通知积分列表组件刷新 + }, + + // 搜索输入 + onSearchInput(e) { + this.setData({ searchDingdan: e.detail.value }); + }, + + // 执行搜索（按键盘搜索按钮或点击搜索图标） + onSearchConfirm() { + this.bumpTrigger(this.data.activeTab); + }, + + // 清空搜索关键字 + clearSearch() { + this.setData({ searchDingdan: '' }); + this.bumpTrigger(this.data.activeTab); + }, + + // 递增触发器，子组件通过 observer 响应 + bumpTrigger(tab) { + const key = `trigger.${tab}`; + this.setData({ [key]: this.data.trigger[tab] + 1 }); + } +}); \ No newline at end of file diff --git a/pages/cfss/cfss/cfss.json b/pages/cfss/cfss/cfss.json new file mode 100644 index 0000000..4ca406b --- /dev/null +++ b/pages/cfss/cfss/cfss.json @@ -0,0 +1,10 @@ +{ + "usingComponents": { + "fakuan-list": "/pages/cfss/components/fakuan-list/fakuan-list", + "jifen-list": "/pages/cfss/components/jifen-list/jifen-list" + }, + "navigationBarTitleText": "处罚中心", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black", + "backgroundColor": "#f7f8fa" + } \ No newline at end of file diff --git a/pages/cfss/cfss/cfss.wxml b/pages/cfss/cfss/cfss.wxml new file mode 100644 index 0000000..03e8517 --- /dev/null +++ b/pages/cfss/cfss/cfss.wxml @@ -0,0 +1,68 @@ + + + + + + + {{ stats.fakuan.daijiaona }} + 待缴罚款 + + + {{ stats.jifen.daichuli }} + 待处理积分 + + + + 罚款：已缴{{ stats.fakuan.yijiaona }} · 申诉中{{ stats.fakuan.shensuzhong }} · 成功{{ stats.fakuan.yibohui }} + 积分：已处理{{ stats.jifen.yichuli }} + + + + + + + 罚款 + + + 积分处罚 + + + + + + + 待缴纳 {{ stats.fakuan.daijiaona }} + 申诉中 {{ stats.fakuan.shensuzhong }} + 已缴纳 {{ stats.fakuan.yijiaona }} + 申诉成功 {{ stats.fakuan.yibohui }} + + + + + 待处理 {{ stats.jifen.daichuli }} + 已处理 {{ stats.jifen.yichuli }} + + + + + + + 搜索 + ✕ + + + + + + + + + + \ No newline at end of file diff --git a/pages/cfss/cfss/cfss.wxss b/pages/cfss/cfss/cfss.wxss new file mode 100644 index 0000000..4cd5d19 --- /dev/null +++ b/pages/cfss/cfss/cfss.wxss @@ -0,0 +1,121 @@ +/* pages/cfss/cfss.wxss */ +page { background: #f7f8fa; font-family: -apple-system, BlinkMacSystemFont, sans-serif; } + +.page-container { padding-bottom: 30rpx; } + +/* 统计卡片 */ +.stats-card { + margin: 24rpx 28rpx; + padding: 30rpx 24rpx; + background: #fff; + border-radius: 24rpx; + box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.04); +} +.stats-number-row { + display: flex; + justify-content: space-around; + margin-bottom: 20rpx; +} +.number-block { + display: flex; + flex-direction: column; + align-items: center; +} +.big-num { + font-size: 56rpx; + font-weight: 700; +} +.green { color: #2E7D32; } +.orange { color: #E67E22; } +.num-label { + font-size: 24rpx; + color: #888; + margin-top: 8rpx; +} +.stats-detail-row { + border-top: 1rpx solid #eee; + padding-top: 18rpx; +} +.stats-detail-row text { + display: block; + font-size: 22rpx; + color: #aaa; + margin-bottom: 4rpx; +} + +/* 主Tab */ +.tab-row { + display: flex; + margin: 16rpx 28rpx; + background: #fff; + border-radius: 18rpx; + overflow: hidden; + box-shadow: 0 2rpx 6rpx rgba(0,0,0,0.02); +} +.tab-item { + flex: 1; + text-align: center; + padding: 24rpx 0; + font-size: 28rpx; + color: #666; + transition: 0.2s; +} +.tab-item.active { + color: #2E7D32; + font-weight: 600; + background: #F0F9F0; +} + +/* 子状态标签 */ +.sub-tabs { + white-space: nowrap; + margin: 8rpx 28rpx 16rpx; +} +.sub-tag { + display: inline-block; + padding: 10rpx 26rpx; + margin-right: 14rpx; + background: #fff; + border-radius: 30rpx; + font-size: 24rpx; + color: #888; + box-shadow: 0 1rpx 4rpx rgba(0,0,0,0.02); +} +.sub-tag.sub-active { + background: #E8F5E9; + color: #2E7D32; + font-weight: 600; +} + +/* 搜索栏 */ +.search-bar { + display: flex; + align-items: center; + margin: 16rpx 28rpx; + background: #fff; + border-radius: 20rpx; + padding: 12rpx 22rpx; + box-shadow: 0 1rpx 6rpx rgba(0,0,0,0.02); +} +.search-input { + flex: 1; + font-size: 26rpx; + color: #333; +} +.search-btn { + margin-left: 18rpx; + padding: 12rpx 30rpx; + background: #2E7D32; + color: #fff; + border-radius: 16rpx; + font-size: 24rpx; +} +.clear-btn { + margin-left: 16rpx; + font-size: 30rpx; + color: #aaa; +} + +.list-area { + margin-top: 10rpx; +} \ No newline at end of file diff --git a/pages/cfss/components/fakuan-list/fakuan-list.js b/pages/cfss/components/fakuan-list/fakuan-list.js new file mode 100644 index 0000000..cf45977 --- /dev/null +++ b/pages/cfss/components/fakuan-list/fakuan-list.js @@ -0,0 +1,317 @@ +// components/fakuan-list/fakuan-list.js +import request from '../../../../utils/request.js'; + +const app = getApp(); +const MEIYE_TIAOSHU = 5; + +Component({ + properties: { + status: { type: Number, value: 1, observer: 'reload' }, + searchDingdan: { type: String, value: '', observer: 'reload' }, + trigger: { type: Number, value: 0, observer: 'reload' } + }, + + data: { + list: [], + page: 1, + hasMore: true, + loading: false, + loadingMore: false, + ossImageUrl: app.globalData.ossImageUrl || '', + + // 详情弹窗 + showDetail: false, + detailItem: null, + + // 申诉弹窗 + showShensu: false, + shensuLiyou: '', + shensuTupian: [], + uploading: false, + uploadProgress: { current: 0, total: 0 }, + uploadProgressWidth: '0%', + + // 支付弹窗 + showPay: false, + payFadan: null + }, + + lifetimes: { + attached() { this.reload(); } + }, + + methods: { + // ==================== 数据加载 ==================== + reload() { + this.setData({ page: 1, list: [], hasMore: true }); + this.loadData(); + }, + + async loadData(isLoadMore = false) { + // 防止重复请求 + if (this.data.loading || this.data.loadingMore) return; + + if (!isLoadMore) { + this.setData({ loading: true }); + } else { + // 加载更多时，如果后端已经告知没有更多数据，不发送请求 + if (!this.data.hasMore) { + wx.showToast({ title: '没有更多了', icon: 'none', duration: 1000 }); + return; + } + this.setData({ loadingMore: true }); + } + + try { + const res = await request({ + url: '/yonghu/dsfklbhq', + method: 'POST', + data: { + page: this.data.page, + page_size: MEIYE_TIAOSHU, + zhuangtai: this.data.status, + sousuo_dingdan_id: this.data.searchDingdan + } + }); + if (res.statusCode === 200 && res.data.code === 0) { + const data = res.data.data; + const newList = isLoadMore ? this.data.list.concat(data.list || []) : (data.list || []); + this.setData({ + list: newList, + hasMore: data.has_more || false, // 以后端返回为准 + page: isLoadMore ? this.data.page + 1 : 2, // 首次加载后页码为2 + loading: false, + loadingMore: false + }); + } else { + wx.showToast({ title: res.data?.msg || '加载失败', icon: 'none' }); + this.setData({ loading: false, loadingMore: false }); + } + } catch (e) { + wx.showToast({ title: '网络请求失败', icon: 'none' }); + this.setData({ loading: false, loadingMore: false }); + } + }, + + loadMore() { + if (this.data.list.length === 0) return; + this.loadData(true); + }, + + // ==================== 详情弹窗 ==================== + openDetail(e) { + const item = e.currentTarget.dataset.item; + this.setData({ showDetail: true, detailItem: item }); + }, + closeDetail() { + this.setData({ showDetail: false, detailItem: null }); + }, + + // ==================== 申诉逻辑 ==================== + openShensu() { + const item = this.data.detailItem; + if (item.bohuiliyou) { + wx.showToast({ title: '该罚单申诉已被驳回', icon: 'none' }); + return; + } + const existingImgs = (item.shensu_tupian || []).map(url => this.getFullUrl(url)); + this.setData({ + showShensu: true, + shensuLiyou: item.shensuliyou || '', + shensuTupian: existingImgs, + uploading: false, + uploadProgress: { current: 0, total: 0 }, + uploadProgressWidth: '0%' + }); + }, + closeShensu() { + this.setData({ showShensu: false }); + }, + onShensuInput(e) { + this.setData({ shensuLiyou: e.detail.value.slice(0, 500) }); + }, + + chooseImage() { + const remain = 9 - this.data.shensuTupian.length; + if (remain <= 0) return; + wx.chooseMedia({ + count: remain, + mediaType: ['image'], + sourceType: ['album', 'camera'], + success: (res) => { + const newImgs = [...this.data.shensuTupian, ...res.tempFiles.map(f => f.tempFilePath)]; + this.setData({ shensuTupian: newImgs.slice(0, 9) }); + } + }); + }, + deleteShensuImg(e) { + const arr = this.data.shensuTupian; + arr.splice(e.currentTarget.dataset.index, 1); + this.setData({ shensuTupian: arr }); + }, + previewImage(e) { + wx.previewImage({ current: e.currentTarget.dataset.url, urls: [e.currentTarget.dataset.url] }); + }, + previewLocalImg(e) { + const idx = e.currentTarget.dataset.index; + wx.previewImage({ current: this.data.shensuTupian[idx], urls: this.data.shensuTupian }); + }, + + // ==================== 提交流程 ==================== + async submitShensu() { + if (!this.data.shensuLiyou.trim()) { + wx.showToast({ title: '请输入申诉理由', icon: 'none' }); + return; + } + wx.showLoading({ title: '提交中...' }); + try { + const newLocalPaths = this.data.shensuTupian.filter(path => !path.startsWith('http')); + let finalUrls = []; + if (newLocalPaths.length > 0) { + finalUrls = await this.piliangShangchuanShensuTupian(newLocalPaths); + if (!finalUrls) { + wx.hideLoading(); + return; + } + } + const oldRemoteRelative = this.data.shensuTupian + .filter(path => path.startsWith('http')) + .map(url => url.replace(this.data.ossImageUrl, '').replace(/^\//, '')); + const allUrls = oldRemoteRelative.concat(finalUrls); + await this.doSubmitShensu(allUrls); + } catch (err) { + console.error('提交申诉失败', err); + wx.showToast({ title: err.message || '提交失败', icon: 'none' }); + } finally { + wx.hideLoading(); + } + }, + + async doSubmitShensu(tupianUrls) { + const res = await request({ + url: '/yonghu/fkss', + method: 'POST', + data: { + fadan_id: this.data.detailItem.id, + shensu_liyou: this.data.shensuLiyou, + shensu_tupian_urls: tupianUrls + } + }); + if (res.statusCode === 200 && res.data.code === 0) { + wx.showToast({ title: '申诉已提交', icon: 'success' }); + this.setData({ showShensu: false, showDetail: false }); + this.reload(); + } else { + throw new Error(res.data?.msg || '提交失败'); + } + }, + + // ==================== 图片上传到COS ==================== + async piliangShangchuanShensuTupian(localPaths) { + const total = localPaths.length; + if (!total) return []; + this.setData({ uploading: true, uploadProgress: { current: 0, total: total }, uploadProgressWidth: '0%' }); + + let tokenData; + try { + const credRes = await request({ + url: '/dingdan/dsscpz', + method: 'POST', + data: { + dingdan_id: this.data.detailItem.guanliandingdan_id || '', + fadan_id: this.data.detailItem.id, + yongtu: 'fakuan' + } + }); + if (credRes.data.code !== 0) throw new Error(credRes.data.msg || '凭证获取失败'); + tokenData = credRes.data.data; + } catch (e) { + wx.showToast({ title: '获取上传凭证失败', icon: 'none' }); + this.setData({ uploading: false }); + return null; + } + + const COS = require('../../../../utils/cos-wx-sdk-v5.js'); + const credentials = tokenData.credentials || tokenData; + const cos = new COS({ + SimpleUploadMethod: 'putObject', + getAuthorization: (options, callback) => { + callback({ + TmpSecretId: credentials.tmpSecretId, + TmpSecretKey: credentials.tmpSecretKey, + SecurityToken: credentials.sessionToken || '', + StartTime: tokenData.startTime, + ExpiredTime: tokenData.expiredTime + }); + } + }); + const bucket = tokenData.bucket || 'julebu-1361527063'; + const region = tokenData.region || 'ap-shanghai'; + + const yonghuid = app.globalData.userInfo?.yonghuid || wx.getStorageSync('uid') || '0000000'; + const fadanId = this.data.detailItem.id; + const keys = []; + for (let i = 0; i < total; i++) { + keys.push(`fakuan/dashoufakuan/dashoufakuanshensu/${yonghuid}_${fadanId}_${Date.now() + i}.jpg`); + } + + for (let i = 0; i < total; i++) { + try { + await new Promise((resolve, reject) => { + const timeoutId = setTimeout(() => resolve(), 2000); + cos.uploadFile({ + Bucket: bucket, + Region: region, + Key: keys[i], + FilePath: localPaths[i], + onProgress: (info) => { + if (Math.round(info.percent * 100) === 100) { + clearTimeout(timeoutId); + resolve(); + } + } + }, (err) => { + clearTimeout(timeoutId); + if (err) reject(err); + else resolve(); + }); + }); + } catch (err) { + wx.showToast({ title: `第 ${i + 1} 张上传失败`, icon: 'none' }); + this.setData({ uploading: false }); + return null; + } + const done = i + 1; + this.setData({ + uploadProgress: { current: done, total: total }, + uploadProgressWidth: `${((done / total) * 100).toFixed(0)}%` + }); + } + this.setData({ uploading: false }); + return keys; + }, + + // ==================== 缴纳支付 ==================== + startPay() { + this.setData({ + showDetail: false, + showPay: true, + payFadan: this.data.detailItem + }); + }, + onPayClose() { + this.setData({ showPay: false, payFadan: null }); + }, + onPaySuccess() { + this.setData({ showPay: false, payFadan: null }); + this.reload(); + }, + + // ==================== 工具方法 ==================== + getFullUrl(url) { + if (!url) return ''; + if (url.startsWith('http')) return url; + return this.data.ossImageUrl + url; + } + } +}); \ No newline at end of file diff --git a/pages/cfss/components/fakuan-list/fakuan-list.json b/pages/cfss/components/fakuan-list/fakuan-list.json new file mode 100644 index 0000000..d192c45 --- /dev/null +++ b/pages/cfss/components/fakuan-list/fakuan-list.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + "fakuan-pay": "/pages/cfss/components/fakuan-pay/fakuan-pay" + } +} \ No newline at end of file diff --git a/pages/cfss/components/fakuan-list/fakuan-list.wxml b/pages/cfss/components/fakuan-list/fakuan-list.wxml new file mode 100644 index 0000000..257802a --- /dev/null +++ b/pages/cfss/components/fakuan-list/fakuan-list.wxml @@ -0,0 +1,116 @@ + + + + 加载中... + + + + {{ item.create_time }} + {{ item.display_status }} + + 金额：¥{{ item.fakuanjine }} + 理由：{{ item.chufaliyou }} + 订单：{{ item.guanliandingdan_id }} + + + + + + 点击获取更多 + + 加载中... + —— 没有更多了 —— + 暂无罚款记录 + + + + + + + + + + + + 申诉理由 +

+          <text class="word-count">{{ shensuLiyou.length }}/500</text>
+        </view>
+        <view class="form-group">
+          <text class="sec-title">上传凭证（最多9张）</text>
+          <view class="img-grid">
+            <block wx:for="{{ shensuTupian }}" wx:key="index">
+              <view class="img-box">
+                <image class="img" src="{{ item }}" mode="aspectFill" bindtap="previewLocalImg" data-index="{{ index }}" />
+                <view class="img-del" catchtap="deleteShensuImg" data-index="{{ index }}">✕</view>
+              </view>
+            </block>
+            <view wx:if="{{ shensuTupian.length < 9 }}" class="img-add" bindtap="chooseImage">+</view>
+          </view>
+          <view wx:if="{{ uploading }}" class="progress-box">
+            <view class="progress-bar"><view class="progress-inner" style="width: {{ uploadProgressWidth }}"></view></view>
+            <text class="progress-text">{{ uploadProgress.current }}/{{ uploadProgress.total }}</text>
+          </view>
+        </view>
+      </scroll-view>
+      <view class="modal-foot">
+        <view class="btn default" bindtap="closeShensu">取消</view>
+        <view class="btn primary" bindtap="submitShensu">提交申诉</view>
+      </view>
+    </view>
+  </view>
+
+  
+  <fakuan-pay
+    visible="{{ showPay }}"
+    fadan="{{ payFadan }}"
+    bind:close="onPayClose"
+    bind:success="onPaySuccess"
+  />
+</view>
\ No newline at end of file
diff --git a/pages/cfss/components/fakuan-list/fakuan-list.wxss b/pages/cfss/components/fakuan-list/fakuan-list.wxss
new file mode 100644
index 0000000..3e02bb2
--- /dev/null
+++ b/pages/cfss/components/fakuan-list/fakuan-list.wxss
@@ -0,0 +1,77 @@
+/* 完全复用积分组件的样式 */
+page { background: #f5f5f5; }
+
+.container { width: 100%; box-sizing: border-box; display: flex; flex-direction: column; }
+
+.scroll { width: 100%; box-sizing: border-box; padding: 20rpx 24rpx; }
+
+.tip { text-align: center; color: #999; font-size: 24rpx; padding: 30rpx 0; }
+.empty { display: flex; flex-direction: column; align-items: center; padding-top: 200rpx; color: #999; font-size: 28rpx; }
+
+.card { width: 100%; box-sizing: border-box; background: #fff; border-radius: 16rpx; padding: 24rpx; margin-bottom: 16rpx; }
+.card-head { display: flex; justify-content: space-between; align-items: center; margin-bottom: 12rpx; }
+.time { font-size: 24rpx; color: #999; }
+.tag { font-size: 20rpx; padding: 2rpx 14rpx; border-radius: 16rpx; display: inline-block; }
+
+/* 状态标签颜色（与积分组件完全相同） */
+.zhuangtai-daijiaona { background: #FFF3E0; color: #E65100; }   /* 待缴纳 */
+.zhuangtai-yijiaona { background: #E8F5E9; color: #2E7D32; }     /* 已缴纳 */
+.zhuangtai-shensuzhong { background: #E3F2FD; color: #1565C0; }   /* 申诉中 */
+.zhuangtai-yibohui { background: #F3E5F5; color: #7B1FA2; }      /* 申诉成功 */
+
+.info { display: block; font-size: 26rpx; color: #333; margin-top: 8rpx; }
+
+.modal-mask { position: fixed; top: 0; left: 0; right: 0; bottom: 0; background: rgba(0,0,0,0.5); z-index: 999; display: flex; align-items: flex-end; justify-content: center; }
+.modal-panel { width: 100%; box-sizing: border-box; max-height: 85vh; background: #fff; border-radius: 24rpx 24rpx 0 0; display: flex; flex-direction: column; overflow: hidden; }
+.modal-head { display: flex; justify-content: space-between; align-items: center; padding: 28rpx 30rpx 16rpx; border-bottom: 1px solid #eee; }
+.modal-title { font-size: 32rpx; font-weight: 600; }
+.modal-close { width: 44rpx; height: 44rpx; border-radius: 50%; background: #f5f5f5; display: flex; align-items: center; justify-content: center; font-size: 26rpx; color: #888; }
+
+.modal-body { width: 100%; box-sizing: border-box; padding: 20rpx 30rpx; overflow-y: auto; }
+.row { display: flex; margin-bottom: 16rpx; }
+.lbl { width: 150rpx; font-size: 26rpx; color: #888; flex-shrink: 0; }
+.val { flex: 1; font-size: 26rpx; color: #333; word-break: break-all; }
+.strong { font-weight: 600; color: #E53935; }
+.section { margin: 20rpx 0; }
+.sec-title { font-size: 26rpx; color: #888; margin-bottom: 12rpx; display: block; }
+
+.img-grid { width: 100%; box-sizing: border-box; display: flex; flex-wrap: wrap; gap: 12rpx; }
+.img-box { position: relative; width: calc((100% - 24rpx) / 3); height: 0; padding-bottom: calc((100% - 24rpx) / 3); }
+.img-box .img { position: absolute; top: 0; left: 0; width: 100%; height: 100%; border-radius: 10rpx; background: #f0f0f0; }
+.img-del { position: absolute; top: -6rpx; right: -6rpx; width: 34rpx; height: 34rpx; background: #e53935; border-radius: 50%; display: flex; align-items: center; justify-content: center; color: #fff; font-size: 18rpx; z-index: 2; }
+.img-add { width: calc((100% - 24rpx) / 3); height: 0; padding-bottom: calc((100% - 24rpx) / 3); border: 2rpx dashed #ccc; border-radius: 10rpx; display: flex; align-items: center; justify-content: center; font-size: 48rpx; color: #aaa; position: relative; box-sizing: border-box; }
+
+.form-group { margin-bottom: 24rpx; }
+.textarea { width: 100%; box-sizing: border-box; height: 180rpx; background: #f9f9f9; border-radius: 10rpx; padding: 16rpx; font-size: 26rpx; border: 1px solid #eee; }
+.word-count { text-align: right; font-size: 22rpx; color: #bbb; margin-top: 6rpx; }
+.progress-box { margin-top: 12rpx; }
+.progress-bar { height: 10rpx; background: #eee; border-radius: 5rpx; }
+.progress-inner { height: 100%; background: #2e7d32; border-radius: 5rpx; }
+.progress-text { font-size: 22rpx; color: #2e7d32; text-align: right; margin-top: 4rpx; }
+
+.modal-foot { width: 100%; box-sizing: border-box; display: flex; padding: 16rpx 30rpx 30rpx; gap: 20rpx; border-top: 1px solid #eee; }
+.btn { flex: 1; text-align: center; padding: 22rpx 0; border-radius: 16rpx; font-size: 28rpx; font-weight: 600; }
+.primary { background: #2e7d32; color: #fff; }
+.default { background: #f0f0f0; color: #555; }
+.btn:active { opacity: 0.8; }
+
+
+/* ===== 获取更多按钮 ===== */
+.load-more-btn {
+    width: 80%;
+    margin: 20rpx auto 30rpx;
+    padding: 22rpx 0;
+    text-align: center;
+    background: #ffffff;
+    border: 2rpx solid #e0e0e0;
+    border-radius: 20rpx;
+    color: #555;
+    font-size: 26rpx;
+    box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.02);
+    transition: all 0.15s;
+  }
+  .load-more-btn:active {
+    background: #f5f5f5;
+    border-color: #2e7d32;
+    color: #2e7d32;
+  }
\ No newline at end of file
diff --git a/pages/cfss/components/fakuan-pay/fakuan-pay.js b/pages/cfss/components/fakuan-pay/fakuan-pay.js
new file mode 100644
index 0000000..53d2f89
--- /dev/null
+++ b/pages/cfss/components/fakuan-pay/fakuan-pay.js
@@ -0,0 +1,178 @@
+// components/fakuan-list/fakuan-pay/fakuan-pay.js
+import request from '../../../../utils/request.js';  // 路径保持您原来的样子
+
+Component({
+  properties: {
+    visible: { type: Boolean, value: false, observer: 'onVisibleChange' },
+    fadan: { type: Object, value: null }  // { id, fakuanjine }
+  },
+
+  data: {
+    step: 'method',          // method / balance / confirm / loading
+    balanceOptions: [],
+    selectedBalance: null,
+    loadingText: '',
+    payLoading: false,
+    dingdanid: ''            // 微信支付内部订单ID
+  },
+
+  methods: {
+    onVisibleChange(val) {
+      if (val) {
+        // 每次打开重置为支付方式选择
+        this.setData({ step: 'method', balanceOptions: [], selectedBalance: null });
+      }
+    },
+
+    close() {
+      this.setData({ visible: false });
+      this.triggerEvent('close');
+    },
+
+    // 选择支付方式
+    async chooseMethod(e) {
+      const method = e.currentTarget.dataset.method;
+      if (method === 'wx') {
+        this.wxPay();
+      } else if (method === 'balance') {
+        this.fetchBalanceOptions();
+      }
+    },
+
+    // ========== 微信支付流程 ==========
+    async wxPay() {
+      this.setData({ step: 'loading', loadingText: '发起支付中...' });
+      try {
+        const res = await request({
+          url: '/yonghu/fkjn',
+          method: 'POST',
+          data: { fadan_id: this.properties.fadan.id }
+        });
+        if (res.data.code !== 200) throw new Error(res.data.msg || '下单失败');
+
+        // 🔥 唯一修改点：后端返回格式 { code:200, payParams:{...}, dingdanid:'...' }
+        const payParams = res.data.payParams;
+        const dingdanid = res.data.dingdanid;
+
+        this.setData({ dingdanid });
+        await this.requestWxPayment(payParams);
+      } catch (e) {
+        this.setData({ step: 'method' });
+        wx.showToast({ title: e.message, icon: 'none' });
+      }
+    },
+
+    async requestWxPayment(payParams) {
+      return new Promise((resolve, reject) => {
+        if (!payParams || !payParams.timeStamp || !payParams.paySign) {
+          wx.showToast({ title: '支付参数错误', icon: 'none' });
+          reject(new Error('支付参数错误'));
+          return;
+        }
+        wx.requestPayment({
+          timeStamp: payParams.timeStamp,
+          nonceStr: payParams.nonceStr,
+          package: payParams.package,
+          signType: payParams.signType || 'MD5',
+          paySign: payParams.paySign,
+          success: () => {
+            this.pollPayStatus();
+            resolve();
+          },
+          fail: (err) => {
+            this.setData({ step: 'method' });
+            this.notifyPayFail();
+            reject(err);
+          }
+        });
+      });
+    },
+
+    async pollPayStatus() {
+      this.setData({ step: 'loading', loadingText: '确认支付结果...' });
+      for (let i = 0; i < 10; i++) {
+        try {
+          const res = await request({
+            url: '/yonghu/fkzffc',
+            method: 'POST',
+            data: { dingdanid: this.data.dingdanid }
+          });
+          if (res.data.code === 200) {
+            this.triggerEvent('success');
+            this.close();
+            wx.showToast({ title: '缴纳成功', icon: 'success' });
+            return;
+          }
+        } catch (e) {}
+        await new Promise(r => setTimeout(r, 2000));
+      }
+      this.setData({ step: 'method' });
+      wx.showToast({ title: '支付确认超时', icon: 'none' });
+    },
+
+    async notifyPayFail() {
+      try {
+        await request({
+          url: '/yonghu/fkzfsb',
+          method: 'POST',
+          data: { dingdanid: this.data.dingdanid }
+        });
+      } catch (e) {}
+    },
+
+    // ========== 佣金抵扣流程 ==========
+    async fetchBalanceOptions() {
+      this.setData({ step: 'loading', loadingText: '获取可抵扣身份...' });
+      try {
+        const res = await request({
+          url: '/shangpin/czhqdy',
+          method: 'POST',
+          data: {
+            leixing: 4,
+            fadan_id: this.properties.fadan.id,
+            jine: this.properties.fadan.fakuanjine
+          }
+        });
+        if (res.data.code !== 200) throw new Error(res.data.msg || '获取失败');
+        this.setData({ balanceOptions: res.data.data, step: 'balance' });
+      } catch (e) {
+        this.setData({ step: 'method' });
+        wx.showToast({ title: e.message, icon: 'none' });
+      }
+    },
+
+    selectBalance(e) {
+      const id = e.currentTarget.dataset.id;
+      const info = this.data.balanceOptions.find(opt => opt.id === id);
+      if (!info) return;
+      this.setData({ selectedBalance: info, step: 'confirm' });
+    },
+
+    backToMethod() {
+      this.setData({ step: 'method' });
+    },
+
+    async confirmBalance() {
+      if (!this.data.selectedBalance) return;
+      this.setData({ step: 'loading', loadingText: '抵扣扣款中...' });
+      try {
+        const res = await request({
+          url: '/shangpin/dsqrgmdh',
+          method: 'POST',
+          data: {
+            leixing: 4,
+            shenfen_id: this.data.selectedBalance.id,
+            fadan_id: this.properties.fadan.id
+          }
+        });
+        if (res.data.code !== 200) throw new Error(res.data.msg || '抵扣失败');
+        this.triggerEvent('success');
+        this.close();
+        wx.showToast({ title: '缴纳成功', icon: 'success' });
+      } catch (e) {
+        this.setData({ step: 'method' });
+        wx.showToast({ title: e.message, icon: 'none' });
+      }
+    }
+  }
+});
\ No newline at end of file
diff --git a/pages/cfss/components/fakuan-pay/fakuan-pay.json b/pages/cfss/components/fakuan-pay/fakuan-pay.json
new file mode 100644
index 0000000..fba482a
--- /dev/null
+++ b/pages/cfss/components/fakuan-pay/fakuan-pay.json
@@ -0,0 +1,3 @@
+{
+    "component": true
+}
\ No newline at end of file
diff --git a/pages/cfss/components/fakuan-pay/fakuan-pay.wxml b/pages/cfss/components/fakuan-pay/fakuan-pay.wxml
new file mode 100644
index 0000000..d3a9c3a
--- /dev/null
+++ b/pages/cfss/components/fakuan-pay/fakuan-pay.wxml
@@ -0,0 +1,61 @@
+
+<view wx:if="{{ visible }}" class="pay-mask" catchtouchmove="prevent">
+  
+  <view wx:if="{{ step === 'method' }}" class="pay-panel">
+    <view class="pay-head">
+      <text class="pay-title">选择支付方式</text>
+      <view class="pay-close" bindtap="close">✕</view>
+    </view>
+    <view class="pay-body">
+      <view class="method-item" bindtap="chooseMethod" data-method="wx">
+        <text class="method-icon">💳</text>
+        <text class="method-name">微信支付</text>
+      </view>
+      <view class="method-item" bindtap="chooseMethod" data-method="balance">
+        <text class="method-icon">💰</text>
+        <text class="method-name">佣金抵扣</text>
+      </view>
+    </view>
+  </view>
+
+  
+  <view wx:if="{{ step === 'balance' }}" class="pay-panel">
+    <view class="pay-head">
+      <text class="pay-title">选择抵扣身份</text>
+      <view class="pay-close" bindtap="close">✕</view>
+    </view>
+    <scroll-view scroll-y class="pay-body">
+      <view wx:for="{{ balanceOptions }}" wx:key="id" class="balance-item" bindtap="selectBalance" data-id="{{ item.id }}">
+        <text class="balance-name">{{ item.jieshao }}</text>
+        <text class="balance-amount">需¥{{ item.xuyao }}</text>
+      </view>
+    </scroll-view>
+  </view>
+
+  
+  <view wx:if="{{ step === 'confirm' }}" class="pay-panel">
+    <view class="pay-head">
+      <text class="pay-title">确认抵扣</text>
+      <view class="pay-close" bindtap="close">✕</view>
+    </view>
+    <view class="pay-body">
+      <view class="confirm-row">
+        <text>抵扣身份：{{ selectedBalance.jieshao }}</text>
+      </view>
+      <view class="confirm-row">
+        <text>需扣除：¥{{ selectedBalance.xuyao }}</text>
+      </view>
+      <text class="confirm-tip">确认后将从您的佣金/分红中扣除</text>
+    </view>
+    <view class="pay-foot">
+      <view class="btn default" bindtap="backToMethod">取消</view>
+      <view class="btn primary" bindtap="confirmBalance">确认</view>
+    </view>
+  </view>
+
+  
+  <view wx:if="{{ step === 'loading' }}" class="pay-mask loading-box">
+    <view class="spinner"></view>
+    <text class="loading-text">{{ loadingText }}</text>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/cfss/components/fakuan-pay/fakuan-pay.wxss b/pages/cfss/components/fakuan-pay/fakuan-pay.wxss
new file mode 100644
index 0000000..1f7f292
--- /dev/null
+++ b/pages/cfss/components/fakuan-pay/fakuan-pay.wxss
@@ -0,0 +1,59 @@
+/* 支付组件样式，与罚款列表统一 */
+.pay-mask {
+    position: fixed; top: 0; left: 0; right: 0; bottom: 0;
+    background: rgba(0,0,0,0.5); z-index: 2000;
+    display: flex; align-items: flex-end; justify-content: center;
+  }
+  .pay-panel {
+    width: 100%; max-height: 85vh; background: #fff;
+    border-radius: 24rpx 24rpx 0 0; display: flex; flex-direction: column; overflow: hidden;
+  }
+  .pay-head {
+    display: flex; justify-content: space-between; align-items: center;
+    padding: 28rpx 30rpx 16rpx; border-bottom: 1px solid #eee;
+  }
+  .pay-title { font-size: 32rpx; font-weight: 600; }
+  .pay-close {
+    width: 44rpx; height: 44rpx; background: #f5f5f5;
+    border-radius: 50%; display: flex; align-items: center; justify-content: center;
+    font-size: 26rpx; color: #888;
+  }
+  .pay-body { padding: 20rpx 30rpx; flex: 1; overflow-y: auto; }
+  .pay-foot {
+    display: flex; padding: 16rpx 30rpx 30rpx; gap: 20rpx; border-top: 1px solid #eee;
+  }
+  
+  .method-item {
+    display: flex; flex-direction: column; align-items: center;
+    padding: 40rpx 30rpx; background: #f9f9f9; border-radius: 20rpx; margin-bottom: 20rpx;
+  }
+  .method-icon { font-size: 48rpx; margin-bottom: 12rpx; }
+  .method-name { font-size: 28rpx; color: #333; }
+  
+  .balance-item {
+    display: flex; justify-content: space-between; align-items: center;
+    padding: 24rpx 0; border-bottom: 1rpx solid #f0f0f0;
+  }
+  .balance-name { font-size: 28rpx; color: #333; }
+  .balance-amount { font-size: 28rpx; color: #E53935; }
+  
+  .confirm-row { font-size: 28rpx; margin-bottom: 16rpx; }
+  .confirm-tip { font-size: 24rpx; color: #888; display: block; margin-top: 20rpx; }
+  
+  .loading-box {
+    display: flex; flex-direction: column; align-items: center; justify-content: center;
+    background: rgba(0,0,0,0.6);
+  }
+  .spinner {
+    width: 60rpx; height: 60rpx;
+    border: 4rpx solid rgba(255,255,255,0.3);
+    border-top-color: #fff; border-radius: 50%;
+    animation: spin 1s linear infinite; margin-bottom: 20rpx;
+  }
+  @keyframes spin { to { transform: rotate(360deg); } }
+  .loading-text { color: #fff; font-size: 26rpx; }
+  
+  .btn { flex: 1; text-align: center; padding: 22rpx 0; border-radius: 16rpx; font-size: 28rpx; font-weight: 600; }
+  .primary { background: #2e7d32; color: #fff; }
+  .default { background: #f0f0f0; color: #555; }
+  .btn:active { opacity: 0.8; }
\ No newline at end of file
diff --git a/pages/cfss/components/jifen-list/jifen-list.js b/pages/cfss/components/jifen-list/jifen-list.js
new file mode 100644
index 0000000..487c7d9
--- /dev/null
+++ b/pages/cfss/components/jifen-list/jifen-list.js
@@ -0,0 +1,220 @@
+// components/jifen-list/jifen-list.js
+import request from '../../../../utils/request.js';
+const app = getApp();
+const MEIYE_TIAOSHU = 5;
+
+Component({
+  properties: {
+    status: { type: Number, value: 0, observer: 'reload' },
+    trigger: { type: Number, value: 0, observer: 'reload' }
+  },
+
+  data: {
+    chufaList: [],
+    dangqianye: 1,
+    haiyougengduo: true,
+    jiazhaozhong: false,
+    jiazhaigengduo: false,
+    ossImageUrl: app.globalData.ossImageUrl || '',
+
+    showXiangqing: false,
+    xuanzhongChufa: {},
+
+    showShensuModal: false,
+    shensuLiyou: '',
+    shensuTupian: [],
+    shangchuanJindu: 0,
+    shangchuanZongshu: 0,
+    jinduWidth: '0%',
+    isShangchuanzhong: false,
+    fangdouTimer: null
+  },
+
+  lifetimes: {
+    attached() { this.reload(); },
+    detached() { if (this.data.fangdouTimer) clearTimeout(this.data.fangdouTimer); }
+  },
+
+  methods: {
+    reload() {
+      this.setData({ dangqianye: 1, chufaList: [], haiyougengduo: true });
+      this.loadJifenList();
+    },
+
+    async loadJifenList(isLoadMore = false) {
+      if (this.data.jiazhaozhong || this.data.jiazhaigengduo) return;
+      if (isLoadMore && !this.data.haiyougengduo) return;
+      if (isLoadMore) this.setData({ jiazhaigengduo: true });
+      else this.setData({ jiazhaozhong: true });
+
+      try {
+        const params = { page: this.data.dangqianye, page_size: MEIYE_TIAOSHU, zhuangtai: this.data.status };
+        const res = await request({ url: '/yonghu/dshqcfjl', method: 'POST', data: params });
+        if (res.statusCode === 200 && res.data.code === 0) {
+          const data = res.data.data;
+          if (data.list && Array.isArray(data.list)) {
+            const processedList = data.list.map(item => {
+              let displayTime = '--';
+              if (item.create_time) displayTime = item.create_time;
+              let displayStatus = '未知状态', statusClass = 'zhuangtai-weizhi';
+              const n = Number(item.sqzhuangtai);
+              if (!isNaN(n)) {
+                if (n === 0) { displayStatus = '待处理'; statusClass = 'zhuangtai-daichuli'; }
+                else if (n === 1) { displayStatus = '已处罚'; statusClass = 'zhuangtai-yichufa'; }
+                else if (n === 2) { displayStatus = '处罚已撤销'; statusClass = 'zhuangtai-yibohui'; }
+                else if (n === 3) { displayStatus = '申诉中'; statusClass = 'zhuangtai-shensuzhong'; }
+              }
+              return {
+                ...item,
+                display_time: displayTime, display_status: displayStatus, status_class: statusClass,
+                full_zhengju_tupian: (item.zhengju_tupian || []).map(url => this.getFullImageUrl(url)),
+                full_shensu_tupian: (item.shensu_tupian || []).map(url => this.getFullImageUrl(url))
+              };
+            });
+            const newList = isLoadMore ? [...this.data.chufaList, ...processedList] : processedList;
+            this.setData({ chufaList: newList, haiyougengduo: data.has_more === true, dangqianye: this.data.dangqianye + 1 });
+          } else this.setData({ haiyougengduo: false });
+        }
+      } catch (e) { wx.showToast({ title: '加载失败', icon: 'none' }); this.setData({ haiyougengduo: false }); }
+      finally { if (isLoadMore) this.setData({ jiazhaigengduo: false }); else this.setData({ jiazhaozhong: false }); }
+    },
+
+    onReachBottom() {
+      if (this.data.fangdouTimer) clearTimeout(this.data.fangdouTimer);
+      const timer = setTimeout(() => {
+        if (this.data.jiazhaozhong || this.data.jiazhaigengduo) return;
+        if (!this.data.haiyougengduo) return;
+        this.loadJifenList(true);
+      }, 300);
+      this.setData({ fangdouTimer: timer });
+    },
+
+    chakanXiangqing(e) { this.setData({ showXiangqing: true, xuanzhongChufa: e.currentTarget.dataset.item }); },
+    guanbiXiangqing() { this.setData({ showXiangqing: false, xuanzhongChufa: {} }); },
+
+    openShensuModal() {
+      const { xuanzhongChufa } = this.data;
+      if (xuanzhongChufa.ssliyou || (xuanzhongChufa.shensu_tupian && xuanzhongChufa.shensu_tupian.length > 0)) {
+        wx.showToast({ title: '您已经提交过申诉，请等待处理结果', icon: 'none' }); return;
+      }
+      this.setData({ showShensuModal: true, shensuLiyou: '', shensuTupian: [], shangchuanJindu: 0, shangchuanZongshu: 0, jinduWidth: '0%', isShangchuanzhong: false });
+    },
+    closeShensuModal() { this.setData({ showShensuModal: false }); },
+
+    onShensuLiyouInput(e) { this.setData({ shensuLiyou: e.detail.value.slice(0, 500) }); },
+
+    chooseShensuTupian() {
+      if (this.data.isShangchuanzhong) return;
+      const shengyu = 9 - this.data.shensuTupian.length;
+      if (shengyu <= 0) { wx.showToast({ title: '最多只能上传9张图片', icon: 'none' }); return; }
+      wx.chooseMedia({ count: shengyu, mediaType: ['image'], sourceType: ['album', 'camera'], success: (res) => {
+        const newTupian = [...this.data.shensuTupian, ...res.tempFiles.map(f => f.tempFilePath)];
+        this.setData({ shensuTupian: newTupian.slice(0, 9) });
+      }});
+    },
+    deleteShensuTupian(e) { const arr = [...this.data.shensuTupian]; arr.splice(e.currentTarget.dataset.index, 1); this.setData({ shensuTupian: arr }); },
+    yulanShensuTupian(e) {
+      const idx = e.currentTarget.dataset.index;
+      const urls = this.data.shensuTupian;
+      if (!urls[idx]) return;
+      wx.previewImage({ current: urls[idx], urls });
+    },
+    yulanTupian(e) {
+      const current = e.currentTarget.dataset.url;
+      const urls = e.currentTarget.dataset.urls || [];
+      const fullCurrent = current.startsWith('http') ? current : this.getFullImageUrl(current);
+      const fullUrls = urls.map(url => url.startsWith('http') ? url : this.getFullImageUrl(url));
+      wx.previewImage({ current: fullCurrent, urls: fullUrls.length ? fullUrls : [fullCurrent] });
+    },
+
+    /* ========== 图片上传（完全照抄原 cfss.js） ========== */
+    // 【仅替换此方法，其余代码一个字别动】
+getFullImageUrl(relativeUrl) {
+    if (!relativeUrl) return '';
+    if (relativeUrl.startsWith('http')) return relativeUrl;
+    const ossUrl = this.data.ossImageUrl;
+    if (!ossUrl) return relativeUrl;
+    // 确保拼接时只有一个斜杠
+    const base = ossUrl.replace(/\/+$/, '');
+    const rel = relativeUrl.replace(/^\/+/, '');
+    return base + '/' + rel;
+  },
+    getFileExtension(filePath) {
+      const lastDot = filePath.lastIndexOf('.'); if (lastDot === -1) return '.jpg';
+      const ext = filePath.substring(lastDot).toLowerCase();
+      return ['.jpg','.jpeg','.png','.gif','.bmp','.webp'].includes(ext) ? ext : '.jpg';
+    },
+    async getCOSZhengshu() {
+      const res = await request({ url: '/dingdan/dsscpz', method: 'POST', data: { dingdan_id: this.data.xuanzhongChufa.dingdan_id || '', yongtu: 'chufa' } });
+      if (res.statusCode === 200 && res.data.code === 0 && res.data.data) return res.data.data;
+      throw new Error(res?.data?.msg || '获取上传凭证失败');
+    },
+    initCOSClient(tokenData) {
+      const COS = require('../../../../utils/cos-wx-sdk-v5.js');
+      const credentials = tokenData.credentials || tokenData;
+      const bucket = tokenData.bucket || 'julebu-1361527063';
+      const region = tokenData.region || 'ap-shanghai';
+      const cos = new COS({ SimpleUploadMethod: 'putObject', getAuthorization: (options, callback) => { callback({ TmpSecretId: credentials.tmpSecretId, TmpSecretKey: credentials.tmpSecretKey, SecurityToken: credentials.sessionToken || '', StartTime: tokenData.startTime || Math.floor(Date.now() / 1000), ExpiredTime: tokenData.expiredTime || (Math.floor(Date.now() / 1000) + 7200) }); } });
+      return { cos, bucket, region };
+    },
+    shangchuanDanZhangTupian(filePath, cosKey, cosClient, bucket, region) {
+      return new Promise(resolve => {
+        const timeoutId = setTimeout(() => resolve({ status: 'optimistic_success', key: cosKey }), 2000);
+        cosClient.uploadFile({ Bucket: bucket, Region: region, Key: cosKey, FilePath: filePath, onProgress: (info) => { if (Math.round(info.percent * 100) === 100) { clearTimeout(timeoutId); resolve({ status: 'optimistic_success', key: cosKey }); } } });
+      });
+    },
+    async piliangShangchuanShensuTupian() {
+      const total = this.data.shensuTupian.length;
+      if (total === 0) return [];
+      this.setData({ shangchuanZongshu: total, shangchuanJindu: 0, jinduWidth: '0%', isShangchuanzhong: true });
+
+      let yonghuid = '';
+      const uid = wx.getStorageSync('uid'); if (uid) yonghuid = String(uid).padStart(7, '0');
+      else if (app.globalData.userInfo?.yonghuid) yonghuid = String(app.globalData.userInfo.yonghuid).padStart(7, '0');
+      if (!yonghuid) { wx.showToast({ title: '请先登录', icon: 'none' }); this.setData({ isShangchuanzhong: false }); return []; }
+
+      const preGeneratedUrls = [];
+      for (let i = 0; i < total; i++) {
+        const timestamp = Date.now() + i, random = Math.floor(Math.random() * 10000);
+        preGeneratedUrls.push(`a_long/chfajltp/dssstp/${yonghuid}_${timestamp}_${random}${this.getFileExtension(this.data.shensuTupian[i])}`);
+      }
+
+      let cosClient, bucket, region;
+      try { const tokenData = await this.getCOSZhengshu(); const c = this.initCOSClient(tokenData); cosClient = c.cos; bucket = c.bucket; region = c.region; }
+      catch (e) { wx.showToast({ title: '上传初始化失败', icon: 'none' }); this.setData({ isShangchuanzhong: false }); return []; }
+
+      for (let i = 0; i < total; i++) {
+        await this.shangchuanDanZhangTupian(this.data.shensuTupian[i], preGeneratedUrls[i], cosClient, bucket, region);
+        const done = i + 1;
+        this.setData({ shangchuanJindu: done, jinduWidth: `${((done / total) * 100).toFixed(0)}%` });
+      }
+      this.setData({ isShangchuanzhong: false });
+      return preGeneratedUrls;
+    },
+
+    async submitShensu() {
+      if (!this.data.shensuLiyou.trim()) { wx.showToast({ title: '请输入申诉理由', icon: 'none' }); return; }
+      if (this.data.shensuTupian.length === 0) { wx.showModal({ title: '提示', content: '未上传任何图片，确定要提交申诉吗？', success: async (res) => { if (res.confirm) await this.tijiaoShensuData([]); } }); return; }
+      wx.showToast({ title: '开始上传图片...', icon: 'none' });
+      try {
+        const urls = await this.piliangShangchuanShensuTupian();
+        if (!urls || urls.length === 0) throw new Error('图片上传失败');
+        await this.tijiaoShensuData(urls);
+      } catch (e) { wx.showToast({ title: e.message || '提交失败', icon: 'none' }); }
+    },
+    async tijiaoShensuData(tupianUrls) {
+      wx.showToast({ title: '提交申诉中...', icon: 'none' });
+      try {
+        const res = await request({ url: '/yonghu/dscfss', method: 'POST', data: { chufa_id: this.data.xuanzhongChufa.id, shensu_liyou: this.data.shensuLiyou, shensu_tupian_urls: tupianUrls } });
+        if (res.statusCode === 200 && res.data.code === 0) {
+          const newList = this.data.chufaList.map(item => {
+            if (item.id === this.data.xuanzhongChufa.id) { return { ...item, sqzhuangtai: 3, ssliyou: this.data.shensuLiyou, display_status: '申诉中', status_class: 'zhuangtai-shensuzhong', full_shensu_tupian: tupianUrls.map(url => this.getFullImageUrl(url)) }; }
+            return item;
+          });
+          this.setData({ chufaList: newList, showShensuModal: false, showXiangqing: false });
+          wx.showToast({ title: '申诉提交成功，请等待处理', icon: 'success' });
+        } else throw new Error(res.data?.msg || '提交申诉失败');
+      } catch (e) { wx.showToast({ title: e.message || '提交失败', icon: 'none' }); }
+    }
+  }
+});
\ No newline at end of file
diff --git a/pages/cfss/components/jifen-list/jifen-list.json b/pages/cfss/components/jifen-list/jifen-list.json
new file mode 100644
index 0000000..bbde8dc
--- /dev/null
+++ b/pages/cfss/components/jifen-list/jifen-list.json
@@ -0,0 +1,3 @@
+{
+    "component": true
+  }
\ No newline at end of file
diff --git a/pages/cfss/components/jifen-list/jifen-list.wxml b/pages/cfss/components/jifen-list/jifen-list.wxml
new file mode 100644
index 0000000..ccef2b0
--- /dev/null
+++ b/pages/cfss/components/jifen-list/jifen-list.wxml
@@ -0,0 +1,105 @@
+<view class="container">
+  <scroll-view scroll-y class="scroll" bindscrolltolower="onReachBottom">
+    <view wx:if="{{ jiazhaozhong && chufaList.length === 0 }}" class="tip">加载中...</view>
+    <block wx:for="{{ chufaList }}" wx:key="id">
+      <view class="card" bindtap="chakanXiangqing" data-item="{{ item }}">
+        <view class="card-head">
+          <text class="time">{{ item.display_time }}</text>
+          <text class="tag {{ item.status_class }}">{{ item.display_status }}</text>
+        </view>
+        <text class="info">申请人：{{ item.qingqiuid || '--' }}</text>
+        <text class="info">理由：{{ item.cfliyou || '无' }}</text>
+        <text class="info" wx:if="{{ item.dingdan_id }}">订单：{{ item.dingdan_id }}</text>
+      </view>
+    </block>
+
+    
+    <view wx:if="{{ haiyougengduo && !jiazhaigengduo }}" class="load-more-btn" bindtap="onReachBottom">
+      <text>点击获取更多</text>
+    </view>
+    <view wx:if="{{ jiazhaigengduo }}" class="tip">加载中...</view>
+    <view wx:if="{{ !haiyougengduo && chufaList.length > 0 }}" class="tip">—— 没有更多了 ——</view>
+    <view wx:if="{{ !jiazhaozhong && chufaList.length === 0 }}" class="empty">暂无积分处罚记录</view>
+  </scroll-view>
+
+  
+  <view wx:if="{{ showXiangqing }}" class="modal-mask">
+    <view class="modal-panel">
+      <view class="modal-head">
+        <text class="modal-title">处罚详情</text>
+        <view class="modal-close" bindtap="guanbiXiangqing">✕</view>
+      </view>
+      <scroll-view scroll-y class="modal-body">
+        <view class="row"><text class="lbl">订单编号</text><text class="val">{{ xuanzhongChufa.dingdan_id || '--' }}</text></view>
+        <view class="row"><text class="lbl">申请人ID</text><text class="val">{{ xuanzhongChufa.qingqiuid || '--' }}</text></view>
+        <view class="row"><text class="lbl">时间</text><text class="val">{{ xuanzhongChufa.display_time }}</text></view>
+        <view class="row"><text class="lbl">状态</text><text class="val"><text class="tag {{ xuanzhongChufa.status_class }}">{{ xuanzhongChufa.display_status }}</text></text></view>
+        <view class="row"><text class="lbl">处罚理由</text><text class="val">{{ xuanzhongChufa.cfliyou || '无' }}</text></view>
+
+        <view wx:if="{{ xuanzhongChufa.full_zhengju_tupian.length }}" class="section">
+          <text class="sec-title">证据图片</text>
+          <view class="img-grid">
+            <block wx:for="{{ xuanzhongChufa.full_zhengju_tupian }}" wx:key="index">
+              <view class="img-box" bindtap="yulanTupian" data-url="{{ item }}" data-urls="{{ xuanzhongChufa.full_zhengju_tupian }}">
+                <image class="img" src="{{ item }}" mode="aspectFill" />
+              </view>
+            </block>
+          </view>
+        </view>
+
+        <view wx:if="{{ xuanzhongChufa.ssliyou || xuanzhongChufa.full_shensu_tupian.length }}" class="section">
+          <text class="sec-title">我的申诉</text>
+          <view wx:if="{{ xuanzhongChufa.ssliyou }}" class="row"><text class="lbl">理由</text><text class="val">{{ xuanzhongChufa.ssliyou }}</text></view>
+          <view wx:if="{{ xuanzhongChufa.full_shensu_tupian.length }}" class="img-grid">
+            <block wx:for="{{ xuanzhongChufa.full_shensu_tupian }}" wx:key="index">
+              <view class="img-box" bindtap="yulanTupian" data-url="{{ item }}" data-urls="{{ xuanzhongChufa.full_shensu_tupian }}">
+                <image class="img" src="{{ item }}" mode="aspectFill" />
+              </view>
+            </block>
+          </view>
+        </view>
+      </scroll-view>
+      <view class="modal-foot">
+        <view wx:if="{{ xuanzhongChufa.sqzhuangtai === 0 }}" class="btn primary" bindtap="openShensuModal">申诉</view>
+        <view class="btn default" bindtap="guanbiXiangqing">关闭</view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view wx:if="{{ showShensuModal }}" class="modal-mask">
+    <view class="modal-panel">
+      <view class="modal-head">
+        <text class="modal-title">提交申诉</text>
+        <view class="modal-close" bindtap="closeShensuModal">✕</view>
+      </view>
+      <scroll-view scroll-y class="modal-body">
+        <view class="form-group">
+          <text class="sec-title">申诉理由</text>
+          <textarea class="textarea" placeholder="请输入申诉理由（最多500字）" value="{{ shensuLiyou }}" bindinput="onShensuLiyouInput" maxlength="500" />
+          <text class="word-count">{{ shensuLiyou.length }}/500</text>
+        </view>
+        <view class="form-group">
+          <text class="sec-title">上传凭证（最多9张）</text>
+          <view class="img-grid">
+            <block wx:for="{{ shensuTupian }}" wx:key="index">
+              <view class="img-box">
+                <image class="img" src="{{ item }}" mode="aspectFill" bindtap="yulanShensuTupian" data-index="{{ index }}" />
+                <view class="img-del" catchtap="deleteShensuTupian" data-index="{{ index }}">✕</view>
+              </view>
+            </block>
+            <view wx:if="{{ shensuTupian.length < 9 }}" class="img-add" bindtap="chooseShensuTupian">+</view>
+          </view>
+          <view wx:if="{{ shangchuanZongshu > 0 }}" class="progress-box">
+            <view class="progress-bar"><view class="progress-inner" style="width: {{ jinduWidth }}"></view></view>
+            <text class="progress-text">{{ shangchuanJindu }}/{{ shangchuanZongshu }}</text>
+          </view>
+        </view>
+      </scroll-view>
+      <view class="modal-foot">
+        <view class="btn default" bindtap="closeShensuModal">取消</view>
+        <view class="btn primary" bindtap="submitShensu">提交申诉</view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/cfss/components/jifen-list/jifen-list.wxss b/pages/cfss/components/jifen-list/jifen-list.wxss
new file mode 100644
index 0000000..5cf6c07
--- /dev/null
+++ b/pages/cfss/components/jifen-list/jifen-list.wxss
@@ -0,0 +1,86 @@
+/* 页面与容器 */
+page { background: #f5f5f5; }
+
+/* 🔥 组件自身必须占满宽度，且 padding 左右严格相等 */
+.container { width: 100%; box-sizing: border-box; display: flex; flex-direction: column; }
+
+/* 🔥 滚动区 padding 左右必须相等，且容器用 box-sizing */
+.scroll { width: 100%; box-sizing: border-box; padding: 20rpx 24rpx; }
+
+/* 提示文字 */
+.tip { text-align: center; color: #999; font-size: 24rpx; padding: 30rpx 0; }
+.empty { display: flex; flex-direction: column; align-items: center; padding-top: 200rpx; color: #999; font-size: 28rpx; }
+
+/* 🔥 卡片 width:100% + box-sizing 使左右边距完全由父容器决定 */
+.card { width: 100%; box-sizing: border-box; background: #fff; border-radius: 16rpx; padding: 24rpx; margin-bottom: 16rpx; }
+.card-head { display: flex; justify-content: space-between; align-items: center; margin-bottom: 12rpx; }
+.time { font-size: 24rpx; color: #999; }
+.tag { font-size: 20rpx; padding: 2rpx 14rpx; border-radius: 16rpx; display: inline-block; }
+.zhuangtai-daichuli { background: #fff3e0; color: #e65100; }
+.zhuangtai-yichufa { background: #e8f5e9; color: #2e7d32; }
+.zhuangtai-yibohui { background: #f3e5f5; color: #7b1fa2; }
+.zhuangtai-shensuzhong { background: #e3f2fd; color: #1565c0; }
+.zhuangtai-weizhi { background: #f0f0f0; color: #888; }
+.info { display: block; font-size: 26rpx; color: #333; margin-top: 8rpx; }
+
+/* 弹窗遮罩 */
+.modal-mask { position: fixed; top: 0; left: 0; right: 0; bottom: 0; background: rgba(0,0,0,0.5); z-index: 999; display: flex; align-items: flex-end; justify-content: center; }
+
+/* 🔥 弹窗面板 width:100% + box-sizing */
+.modal-panel { width: 100%; box-sizing: border-box; max-height: 85vh; background: #fff; border-radius: 24rpx 24rpx 0 0; display: flex; flex-direction: column; overflow: hidden; }
+.modal-head { display: flex; justify-content: space-between; align-items: center; padding: 28rpx 30rpx 16rpx; border-bottom: 1px solid #eee; }
+.modal-title { font-size: 32rpx; font-weight: 600; }
+.modal-close { width: 44rpx; height: 44rpx; border-radius: 50%; background: #f5f5f5; display: flex; align-items: center; justify-content: center; font-size: 26rpx; color: #888; }
+
+/* 🔥 内容区左右 padding 严格相等 */
+.modal-body { width: 100%; box-sizing: border-box; padding: 20rpx 30rpx; overflow-y: auto; }
+.row { display: flex; margin-bottom: 16rpx; }
+.lbl { width: 150rpx; font-size: 26rpx; color: #888; flex-shrink: 0; }
+.val { flex: 1; font-size: 26rpx; color: #333; word-break: break-all; }
+.section { margin: 20rpx 0; }
+.sec-title { font-size: 26rpx; color: #888; margin-bottom: 12rpx; display: block; }
+
+/* 🔥 图片网格：gap 均等，无任何额外水平偏移 */
+.img-grid { width: 100%; box-sizing: border-box; display: flex; flex-wrap: wrap; gap: 12rpx; }
+.img { width: calc((100% - 24rpx) / 3); height: 0; padding-bottom: calc((100% - 24rpx) / 3); border-radius: 10rpx; background: #f0f0f0; display: block; position: relative; }
+.img-box { position: relative; width: calc((100% - 24rpx) / 3); height: 0; padding-bottom: calc((100% - 24rpx) / 3); }
+.img-box .img { position: absolute; top: 0; left: 0; width: 100%; height: 100%; padding-bottom: 0; }
+.img-del { position: absolute; top: -6rpx; right: -6rpx; width: 34rpx; height: 34rpx; background: #e53935; border-radius: 50%; display: flex; align-items: center; justify-content: center; color: #fff; font-size: 18rpx; z-index: 2; }
+.img-add { width: calc((100% - 24rpx) / 3); height: 0; padding-bottom: calc((100% - 24rpx) / 3); border: 2rpx dashed #ccc; border-radius: 10rpx; display: flex; align-items: center; justify-content: center; font-size: 52rpx; color: #aaa; box-sizing: border-box; position: relative; }
+
+/* 表单 */
+.form-group { margin-bottom: 24rpx; }
+.textarea { width: 100%; box-sizing: border-box; height: 180rpx; background: #f9f9f9; border-radius: 10rpx; padding: 16rpx; font-size: 26rpx; border: 1px solid #eee; }
+.word-count { text-align: right; font-size: 22rpx; color: #bbb; margin-top: 6rpx; }
+.progress-box { margin-top: 12rpx; }
+.progress-bar { height: 10rpx; background: #eee; border-radius: 5rpx; }
+.progress-inner { height: 100%; background: #2e7d32; border-radius: 5rpx; }
+.progress-text { font-size: 22rpx; color: #2e7d32; text-align: right; margin-top: 4rpx; }
+
+/* 🔥 底部按钮区左右 padding 严格均等 */
+.modal-foot { width: 100%; box-sizing: border-box; display: flex; padding: 16rpx 30rpx 30rpx; gap: 20rpx; border-top: 1px solid #eee; }
+.btn { flex: 1; text-align: center; padding: 22rpx 0; border-radius: 16rpx; font-size: 28rpx; font-weight: 600; }
+.primary { background: #2e7d32; color: #fff; }
+.default { background: #f0f0f0; color: #555; }
+.btn:active { opacity: 0.8; }
+
+
+/* ===== 获取更多按钮 ===== */
+.load-more-btn {
+    width: 80%;
+    margin: 20rpx auto 30rpx;
+    padding: 22rpx 0;
+    text-align: center;
+    background: #ffffff;
+    border: 2rpx solid #e0e0e0;
+    border-radius: 20rpx;
+    color: #555;
+    font-size: 26rpx;
+    box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.02);
+    transition: all 0.15s;
+  }
+  .load-more-btn:active {
+    background: #f5f5f5;
+    border-color: #2e7d32;
+    color: #2e7d32;
+  }
\ No newline at end of file
diff --git a/pages/czjilu/czjilu.js b/pages/czjilu/czjilu.js
new file mode 100644
index 0000000..a2a592d
--- /dev/null
+++ b/pages/czjilu/czjilu.js
@@ -0,0 +1,288 @@
+// 管事会员记录页面逻辑
+import request from '../../utils/request.js';
+
+// 每页数据条数常量 - 统一管理，方便修改
+const MEIYE_TIAOSHU = 50;
+
+Page({
+  data: {
+    // 从全局变量获取的数据
+    yaoqingzongshu: 0,       // 邀请打手总数
+    fenyongzonge: '0.00',    // 分成总额
+    
+    // 从接口获取的数据
+    chongzhiDashouShuliang: 0, // 充值打手数量
+    dashouList: [],          // 打手列表数据
+    zongTiaoshu: 0,         // 总条数
+    
+    // 分页相关
+    dangqianYe: 1,          // 当前页
+    meiyouGengduo: false,   // 没有更多数据
+    jiazaiZhong: false,     // 加载中状态
+    jiazaiGengduo: false,   // 加载更多状态
+    
+    // UI状态
+    cuowuTishi: '',         // 错误提示
+    shuaxinKezhi: false,    // 刷新按钮是否可点击
+    shuaxinCd: 2000,        // 刷新冷却时间（毫秒）
+    
+    // 常量（用于模板）
+    meiyeTiaoshu: MEIYE_TIAOSHU  // 每页条数
+  },
+
+  onLoad(options) {
+    // 从全局变量获取管事数据
+    this.huoquQuanjubianliang();
+    
+    // 加载第一页数据
+    this.jiazaiShuju(true);
+  },
+
+  onShow() {
+    // 页面显示时检查全局变量是否有更新
+    this.registerNotificationComponent();
+    this.huoquQuanjubianliang();
+  },
+    // 🆕 新增：注册通知组件
+    registerNotificationComponent() {
+        const app = getApp();
+        const notificationComp = this.selectComponent('#global-notification');
+        
+        if (notificationComp && notificationComp.showNotification) {
+            console.log('🏪 商城页面注册通知组件');
+            app.globalData.globalNotification = {
+                show: (data) => notificationComp.showNotification(data),
+                hide: () => notificationComp.hideNotification()
+            };
+        }
+    },
+
+  // 获取全局变量数据
+  huoquQuanjubianliang() {
+    const app = getApp();
+    const guanshiData = app.globalData.guanshi;
+    
+    if (guanshiData) {
+      this.setData({
+        yaoqingzongshu: guanshiData.yaoqingzongshu || 0,
+        fenyongzonge: guanshiData.fenyongzonge || '0.00'
+      });
+    }
+  },
+
+  // 加载数据核心方法
+  async jiazaiShuju(chushihua = false) {
+    // 防止重复请求
+    if (this.data.jiazaiZhong) return;
+    
+    // 如果是初始化加载，重置分页
+    if (chushihua) {
+      this.setData({
+        dangqianYe: 1,
+        meiyouGengduo: false,
+        dashouList: [],
+        zongTiaoshu: 0,
+        chongzhiDashouShuliang: 0
+      });
+    } else {
+      // 上拉加载更多时，检查是否还有更多数据
+      if (this.data.meiyouGengduo) return;
+      
+      // 如果有数据但不足一页，说明后端已经没数据了
+      if (this.data.dashouList.length > 0 && this.data.dashouList.length < MEIYE_TIAOSHU) {
+        this.setData({ meiyouGengduo: true });
+        return;
+      }
+      
+      // 如果数据量已经达到总条数，则不请求
+      if (this.data.dashouList.length >= this.data.zongTiaoshu && this.data.zongTiaoshu > 0) {
+        this.setData({ meiyouGengduo: true });
+        return;
+      }
+    }
+    
+    // 设置加载状态
+    this.setData({
+      jiazaiZhong: chushihua ? true : false,
+      jiazaiGengduo: !chushihua ? true : false,
+      cuowuTishi: ''
+    });
+    
+    try {
+      const { dangqianYe } = this.data;
+      
+      // 严格按照您的request规范调用
+      const res = await request({
+        url: '/shangpin/fenhonghq',
+        method: 'POST',
+        data: {
+          page: dangqianYe,
+          page_size: MEIYE_TIAOSHU  // 使用统一常量
+        }
+      });
+      
+      // 处理返回数据
+      if (res.data.code === 200) {
+        const data = res.data.data || {};
+        const newList = data.list || [];
+        const total = data.total || 0;
+        
+        // 处理头像URL拼接
+        const processedList = this.chuliTouxiangURL(newList);
+        
+        // 计算是否有更多数据
+        const hasMoreData = processedList.length === MEIYE_TIAOSHU;
+        
+        // 更新数据
+        this.setData({
+          dashouList: chushihua ? processedList : [...this.data.dashouList, ...processedList],
+          zongTiaoshu: total,
+          chongzhiDashouShuliang: data.chongzhi_dashou_shuliang || 0,
+          meiyouGengduo: !hasMoreData,
+          dangqianYe: chushihua ? 2 : this.data.dangqianYe + 1
+        });
+        
+        // 如果数据为空，显示空状态
+        if (chushihua && processedList.length === 0) {
+          wx.showToast({
+            title: '暂无数据',
+            icon: 'none',
+            duration: 1500
+          });
+        }
+        
+        // 如果加载了数据，给个提示
+        if (processedList.length > 0) {
+          if (chushihua) {
+            wx.showToast({
+              title: `已加载${processedList.length}条记录`,
+              icon: 'success',
+              duration: 1000
+            });
+          }
+        }
+      } else {
+        this.setData({
+          cuowuTishi: res.data.msg || '数据加载失败'
+        });
+        wx.showToast({
+          title: res.data.msg || '加载失败',
+          icon: 'none',
+          duration: 2000
+        });
+      }
+    } catch (error) {
+      console.error('加载数据失败:', error);
+      this.setData({
+        cuowuTishi: '网络错误，请检查网络连接'
+      });
+      wx.showToast({
+        title: '网络错误',
+        icon: 'none',
+        duration: 2000
+      });
+    } finally {
+      this.setData({ 
+        jiazaiZhong: false,
+        jiazaiGengduo: false
+      });
+    }
+  },
+
+  // 处理头像URL拼接
+  chuliTouxiangURL(list) {
+    const app = getApp();
+    const ossUrl = app.globalData.ossImageUrl || '';
+    
+    return list.map(item => {
+      // 确保有头像URL，如果没有则使用默认头像
+      let touxiangUrl = item.avatar || '';
+      if (touxiangUrl && !touxiangUrl.startsWith('http')) {
+        touxiangUrl = ossUrl + touxiangUrl;
+      }
+      
+      // 格式化时间
+      let shijian = item.create_time || '';
+      if (shijian) {
+        // 如果是时间戳，转换为日期格式
+        if (/^\d+$/.test(shijian)) {
+          const date = new Date(parseInt(shijian));
+          shijian = `${date.getMonth() + 1}月${date.getDate()}日 ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`;
+        } else {
+          // 如果是字符串，提取日期和时间
+          try {
+            const dateObj = new Date(shijian);
+            shijian = `${dateObj.getMonth() + 1}月${dateObj.getDate()}日 ${dateObj.getHours().toString().padStart(2, '0')}:${dateObj.getMinutes().toString().padStart(2, '0')}`;
+          } catch (e) {
+            shijian = shijian.substring(0, 10);
+          }
+        }
+      }
+      
+      return {
+        ...item,
+        touxiangUrl: touxiangUrl || '/images/default-avatar.png',
+        shijian: shijian,
+        fenhong: parseFloat(item.fenhong || 0).toFixed(2)
+      };
+    });
+  },
+
+  // 刷新数据（带防重复点击）
+  shuaxinShuju() {
+    // 检查是否在冷却中
+    if (this.data.shuaxinKezhi) {
+      wx.showToast({
+        title: `请等待${this.data.shuaxinCd/1000}秒`,
+        icon: 'none',
+        duration: 1000
+      });
+      return;
+    }
+    
+    // 设置冷却状态
+    this.setData({ shuaxinKezhi: true });
+    
+    // 显示刷新动画
+    this.setData({
+      jiazaiZhong: true
+    });
+    
+    // 刷新数据
+    this.jiazaiShuju(true).finally(() => {
+      // 2秒后恢复按钮可点击
+      setTimeout(() => {
+        this.setData({ shuaxinKezhi: false });
+      }, this.data.shuaxinCd);
+    });
+  },
+
+  // 上拉加载更多
+  shanglaJiazai() {
+    // 没有更多数据时不再请求
+    if (this.data.meiyouGengduo) {
+      wx.showToast({
+        title: '已经到底了',
+        icon: 'none',
+        duration: 1000
+      });
+      return;
+    }
+    
+    // 如果正在加载，不再请求
+    if (this.data.jiazaiGengduo || this.data.jiazaiZhong) {
+      return;
+    }
+    
+    this.jiazaiShuju(false);
+  },
+
+  // 重试加载
+  chongshiJiazai() {
+    this.setData({ 
+      cuowuTishi: '',
+      meiyouGengduo: false
+    });
+    this.jiazaiShuju(true);
+  }
+});
\ No newline at end of file
diff --git a/pages/czjilu/czjilu.json b/pages/czjilu/czjilu.json
new file mode 100644
index 0000000..ea59dc7
--- /dev/null
+++ b/pages/czjilu/czjilu.json
@@ -0,0 +1,11 @@
+{
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    },
+    "navigationBarTitleText": "会员记录",
+    "navigationBarBackgroundColor": "#0a0a0f",
+    "navigationBarTextStyle": "white",
+    "backgroundColor": "#0a0a0f",
+    "backgroundTextStyle": "light",
+    "enablePullDownRefresh": false
+  }
\ No newline at end of file
diff --git a/pages/czjilu/czjilu.wxml b/pages/czjilu/czjilu.wxml
new file mode 100644
index 0000000..46fcd82
--- /dev/null
+++ b/pages/czjilu/czjilu.wxml
@@ -0,0 +1,119 @@
+
+<view class="page-container">
+  
+  <view class="fixed-top">
+    
+    <view class="tongji-quyu">
+      
+      <view class="fenyong-zonge">
+        <view class="zonge-label">分红总额</view>
+        <view class="zonge-value">¥{{fenyongzonge}}</view>
+        <view class="zonge-tip">累计收益</view>
+      </view>
+
+      
+      <view class="tongji-bottom">
+        <view class="tongji-item">
+          <view class="tongji-number">{{yaoqingzongshu}}</view>
+          <view class="tongji-label">邀请打手</view>
+        </view>
+        
+        <view class="tongji-divider"></view>
+        
+        <view class="tongji-item">
+          <view class="tongji-number">{{chongzhiDashouShuliang}}</view>
+          <view class="tongji-label">充值打手</view>
+        </view>
+      </view>
+    </view>
+
+    
+    <view class="shuaxin-anniu" bindtap="shuaxinShuju">
+      <text class="shuaxin-icon {{shuaxinKezhi ? 'shuaxin-disabled' : ''}}">↻</text>
+    </view>
+  </view>
+
+  
+  <scroll-view 
+    class="scroll-area"
+    scroll-y
+    enable-back-to-top
+    bindscrolltolower="shanglaJiazai">
+    
+    
+    <view wx:if="{{jiazaiZhong && dashouList.length === 0}}" class="jiazai-quanju">
+      <view class="jiazai-spinner"></view>
+      <view class="jiazai-text">加载中...</view>
+    </view>
+    
+    
+    <view wx:if="{{!jiazaiZhong && dashouList.length === 0}}" class="kong-shuju">
+      <view class="kong-icon">🚀</view>
+      <view class="kong-text">暂无会员记录</view>
+      <view class="kong-tip">快去邀请打手吧</view>
+      <view class="kong-btn" bindtap="shuaxinShuju">点击刷新</view>
+    </view>
+
+    
+    <block wx:if="{{dashouList.length > 0}}">
+      
+      <view class="list-title">
+        <text class="title-text">充值记录</text>
+        <text class="title-count">({{dashouList.length}}/{{zongTiaoshu}})</text>
+      </view>
+      
+      
+      <view class="card-list">
+        <block wx:for="{{dashouList}}" wx:key="index">
+          <view class="dashou-card">
+            
+            <view class="touxiang-quyu">
+              <image 
+                class="dashou-touxiang" 
+                src="{{item.touxiangUrl}}"
+                mode="aspectFill">
+              </image>
+              
+              <view class="touxiang-border"></view>
+            </view>
+
+            
+            <view class="xinxi-quyu">
+              <view class="nicheng">{{item.nicheng}}</view>
+              <view class="dashou-id">ID: {{item.yonghuid}}</view>
+            </view>
+
+            
+            <view class="fenhong-quyu">
+              <view class="fenhong-value">
+                <text class="fenhong-jiahao">+</text>
+                <text class="fenhong-shuzi">¥{{item.fenhong}}</text>
+              </view>
+              <view class="shijian">{{item.shijian}}</view>
+            </view>
+          </view>
+        </block>
+      </view>
+      
+      
+      <view wx:if="{{jiazaiGengduo}}" class="jiazai-gengduo">
+        <view class="gengduo-spinner"></view>
+        <text class="gengduo-text">加载更多中...</text>
+      </view>
+      
+      
+      <view wx:if="{{meiyouGengduo && dashouList.length > 0}}" class="meiyou-gengduo">
+        <view class="meiyou-icon">✓</view>
+        <text class="meiyou-text">已经到底了，共{{dashouList.length}}条记录</text>
+      </view>
+    </block>
+  </scroll-view>
+
+  
+  <view wx:if="{{cuowuTishi}}" class="cuowu-quyu">
+    <view class="cuowu-icon">⚠️</view>
+    <view class="cuowu-text">{{cuowuTishi}}</view>
+    <view class="cuowu-btn" bindtap="chongshiJiazai">重试加载</view>
+  </view>
+</view>
+<global-notification id="global-notification" />
diff --git a/pages/czjilu/czjilu.wxss b/pages/czjilu/czjilu.wxss
new file mode 100644
index 0000000..e239ef6
--- /dev/null
+++ b/pages/czjilu/czjilu.wxss
@@ -0,0 +1,506 @@
+/* 管事会员记录页面样式 - 赛博风格 */
+
+/* 页面容器 */
+page {
+    height: 100%;
+    background: #0a0a0f;
+  }
+  
+  .page-container {
+    height: 100%;
+    background: linear-gradient(135deg, #0a0a0f 0%, #1a1a2e 50%, #16213e 100%);
+    position: relative;
+  }
+  
+  /* 固定顶部区域 */
+  .fixed-top {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 100;
+    background: linear-gradient(135deg, #0a0a0f 0%, #1a1a2e 100%);
+    padding-bottom: 20rpx;
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.3);
+  }
+  
+  /* 顶部统计区域 - 赛博卡片设计 */
+  .tongji-quyu {
+    position: relative;
+    margin: 20rpx 30rpx 0;
+    padding: 40rpx 30rpx;
+    background: rgba(20, 20, 35, 0.9);
+    border-radius: 24rpx;
+    border: 1px solid rgba(100, 255, 255, 0.1);
+    box-shadow: 
+      0 10rpx 30rpx rgba(0, 0, 0, 0.4),
+      0 0 20rpx rgba(100, 255, 255, 0.05) inset,
+      0 0 0 1px rgba(100, 255, 255, 0.1);
+    backdrop-filter: blur(10px);
+    overflow: hidden;
+  }
+  
+  .tongji-bg {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: 
+      linear-gradient(45deg, 
+        rgba(100, 255, 255, 0.03) 0%, 
+        rgba(255, 100, 255, 0.03) 100%);
+    z-index: 0;
+  }
+  
+  /* 分红总额样式 - 赛博霓虹效果 */
+  .fenyong-zonge {
+    position: relative;
+    text-align: center;
+    padding: 20rpx 0 30rpx;
+    margin-bottom: 25rpx;
+    border-bottom: 1px solid rgba(100, 255, 255, 0.1);
+    z-index: 1;
+  }
+  
+  .zonge-label {
+    font-size: 26rpx;
+    color: rgba(255, 255, 255, 0.7);
+    margin-bottom: 15rpx;
+    text-transform: uppercase;
+    letter-spacing: 2rpx;
+  }
+  
+  .zonge-value {
+    font-size: 60rpx;
+    font-weight: 800;
+    color: #00ffea;
+    margin-bottom: 8rpx;
+    text-shadow: 
+      0 0 10rpx rgba(0, 255, 234, 0.5),
+      0 0 20rpx rgba(0, 255, 234, 0.3);
+    font-family: 'Arial', sans-serif;
+  }
+  
+  .zonge-tip {
+    font-size: 22rpx;
+    color: rgba(255, 255, 255, 0.5);
+  }
+  
+  /* 底部统计信息 */
+  .tongji-bottom {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    z-index: 1;
+    position: relative;
+  }
+  
+  .tongji-item {
+    text-align: center;
+    flex: 1;
+  }
+  
+  .tongji-number {
+    font-size: 40rpx;
+    font-weight: 700;
+    color: #ffffff;
+    margin-bottom: 6rpx;
+    text-shadow: 0 0 10rpx rgba(255, 255, 255, 0.3);
+  }
+  
+  .tongji-label {
+    font-size: 24rpx;
+    color: rgba(255, 255, 255, 0.6);
+  }
+  
+  .tongji-divider {
+    width: 1px;
+    height: 45rpx;
+    background: linear-gradient(to bottom, 
+      transparent 0%, 
+      rgba(100, 255, 255, 0.3) 50%, 
+      transparent 100%);
+  }
+  
+  /* 刷新按钮 - 固定在右上角 */
+  .shuaxin-anniu {
+    position: absolute;
+    top: 60rpx;
+    right: 60rpx;
+    z-index: 200;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 70rpx;
+    height: 70rpx;
+    background: rgba(20, 20, 35, 0.95);
+    border-radius: 50%;
+    border: 1px solid rgba(100, 255, 255, 0.2);
+    box-shadow: 
+      0 8rpx 20rpx rgba(0, 0, 0, 0.4),
+      0 0 20rpx rgba(100, 255, 255, 0.1);
+    backdrop-filter: blur(10px);
+    transition: all 0.3s ease;
+  }
+  
+  .shuaxin-anniu:active {
+    transform: scale(0.95);
+    background: rgba(100, 255, 255, 0.1);
+    box-shadow: 
+      0 4rpx 10rpx rgba(0, 0, 0, 0.3),
+      0 0 30rpx rgba(100, 255, 255, 0.2);
+  }
+  
+  .shuaxin-icon {
+    font-size: 32rpx;
+    color: #00ffea;
+    transition: all 0.3s ease;
+  }
+  
+  .shuaxin-disabled {
+    color: rgba(255, 255, 255, 0.3);
+    animation: rotate 1s linear infinite;
+  }
+  
+  @keyframes rotate {
+    from { transform: rotate(0deg); }
+    to { transform: rotate(360deg); }
+  }
+  
+  /* 滚动区域 - 只包裹列表部分 */
+  .scroll-area {
+    position: fixed;
+    top: 340rpx; /* 根据固定区域高度调整 */
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 50;
+  }
+  
+  /* 全局加载状态 */
+  .jiazai-quanju {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 120rpx 0;
+  }
+  
+  .jiazai-spinner {
+    width: 80rpx;
+    height: 80rpx;
+    border: 4rpx solid rgba(100, 255, 255, 0.1);
+    border-top: 4rpx solid #00ffea;
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+    margin-bottom: 30rpx;
+    box-shadow: 0 0 20rpx rgba(0, 255, 234, 0.3);
+  }
+  
+  @keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+  }
+  
+  .jiazai-text {
+    font-size: 28rpx;
+    color: rgba(255, 255, 255, 0.7);
+  }
+  
+  /* 空数据提示 */
+  .kong-shuju {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 120rpx 30rpx;
+    background: rgba(20, 20, 35, 0.5);
+    border-radius: 24rpx;
+    border: 1px solid rgba(100, 255, 255, 0.1);
+    margin: 40rpx 30rpx 0;
+  }
+  
+  .kong-icon {
+    font-size: 100rpx;
+    margin-bottom: 30rpx;
+    color: rgba(255, 255, 255, 0.2);
+  }
+  
+  .kong-text {
+    font-size: 32rpx;
+    color: rgba(255, 255, 255, 0.8);
+    margin-bottom: 10rpx;
+    font-weight: 500;
+  }
+  
+  .kong-tip {
+    font-size: 26rpx;
+    color: rgba(255, 255, 255, 0.5);
+    margin-bottom: 50rpx;
+  }
+  
+  .kong-btn {
+    padding: 20rpx 50rpx;
+    background: linear-gradient(90deg, #00ffea 0%, #0088ff 100%);
+    color: #000;
+    border-radius: 50rpx;
+    font-size: 28rpx;
+    font-weight: 600;
+    box-shadow: 0 8rpx 20rpx rgba(0, 255, 234, 0.3);
+  }
+  
+  .kong-btn:active {
+    transform: scale(0.95);
+    box-shadow: 0 4rpx 10rpx rgba(0, 255, 234, 0.2);
+  }
+  
+  /* 列表标题 */
+  .list-title {
+    margin: 0 30rpx 20rpx;
+    display: flex;
+    align-items: baseline;
+  }
+  
+  .title-text {
+    font-size: 32rpx;
+    color: #ffffff;
+    font-weight: 600;
+    margin-right: 10rpx;
+    text-shadow: 0 0 10rpx rgba(255, 255, 255, 0.2);
+  }
+  
+  .title-count {
+    font-size: 24rpx;
+    color: rgba(255, 255, 255, 0.5);
+  }
+  
+  /* 卡片列表 */
+  .card-list {
+    margin: 0 30rpx;
+  }
+  
+  /* 打手卡片 - 赛博风格设计 */
+  .dashou-card {
+    position: relative;
+    display: flex;
+    align-items: center;
+    padding: 30rpx;
+    margin-bottom: 20rpx;
+    background: rgba(20, 20, 35, 0.7);
+    border-radius: 20rpx;
+    border: 1px solid rgba(100, 255, 255, 0.1);
+    box-shadow: 
+      0 8rpx 24rpx rgba(0, 0, 0, 0.3),
+      0 0 0 1px rgba(100, 255, 255, 0.05);
+    transition: all 0.3s ease;
+  }
+  
+  .dashou-card:active {
+    transform: translateY(-2rpx);
+    background: rgba(30, 30, 50, 0.8);
+    box-shadow: 
+      0 12rpx 30rpx rgba(0, 0, 0, 0.4),
+      0 0 20rpx rgba(100, 255, 255, 0.1);
+  }
+  
+  /* 头像区域 - 纯圆形 */
+  .touxiang-quyu {
+    position: relative;
+    margin-right: 30rpx;
+    flex-shrink: 0;
+  }
+  
+  .dashou-touxiang {
+    width: 100rpx;
+    height: 100rpx;
+    border-radius: 50%; /* 确保是纯圆形 */
+    z-index: 2;
+    position: relative;
+  }
+  
+  .touxiang-border {
+    position: absolute;
+    top: -4rpx;
+    left: -4rpx;
+    width: 108rpx;
+    height: 108rpx;
+    border-radius: 50%;
+    background: linear-gradient(45deg, #00ffea, #ff00ff);
+    z-index: 1;
+    opacity: 0.3;
+    animation: borderGlow 2s linear infinite;
+  }
+  
+  @keyframes borderGlow {
+    0%, 100% { opacity: 0.3; }
+    50% { opacity: 0.6; }
+  }
+  
+  /* 信息区域 */
+  .xinxi-quyu {
+    flex: 1;
+    min-width: 0; /* 防止内容撑开 */
+  }
+  
+  .nicheng {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #ffffff;
+    margin-bottom: 10rpx;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    text-shadow: 0 0 10rpx rgba(255, 255, 255, 0.2);
+  }
+  
+  .dashou-id {
+    font-size: 24rpx;
+    color: rgba(255, 255, 255, 0.5);
+    letter-spacing: 1rpx;
+  }
+  
+  /* 分红金额区域 */
+  .fenhong-quyu {
+    text-align: right;
+    flex-shrink: 0;
+    min-width: 180rpx;
+  }
+  
+  .fenhong-value {
+    margin-bottom: 8rpx;
+  }
+  
+  .fenhong-jiahao {
+    font-size: 26rpx;
+    color: #00ff00;
+    margin-right: 4rpx;
+  }
+  
+  .fenhong-shuzi {
+    font-size: 32rpx;
+    font-weight: 700;
+    color: #00ff00;
+    text-shadow: 0 0 10rpx rgba(0, 255, 0, 0.5);
+  }
+  
+  .shijian {
+    font-size: 22rpx;
+    color: rgba(255, 255, 255, 0.4);
+  }
+  
+  /* 加载更多提示 */
+  .jiazai-gengduo {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 40rpx 0 60rpx;
+    margin: 0 30rpx;
+  }
+  
+  .gengduo-spinner {
+    width: 40rpx;
+    height: 40rpx;
+    border: 3rpx solid rgba(100, 255, 255, 0.1);
+    border-top: 3rpx solid #00ffea;
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+    margin-bottom: 20rpx;
+  }
+  
+  .gengduo-text {
+    font-size: 26rpx;
+    color: rgba(255, 255, 255, 0.6);
+  }
+  
+  /* 没有更多数据 */
+  .meiyou-gengduo {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 50rpx 0 80rpx;
+    margin: 0 30rpx;
+    color: rgba(255, 255, 255, 0.4);
+  }
+  
+  .meiyou-icon {
+    width: 60rpx;
+    height: 60rpx;
+    border-radius: 50%;
+    background: rgba(0, 255, 234, 0.1);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    color: #00ffea;
+    margin-bottom: 20rpx;
+    border: 1px solid rgba(0, 255, 234, 0.2);
+  }
+  
+  .meiyou-text {
+    font-size: 26rpx;
+    text-align: center;
+  }
+  
+  /* 错误提示 */
+  .cuowu-quyu {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 100rpx 30rpx;
+    background: rgba(40, 20, 20, 0.8);
+    border-radius: 24rpx;
+    border: 1px solid rgba(255, 100, 100, 0.2);
+    margin: 40rpx 30rpx 0;
+  }
+  
+  .cuowu-icon {
+    font-size: 80rpx;
+    color: #ff5555;
+    margin-bottom: 30rpx;
+    text-shadow: 0 0 20rpx rgba(255, 85, 85, 0.5);
+  }
+  
+  .cuowu-text {
+    font-size: 30rpx;
+    color: rgba(255, 255, 255, 0.9);
+    margin-bottom: 40rpx;
+    text-align: center;
+    line-height: 1.5;
+  }
+  
+  .cuowu-btn {
+    padding: 20rpx 50rpx;
+    background: linear-gradient(90deg, #ff5555 0%, #ff8800 100%);
+    color: #fff;
+    border-radius: 50rpx;
+    font-size: 28rpx;
+    font-weight: 600;
+    box-shadow: 0 8rpx 20rpx rgba(255, 85, 85, 0.3);
+  }
+  
+  .cuowu-btn:active {
+    transform: scale(0.95);
+    box-shadow: 0 4rpx 10rpx rgba(255, 85, 85, 0.2);
+  }
+
+
+
+
+/* 调整滚动区域的顶部距离，增加间隔 */
+.scroll-area {
+    position: fixed;
+    top: 400rpx; /* 从 340rpx 增加到 360rpx，增加20rpx的间隔 */
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 50;
+  }
+  
+  /* 如果觉得还不够，可以再增加列表标题的上边距 */
+  .list-title {
+    margin: 10rpx 30rpx 20rpx; /* 从 0 30rpx 20rpx 改为 10rpx 30rpx 20rpx */
+    display: flex;
+    align-items: baseline;
+  }  
\ No newline at end of file
diff --git a/pages/dashouchongzhi/dashouchongzhi.js b/pages/dashouchongzhi/dashouchongzhi.js
new file mode 100644
index 0000000..030a40e
--- /dev/null
+++ b/pages/dashouchongzhi/dashouchongzhi.js
@@ -0,0 +1,975 @@
+// pages/dashou-chongzhi/index.js
+import request from '../../utils/request';
+// 引入弹窗服务（路径根据实际调整）
+import PopupService from '../../services/popupService.js';
+
+Page({
+  data: {
+    // ========== 全局数据 ==========
+    clubmber: [],          // 会员列表（注意：全局变量中是 clumber，这里保持原样）
+    yajin: 0,              // 押金
+    jifen: 0,              // 积分（注意：全局变量中是 jinfen）
+    jifenProgress: 0,      // 积分进度条角度
+    
+    // ========== 会员商品列表 ==========
+    huiyuanList: [],       // 从后端获取的会员列表
+    currentHuiyuanIndex: 0, // 当前选中的会员索引
+    currentHuiyuan: {},    // 当前选中的会员详情
+    
+    // ========== 押金充值相关 ==========
+    showYajinModal: false, // 显示押金弹窗
+    yajinAmount: '100',    // 押金金额
+    
+    // ========== 支付相关 ==========
+    payLoading: false,     // 支付加载状态
+    loadingText: '支付中...',
+    
+    // ========== 订单ID记录 ==========
+    currentDingdanid: '',  // 当前操作的订单ID
+    
+    // ========== 计算高度 ==========
+    huiyuanListHeight: 120,
+    
+    // ========== 会员详情规则 ==========
+    detailRules: [
+      '会员有效期为30天，从购买当天开始计算',
+      '会员期间享受优先接单特权',
+      '可享受专属客服服务',
+      '会员到期前3天会有提醒',
+      '支持随时续费，续费天数叠加'
+    ],
+    
+    // ========== 新增：跳转参数处理 ==========
+    // 用于接收从其他页面跳转过来的参数，决定是否自动滚动
+    jumpParams: {},
+    
+    // ========== 新增：支付方式选择 ==========
+    showPayMethodModal: false,   // 支付方式选择弹窗
+    currentBuyType: null,        // 当前购买类型：1会员 2押金 3积分
+    currentHuiyuanId: null,      // 当前选中的会员ID（用于会员购买）
+    currentYajinAmount: null,    // 当前押金金额（用于押金购买）
+    
+    // ========== 新增：余额抵扣身份选择 ==========
+    showBalanceModal: false,      // 余额抵扣身份选择弹窗
+    balanceOptions: [],           // 后端返回的身份列表
+    selectedBalanceId: null,      // 选中的身份ID
+    
+    // ========== 新增：余额抵扣确认弹窗 ==========
+    showConfirmModal: false,      // 余额抵扣确认弹窗
+    selectedBalanceInfo: null,    // 选中的身份详情（用于确认弹窗）
+    
+    // ========== 新增：会员详情弹窗 ==========
+    showMemberModal: false,
+    currentMemberDetail: null,
+  },
+
+  // ========== 生命周期函数 ==========
+  onLoad(options) {
+    //console.log('页面加载，跳转参数:', options);
+    
+    // ✅ 新增：保存跳转参数
+    this.setData({
+      jumpParams: options || {}
+    });
+    
+    this.initPage();
+  },
+
+  // pages/tijiao/tijiao.js 中添加 onHide 方法（如果已有则合并内容）
+onHide() {
+    const popupComp = this.selectComponent('#popupNotice');
+    if (popupComp && popupComp.cleanup) {
+      popupComp.cleanup();
+    }
+  },
+
+  onShow() {
+    // 每次显示页面都刷新数据
+    this.registerNotificationComponent();
+    this.loadFromGlobalData();
+    this.checkAndRefreshData();
+
+    // 调用统一弹窗组件检查并展示公告
+    PopupService.checkAndShow(this, 'dashouchongzhi');
+  },
+
+  // 注册通知组件（原有，保持不变）
+  registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+    
+    if (notificationComp && notificationComp.showNotification) {
+        
+        app.globalData.globalNotification = {
+            show: (data) => notificationComp.showNotification(data),
+            hide: () => notificationComp.hideNotification()
+        };
+    }
+  },
+
+  onReady() {
+    // ✅ 新增：页面渲染完成后处理自动滚动
+    this.handleAutoScroll();
+  },
+
+  // ========== 初始化页面 ==========
+  async initPage() {
+    // 从全局数据加载
+    this.loadFromGlobalData();
+    
+    // 获取会员商品列表
+    await this.fetchHuiyuanList();
+    
+    // 计算会员列表高度
+    this.calculateHuiyuanHeight();
+  },
+
+  // ========== 从全局变量加载数据 ==========
+  loadFromGlobalData() {
+    const app = getApp();
+    const globalData = app.globalData || {};
+    
+    // ✅ 重要：保持字段对应关系
+    // 全局变量中是 clumber，页面中是 clubmber
+    // 全局变量中是 jinfen，页面中是 jifen
+    this.setData({
+      clubmber: globalData.clumber || [],
+      yajin: globalData.yajin || 0,
+      jifen: globalData.jinfen || 0  // ✅ 注意：这里从 jinfen 读取
+    });
+    
+    // 计算积分进度条
+    this.calculateJifenProgress();
+  },
+
+  // ========== 计算积分进度条角度 ==========
+  calculateJifenProgress() {
+    const jifen = this.data.jifen || 0;
+    const progress = (jifen / 10) * 360; // 满分10分
+    this.setData({
+      jifenProgress: progress
+    });
+  },
+
+  // ========== 计算会员列表高度 ==========
+  calculateHuiyuanHeight() {
+    const clubmber = this.data.clubmber || [];
+    
+    const itemHeight = 100; // 每个会员标签高度
+    const maxHeight = 300;  // 最大高度（3个会员）
+    
+    let height = clubmber.length * itemHeight;
+    height = Math.min(height, maxHeight);
+    
+    this.setData({
+      huiyuanListHeight: height
+    });
+  },
+
+  // ========== 获取会员商品列表 ==========
+  async fetchHuiyuanList() {
+    try {
+      const res = await request({
+        url: '/shangpin/dshyhq',
+        method: 'POST',
+        data: {}
+      });
+
+      if (res.data.code === 200) {
+        const huiyuanList = res.data.data || [];
+        
+        // 处理数据，标记已购买的会员
+        const processedList = this.processHuiyuanList(huiyuanList);
+        
+        this.setData({
+          huiyuanList: processedList,
+          currentHuiyuan: processedList[0] || {}
+        });
+      } else {
+        wx.showToast({
+          title: res.data.message || '获取会员列表失败',
+          icon: 'none'
+        });
+      }
+    } catch (error) {
+      console.error('获取会员列表失败:', error);
+      wx.showToast({
+        title: '网络错误，请重试',
+        icon: 'none'
+      });
+    }
+  },
+
+  // ========== 处理会员列表，标记已购买的会员 ==========
+  processHuiyuanList(huiyuanList) {
+    const clubmber = this.data.clubmber || [];
+    
+    return huiyuanList.map(item => {
+      // 检查是否已购买（注意：会员ID字段是 id）
+      const boughtItem = clubmber.find(c => c.huiyuanid === item.id);
+      
+      return {
+        ...item,
+        isBought: !!boughtItem,
+        buyInfo: boughtItem || null
+      };
+    });
+  },
+
+  // ========== Swiper切换事件 ==========
+  onSwiperChange(e) {
+    const current = e.detail.current;
+    const huiyuanList = this.data.huiyuanList || [];
+    
+    this.setData({
+      currentHuiyuanIndex: current,
+      currentHuiyuan: huiyuanList[current] || {}
+    });
+  },
+
+  // ========== 手动选择会员 ==========
+  selectHuiyuan(e) {
+    const index = e.currentTarget.dataset.index;
+    const huiyuanList = this.data.huiyuanList || [];
+    
+    this.setData({
+      currentHuiyuanIndex: index,
+      currentHuiyuan: huiyuanList[index] || {}
+    });
+  },
+
+  // ========== 格式化到期时间 ==========
+  formatDaoqiTime(daoqi) {
+    if (!daoqi) return '';
+    
+    try {
+      // 如果是标准日期格式，格式化为 YYYY-MM-DD
+      if (daoqi.includes(' ')) {
+        const dateStr = daoqi.split(' ')[0];
+        const dateParts = dateStr.split('-');
+        if (dateParts.length === 3) {
+          return `${dateParts[0]}-${dateParts[1]}-${dateParts[2]}`;
+        }
+      }
+      return daoqi;
+    } catch (error) {
+      console.error('格式化到期时间错误:', error);
+      return daoqi;
+    }
+  },
+
+  // ========== 计算剩余时间 ==========
+  formatRemainTime(daoqi) {
+    if (!daoqi) return '';
+    
+    try {
+      const now = new Date();
+      const end = new Date(daoqi);
+      const diff = end - now;
+      
+      if (diff <= 0) return '已过期';
+      
+      const days = Math.floor(diff / (1000 * 60 * 60 * 24));
+      if (days > 0) {
+        return `${days}天`;
+      }
+      
+      const hours = Math.floor(diff / (1000 * 60 * 60));
+      if (hours > 0) {
+        return `${hours}小时`;
+      }
+      
+      return '即将到期';
+    } catch (error) {
+      console.error('计算剩余时间错误:', error);
+      return '时间错误';
+    }
+  },
+
+  // ========== 处理自动滚动 ==========
+  handleAutoScroll() {
+    const { jumpParams } = this.data;
+    
+    if (!jumpParams || !jumpParams.needScroll) return;
+    
+    setTimeout(() => {
+      let scrollTop = 0;
+      
+      if (jumpParams.scrollTo === 'bottom') {
+        scrollTop = 2000;
+      } else if (jumpParams.scrollTo === 'member') {
+        return;
+      }
+      
+      if (scrollTop > 0) {
+        wx.pageScrollTo({
+          scrollTop: scrollTop,
+          duration: 300
+        });
+      }
+    }, 800);
+  },
+
+  // ========== 押金充值相关 ==========
+  showYajinModal() {
+    this.setData({
+      showYajinModal: true,
+      yajinAmount: '100'
+    });
+  },
+
+  hideYajinModal() {
+    this.setData({
+      showYajinModal: false
+    });
+  },
+
+  onYajinInput(e) {
+    let value = e.detail.value;
+    value = value.replace(/[^\d]/g, '');
+    
+    if (value) {
+      const num = parseInt(value);
+      if (num < 1) value = '1';
+      if (num > 10000) value = '10000';
+    }
+    
+    this.setData({
+      yajinAmount: value
+    });
+  },
+
+  setYajinAmount(e) {
+    const amount = e.currentTarget.dataset.amount;
+    this.setData({
+      yajinAmount: amount
+    });
+  },
+
+  async handleYajinPay() {
+    const amount = this.data.yajinAmount;
+    
+    if (!amount || amount < 1 || amount > 10000) {
+      wx.showToast({
+        title: '请输入1-10000元的金额',
+        icon: 'none'
+      });
+      return;
+    }
+
+    this.showLoading('发起支付中...');
+
+    try {
+      const res = await request({
+        url: '/shangpin/yajingoumai',
+        method: 'POST',
+        data: {
+          jine: parseInt(amount)
+        }
+      });
+
+      if (res.data.code === 200) {
+        const payParams = res.data.payParams;
+        const dingdanid = res.data.dingdanid;
+        
+        this.setData({
+          currentDingdanid: dingdanid
+        });
+        
+        await this.wechatPay(payParams, 'yajin');
+      } else {
+        wx.showToast({
+          title: res.data.message || '支付发起失败',
+          icon: 'none'
+        });
+      }
+    } catch (error) {
+      console.error('押金支付失败:', error);
+      wx.showToast({
+        title: '支付失败，请重试',
+        icon: 'none'
+      });
+    } finally {
+      this.hideLoading();
+    }
+  },
+
+  // ========== 积分充值相关 ==========
+  // 🔥 修改点1：增加积分已满的硬拦截，不弹任何提示，直接返回
+  onJifenClick(e) {
+    // 优先判断积分是否已满（10分为满分）
+    if (this.data.jifen >= 10) {
+      // 积分已满，不弹窗，不提示，静默返回
+      return;
+    }
+
+    // 检查是否有会员
+    const clubmber = this.data.clubmber || [];
+    if (clubmber.length === 0) {
+      wx.showToast({
+        title: '请先购买会员才能充值积分',
+        icon: 'none',
+        duration: 3000
+      });
+      return;
+    }
+
+    // 积分未满，正常打开支付方式选择
+    this.setData({
+      currentBuyType: 3,
+      showPayMethodModal: true
+    });
+  },
+
+  // ========== 会员购买相关 ==========
+  async handleHuiyuanBuy(e) {
+    const huiyuanId = e.currentTarget.dataset.id;
+    
+    if (!huiyuanId) {
+      wx.showToast({
+        title: '会员信息错误',
+        icon: 'none'
+      });
+      return;
+    }
+
+    this.showLoading('发起会员支付中...');
+
+    try {
+      const res = await request({
+        url: '/shangpin/huiyuangm',
+        method: 'POST',
+        data: {
+          huiyuanid: huiyuanId
+        }
+      });
+
+      if (res.data.code === 200) {
+        const payParams = res.data.payParams;
+        const dingdanid = res.data.dingdanid;
+        
+        this.setData({
+          currentDingdanid: dingdanid
+        });
+        
+        await this.wechatPay(payParams, 'huiyuan', huiyuanId);
+      } else {
+        wx.showToast({
+          title: res.data.message || '会员支付发起失败',
+          icon: 'none'
+        });
+      }
+    } catch (error) {
+      console.error('会员支付失败:', error);
+      wx.showToast({
+        title: '支付失败，请重试',
+        icon: 'none'
+      });
+    } finally {
+      this.hideLoading();
+    }
+  },
+
+  // ========== 积分购买（微信支付）—— 已替换为正确的后端接口 ==========
+  async handleJifenBuy(e) {
+    const disabled = e.currentTarget.dataset.disabled;
+    
+    // 检查积分是否已满
+    if (disabled === 'true') {
+      wx.showToast({ title: '积分已满，无需补充', icon: 'none' });
+      return;
+    }
+
+    // 检查是否有会员
+    const clubmber = this.data.clubmber || [];
+    if (clubmber.length === 0) {
+      wx.showToast({ title: '请先购买会员才能充值积分', icon: 'none', duration: 3000 });
+      return;
+    }
+
+    this.showLoading('发起积分支付中...');
+
+    try {
+      const res = await request({
+        url: '/shangpin/jifenbc',    // 正确的积分下单接口
+        method: 'POST',
+        data: {}
+      });
+
+      if (res.data.code === 200) {
+        const payParams = res.data.payParams;
+        const dingdanid = res.data.dingdanid;
+        
+        this.setData({ currentDingdanid: dingdanid });
+        await this.wechatPay(payParams, 'jifen');
+      } else {
+        wx.showToast({ title: res.data.message || '积分支付发起失败', icon: 'none' });
+      }
+    } catch (error) {
+      wx.showToast({ title: '支付失败，请重试', icon: 'none' });
+    } finally {
+      this.hideLoading();
+    }
+  },
+
+  // ========== 微信支付封装 ==========
+  async wechatPay(payParams, payType, extraData = null) {
+    return new Promise((resolve, reject) => {
+      if (!payParams || !payParams.timeStamp || !payParams.paySign) {
+        wx.showToast({
+          title: '支付参数错误',
+          icon: 'none'
+        });
+        reject(new Error('支付参数错误'));
+        return;
+      }
+
+      this.showLoading('调起支付中...');
+
+      wx.requestPayment({
+        timeStamp: payParams.timeStamp,
+        nonceStr: payParams.nonceStr,
+        package: payParams.package,
+        signType: payParams.signType || 'MD5',
+        paySign: payParams.paySign,
+        success: async () => {
+          this.hideLoading();
+          
+          wx.showToast({
+            title: '支付成功！确认中...',
+            icon: 'none',
+            duration: 2000
+          });
+          
+          try {
+            await this.startPolling(payType, extraData);
+            resolve();
+          } catch (error) {
+            reject(error);
+          }
+        },
+        fail: async (res) => {
+          this.hideLoading();
+          
+          let errorMsg = '支付失败';
+          if (res.errMsg.includes('cancel')) {
+            errorMsg = '您取消了支付';
+          } else if (res.errMsg.includes('fail')) {
+            errorMsg = '支付失败，请重试';
+          }
+          
+          wx.showToast({
+            title: errorMsg,
+            icon: 'none'
+          });
+          
+          try {
+            await this.handlePayFailure(payType, extraData);
+          } catch (error) {
+            console.error('支付失败通知失败:', error);
+          }
+          
+          reject(new Error(res.errMsg));
+        }
+      });
+    });
+  },
+
+  // ========== 开始轮询支付结果 ==========
+  async startPolling(payType, extraData = null) {
+    const maxRetries = 10;
+    const interval = 2000;
+    const dingdanid = this.data.currentDingdanid;
+    
+    if (!dingdanid) {
+      wx.showToast({
+        title: '订单号缺失',
+        icon: 'none'
+      });
+      return;
+    }
+
+    this.showLoading('确认支付结果中...');
+
+    for (let i = 0; i < maxRetries; i++) {
+      try {
+        const pollResult = await this.checkPayStatus(payType, dingdanid, extraData);
+        
+        if (pollResult.success) {
+          this.hideLoading();
+          await this.updateAfterPayment(payType, extraData, pollResult.data);
+          
+          wx.showToast({
+            title: this.getSuccessMessage(payType),
+            icon: 'success',
+            duration: 2000
+          });
+          
+          return;
+        }
+        
+        await this.sleep(interval);
+      } catch (error) {
+        console.error(`轮询失败第${i + 1}次:`, error);
+      }
+    }
+
+    this.hideLoading();
+    wx.showToast({
+      title: '支付确认超时，请联系客服',
+      icon: 'none'
+    });
+  },
+
+  // ========== 检查支付状态 ==========
+  async checkPayStatus(payType, dingdanid, extraData = null) {
+    let url = '';
+    let data = { dingdanid: dingdanid };
+    
+    switch (payType) {
+      case 'yajin':
+        url = '/shangpin/yajinlunxun';
+        break;
+      case 'jifen':
+        url = '/shangpin/jifenlunxun';
+        break;
+      case 'huiyuan':
+        url = '/shangpin/huiyuanlx';
+        data.huiyuanid = extraData;
+        break;
+      default:
+        throw new Error('未知的支付类型');
+    }
+    
+    try {
+      const res = await request({
+        url,
+        method: 'POST',
+        data
+      });
+      
+      return {
+        success: res.data.code === 200,
+        data: res.data
+      };
+    } catch (error) {
+      console.error('检查支付状态失败:', error);
+      return {
+        success: false,
+        data: null
+      };
+    }
+  },
+
+  // ========== 支付失败处理 ==========
+  async handlePayFailure(payType, extraData = null) {
+    let url = '';
+    let data = { dingdanid: this.data.currentDingdanid };
+    
+    switch (payType) {
+      case 'yajin':
+        url = '/shangpin/yajinshibai';
+        break;
+      case 'jifen':
+        url = '/shangpin/jifenshibai';
+        break;
+      case 'huiyuan':
+        url = '/shangpin/huiyuanshibai';
+        data.huiyuanid = extraData;
+        break;
+      default:
+        return;
+    }
+    
+    try {
+      await request({
+        url,
+        method: 'POST',
+        data
+      });
+    } catch (error) {
+      console.error('支付失败通知失败:', error);
+    }
+  },
+
+  // ========== 支付成功后更新数据 ==========
+  async updateAfterPayment(payType, extraData = null, responseData = null) {
+    const app = getApp();
+    
+    switch (payType) {
+      case 'yajin':
+        if (responseData && responseData.yajin !== undefined) {
+          app.globalData.yajin = responseData.yajin;
+        }
+        await this.refreshYajinData();
+        break;
+        
+      case 'jifen':
+        if (responseData && responseData.jifen !== undefined) {
+          app.globalData.jinfen = responseData.jifen;
+        }
+        await this.refreshJifenData();
+        break;
+        
+      case 'huiyuan':
+        if (responseData && responseData.huiyuan) {
+          app.globalData.jinfen = responseData.jifen;
+          await this.updateClubmberData(responseData.huiyuan);
+        }
+        await this.refreshHuiyuanData(extraData);
+        break;
+    }
+    
+    this.loadFromGlobalData();
+  },
+
+  // ========== 刷新押金数据 ==========
+  async refreshYajinData() {
+    this.loadFromGlobalData();
+  },
+
+  // ========== 刷新积分数据 ==========
+  async refreshJifenData() {
+    this.loadFromGlobalData();
+  },
+
+  // ========== 刷新会员数据 ==========
+  async refreshHuiyuanData(huiyuanId) {
+    this.loadFromGlobalData();
+    await this.fetchHuiyuanList();
+  },
+
+  // ========== 更新会员数据到全局变量 ==========
+  async updateClubmberData(huiyuanData) {
+    const app = getApp();
+    const globalClubmber = app.globalData.clumber || [];
+    
+    const { huiyuanid, huiyuanming, daoqi } = huiyuanData;
+    
+    const index = globalClubmber.findIndex(item => item.huiyuanid === huiyuanid);
+    
+    if (index >= 0) {
+      globalClubmber[index].daoqi = daoqi;
+    } else {
+      globalClubmber.push({
+        huiyuanid: huiyuanid,
+        huiyuanming: huiyuanming,
+        daoqi: daoqi
+      });
+    }
+    
+    app.globalData.clumber = globalClubmber;
+    
+    this.setData({
+      clubmber: [...globalClubmber]
+    });
+  },
+
+  // ========== 检查并刷新数据 ==========
+  async checkAndRefreshData() {
+    this.loadFromGlobalData();
+  },
+
+  // ========== 工具方法 ==========
+  getSuccessMessage(payType) {
+    switch (payType) {
+      case 'yajin': return '押金充值成功';
+      case 'jifen': return '积分补充成功';
+      case 'huiyuan': return '会员购买成功';
+      default: return '支付成功';
+    }
+  },
+
+  showLoading(text = '加载中...') {
+    this.setData({
+      payLoading: true,
+      loadingText: text
+    });
+  },
+
+  hideLoading() {
+    this.setData({
+      payLoading: false
+    });
+  },
+
+  sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  },
+
+  // ========== 新增功能（余额抵扣等） ==========
+  onBuyHuiyuanClick(e) {
+    const huiyuanId = e.currentTarget.dataset.id;
+    this.setData({
+      currentBuyType: 1,
+      currentHuiyuanId: huiyuanId,
+      showPayMethodModal: true
+    });
+  },
+
+  onYajinClick() {
+    this.showYajinModal();
+  },
+
+  onYajinConfirm() {
+    const amount = this.data.yajinAmount;
+    if (!amount || amount < 1 || amount > 10000) {
+      wx.showToast({ title: '请输入1-10000元的金额', icon: 'none' });
+      return;
+    }
+    this.hideYajinModal();
+    this.setData({
+      currentBuyType: 2,
+      currentYajinAmount: amount,
+      showPayMethodModal: true
+    });
+  },
+
+  hidePayMethodModal() {
+    this.setData({ showPayMethodModal: false });
+  },
+
+  // 🔥 修改点2：选择支付方式时再次校验积分状态（防止异步过程中积分变化）
+  onPayMethodSelect(e) {
+    const method = e.currentTarget.dataset.method;
+    const { currentBuyType, currentHuiyuanId, currentYajinAmount, jifen } = this.data;
+    this.hidePayMethodModal();
+
+    // 如果是积分购买，且积分已满，直接拒绝
+    if (currentBuyType === 3 && jifen >= 10) {
+      wx.showToast({
+        title: '积分已满，无需补充',
+        icon: 'none'
+      });
+      return;
+    }
+
+    if (method === 'wx') {
+      if (currentBuyType === 1) {
+        this.handleHuiyuanBuy({ currentTarget: { dataset: { id: currentHuiyuanId } } });
+      } else if (currentBuyType === 2) {
+        this.setData({ yajinAmount: currentYajinAmount }, () => {
+          this.handleYajinPay();
+        });
+      } else if (currentBuyType === 3) {
+        // ✅ 调用已修正的积分支付函数
+        this.handleJifenBuy({ currentTarget: { dataset: { disabled: 'false' } } });
+      }
+    } else if (method === 'balance') {
+      this.fetchBalanceOptions();
+    }
+  },
+
+  // 🔥 修改点3：请求余额抵扣选项前校验积分状态
+  async fetchBalanceOptions() {
+    const { currentBuyType, currentHuiyuanId, currentYajinAmount, jifen } = this.data;
+    
+    // 如果是积分购买，且积分已满，拒绝发起余额抵扣
+    if (currentBuyType === 3 && jifen >= 10) {
+      wx.showToast({
+        title: '积分已满，无需补充',
+        icon: 'none'
+      });
+      return;
+    }
+
+    this.showLoading('获取抵扣信息...');
+    
+    try {
+      const res = await request({
+        url: '/shangpin/czhqdy',
+        method: 'POST',
+        data: {
+          leixing: currentBuyType,
+          huiyuan_id: currentBuyType === 1 ? currentHuiyuanId : undefined,
+          yajin_jine: currentBuyType === 2 ? parseInt(currentYajinAmount) : undefined,
+        }
+      });
+      if (res.data.code === 200) {
+        const options = res.data.data || [];
+        this.setData({
+          balanceOptions: options,
+          showBalanceModal: true
+        });
+      } else {
+        wx.showToast({ title: res.data.message || '获取失败', icon: 'none' });
+      }
+    } catch (error) {
+      console.error('获取抵扣身份失败:', error);
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    } finally {
+      this.hideLoading();
+    }
+  },
+
+  hideBalanceModal() {
+    this.setData({ showBalanceModal: false });
+  },
+
+  onBalanceSelect(e) {
+    const identityId = e.currentTarget.dataset.id;
+    const selected = this.data.balanceOptions.find(opt => opt.id === identityId);
+    if (!selected) return;
+    
+    this.setData({
+      selectedBalanceId: identityId,
+      selectedBalanceInfo: selected,
+      showConfirmModal: true,
+      showBalanceModal: false
+    });
+  },
+
+  hideConfirmModal() {
+    this.setData({ showConfirmModal: false });
+  },
+
+  async confirmBalancePay() {
+    const { selectedBalanceId, currentBuyType, currentHuiyuanId, currentYajinAmount } = this.data;
+    if (!selectedBalanceId) return;
+    
+    this.hideConfirmModal();
+    this.showLoading('抵扣支付中...');
+
+    try {
+      const res = await request({
+        url: '/shangpin/dsqrgmdh',
+        method: 'POST',
+        data: {
+          leixing: currentBuyType,
+          shenfen_id: selectedBalanceId,
+          huiyuan_id: currentBuyType === 1 ? currentHuiyuanId : undefined,
+          yajin_jine: currentBuyType === 2 ? parseInt(currentYajinAmount) : undefined,
+        }
+      });
+
+      if (res.data.code === 200) {
+        const responseData = res.data.data || {};
+        await this.updateAfterPayment(
+          currentBuyType === 1 ? 'huiyuan' : (currentBuyType === 2 ? 'yajin' : 'jifen'),
+          currentBuyType === 1 ? currentHuiyuanId : null,
+          responseData
+        );
+        wx.showToast({ title: '购买成功', icon: 'success' });
+      } else {
+        wx.showToast({ title: res.data.message || '购买失败', icon: 'none' });
+      }
+    } catch (error) {
+      console.error('抵扣支付失败:', error);
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    } finally {
+      this.hideLoading();
+    }
+  },
+
+  showMemberDetail(e) {
+    const item = e.currentTarget.dataset.item;
+    this.setData({
+      currentMemberDetail: item,
+      showMemberModal: true
+    });
+  },
+
+  hideMemberModal() {
+    this.setData({ showMemberModal: false });
+  },
+});
\ No newline at end of file
diff --git a/pages/dashouchongzhi/dashouchongzhi.json b/pages/dashouchongzhi/dashouchongzhi.json
new file mode 100644
index 0000000..90e50da
--- /dev/null
+++ b/pages/dashouchongzhi/dashouchongzhi.json
@@ -0,0 +1,12 @@
+{
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    },
+    "navigationBarTitleText": "充值中心",
+    "navigationBarBackgroundColor": "#0a0e2a",
+    "navigationBarTextStyle": "white",
+    "backgroundColor": "#0a0e2a",
+    "backgroundTextStyle": "light",
+    "enablePullDownRefresh": false,
+    "onReachBottomDistance": 50
+  }
\ No newline at end of file
diff --git a/pages/dashouchongzhi/dashouchongzhi.wxml b/pages/dashouchongzhi/dashouchongzhi.wxml
new file mode 100644
index 0000000..04f074e
--- /dev/null
+++ b/pages/dashouchongzhi/dashouchongzhi.wxml
@@ -0,0 +1,514 @@
+
+<view class="page-container">
+  
+
+  
+  
+  
+  <view class="vip-section">
+    <view class="section-header">
+      <view class="header-decoration">
+        <view class="dec-line"></view>
+        <view class="dec-diamond"></view>
+        <text class="dec-text">VIP会员充值</text>
+        <view class="dec-diamond"></view>
+        <view class="dec-line"></view>
+      </view>
+      <text class="section-subtitle">选择你的会员</text>
+    </view>
+
+    
+    <swiper 
+      class="vip-swiper" 
+      current="{{currentHuiyuanIndex}}" 
+      circular="{{true}}"
+      previous-margin="120rpx"
+      next-margin="120rpx"
+      duration="500"
+      easing-function="easeOutCubic"
+      bindchange="onSwiperChange">
+      <swiper-item wx:for="{{huiyuanList}}" wx:key="id">
+        <view class="vip-card {{index === currentHuiyuanIndex ? 'active' : ''}}" 
+              data-index="{{index}}" bindtap="selectHuiyuan">
+          
+          <view class="card-frame">
+            <view class="frame-corner tl"></view>
+            <view class="frame-corner tr"></view>
+            <view class="frame-corner bl"></view>
+            <view class="frame-corner br"></view>
+            <view class="frame-line top"></view>
+            <view class="frame-line right"></view>
+            <view class="frame-line bottom"></view>
+            <view class="frame-line left"></view>
+          </view>
+          
+          
+          <view class="card-content">
+            <view class="vip-badge" wx:if="{{item.isBought}}">
+              <text class="badge-text">已拥有</text>
+            </view>
+            
+            <view class="vip-title">
+              <text class="title-text">{{item.mingzi}}</text>
+              <view class="title-underline"></view>
+            </view>
+            
+            <view class="vip-price">
+              <text class="price-symbol">¥</text>
+              <text class="price-number">{{item.jiage}}</text>
+              <text class="price-unit">/30天</text>
+            </view>
+            
+            <view class="vip-features">
+              <view class="feature-item" wx:for="{{item.features || ['特权功能', '专属标识', '优先接单']}}" 
+                    wx:key="index">
+                <image class="feature-icon" src="/static/images/check-tech.png"></image>
+                <text class="feature-text">{{item}}</text>
+              </view>
+            </view>
+          </view>
+          
+          
+          <view class="card-indicator" wx:if="{{index === currentHuiyuanIndex}}">
+            <view class="indicator-triangle"></view>
+            <view class="indicator-glow"></view>
+          </view>
+        </view>
+      </swiper-item>
+    </swiper>
+
+    
+    <view class="vip-detail">
+      <view class="detail-header">
+        <view class="detail-title">
+          <image class="detail-icon" src="/static/images/info-tech.png"></image>
+          <text class="title-text">{{currentHuiyuan.mingzi}} - 会员详情</text>
+        </view>
+        <view class="detail-tech"></view>
+      </view>
+      
+      <view class="detail-content">
+        <scroll-view class="detail-scroll" scroll-y>
+          <text class="detail-text">{{currentHuiyuan.jieshao || '加载中...'}}</text>
+          
+          <view class="detail-rules">
+            <view class="rule-item" wx:for="{{detailRules}}" wx:key="index">
+              <view class="rule-number">{{index + 1}}</view>
+              <text class="rule-text">{{item}}</text>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+      
+      
+      <view class="buy-section">
+        <view class="buy-info">
+          <view class="price-display">
+            
+            <text class="price-label">价格：</text>
+            <text class="price-value">¥{{currentHuiyuan.jiage}}</text>
+          </view>
+          <text class="buy-desc" wx:if="{{currentHuiyuan.isBought && currentHuiyuan.buyInfo}}">
+            已激活，<text class="expire-date">{{currentHuiyuan.buyInfo.daoqi}}</text>后到期
+          </text>
+          <text class="buy-desc" wx:else>激活会员特权</text>
+        </view>
+        
+        <view class="buy-action">
+          <view class="tech-buy-btn {{currentHuiyuan.isBought ? 'renew' : ''}}" 
+                bindtap="onBuyHuiyuanClick" data-id="{{currentHuiyuan.id}}">
+            <view class="buy-btn-bg"></view>
+            <view class="buy-btn-glow"></view>
+            <text class="buy-btn-text">
+              {{currentHuiyuan.isBought ? '立即续费' : '立即激活'}}
+            </text>
+            <view class="buy-btn-energy">
+              <view class="energy-dot"></view>
+              <view class="energy-dot"></view>
+              <view class="energy-dot"></view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  
+  
+  
+  <view class="tech-grid">
+    
+    <view class="tech-card huiyuan-card">
+      <view class="card-header">
+        <view class="card-title">
+          <text class="title-text">我的会员</text>
+          <view class="title-text">👑</view>
+        </view>
+        <view class="card-badge">{{clubmber.length}}</view>
+      </view>
+      
+      <scroll-view 
+        class="huiyuan-scroll" 
+        scroll-y 
+        enable-flex 
+        style="height: {{huiyuanListHeight}}rpx">
+        <view wx:for="{{clubmber}}" wx:key="huiyuanid" class="huiyuan-item" data-item="{{item}}" bindtap="showMemberDetail">
+          <view class="huiyuan-tag tech-tag">
+            <view class="tag-triangle"></view>
+            <text class="tag-name">{{item.huiyuanming}}</text>
+            <text class="tag-time">到期: {{formatDaoqiTime(item.daoqi)}}</text>
+            <view class="tag-glow"></view>
+          </view>
+        </view>
+        <view wx:if="{{clubmber.length === 0}}" class="empty-huiyuan">
+          <image class="empty-icon" src="/static/images/empty-member.png"></image>
+          <text class="empty-text">暂无会员</text>
+        </view>
+      </scroll-view>
+      
+      <view class="card-footer">
+        <text class="footer-text">共{{clubmber.length}}个会员</text>
+        <view class="footer-line"></view>
+      </view>
+    </view>
+
+    
+    <view class="tech-card yajin-card">
+      <view class="card-header">
+        <view class="card-title">
+          <text class="title-text">我的押金</text>
+          <view class="title-text">💰</view>
+        </view>
+        <view class="card-corner"></view>
+      </view>
+      
+      <view class="yajin-display">
+        <view class="amount-container">
+          <text class="amount-symbol">¥</text>
+          <text class="amount-number">{{yajin}}</text>
+        </view>
+        <text class="amount-unit">可用余额</text>
+      </view>
+      
+      <view class="tech-line"></view>
+      
+      <view class="action-container">
+        <view class="tech-btn yajin-btn" bindtap="onYajinClick">
+          <view class="btn-bg"></view>
+          <text class="btn-text">立即充值</text>
+          <view class="btn-arrow" style="display:none;">➤</view>
+          <view class="btn-glow"></view>
+        </view>
+      </view>
+      
+      <view class="card-corner corner-bottom"></view>
+    </view>
+
+    
+    <view class="tech-card jifen-card">
+      <view class="card-header">
+        <view class="card-title">
+          <text class="title-text">我的积分</text>
+          <view class="title-text">⭐</view>
+        </view>
+      </view>
+      
+      <view class="jifen-display">
+        <view class="circle-progress">
+          <view class="circle-bg"></view>
+          <view class="circle-mask" style="transform: rotate({{jifenProgress}}deg);"></view>
+          <view class="circle-fill" style="transform: rotate({{jifenProgress}}deg);"></view>
+          <view class="circle-center">
+            <text class="jifen-value">{{jifen}}</text>
+            <text class="jifen-label">积分</text>
+          </view>
+          <view class="circle-dots">
+            <view class="circle-dot" wx:for="{{10}}" wx:key="index" 
+                  style="transform: rotate({{index * 36}}deg);"></view>
+          </view>
+        </view>
+        
+        <view class="jifen-status">
+          <text class="status-text" wx:if="{{jifen < 10}}">积分不足，影响接单,提现权限</text>
+          <text class="status-text full" wx:else>积分充足，无需补充</text>
+        </view>
+      </view>
+      
+      <view class="action-container">
+        <view class="tech-btn jifen-btn" bindtap="onJifenClick" data-disabled="{{jifen >= 10}}">
+          <view class="btn-bg"></view>
+          <text class="btn-text">{{jifen >= 10 ? '积分已满' : '立即补充'}}</text>
+          <view class="btn-energy" wx:if="{{jifen < 10}}"></view>
+          <view class="btn-glow" wx:if="{{jifen < 10}}"></view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  
+  
+  
+  <view class="tech-modal" wx:if="{{showYajinModal}}">
+    <view class="modal-backdrop" bindtap="hideYajinModal"></view>
+    <view class="modal-container">
+      <view class="modal-corner tl"></view>
+      <view class="modal-corner tr"></view>
+      <view class="modal-corner bl"></view>
+      <view class="modal-corner br"></view>
+      
+      <view class="modal-header">
+        <text class="modal-title">押金充值</text>
+        <text class="modal-subtitle">充值保证金</text>
+        <view class="modal-close" bindtap="hideYajinModal">
+          <text class="close-text">✕</text>
+        </view>
+      </view>
+      
+      <view class="modal-body">
+        <view class="input-section">
+          <view class="input-label">
+            <image class="label-icon" src="/static/images/money-tech.png"></image>
+            <text class="label-text">充值金额 (1-10000元)</text>
+          </view>
+          
+          <view class="input-container">
+            <view class="input-prefix">¥</view>
+            <input 
+              class="yajin-input" 
+              type="digit" 
+              placeholder="输入充值金额"
+              placeholder-class="input-placeholder"
+              value="{{yajinAmount}}"
+              bindinput="onYajinInput"
+              maxlength="5"
+              focus="{{showYajinModal}}"/>
+            <view class="input-underline"></view>
+          </view>
+          
+          <text class="input-tip">支持1-10000元整数充值</text>
+        </view>
+        
+        <view class="quick-section">
+          <text class="quick-title">快速选择</text>
+          <view class="quick-buttons">
+            <view 
+              class="quick-btn {{yajinAmount == '100' ? 'active' : ''}}" 
+              bindtap="setYajinAmount" 
+              data-amount="100">
+              <text class="quick-text">100元</text>
+            </view>
+            <view 
+              class="quick-btn {{yajinAmount == '500' ? 'active' : ''}}" 
+              bindtap="setYajinAmount" 
+              data-amount="500">
+              <text class="quick-text">500元</text>
+            </view>
+            <view 
+              class="quick-btn {{yajinAmount == '1000' ? 'active' : ''}}" 
+              bindtap="setYajinAmount" 
+              data-amount="1000">
+              <text class="quick-text">1000元</text>
+            </view>
+            <view 
+              class="quick-btn {{yajinAmount == '5000' ? 'active' : ''}}" 
+              bindtap="setYajinAmount" 
+              data-amount="5000">
+              <text class="quick-text">5000元</text>
+            </view>
+          </view>
+        </view>
+      </view>
+      
+      <view class="modal-footer">
+        <view class="modal-btn cancel-btn" bindtap="hideYajinModal">
+          <text class="btn-text">取消</text>
+        </view>
+        <view class="modal-divider"></view>
+        <view class="modal-btn confirm-btn" bindtap="onYajinConfirm">
+          <text class="btn-text">确认支付</text>
+          <view class="btn-sparkle"></view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="tech-modal" wx:if="{{showPayMethodModal}}">
+    <view class="modal-backdrop" bindtap="hidePayMethodModal"></view>
+    <view class="modal-container small">
+      <view class="modal-corner tl"></view>
+      <view class="modal-corner tr"></view>
+      <view class="modal-corner bl"></view>
+      <view class="modal-corner br"></view>
+      
+      <view class="modal-header">
+        <text class="modal-title">选择支付方式</text>
+        <view class="modal-close" bindtap="hidePayMethodModal">
+          <text class="close-text">✕</text>
+        </view>
+      </view>
+      
+      <view class="modal-body">
+        <view class="pay-method-list">
+          <view class="pay-method-item" bindtap="onPayMethodSelect" data-method="wx">
+            <image class="method-icon" src="/static/images/wechat-pay.png"></image>
+            <text class="method-name">微信支付</text>
+            <text class="method-desc">安全快捷</text>
+          </view>
+          <view class="pay-method-item" bindtap="onPayMethodSelect" data-method="balance">
+            <image class="method-icon" src="/static/images/balance-pay.png"></image>
+            <text class="method-name">余额抵扣</text>
+            <text class="method-desc">使用佣金或分红</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="tech-modal" wx:if="{{showBalanceModal}}">
+    <view class="modal-backdrop" bindtap="hideBalanceModal"></view>
+    <view class="modal-container">
+      <view class="modal-corner tl"></view>
+      <view class="modal-corner tr"></view>
+      <view class="modal-corner bl"></view>
+      <view class="modal-corner br"></view>
+      
+      <view class="modal-header">
+        <text class="modal-title">选择抵扣身份</text>
+        <view class="modal-close" bindtap="hideBalanceModal">
+          <text class="close-text">✕</text>
+        </view>
+      </view>
+      
+      <view class="modal-body">
+        <view class="balance-list">
+          <view wx:for="{{balanceOptions}}" wx:key="id" class="balance-item" 
+                data-id="{{item.id}}" bindtap="onBalanceSelect">
+            <view class="balance-info">
+              <text class="balance-name">{{item.jieshao}}</text>
+              <text class="balance-amount">需¥{{item.xuyao}}</text>
+            </view>
+            <view class="balance-arrow">➤</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="tech-modal" wx:if="{{showConfirmModal}}">
+    <view class="modal-backdrop" bindtap="hideConfirmModal"></view>
+    <view class="modal-container">
+      <view class="modal-corner tl"></view>
+      <view class="modal-corner tr"></view>
+      <view class="modal-corner bl"></view>
+      <view class="modal-corner br"></view>
+      
+      <view class="modal-header">
+        <text class="modal-title">确认抵扣</text>
+        <view class="modal-close" bindtap="hideConfirmModal">
+          <text class="close-text">✕</text>
+        </view>
+      </view>
+      
+      <view class="modal-body">
+        <view class="confirm-detail">
+          <view class="detail-row">
+            <text class="detail-label">抵扣身份：</text>
+            <text class="detail-value">{{selectedBalanceInfo && selectedBalanceInfo.jieshao}}</text>
+          </view>
+          <view class="detail-row">
+            <text class="detail-label">所需金额：</text>
+            <text class="detail-value">¥{{selectedBalanceInfo && selectedBalanceInfo.xuyao}}</text>
+          </view>
+          <view class="detail-row">
+            <text class="detail-label">实际扣除：</text>
+            <text class="detail-value">¥{{selectedBalanceInfo && selectedBalanceInfo.xuyao}}</text>
+          </view>
+          <view class="detail-tip">确认后将从您的余额中扣除</view>
+        </view>
+      </view>
+      
+      <view class="modal-footer">
+        <view class="modal-btn cancel-btn" bindtap="hideConfirmModal">
+          <text class="btn-text">取消</text>
+        </view>
+        <view class="modal-divider"></view>
+        <view class="modal-btn confirm-btn" bindtap="confirmBalancePay">
+          <text class="btn-text">确认支付</text>
+          <view class="btn-sparkle"></view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="tech-modal" wx:if="{{showMemberModal}}">
+    <view class="modal-backdrop" bindtap="hideMemberModal"></view>
+    <view class="modal-container">
+      <view class="modal-corner tl"></view>
+      <view class="modal-corner tr"></view>
+      <view class="modal-corner bl"></view>
+      <view class="modal-corner br"></view>
+      
+      <view class="modal-header">
+        <text class="modal-title">会员详情</text>
+        <view class="modal-close" bindtap="hideMemberModal">
+          <text class="close-text">✕</text>
+        </view>
+      </view>
+      
+      <view class="modal-body">
+        <view class="member-detail">
+          <view class="detail-row">
+            <text class="detail-label">会员名称：</text>
+            <text class="detail-value">{{currentMemberDetail && currentMemberDetail.huiyuanming}}</text>
+          </view>
+          <view class="detail-row">
+            <text class="detail-label">到期时间：</text>
+            <text class="detail-value">{{currentMemberDetail && currentMemberDetail.daoqi}}</text>
+          </view>
+          <view class="detail-row">
+            <text class="detail-label">剩余天数：</text>
+            <text class="detail-value">{{formatRemainTime(currentMemberDetail && currentMemberDetail.daoqi)}}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  
+
+  
+  
+  
+  <view class="tech-loading" wx:if="{{payLoading}}">
+    <view class="loading-backdrop"></view>
+    <view class="loading-content">
+      <view class="loading-spinner">
+        <view class="spinner-ring ring-1"></view>
+        <view class="spinner-ring ring-2"></view>
+        <view class="spinner-ring ring-3"></view>
+        <view class="spinner-core"></view>
+        <view class="spinner-energy"></view>
+      </view>
+      <text class="loading-text">{{loadingText}}</text>
+      <text class="loading-subtext">正在连接支付系统...</text>
+    </view>
+  </view>
+
+  
+  
+  
+  <view class="tech-footer">
+    <view class="footer-line"></view>
+    <view class="footer-text">星阙网络 © 7891 科技</view>
+  </view>
+</view>
+
+
+<global-notification id="global-notification" />
+
+
+<popup-notice id="popupNotice" />
\ No newline at end of file
diff --git a/pages/dashouchongzhi/dashouchongzhi.wxss b/pages/dashouchongzhi/dashouchongzhi.wxss
new file mode 100644
index 0000000..e2536bf
--- /dev/null
+++ b/pages/dashouchongzhi/dashouchongzhi.wxss
@@ -0,0 +1,1705 @@
+/* pages/dashou-chongzhi/index.wxss - 完整保留原有样式，仅删除导航栏相关，调整间距和字体 */
+
+/* ==================== 基础样式 ==================== */
+.page-container {
+    min-height: 100vh;
+    background: linear-gradient(135deg, #0a0e2a 0%, #1a1f4e 30%, #0a0e2a 100%);
+    position: relative;
+    overflow-x: hidden;
+    padding-bottom: 40rpx;
+  }
+  
+  .page-container::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: 
+      radial-gradient(circle at 20% 30%, rgba(64, 156, 255, 0.1) 0%, transparent 50%),
+      radial-gradient(circle at 80% 70%, rgba(138, 43, 226, 0.08) 0%, transparent 50%),
+      linear-gradient(45deg, transparent 49%, rgba(64, 156, 255, 0.05) 50%, transparent 51%),
+      linear-gradient(-45deg, transparent 49%, rgba(64, 156, 255, 0.05) 50%, transparent 51%);
+    background-size: 100% 100%, 100% 100%, 60rpx 60rpx, 60rpx 60rpx;
+    z-index: 0;
+    pointer-events: none;
+  }
+  
+  /* ❌ 删除 .custom-navbar 及其所有子样式 */
+  
+  /* 顶部三区域网格 */
+  .tech-grid {
+    display: flex;
+    justify-content: space-between;
+    padding: 20rpx 30rpx;
+    gap: 20rpx;
+    position: relative;
+    z-index: 1;
+  }
+  
+  /* 科技卡片 */
+  .tech-card {
+    flex: 1;
+    background: rgba(16, 20, 48, 0.8);
+    border-radius: 20rpx;
+    padding: 20rpx 25rpx;
+    position: relative;
+    overflow: hidden;
+    border: 1px solid rgba(64, 156, 255, 0.2);
+    box-shadow: 
+      0 10rpx 30rpx rgba(0, 10, 30, 0.5),
+      inset 0 1px 0 rgba(255, 255, 255, 0.1);
+    min-height: 260rpx;
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .tech-card::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    border-radius: 20rpx;
+    padding: 2rpx;
+    background: linear-gradient(135deg, 
+      rgba(64, 156, 255, 0.4) 0%, 
+      rgba(64, 156, 255, 0.1) 50%,
+      rgba(64, 156, 255, 0.4) 100%);
+    -webkit-mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
+    mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
+    -webkit-mask-composite: xor;
+    mask-composite: exclude;
+    pointer-events: none;
+  }
+  
+  /* 卡片头部 */
+  .card-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20rpx;
+    padding: 0 5rpx;
+  }
+  
+  .card-title {
+    display: flex;
+    align-items: center;
+    gap: 12rpx;
+    flex: 1;
+    white-space: nowrap;
+  }
+  
+  .title-icon {
+    width: 32rpx;
+    height: 32rpx;
+    filter: drop-shadow(0 0 8rpx rgba(64, 156, 255, 0.6));
+  }
+  
+  .title-text {
+    font-size: 26rpx;
+    font-weight: bold;
+    color: #e0f0ff;
+    text-shadow: 0 0 10rpx rgba(64, 156, 255, 0.5);
+    white-space: nowrap;
+  }
+  
+  /* ===== 会员区域（优化后） ===== */
+  .huiyuan-scroll {
+    flex: 1;
+    margin-bottom: 15rpx;
+    overflow-y: scroll;
+  }
+  
+  .huiyuan-item {
+    margin-bottom: 12rpx;
+  }
+  
+  .huiyuan-tag {
+    background: linear-gradient(90deg, 
+      rgba(64, 156, 255, 0.15), 
+      rgba(64, 156, 255, 0.08));
+    border: 1px solid rgba(64, 156, 255, 0.3);
+    border-radius: 16rpx;
+    padding: 15rpx 20rpx;
+    position: relative;
+    overflow: hidden;
+    min-height: 70rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
+  
+  .tag-triangle {
+    position: absolute;
+    top: 10rpx;
+    left: 10rpx;
+    width: 0;
+    height: 0;
+    border-top: 10rpx solid #409cff;
+    border-right: 10rpx solid transparent;
+  }
+  
+  .tag-name {
+    display: block;
+    font-size: 24rpx;
+    color: #fff;
+    font-weight: bold;
+    margin-bottom: 5rpx;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  
+  .tag-time {
+    display: block;
+    font-size: 20rpx;
+    color: #ffd166;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  
+  .tag-glow {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, 
+      transparent, 
+      rgba(255, 255, 255, 0.15), 
+      transparent);
+    animation: techGlide 3s infinite;
+  }
+  
+  .empty-huiyuan {
+    height: 100rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .empty-icon {
+    width: 50rpx;
+    height: 50rpx;
+    opacity: 0.5;
+    margin-bottom: 8rpx;
+  }
+  
+  .empty-text {
+    color: #6688cc;
+    font-size: 22rpx;
+  }
+  
+  .card-footer {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: auto;
+    padding-top: 10rpx;
+  }
+  
+  .footer-text {
+    font-size: 20rpx;
+    color: #a0c8ff;
+  }
+  
+  .footer-line {
+    flex: 1;
+    height: 1px;
+    background: linear-gradient(90deg, 
+      rgba(64, 156, 255, 0.3), 
+      transparent);
+    margin-left: 15rpx;
+  }
+  
+  /* 押金区域 */
+  .yajin-display {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    margin: 15rpx 0;
+  }
+  
+  .amount-container {
+    display: flex;
+    align-items: baseline;
+    margin-bottom: 8rpx;
+  }
+  
+  .amount-symbol {
+    font-size: 28rpx;
+    color: #ffd166;
+    margin-right: 6rpx;
+  }
+  
+  .amount-number {
+    font-size: 56rpx;
+    font-weight: bold;
+    background: linear-gradient(90deg, #40a9ff, #36cfc9);
+    -webkit-background-clip: text;
+    background-clip: text;
+    color: transparent;
+    text-shadow: 0 0 20rpx rgba(64, 169, 255, 0.4);
+  }
+  
+  .amount-unit {
+    font-size: 22rpx;
+    color: #a0c8ff;
+  }
+  
+  .tech-line {
+    height: 2rpx;
+    background: linear-gradient(90deg, 
+      transparent, 
+      rgba(64, 156, 255, 0.5), 
+      transparent);
+    margin: 15rpx 0;
+  }
+  
+  /* 积分区域 */
+  .jifen-card .card-title {
+    flex-direction: row;
+  }
+  
+  .score-badge {
+    background: rgba(64, 156, 255, 0.2);
+    border: 1px solid rgba(64, 156, 255, 0.5);
+    padding: 5rpx 14rpx;
+    border-radius: 20rpx;
+    font-size: 22rpx;
+    color: #409cff;
+    font-weight: bold;
+  }
+  
+  .jifen-display {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    margin: 10rpx 0;
+  }
+  
+  .circle-progress {
+    width: 140rpx;
+    height: 140rpx;
+    position: relative;
+    margin-bottom: 20rpx;
+  }
+  
+  .circle-bg {
+    width: 100%;
+    height: 100%;
+    border: 6rpx solid rgba(255, 255, 255, 0.05);
+    border-radius: 50%;
+    box-sizing: border-box;
+  }
+  
+  .circle-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    border: 6rpx solid transparent;
+    border-top-color: #409cff;
+    border-right-color: #409cff;
+    border-radius: 50%;
+    box-sizing: border-box;
+    transition: transform 0.6s cubic-bezier(0.34, 1.56, 0.64, 1);
+  }
+  
+  .circle-fill {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    border: 6rpx solid transparent;
+    border-top-color: #36cfc9;
+    border-right-color: #36cfc9;
+    border-radius: 50%;
+    box-sizing: border-box;
+    transition: transform 0.6s cubic-bezier(0.34, 1.56, 0.64, 1);
+    filter: drop-shadow(0 0 15rpx rgba(54, 207, 201, 0.6));
+  }
+  
+  .circle-center {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    text-align: center;
+  }
+  
+  .jifen-value {
+    display: block;
+    font-size: 42rpx;
+    font-weight: bold;
+    color: #fff;
+    text-shadow: 0 0 10rpx rgba(64, 156, 255, 0.8);
+  }
+  
+  .jifen-label {
+    display: block;
+    font-size: 20rpx;
+    color: #a0c8ff;
+    margin-top: 5rpx;
+  }
+  
+  .circle-dots {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
+  
+  .circle-dot {
+    position: absolute;
+    top: 0;
+    left: 50%;
+    width: 5rpx;
+    height: 5rpx;
+    background: rgba(64, 156, 255, 0.6);
+    border-radius: 50%;
+    transform-origin: 0 70rpx;
+  }
+  
+  .jifen-status {
+    text-align: center;
+  }
+  
+  .status-text {
+    font-size: 22rpx;
+    color: #ff9d66;
+  }
+  
+  .status-text.full {
+    color: #36cfc9;
+  }
+  
+  /* 科技按钮 */
+  .action-container {
+    margin-top: auto;
+  }
+  
+  .tech-btn {
+    height: 70rpx;
+    border-radius: 35rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
+    font-size: 26rpx;
+    font-weight: bold;
+    color: #fff;
+    transition: all 0.3s ease;
+    line-height: 1;
+  }
+  
+  .tech-btn:active {
+    transform: scale(0.98);
+  }
+  
+  .btn-bg {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    border-radius: 35rpx;
+  }
+  
+  .yajin-btn .btn-bg {
+    background: linear-gradient(135deg, #1e4b8f, #409cff);
+  }
+  
+  .jifen-btn .btn-bg {
+    background: linear-gradient(135deg, #0f2c5c, #36cfc9);
+  }
+  
+  .jifen-btn[data-disabled="true"] .btn-bg {
+    background: linear-gradient(135deg, #333, #666);
+    opacity: 0.7;
+  }
+  
+  .btn-text {
+    position: relative;
+    z-index: 1;
+    display: flex;
+    align-items: center;
+    gap: 8rpx;
+    text-align: center;
+    width: 100%;
+    justify-content: center;
+    height: 100%;
+  }
+  
+  .btn-arrow {
+    font-size: 22rpx;
+    margin-left: 6rpx;
+    color: #fff;
+  }
+  
+  .btn-energy {
+    position: absolute;
+    top: 50%;
+    right: 25rpx;
+    transform: translateY(-50%);
+    display: flex;
+    gap: 4rpx;
+  }
+  
+  .btn-energy .energy-dot {
+    width: 6rpx;
+    height: 6rpx;
+    background: #ffd166;
+    border-radius: 50%;
+    animation: energyPulse 1s infinite;
+  }
+  
+  .btn-energy .energy-dot:nth-child(2) { animation-delay: 0.2s; }
+  .btn-energy .energy-dot:nth-child(3) { animation-delay: 0.4s; }
+  
+  .btn-glow {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, 
+      transparent, 
+      rgba(255, 255, 255, 0.3), 
+      transparent);
+    animation: techShine 2s infinite;
+  }
+  
+  /* VIP会员区域 */
+  .vip-section {
+    margin: 30rpx 30rpx; /* 🔥 移除导航栏后，无需额外 margin-top */
+    background: rgba(16, 20, 48, 0.8);
+    border-radius: 30rpx;
+    padding: 30rpx;
+    border: 1px solid rgba(64, 156, 255, 0.2);
+    box-shadow: 
+      0 20rpx 40rpx rgba(0, 10, 30, 0.6),
+      inset 0 1px 0 rgba(255, 255, 255, 0.1);
+    position: relative;
+    z-index: 1;
+  }
+  
+  .section-header {
+    text-align: center;
+    margin-bottom: 40rpx;
+  }
+  
+  .header-decoration {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 15rpx;
+    margin-bottom: 12rpx;
+  }
+  
+  .dec-line {
+    width: 50rpx;
+    height: 2rpx;
+    background: linear-gradient(90deg, 
+      rgba(64, 156, 255, 0.5), 
+      rgba(64, 156, 255, 0.1));
+  }
+  
+  .dec-diamond {
+    width: 14rpx;
+    height: 14rpx;
+    background: #409cff;
+    transform: rotate(45deg);
+    box-shadow: 0 0 10rpx rgba(64, 156, 255, 0.6);
+  }
+  
+  .dec-text {
+    font-size: 32rpx;
+    font-weight: bold;
+    background: linear-gradient(90deg, #40a9ff, #36cfc9);
+    -webkit-background-clip: text;
+    background-clip: text;
+    color: transparent;
+    text-shadow: 0 0 20rpx rgba(64, 169, 255, 0.4);
+  }
+  
+  .section-subtitle {
+    font-size: 22rpx;
+    color: #a0c8ff;
+    letter-spacing: 4rpx;
+  }
+  
+  /* 会员卡片滑动区域 */
+  .vip-swiper {
+    height: 350rpx;
+    margin-bottom: 40rpx;
+  }
+  
+  .vip-card {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.5s cubic-bezier(0.34, 1.56, 0.64, 1);
+    position: relative;
+  }
+  
+  .vip-card.active {
+    transform: scale(1.08);
+    z-index: 10;
+  }
+  
+  .vip-card:not(.active) {
+    opacity: 0.6;
+    transform: scale(0.85);
+  }
+  
+  /* 机甲风格卡片边框 */
+  .card-frame {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+  }
+  
+  .frame-corner {
+    position: absolute;
+    width: 40rpx;
+    height: 40rpx;
+  }
+  
+  .frame-corner.tl {
+    top: 0;
+    left: 0;
+    border-top: 4rpx solid #409cff;
+    border-left: 4rpx solid #409cff;
+    border-top-left-radius: 20rpx;
+  }
+  
+  .frame-corner.tr {
+    top: 0;
+    right: 0;
+    border-top: 4rpx solid #409cff;
+    border-right: 4rpx solid #409cff;
+    border-top-right-radius: 20rpx;
+  }
+  
+  .frame-corner.bl {
+    bottom: 0;
+    left: 0;
+    border-bottom: 4rpx solid #409cff;
+    border-left: 4rpx solid #409cff;
+    border-bottom-left-radius: 20rpx;
+  }
+  
+  .frame-corner.br {
+    bottom: 0;
+    right: 0;
+    border-bottom: 4rpx solid #409cff;
+    border-right: 4rpx solid #409cff;
+    border-bottom-right-radius: 20rpx;
+  }
+  
+  .frame-line {
+    position: absolute;
+    background: rgba(64, 156, 255, 0.3);
+  }
+  
+  .frame-line.top {
+    top: 0;
+    left: 40rpx;
+    right: 40rpx;
+    height: 2rpx;
+  }
+  
+  .frame-line.right {
+    right: 0;
+    top: 40rpx;
+    bottom: 40rpx;
+    width: 2rpx;
+  }
+  
+  .frame-line.bottom {
+    bottom: 0;
+    left: 40rpx;
+    right: 40rpx;
+    height: 2rpx;
+  }
+  
+  .frame-line.left {
+    left: 0;
+    top: 40rpx;
+    bottom: 40rpx;
+    width: 2rpx;
+  }
+  
+  .vip-card.active .frame-corner {
+    border-color: #36cfc9;
+  }
+  
+  .vip-card.active .frame-line {
+    background: rgba(54, 207, 201, 0.5);
+  }
+  
+  .card-content {
+    position: relative;
+    z-index: 1;
+    text-align: center;
+    padding: 30rpx 25rpx;
+    width: 100%;
+  }
+  
+  .vip-badge {
+    position: absolute;
+    top: 25rpx;
+    right: 25rpx;
+    background: linear-gradient(135deg, #ff6b9d, #ff8e53);
+    padding: 5rpx 14rpx;
+    border-radius: 20rpx;
+    font-size: 20rpx;
+    color: #fff;
+    font-weight: bold;
+    box-shadow: 0 0 15rpx rgba(255, 107, 157, 0.4);
+    z-index: 20;
+  }
+  
+  .vip-title {
+    margin-bottom: 25rpx;
+  }
+  
+  .title-text {
+    display: block;
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #fff;
+    margin-bottom: 8rpx;
+    text-shadow: 0 0 10rpx rgba(64, 156, 255, 0.8);
+  }
+  
+  .title-underline {
+    width: 50rpx;
+    height: 4rpx;
+    background: linear-gradient(90deg, #409cff, #36cfc9);
+    margin: 0 auto;
+    border-radius: 2rpx;
+  }
+  
+  .vip-price {
+    margin-bottom: 30rpx;
+  }
+  
+  .price-symbol {
+    font-size: 26rpx;
+    color: #ffd166;
+    margin-right: 5rpx;
+  }
+  
+  .price-number {
+    font-size: 50rpx;
+    font-weight: bold;
+    color: #ffd166;
+    text-shadow: 0 0 15rpx rgba(255, 209, 102, 0.6);
+  }
+  
+  .price-unit {
+    font-size: 22rpx;
+    color: #a0c8ff;
+    margin-left: 6rpx;
+  }
+  
+  .vip-features {
+    margin-top: 25rpx;
+  }
+  
+  .feature-item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8rpx;
+    margin-bottom: 12rpx;
+  }
+  
+  .feature-icon {
+    width: 20rpx;
+    height: 20rpx;
+  }
+  
+  .feature-text {
+    font-size: 22rpx;
+    color: #e0f0ff;
+  }
+  
+  .card-indicator {
+    position: absolute;
+    bottom: -35rpx;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+  
+  .indicator-triangle {
+    width: 0;
+    height: 0;
+    border-left: 15rpx solid transparent;
+    border-right: 15rpx solid transparent;
+    border-top: 25rpx solid #409cff;
+    filter: drop-shadow(0 5rpx 5rpx rgba(0, 0, 0, 0.3));
+  }
+  
+  .indicator-glow {
+    position: absolute;
+    top: -25rpx;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 30rpx;
+    height: 30rpx;
+    background: radial-gradient(circle, rgba(64, 156, 255, 0.6), transparent 70%);
+    border-radius: 50%;
+    animation: pulseGlow 2s infinite;
+  }
+  
+  /* 会员详细介绍 */
+  .vip-detail {
+    background: rgba(10, 14, 42, 0.9);
+    border-radius: 20rpx;
+    padding: 25rpx;
+    border: 1px solid rgba(64, 156, 255, 0.3);
+  }
+  
+  .detail-header {
+    display: flex;
+    align-items: center;
+    gap: 15rpx;
+    margin-bottom: 25rpx;
+  }
+  
+  .detail-icon {
+    width: 36rpx;
+    height: 36rpx;
+    filter: drop-shadow(0 0 8rpx rgba(64, 156, 255, 0.6));
+  }
+  
+  .detail-title .title-text {
+    font-size: 28rpx;
+    color: #e0f0ff;
+    text-shadow: 0 0 10rpx rgba(64, 156, 255, 0.5);
+  }
+  
+  .detail-tech {
+    flex: 1;
+    height: 2rpx;
+    background: linear-gradient(90deg, rgba(64, 156, 255, 0.5), transparent);
+  }
+  
+  .detail-content {
+    margin-bottom: 30rpx;
+  }
+  
+  .detail-scroll {
+    max-height: 180rpx;
+  }
+  
+  .detail-text {
+    font-size: 24rpx;
+    color: #b8d4ff;
+    line-height: 1.5;
+    margin-bottom: 25rpx;
+  }
+  
+  .detail-rules {
+    margin-top: 25rpx;
+  }
+  
+  .rule-item {
+    display: flex;
+    align-items: flex-start;
+    gap: 15rpx;
+    margin-bottom: 15rpx;
+  }
+  
+  .rule-number {
+    width: 32rpx;
+    height: 32rpx;
+    background: rgba(64, 156, 255, 0.2);
+    border: 1px solid rgba(64, 156, 255, 0.5);
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 20rpx;
+    color: #409cff;
+    flex-shrink: 0;
+    font-weight: bold;
+  }
+  
+  .rule-text {
+    font-size: 22rpx;
+    color: #a0c8ff;
+    line-height: 1.4;
+    flex: 1;
+  }
+  
+  /* 购买区域 */
+  .buy-section {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding-top: 25rpx;
+    border-top: 1px solid rgba(64, 156, 255, 0.2);
+  }
+  
+  .buy-info {
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .price-display {
+    display: flex;
+    align-items: baseline;
+    gap: 8rpx;
+    margin-bottom: 8rpx;
+  }
+  
+  .price-label {
+    font-size: 24rpx;
+    color: #a0c8ff;
+  }
+  
+  .price-value {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #ffd166;
+    text-shadow: 0 0 10rpx rgba(255, 209, 102, 0.4);
+  }
+  
+  .buy-desc {
+    font-size: 20rpx;
+    color: #6688cc;
+  }
+  
+  /* 🔥 新增：到期日期文字加大 */
+  .expire-date {
+    font-size: 26rpx;
+    color: #ffd166;
+    font-weight: bold;
+  }
+  
+  /* 购买按钮 */
+  .tech-buy-btn {
+    width: 220rpx;
+    height: 80rpx;
+    border-radius: 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
+    font-size: 28rpx;
+    font-weight: bold;
+    color: #fff;
+    transition: all 0.3s ease;
+    line-height: 1;
+  }
+  
+  .tech-buy-btn:active {
+    transform: scale(0.98);
+  }
+  
+  .buy-btn-bg {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    border-radius: 40rpx;
+    background: linear-gradient(135deg, #1e4b8f, #409cff);
+  }
+  
+  .tech-buy-btn.renew .buy-btn-bg {
+    background: linear-gradient(135deg, #0f2c5c, #36cfc9);
+  }
+  
+  .buy-btn-glow {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, 
+      transparent, 
+      rgba(255, 255, 255, 0.3), 
+      transparent);
+    animation: techShine 2s infinite;
+  }
+  
+  .buy-btn-text {
+    position: relative;
+    z-index: 1;
+    display: flex;
+    align-items: center;
+    gap: 10rpx;
+    text-align: center;
+    width: 100%;
+    justify-content: center;
+    height: 100%;
+  }
+  
+  .buy-btn-energy {
+    position: absolute;
+    top: 50%;
+    right: 25rpx;
+    transform: translateY(-50%);
+    display: flex;
+    flex-direction: column;
+    gap: 3rpx;
+  }
+  
+  .buy-btn-energy .energy-dot {
+    width: 5rpx;
+    height: 5rpx;
+    background: #ffd166;
+    border-radius: 50%;
+    animation: energyPulse 1s infinite;
+  }
+  
+  .buy-btn-energy .energy-dot:nth-child(2) { animation-delay: 0.2s; }
+  .buy-btn-energy .energy-dot:nth-child(3) { animation-delay: 0.4s; }
+  
+  /* ==================== 弹窗样式（保留原有，删除 tip-content 相关） ==================== */
+  .tech-modal {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 9999;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .modal-backdrop {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 5, 20, 0.85);
+    backdrop-filter: blur(10rpx);
+  }
+  
+  .modal-container {
+    width: 650rpx;
+    background: rgba(16, 20, 48, 0.95);
+    border-radius: 30rpx;
+    border: 2px solid rgba(64, 156, 255, 0.4);
+    box-shadow: 
+      0 30rpx 80rpx rgba(0, 10, 30, 0.8),
+      0 0 0 1px rgba(64, 156, 255, 0.2) inset;
+    position: relative;
+    z-index: 1;
+    overflow: hidden;
+  }
+  
+  .modal-header {
+    padding: 40rpx 40rpx 30rpx;
+    text-align: center;
+    position: relative;
+  }
+  
+  .modal-corner {
+    position: absolute;
+    width: 30rpx;
+    height: 30rpx;
+  }
+  
+  .modal-corner.tl {
+    top: 10rpx;
+    left: 10rpx;
+    border-top: 3rpx solid #409cff;
+    border-left: 3rpx solid #409cff;
+    border-top-left-radius: 10rpx;
+  }
+  
+  .modal-corner.tr {
+    top: 10rpx;
+    right: 10rpx;
+    border-top: 3rpx solid #409cff;
+    border-right: 3rpx solid #409cff;
+    border-top-right-radius: 10rpx;
+  }
+  
+  .modal-corner.bl {
+    bottom: 10rpx;
+    left: 10rpx;
+    border-bottom: 3rpx solid #409cff;
+    border-left: 3rpx solid #409cff;
+    border-bottom-left-radius: 10rpx;
+  }
+  
+  .modal-corner.br {
+    bottom: 10rpx;
+    right: 10rpx;
+    border-bottom: 3rpx solid #409cff;
+    border-right: 3rpx solid #409cff;
+    border-bottom-left-radius: 10rpx;
+  }
+  
+  .modal-title {
+    display: block;
+    font-size: 36rpx;
+    font-weight: bold;
+    background: linear-gradient(90deg, #40a9ff, #36cfc9);
+    -webkit-background-clip: text;
+    background-clip: text;
+    color: transparent;
+    margin-bottom: 10rpx;
+    text-shadow: 0 0 20rpx rgba(64, 169, 255, 0.4);
+  }
+  
+  .modal-subtitle {
+    display: block;
+    font-size: 22rpx;
+    color: #a0c8ff;
+    letter-spacing: 4rpx;
+  }
+  
+  .modal-close {
+    position: absolute;
+    top: 30rpx;
+    right: 30rpx;
+    width: 60rpx;
+    height: 60rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    color: #6688cc;
+    cursor: pointer;
+    transition: all 0.3s ease;
+  }
+  
+  .modal-close:active {
+    transform: scale(0.9);
+  }
+  
+  .modal-body {
+    padding: 0 40rpx 40rpx;
+  }
+  
+  /* 输入框区域（押金弹窗） */
+  .input-section {
+    margin-bottom: 40rpx;
+  }
+  
+  .input-label {
+    display: flex;
+    align-items: center;
+    gap: 15rpx;
+    margin-bottom: 25rpx;
+  }
+  
+  .label-icon {
+    width: 32rpx;
+    height: 32rpx;
+    filter: drop-shadow(0 0 8rpx rgba(64, 156, 255, 0.6));
+  }
+  
+  .label-text {
+    font-size: 28rpx;
+    color: #e0f0ff;
+    font-weight: bold;
+  }
+  
+  .input-container {
+    display: flex;
+    align-items: center;
+    background: rgba(10, 14, 42, 0.8);
+    border-radius: 20rpx;
+    border: 1px solid rgba(64, 156, 255, 0.5);
+    padding: 25rpx 30rpx;
+    margin-bottom: 20rpx;
+    position: relative;
+  }
+  
+  .input-prefix {
+    font-size: 40rpx;
+    color: #ffd166;
+    margin-right: 20rpx;
+    font-weight: bold;
+  }
+  
+  .yajin-input {
+    flex: 1;
+    font-size: 40rpx;
+    color: #fff;
+    min-height: 60rpx;
+  }
+  
+  .input-placeholder {
+    color: #6688cc;
+    font-size: 28rpx;
+  }
+  
+  .input-underline {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 2rpx;
+    background: linear-gradient(90deg, #409cff, #36cfc9);
+    transform: scaleX(0);
+    transition: transform 0.3s ease;
+  }
+  
+  .yajin-input:focus + .input-underline {
+    transform: scaleX(1);
+  }
+  
+  .input-tip {
+    display: block;
+    font-size: 22rpx;
+    color: #a0c8ff;
+    text-align: right;
+  }
+  
+  .quick-section {
+    margin-top: 40rpx;
+  }
+  
+  .quick-title {
+    display: block;
+    font-size: 26rpx;
+    color: #e0f0ff;
+    margin-bottom: 25rpx;
+    font-weight: bold;
+  }
+  
+  .quick-buttons {
+    display: flex;
+    gap: 20rpx;
+  }
+  
+  .quick-btn {
+    flex: 1;
+    height: 80rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: rgba(10, 14, 42, 0.8);
+    border: 1px solid rgba(64, 156, 255, 0.3);
+    border-radius: 15rpx;
+    font-size: 26rpx;
+    color: #a0c8ff;
+    transition: all 0.3s ease;
+  }
+  
+  .quick-btn.active {
+    background: linear-gradient(135deg, #1e4b8f, #409cff);
+    color: #fff;
+    border-color: rgba(64, 156, 255, 0.8);
+    box-shadow: 0 0 20rpx rgba(64, 156, 255, 0.4);
+    transform: translateY(-2rpx);
+  }
+  
+  .quick-text {
+    font-weight: bold;
+  }
+  
+  .modal-footer {
+    display: flex;
+    border-top: 1px solid rgba(64, 156, 255, 0.3);
+  }
+  
+  .modal-btn {
+    flex: 1;
+    height: 100rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 30rpx;
+    font-weight: bold;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    position: relative;
+    overflow: hidden;
+  }
+  
+  .cancel-btn {
+    color: #a0c8ff;
+    background: rgba(10, 14, 42, 0.5);
+  }
+  
+  .cancel-btn:active {
+    background: rgba(10, 14, 42, 0.8);
+  }
+  
+  .modal-divider {
+    width: 1px;
+    background: rgba(64, 156, 255, 0.3);
+  }
+  
+  .confirm-btn {
+    background: linear-gradient(135deg, #1e4b8f, #409cff);
+    color: #fff;
+  }
+  
+  .confirm-btn:active {
+    background: linear-gradient(135deg, #0f2c5c, #3080e0);
+  }
+  
+  .btn-sparkle {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, 
+      transparent, 
+      rgba(255, 255, 255, 0.2), 
+      transparent);
+    animation: techShine 2s infinite;
+  }
+  
+  /* 支付方式选择弹窗（小尺寸） */
+  .modal-container.small {
+    width: 550rpx;
+  }
+  
+  .pay-method-list {
+    padding: 20rpx 0;
+  }
+  
+  .pay-method-item {
+    display: flex;
+    align-items: center;
+    padding: 30rpx 20rpx;
+    background: rgba(10, 14, 42, 0.5);
+    border: 1px solid rgba(64, 156, 255, 0.2);
+    border-radius: 20rpx;
+    margin-bottom: 20rpx;
+    transition: all 0.2s;
+  }
+  
+  .pay-method-item:active {
+    background: rgba(64, 156, 255, 0.1);
+    border-color: rgba(64, 156, 255, 0.5);
+    transform: scale(0.98);
+  }
+  
+  .method-icon {
+    width: 60rpx;
+    height: 60rpx;
+    margin-right: 20rpx;
+  }
+  
+  .method-name {
+    flex: 1;
+    font-size: 30rpx;
+    color: #e0f0ff;
+    font-weight: bold;
+  }
+  
+  .method-desc {
+    font-size: 24rpx;
+    color: #a0c8ff;
+    margin-right: 10rpx;
+  }
+  
+  /* 余额抵扣身份列表 */
+  .balance-list {
+    max-height: 600rpx;
+    overflow-y: auto;
+  }
+  
+  .balance-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 30rpx 20rpx;
+    background: rgba(10, 14, 42, 0.5);
+    border: 1px solid rgba(64, 156, 255, 0.2);
+    border-radius: 20rpx;
+    margin-bottom: 20rpx;
+    transition: all 0.2s;
+  }
+  
+  .balance-item:active {
+    background: rgba(64, 156, 255, 0.1);
+    border-color: rgba(64, 156, 255, 0.5);
+    transform: scale(0.98);
+  }
+  
+  .balance-info {
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .balance-name {
+    font-size: 28rpx;
+    color: #e0f0ff;
+    font-weight: bold;
+    margin-bottom: 8rpx;
+  }
+  
+  .balance-amount {
+    font-size: 24rpx;
+    color: #ffd166;
+  }
+  
+  .balance-arrow {
+    font-size: 32rpx;
+    color: #409cff;
+    transform: scaleX(1.2);
+  }
+  
+  /* 会员详情弹窗 */
+  .member-detail {
+    padding: 30rpx 20rpx;
+  }
+  
+  .detail-row {
+    display: flex;
+    align-items: baseline;
+    margin-bottom: 25rpx;
+    padding-bottom: 15rpx;
+    border-bottom: 1px solid rgba(64, 156, 255, 0.2);
+  }
+  
+  .detail-row:last-child {
+    border-bottom: none;
+    margin-bottom: 0;
+    padding-bottom: 0;
+  }
+  
+  .detail-label {
+    width: 150rpx;
+    font-size: 28rpx;
+    color: #a0c8ff;
+  }
+  
+  .detail-value {
+    flex: 1;
+    font-size: 30rpx;
+    color: #ffd166;
+    font-weight: bold;
+  }
+  
+  /* ❌ 删除 .tip-content 等相关样式 */
+  
+  /* ==================== 加载动画 ==================== */
+  .tech-loading {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 10000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .loading-backdrop {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 5, 20, 0.9);
+    backdrop-filter: blur(20rpx);
+  }
+  
+  .loading-content {
+    position: relative;
+    z-index: 1;
+    text-align: center;
+  }
+  
+  .loading-spinner {
+    width: 150rpx;
+    height: 150rpx;
+    position: relative;
+    margin: 0 auto 40rpx;
+  }
+  
+  .spinner-ring {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    border: 8rpx solid transparent;
+    border-radius: 50%;
+    animation: spinRing 2s linear infinite;
+  }
+  
+  .spinner-ring.ring-1 {
+    border-top-color: #409cff;
+    animation-delay: 0s;
+  }
+  
+  .spinner-ring.ring-2 {
+    border-right-color: #36cfc9;
+    animation-delay: 0.5s;
+  }
+  
+  .spinner-ring.ring-3 {
+    border-bottom-color: #ffd166;
+    animation-delay: 1s;
+  }
+  
+  .spinner-core {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 40rpx;
+    height: 40rpx;
+    background: radial-gradient(circle, #409cff, #1e4b8f);
+    border-radius: 50%;
+    box-shadow: 0 0 30rpx rgba(64, 156, 255, 0.8);
+  }
+  
+  .spinner-energy {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 60rpx;
+    height: 60rpx;
+    border: 4rpx solid rgba(64, 156, 255, 0.3);
+    border-radius: 50%;
+    animation: pulseEnergy 1.5s ease-in-out infinite;
+  }
+  
+  .loading-text {
+    display: block;
+    font-size: 32rpx;
+    color: #fff;
+    margin-bottom: 15rpx;
+    font-weight: bold;
+    text-shadow: 0 0 10rpx rgba(64, 156, 255, 0.8);
+  }
+  
+  .loading-subtext {
+    display: block;
+    font-size: 22rpx;
+    color: #a0c8ff;
+  }
+  
+  /* ==================== 底部装饰 ==================== */
+  .tech-footer {
+    text-align: center;
+    margin-top: 40rpx;
+    padding: 0 30rpx;
+  }
+  
+  .footer-line {
+    height: 1px;
+    background: linear-gradient(90deg, 
+      transparent, 
+      rgba(64, 156, 255, 0.3), 
+      transparent);
+    margin-bottom: 20rpx;
+  }
+  
+  .footer-text {
+    font-size: 20rpx;
+    color: #6688cc;
+    letter-spacing: 4rpx;
+  }
+  
+  /* ==================== 动画定义 ==================== */
+  @keyframes techGlide {
+    0% { left: -100%; }
+    50% { left: 100%; }
+    100% { left: 100%; }
+  }
+  
+  @keyframes techShine {
+    0% { left: -100%; }
+    20% { left: 100%; }
+    100% { left: 100%; }
+  }
+  
+  @keyframes spinRing {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+  }
+  
+  @keyframes pulseEnergy {
+    0% { 
+      width: 60rpx; 
+      height: 60rpx; 
+      opacity: 0.5; 
+    }
+    50% { 
+      width: 80rpx; 
+      height: 80rpx; 
+      opacity: 0.8; 
+    }
+    100% { 
+      width: 60rpx; 
+      height: 60rpx; 
+      opacity: 0.5; 
+    }
+  }
+  
+  @keyframes dotPulse {
+    0%, 100% { opacity: 0.3; }
+    50% { opacity: 1; }
+  }
+  
+  @keyframes energyPulse {
+    0%, 100% { opacity: 0.3; transform: scale(0.8); }
+    50% { opacity: 1; transform: scale(1.2); }
+  }
+  
+  @keyframes pulseGlow {
+    0%, 100% { opacity: 0.5; }
+    50% { opacity: 1; }
+  }
+  
+  /* ==================== 响应式调整 ==================== */
+  @media screen and (max-width: 750rpx) {
+    .tech-grid {
+      flex-direction: column;
+      gap: 20rpx;
+    }
+    
+    .tech-card {
+      width: 100%;
+    }
+    
+    .vip-swiper {
+      height: 320rpx;
+    }
+    
+    .modal-container {
+      width: 90%;
+      margin: 0 5%;
+    }
+    
+    .quick-buttons {
+      flex-wrap: wrap;
+    }
+    
+    .quick-btn {
+      flex: 0 0 calc(50% - 10rpx);
+    }
+  }
+  
+  /* ==================== 按钮垂直居中最终修复（覆盖） ==================== */
+  .tech-btn {
+    height: 70rpx;
+    border-radius: 35rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
+    font-size: 26rpx;
+    font-weight: bold;
+    color: #fff;
+    transition: all 0.3s ease;
+  }
+  
+  .tech-btn .btn-text {
+    position: relative;
+    z-index: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 100%;
+    padding: 0;
+    margin: 0;
+  }
+  
+  .yajin-btn .btn-arrow {
+    display: none !important;
+  }
+  
+  .tech-buy-btn {
+    width: 220rpx;
+    height: 80rpx;
+    border-radius: 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
+    font-size: 28rpx;
+    font-weight: bold;
+    color: #fff;
+    transition: all 0.3s ease;
+  }
+  
+  .tech-buy-btn .buy-btn-text {
+    position: relative;
+    z-index: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 100%;
+    padding: 0;
+    margin: 0;
+  }
+  
+  .tech-btn .btn-bg,
+  .tech-btn .btn-glow,
+  .tech-buy-btn .buy-btn-bg,
+  .tech-buy-btn .buy-btn-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 0;
+    pointer-events: none;
+  }
+  
+  .buy-btn-energy {
+    position: absolute;
+    right: 20rpx;
+    top: 50%;
+    transform: translateY(-50%);
+    z-index: 2;
+  }
+  
+  .btn-text, .buy-btn-text {
+    display: flex !important;
+    align-items: center !important;
+    justify-content: center !important;
+    height: 100% !important;
+  }
+  
+  .tech-buy-btn .buy-btn-text {
+    display: flex !important;
+    align-items: center !important;
+    justify-content: center !important;
+    width: 100% !important;
+    height: 100% !important;
+    line-height: 0.4 !important;
+  }
+  
+  .tech-buy-btn {
+    display: flex !important;
+    align-items: center !important;
+    justify-content: center !important;
+  }
\ No newline at end of file
diff --git a/pages/dashoudingdan/dashoudingdan.js b/pages/dashoudingdan/dashoudingdan.js
new file mode 100644
index 0000000..a4d0866
--- /dev/null
+++ b/pages/dashoudingdan/dashoudingdan.js
@@ -0,0 +1,344 @@
+const app = getApp()
+import request from '../../utils/request.js'
+
+Page({
+    onShow() {
+        // 原有代码...
+        
+        // 🆕 注册通知组件
+        this.registerNotificationComponent();
+    },
+    
+    // 🆕 新增：注册通知组件
+    registerNotificationComponent() {
+        const app = getApp();
+        const notificationComp = this.selectComponent('#global-notification');
+        
+        if (notificationComp && notificationComp.showNotification) {
+            //console.log('🏪 商城页面注册通知组件');
+            app.globalData.globalNotification = {
+                show: (data) => notificationComp.showNotification(data),
+                hide: () => notificationComp.hideNotification()
+            };
+        }
+    },
+
+
+
+
+  data: {
+    // 打手订单状态tab配置（去掉已下单，其他保留）
+    dsDingdanZhuangtaiTabs: [
+      { name: '进行中', key: 'jinxingzhong', zhuangtaiList: [2] },
+      { name: '退款中', key: 'tuikuanzhong', zhuangtaiList: [4] },
+      { name: '已退款', key: 'yituikuan', zhuangtaiList: [5] },
+      { name: '退款失败', key: 'tuikuanshibai', zhuangtaiList: [6] },
+      { name: '已完成', key: 'yiwancheng', zhuangtaiList: [3] },
+      { name: '结算中', key: 'jiesuanzhong', zhuangtaiList: [8] }
+    ],
+    
+    // 当前选中的tab索引（默认0=进行中）
+    xuanzhongTabIndex: 0,
+    // 当前选中的tab的key
+    currentTabKey: 'jinxingzhong',
+    
+    // 防抖标志：是否允许切换tab
+    allowSwitchTab: true,
+    // 防抖时间（毫秒）
+    switchDebounceTime: 2000,
+    
+    // 每个tab对应的订单数据
+    dsDingdanShuju: {
+      jinxingzhong: { list: [], page: 1, hasMore: true, isLoading: false },
+      tuikuanzhong: { list: [], page: 1, hasMore: true, isLoading: false },
+      yituikuan: { list: [], page: 1, hasMore: true, isLoading: false },
+      tuikuanshibai: { list: [], page: 1, hasMore: true, isLoading: false },
+      yiwancheng: { list: [], page: 1, hasMore: true, isLoading: false },
+      jiesuanzhong: { list: [], page: 1, hasMore: true, isLoading: false }
+    },
+    
+    // 打手订单图片URL（从缓存或全局变量获取后拼接）
+    dsDingdanTupianUrl: '',
+    
+    // 页面加载状态
+    isLoading: true,
+    
+    // 是否显示加载更多
+    xianshiJiazaigengduo: false
+  },
+
+  onLoad(options) {
+    // 设置页面标题
+    wx.setNavigationBarTitle({
+      title: '我的接单'
+    })
+    
+    // 初始化：获取图片URL并拼接
+    this.getAndSetTupianUrl()
+    
+    // 加载初始数据（默认进行中）
+    this.setData({
+      isLoading: false
+    })
+    
+    this.jiazaiDsDingdanShuju(0, false)
+  },
+
+  // 获取并设置图片URL
+  getAndSetTupianUrl() {
+    const app = getApp()
+    
+    // 1. 先从缓存获取touxiang
+    const cacheTouxiang = wx.getStorageSync('touxiang') || ''
+    
+    // 2. 如果缓存没有，从全局变量获取morentouxiang
+    let tupianPath = cacheTouxiang || app.globalData.morentouxiang || ''
+    
+    // 3. 拼接完整的图片URL
+    const ossImageUrl = app.globalData.ossImageUrl || ''
+    let fullTupianUrl = ''
+    
+    if (tupianPath && ossImageUrl) {
+      // 确保路径不以斜杠开头（防止双斜杠）
+      if (tupianPath.startsWith('/')) {
+        tupianPath = tupianPath.substring(1)
+      }
+      fullTupianUrl = ossImageUrl + tupianPath
+    }
+    
+    this.setData({
+      dsDingdanTupianUrl: fullTupianUrl
+    })
+  },
+
+  // 切换订单tab（增加防抖）
+  switchDsDingdanTab(e) {
+    const tabIndex = e.currentTarget.dataset.index
+    
+    // 如果当前正在加载，不允许切换
+    const currentTabKey = this.data.currentTabKey
+    const currentTabData = this.data.dsDingdanShuju[currentTabKey]
+    if (currentTabData.isLoading) {
+      console.log('当前正在加载，禁止切换')
+      return
+    }
+    
+    // 防抖：检查是否允许切换
+    if (!this.data.allowSwitchTab) {
+      
+      wx.showToast({
+        title: '切换太频繁，请稍后',
+        icon: 'none',
+        duration: 1000
+      })
+      return
+    }
+    
+    // 如果点击的是当前选中的tab，不处理
+    if (tabIndex === this.data.xuanzhongTabIndex) {
+      return
+    }
+    
+    const tabKey = this.data.dsDingdanZhuangtaiTabs[tabIndex].key
+    
+    // 设置防抖标志，2秒内不允许再次切换
+    this.setData({
+      allowSwitchTab: false
+    })
+    
+    // 设置定时器，2秒后恢复允许切换
+    setTimeout(() => {
+      this.setData({
+        allowSwitchTab: true
+      })
+    }, this.data.switchDebounceTime)
+    
+    // 更新选中的tab
+    this.setData({
+      xuanzhongTabIndex: tabIndex,
+      currentTabKey: tabKey
+    })
+    
+    // 加载对应tab的数据
+    this.jiazaiDsDingdanShuju(tabIndex, false)
+  },
+
+  // 加载打手订单数据
+  async jiazaiDsDingdanShuju(tabIndex, isLoadMore = false) {
+    const tab = this.data.dsDingdanZhuangtaiTabs[tabIndex]
+    const tabKey = tab.key
+    
+    const tabData = this.data.dsDingdanShuju[tabKey]
+    
+    const page = isLoadMore ? tabData.page + 1 : 1
+    
+    // 检查是否正在加载
+    if (tabData.isLoading) {
+      
+      return
+    }
+    
+    // 如果不是加载更多，清空已有数据
+    if (!isLoadMore) {
+      this.setData({
+        [`dsDingdanShuju.${tabKey}.list`]: [],
+        [`dsDingdanShuju.${tabKey}.page`]: 1
+      })
+    }
+    
+    // 设置加载状态
+    this.setData({
+      [`dsDingdanShuju.${tabKey}.isLoading`]: true
+    })
+    
+    // 显示加载提示（非加载更多时显示）
+    if (!isLoadMore) {
+      wx.showLoading({
+        title: '加载订单...',
+        mask: true
+      })
+    }
+    
+    try {
+      // 准备请求数据
+      const requestData = {
+        zhuangtai_list: tab.zhuangtaiList,
+        page: page,
+        page_size: 10
+      }
+      
+      
+      
+      const res = await request({
+        url: '/dingdan/dshqdingdan',
+        method: 'POST',
+        data: requestData,
+        header: {
+          'content-type': 'application/json'
+        }
+      })
+      
+      // 隐藏加载提示
+      if (!isLoadMore) {
+        wx.hideLoading()
+      }
+      
+      // 处理返回数据
+      if (res && res.data.code === 0) {
+        const newDingdanList = res.data.data.list || []
+        const hasMore = res.data.data.has_more || false
+        
+       
+        
+        // 为每个订单添加状态中文描述和统一的图片URL
+        const processedList = newDingdanList.map(item => {
+          const zhuangtaiZh = this.getZhuangtaiZhongwen(item.zhuangtai)
+          
+          return {
+            ...item,
+            tupian: this.data.dsDingdanTupianUrl, // 使用统一的图片URL
+            zhuangtaiZh: zhuangtaiZh
+          }
+        })
+        
+        const currentList = this.data.dsDingdanShuju[tabKey].list
+        const updatedList = isLoadMore 
+          ? [...currentList, ...processedList]
+          : processedList
+        
+        // 更新数据
+        this.setData({
+          [`dsDingdanShuju.${tabKey}.list`]: updatedList,
+          [`dsDingdanShuju.${tabKey}.page`]: page,
+          [`dsDingdanShuju.${tabKey}.hasMore`]: hasMore,
+          [`dsDingdanShuju.${tabKey}.isLoading`]: false,
+          xianshiJiazaigengduo: hasMore
+        })
+        
+      } else {
+        // 请求失败处理
+        const errorMsg = res ? (res.data.msg || '加载失败') : '请求失败'
+        
+        if (!isLoadMore) {
+          wx.showToast({
+            title: errorMsg,
+            icon: 'none',
+            duration: 2000
+          })
+        }
+        
+        this.setData({
+          [`dsDingdanShuju.${tabKey}.isLoading`]: false
+        })
+      }
+      
+    } catch (error) {
+      
+      
+      if (!isLoadMore) {
+        wx.hideLoading()
+        wx.showToast({
+          title: '网络请求失败，请重试',
+          icon: 'none',
+          duration: 2000
+        })
+      }
+      
+      this.setData({
+        [`dsDingdanShuju.${tabKey}.isLoading`]: false
+      })
+    }
+  },
+
+  // 获取状态中文描述
+  getZhuangtaiZhongwen(zhuangtai) {
+    const zhuangtaiMap = {
+      1: '已下单',      // 打手看不到这个状态
+      2: '进行中',
+      3: '已完成',
+      4: '退款中',
+      5: '已退款',
+      6: '退款失败',
+      7: '指定中',      // 打手看不到这个状态
+      8: '结算中'
+    }
+    
+    return zhuangtaiMap[zhuangtai] || '未知状态'
+  },
+
+  // 上拉加载更多
+  onReachBottom() {
+    const tabKey = this.data.currentTabKey
+    const tabData = this.data.dsDingdanShuju[tabKey]
+    
+    // 检查是否还有更多数据并且当前没有正在加载
+    if (tabData.hasMore && !tabData.isLoading) {
+      const tabIndex = this.data.xuanzhongTabIndex
+      this.jiazaiDsDingdanShuju(tabIndex, true)
+    }
+  },
+
+  // 跳转到订单详情页面
+  goToDsDingdanXiangqing(e) {
+    const dingdanItem = e.currentTarget.dataset.item
+    if (!dingdanItem) return
+    
+    // 编码订单数据
+    const dingdanDataStr = encodeURIComponent(JSON.stringify(dingdanItem))
+    
+    // 跳转到打手订单详情页
+    wx.navigateTo({
+      url: `/pages/dsddxq/dsddxq?dingdanData=${dingdanDataStr}`
+    })
+  },
+
+  // 图片加载失败处理
+  onImageError(e) {
+    // 如果统一图片加载失败，使用默认图片
+    const defaultImage = app.globalData.lunbozhanwei || '/images/default.jpg'
+    
+    this.setData({
+      dsDingdanTupianUrl: defaultImage
+    })
+  }
+})
\ No newline at end of file
diff --git a/pages/dashoudingdan/dashoudingdan.json b/pages/dashoudingdan/dashoudingdan.json
new file mode 100644
index 0000000..60b86d2
--- /dev/null
+++ b/pages/dashoudingdan/dashoudingdan.json
@@ -0,0 +1,8 @@
+{
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    },
+    "navigationBarTitleText": "我的接单",
+    "enablePullDownRefresh": false,
+    "onReachBottomDistance": 50
+  }
\ No newline at end of file
diff --git a/pages/dashoudingdan/dashoudingdan.wxml b/pages/dashoudingdan/dashoudingdan.wxml
new file mode 100644
index 0000000..cec5582
--- /dev/null
+++ b/pages/dashoudingdan/dashoudingdan.wxml
@@ -0,0 +1,111 @@
+
+<view class="ds-dingdan-page">
+  
+  
+  <scroll-view 
+    class="ds-dingdan-tabs-scroll"
+    scroll-x="true"
+    scroll-with-animation="true"
+  >
+    <view class="ds-dingdan-tabs-container">
+      <block wx:for="{{dsDingdanZhuangtaiTabs}}" wx:key="key">
+        <view 
+          class="ds-dingdan-tab-item {{index === xuanzhongTabIndex ? 'ds-tab-active' : ''}}"
+          bindtap="switchDsDingdanTab"
+          data-index="{{index}}"
+        >
+          <text class="ds-tab-text">{{item.name}}</text>
+          <view class="ds-tab-active-line" wx:if="{{index === xuanzhongTabIndex}}"></view>
+        </view>
+      </block>
+    </view>
+  </scroll-view>
+  
+  
+  <view class="ds-dingdan-list-container">
+    
+    
+    <view class="ds-loading-container" wx:if="{{isLoading}}">
+      <view class="ds-loading-spinner"></view>
+      <text class="ds-loading-text">加载中...</text>
+    </view>
+    
+    
+    <view 
+      class="ds-empty-container" 
+      wx:if="{{!isLoading && dsDingdanShuju[currentTabKey].list.length === 0}}"
+    >
+      <image 
+        class="ds-empty-image" 
+        src="/images/empty-order.png" 
+        mode="aspectFit"
+      ></image>
+      <text class="ds-empty-text">暂无订单</text>
+      <text class="ds-empty-subtext">快去接单吧</text>
+    </view>
+    
+    
+    <block wx:if="{{!isLoading && dsDingdanShuju[currentTabKey].list.length > 0}}">
+      <block wx:for="{{dsDingdanShuju[currentTabKey].list}}" wx:key="dingdan_id">
+        <view 
+          class="ds-dingdan-card"
+          bindtap="goToDsDingdanXiangqing"
+          data-item="{{item}}"
+        >
+          
+          <view class="ds-dingdan-card-left">
+            <image 
+              class="ds-dingdan-image"
+              src="{{item.tupian}}"
+              mode="aspectFill"
+              binderror="onImageError"
+            ></image>
+          </view>
+          
+          
+          <view class="ds-dingdan-card-center">
+            <view class="ds-dingdan-jieshao ds-jieshao-three-line">
+              {{item.jieshao || '暂无订单描述'}}
+            </view>
+          </view>
+          
+          
+          <view class="ds-dingdan-card-right">
+            
+            <view class="ds-dingdan-zhuangtai">
+              {{item.zhuangtaiZh || '未知状态'}}
+            </view>
+            
+            
+            <view class="ds-dingdan-jine">
+              <text class="ds-jine-symbol">¥</text>
+              <text class="ds-jine-number">{{item.jine || '0.00'}}</text>
+            </view>
+          </view>
+        </view>
+      </block>
+    </block>
+    
+    
+    <view 
+      class="ds-load-more-container" 
+      wx:if="{{xianshiJiazaigengduo && !isLoading && dsDingdanShuju[currentTabKey].list.length > 0}}"
+    >
+      <view class="ds-load-more-line"></view>
+      <text class="ds-load-more-text">上拉加载更多</text>
+      <view class="ds-load-more-line"></view>
+    </view>
+    
+    
+    <view 
+      class="ds-no-more-container" 
+      wx:if="{{!xianshiJiazaigengduo && !isLoading && dsDingdanShuju[currentTabKey].list.length > 0}}"
+    >
+      <text class="ds-no-more-text">没有更多订单了</text>
+    </view>
+    
+  </view>
+  <custom-tab-bar />
+  
+</view>
+<global-notification id="global-notification" />
diff --git a/pages/dashoudingdan/dashoudingdan.wxss b/pages/dashoudingdan/dashoudingdan.wxss
new file mode 100644
index 0000000..eddb631
--- /dev/null
+++ b/pages/dashoudingdan/dashoudingdan.wxss
@@ -0,0 +1,273 @@
+/* pages/dashouDingdan/dashouDingdan.wxss */
+
+.ds-dingdan-page {
+    min-height: 100vh;
+    background-color: #f8f9fa;
+    padding-bottom: 20rpx;
+  }
+  
+  .ds-dingdan-tabs-scroll {
+    width: 100%;
+    height: 90rpx;
+    white-space: nowrap;
+    background-color: #ffffff;
+    border-bottom: 1rpx solid #f0f0f0;
+    box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.03);
+  }
+  
+  .ds-dingdan-tabs-container {
+    display: flex;
+    align-items: center;
+    height: 100%;
+    padding: 0 20rpx;
+  }
+  
+  .ds-dingdan-tab-item {
+    display: inline-flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 60rpx;
+    padding: 0 30rpx;
+    margin-right: 20rpx;
+    border-radius: 30rpx;
+    background-color: #f5f5f5;
+    color: #666666;
+    font-size: 28rpx;
+    transition: all 0.3s ease;
+    position: relative;
+    flex-shrink: 0;
+  }
+  
+  .ds-dingdan-tab-item:last-child {
+    margin-right: 0;
+  }
+  
+  .ds-dingdan-tab-item.ds-tab-active {
+    background-color: #e3f2fd;
+    color: #1565c0;
+    font-weight: 500;
+    box-shadow: 0 4rpx 12rpx rgba(21, 101, 192, 0.1);
+  }
+  
+  .ds-tab-active-line {
+    width: 40rpx;
+    height: 4rpx;
+    background-color: #2196f3;
+    border-radius: 2rpx;
+    margin-top: 6rpx;
+    animation: ds-fadeIn 0.3s ease;
+  }
+  
+  @keyframes ds-fadeIn {
+    from { opacity: 0; transform: scale(0.8); }
+    to { opacity: 1; transform: scale(1); }
+  }
+  
+  .ds-tab-text {
+    font-weight: 400;
+  }
+  
+  .ds-dingdan-list-container {
+    padding: 20rpx;
+  }
+  
+  .ds-loading-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 400rpx;
+  }
+  
+  .ds-loading-spinner {
+    width: 60rpx;
+    height: 60rpx;
+    border: 6rpx solid #e0e0e0;
+    border-top-color: #2196f3;
+    border-radius: 50%;
+    animation: ds-spin 1s linear infinite;
+    margin-bottom: 20rpx;
+  }
+  
+  @keyframes ds-spin {
+    from { transform: rotate(0deg); }
+    to { transform: rotate(360deg); }
+  }
+  
+  .ds-loading-text {
+    font-size: 28rpx;
+    color: #999999;
+  }
+  
+  .ds-empty-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 500rpx;
+    padding-top: 80rpx;
+  }
+  
+  .ds-empty-image {
+    width: 200rpx;
+    height: 200rpx;
+    margin-bottom: 30rpx;
+    opacity: 0.6;
+  }
+  
+  .ds-empty-text {
+    font-size: 32rpx;
+    color: #999999;
+    margin-bottom: 10rpx;
+  }
+  
+  .ds-empty-subtext {
+    font-size: 26rpx;
+    color: #cccccc;
+  }
+  
+  .ds-dingdan-card {
+    display: flex;
+    align-items: center;
+    background-color: #ffffff;
+    border-radius: 16rpx;
+    padding: 24rpx;
+    margin-bottom: 20rpx;
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+    transition: transform 0.2s ease, box-shadow 0.2s ease;
+  }
+  
+  .ds-dingdan-card:active {
+    transform: translateY(-2rpx);
+    box-shadow: 0 6rpx 24rpx rgba(0, 0, 0, 0.08);
+  }
+  
+  .ds-dingdan-card-left {
+    flex-shrink: 0;
+    margin-right: 24rpx;
+  }
+  
+  .ds-dingdan-image {
+    width: 160rpx;
+    height: 160rpx;
+    border-radius: 12rpx;
+    background-color: #f5f5f5;
+  }
+  
+  .ds-dingdan-card-center {
+    flex: 1;
+    height: 160rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+  
+  /* 关键不同点：订单介绍显示三行 */
+  .ds-dingdan-jieshao.ds-jieshao-three-line {
+    font-size: 28rpx;
+    line-height: 36rpx;
+    color: #333333;
+    font-weight: 400;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 3;  /* 改为3行 */
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin-bottom: 8rpx;
+    min-height: 108rpx; /* 3 * 36rpx */
+  }
+  
+  .ds-dingdan-card-right {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    justify-content: space-between;
+    height: 160rpx;
+    margin-left: 20rpx;
+  }
+  
+  .ds-dingdan-zhuangtai {
+    font-size: 24rpx;
+    color: #ff6b6b;
+    font-weight: 500;
+    padding: 6rpx 16rpx;
+    border-radius: 20rpx;
+    background-color: #fff5f5;
+    white-space: nowrap;
+    text-align: center;
+    min-width: 100rpx;
+  }
+  
+  .ds-dingdan-jine {
+    display: flex;
+    align-items: center;
+  }
+  
+  .ds-jine-symbol {
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: 500;
+    margin-right: 4rpx;
+  }
+  
+  .ds-jine-number {
+    font-size: 32rpx;
+    color: #333333;
+    font-weight: 600;
+  }
+  
+  .ds-load-more-container {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 40rpx 0;
+  }
+  
+  .ds-load-more-line {
+    width: 80rpx;
+    height: 1rpx;
+    background-color: #e0e0e0;
+    margin: 0 20rpx;
+  }
+  
+  .ds-load-more-text {
+    font-size: 26rpx;
+    color: #999999;
+    white-space: nowrap;
+  }
+  
+  .ds-no-more-container {
+    text-align: center;
+    padding: 40rpx 0;
+  }
+  
+  .ds-no-more-text {
+    font-size: 26rpx;
+    color: #cccccc;
+  }
+  
+  @media (max-width: 375px) {
+    .ds-dingdan-image {
+      width: 140rpx;
+      height: 140rpx;
+    }
+    
+    .ds-dingdan-card-center {
+      height: 140rpx;
+    }
+    
+    .ds-dingdan-card-right {
+      height: 140rpx;
+    }
+    
+    .ds-jine-number {
+      font-size: 30rpx;
+    }
+    
+    .ds-dingdan-jieshao.ds-jieshao-three-line {
+      min-height: 96rpx; /* 调整小屏幕下的最小高度 */
+      font-size: 26rpx;
+      line-height: 32rpx;
+    }
+  }
\ No newline at end of file
diff --git a/pages/dashouduan/dashouduan.js b/pages/dashouduan/dashouduan.js
new file mode 100644
index 0000000..7a4a87c
--- /dev/null
+++ b/pages/dashouduan/dashouduan.js
@@ -0,0 +1,543 @@
+// pages/dashouzhongxin/dashouzhongxin.js
+import request from '../../utils/request.js'
+import popupService from '../../services/popupService.js'
+
+const PLATFORM_INVITE_CODE = '0000008RffVgKHMj7kQC'
+
+Page({
+  data: {
+    isDashou: false,
+    isLoading: false,
+    inviteCode: '',
+    uid: '',
+    touxiang: '',
+    avatarUrl: '',
+    dashouNicheng: '',
+    zhanghaoStatus: '',
+    yongjin: '',
+    zonge: '',
+    yajin: '',
+    chenghao: '',
+    jinfen: '',
+    clumber: [],
+    chengjiaoliang: '',
+    zaixianZhuangtai: 0,
+    lastRefreshTime: 0,
+    canRefresh: true,
+    isAutoRegistering: false,
+    inviterCache: null,
+    // 🆕 称号标签列表（从独立接口获取）
+    chenghaoList: []
+  },
+
+  onLoad(options) {
+    if (options.scene) {
+      try {
+        const scene = decodeURIComponent(options.scene);
+        options.inviteCode = scene;
+      } catch (e) {
+        console.error('scene解码失败', e);
+      }
+    }
+    this.checkDashouStatus();
+    const { inviteCode } = options || {};
+    if (inviteCode) {
+      this.setData({ inviteCode: inviteCode });
+      setTimeout(() => {
+        this.handleInviteCodeWithLoginCheck(inviteCode);
+      }, 500);
+    }
+    const app = getApp();
+    if (!app.globalData.hasShownPopupOnColdStart) {
+      app.globalData.hasShownPopupOnColdStart = true;
+      setTimeout(() => {
+        popupService.checkAndShow(this, 'dashouduan');
+      }, 300);
+    }
+  },
+
+  onHide() {
+    const popupComp = this.selectComponent('#popupNotice');
+    if (popupComp && popupComp.cleanup) {
+      popupComp.cleanup();
+    }
+  },
+
+  onShow() {
+    // 从缓存读取邀请人信息
+    const inviterCache = wx.getStorageSync('inviterCache') || null;
+    this.setData({ inviterCache });
+
+    this.registerNotificationComponent();
+    this.checkAndRedirectToJinpai();
+    if (this.data.isDashou) {
+      setTimeout(() => {
+        this.refreshDashouInfo();
+        this.fetchChenghaoList();   // 🆕 获取标签
+      }, 300);
+    }
+    const pages = getCurrentPages();
+    const currentPage = pages[pages.length - 1];
+    const options = currentPage.options || {};
+    if (options.inviteCode && this.data.isDashou === false) {
+      const { inviteCode } = options;
+      setTimeout(() => {
+        this.handleInviteCodeWithLoginCheck(inviteCode);
+      }, 300);
+    }
+  },
+
+  // ==================== 🆕 获取称号标签列表 ====================
+  async fetchChenghaoList() {
+    try {
+      const res = await request({
+        url: '/dengji/dsbqhq',
+        method: 'POST'
+      });
+      if (res && res.data.code === 0 && res.data.data) {
+        const list = res.data.data.chenghao_list || [];
+        this.setData({ chenghaoList: list });
+        // 可选：也存入全局，方便其他页面使用
+        const app = getApp();
+        app.globalData.chenghaoList = list;
+      } else {
+        this.setData({ chenghaoList: [] });
+      }
+    } catch (e) {
+      console.error('获取称号标签失败', e);
+      // 失败不影响主流程
+    }
+  },
+  // ========================================================
+
+  // 联系邀请人（保持不变）
+  async contactInviter() {
+    wx.showLoading({ title: '获取邀请人...', mask: true });
+    try {
+      const res = await request({ url: '/yonghu/hqwdyqr', method: 'POST' });
+      if (res && res.data.code === 200) {
+        const inviter = res.data.data;
+        const ossImageUrl = getApp().globalData.ossImageUrl || '';
+        const fullAvatar = inviter.touxiang
+          ? (inviter.touxiang.startsWith('http') ? inviter.touxiang : ossImageUrl + inviter.touxiang)
+          : '';
+
+        const cacheData = {
+          uid: inviter.uid,
+          nicheng: inviter.nicheng || '',
+          avatar: fullAvatar
+        };
+        wx.setStorageSync('inviterCache', cacheData);
+        this.setData({ inviterCache: cacheData });
+
+        const app = getApp();
+        const myUid = wx.getStorageSync('uid');
+        if (app.globalData.currentRole !== 'dashou') {
+          app.globalData.currentRole = 'dashou';
+          wx.setStorageSync('currentRole', 'dashou');
+          if (app.switchRoleAndReconnect) {
+            await app.switchRoleAndReconnect('dashou');
+          }
+        } else {
+          if (app.connectForCurrentRole) app.connectForCurrentRole();
+        }
+
+        const param = {
+          toUserId: 'Gs' + inviter.uid,
+          toName: inviter.nicheng || '邀请人',
+          toAvatar: fullAvatar
+        };
+        wx.navigateTo({
+          url: '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param))
+        });
+      } else {
+        wx.showToast({ title: res?.data?.msg || '获取失败', icon: 'none' });
+      }
+    } catch (e) {
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    } finally {
+      wx.hideLoading();
+    }
+  },
+
+  handleInviteCodeWithLoginCheck(inviteCode) {
+    const that = this;
+    const token = wx.getStorageSync('token');
+    const uid = wx.getStorageSync('uid');
+    if (!token || !uid) {
+      this.loginAndRegisterWithInviteCode(inviteCode);
+    } else {
+      if (!that.data.isDashou) {
+        wx.showLoading({ title: '自动注册中...', mask: true });
+        that.setData({ isAutoRegistering: true });
+        that.onRegister();
+      } else {
+        wx.showToast({ title: '您已是打手', icon: 'success', duration: 2000 });
+      }
+    }
+  },
+
+  loginAndRegisterWithInviteCode(inviteCode) {
+    const that = this;
+    wx.showLoading({ title: '登录注册中...', mask: true });
+    wx.login({
+      success: (loginRes) => {
+        if (loginRes.code) {
+          that.callLoginRegisterApi(loginRes.code, inviteCode);
+        } else {
+          wx.hideLoading();
+          wx.showToast({ title: '微信登录失败', icon: 'none' });
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        console.error('微信登录失败');
+        wx.reLaunch({ url: '/pages/gerenzhongxin/gerenzhongxin' });
+      }
+    });
+  },
+
+  callLoginRegisterApi(code, inviteCode) {
+    const that = this;
+    const app = getApp();
+    const apiBaseUrl = app.globalData.apiBaseUrl;
+    if (!apiBaseUrl) {
+      wx.hideLoading();
+      wx.showToast({ title: '服务器配置错误', icon: 'none' });
+      return;
+    }
+    wx.request({
+      url: apiBaseUrl + '/yonghu/wdlyhdl',
+      method: 'POST',
+      data: { code: code, inviteCode: inviteCode },
+      header: { 'content-type': 'application/json' },
+      success: (res) => {
+        if (res.statusCode === 200 && res.data && res.data.code === 0 && res.data.data) {
+          const userData = res.data.data;
+          if (userData.token) wx.setStorageSync('token', userData.token);
+          const identityFields = ['nicheng', 'uid', 'touxiang', 'dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus'];
+          identityFields.forEach(field => {
+            if (userData[field] !== undefined) {
+              wx.setStorageSync(field, userData[field]);
+              app.globalData[field] = userData[field];
+            }
+          });
+          const groupFields = ['dashouqun', 'dashouqunid', 'guanshiqun', 'guanshiqunid'];
+          groupFields.forEach(field => {
+            if (userData[field] !== undefined) {
+              wx.setStorageSync(field, userData[field]);
+              app.globalData[field] = userData[field];
+            }
+          });
+          if (userData.dashounicheng || userData.yongjin) {
+            const updateData = {
+              dashouNicheng: userData.dashounicheng || '',
+              zhanghaoStatus: userData.zhanghaostatus || '',
+              yongjin: userData.yongjin || '0.00',
+              zonge: userData.zonge || '0.00',
+              yajin: userData.yajin || '0.00',
+              chenghao: userData.chenghao || '',
+              jinfen: userData.jifen || userData.jinfen || '0',
+              clumber: userData.clumber || [],
+              chengjiaoliang: userData.chengjiaoliang || '0',
+              zaixianZhuangtai: userData.zaixianzhuangtai || 0,
+              dashouzhuangtai: userData.dashouzhuangtai || '',
+              // 🔥 不再从这里取 chenghaoList，单独调用 fetchChenghaoList
+            };
+            Object.assign(app.globalData, updateData);
+          }
+          that.setData({
+            isDashou: true,
+            uid: userData.uid || '',
+            touxiang: userData.touxiang || '',
+            isAutoRegistering: false
+            // 不设置 chenghaoList，稍后在 onShow 中自动获取
+          });
+          that.loadAvatar();
+          that.getDashouInfo();
+          that.switchToDashouRole();
+          wx.hideLoading();
+          wx.showToast({ title: '登录注册成功！', icon: 'success', duration: 2000 });
+        } else {
+          wx.hideLoading();
+          wx.showToast({ title: (res.data && res.data.msg) || '登录注册失败', icon: 'none' });
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        wx.showToast({ title: '网络请求失败', icon: 'none' });
+      }
+    });
+  },
+
+  registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  checkDashouStatus() {
+    try {
+      const dashoustatus = wx.getStorageSync('dashoustatus');
+      const uid = wx.getStorageSync('uid');
+      const touxiang = wx.getStorageSync('touxiang');
+      if (dashoustatus === 1) {
+        this.setData({ isDashou: true, uid: uid || '', touxiang: touxiang || '' });
+        this.loadAvatar();
+        this.checkGlobalData();
+      } else {
+        this.setData({ isDashou: false });
+      }
+    } catch (error) {
+      console.error('读取缓存失败:', error);
+      this.setData({ isDashou: false });
+    }
+  },
+
+  loadAvatar() {
+    const app = getApp();
+    const { ossImageUrl = '', morentouxiang = 'avatar/default.jpg' } = app.globalData || {};
+    const { touxiang } = this.data;
+    let avatarUrl = '';
+    if (touxiang) {
+      avatarUrl = ossImageUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang);
+    } else {
+      avatarUrl = ossImageUrl + (morentouxiang.startsWith('/') ? morentouxiang : '/' + morentouxiang);
+    }
+    this.setData({ avatarUrl });
+  },
+
+  checkGlobalData() {
+    const app = getApp();
+    const globalData = app.globalData || {};
+    const needRefresh = !globalData.dashouNicheng || globalData.dashouNicheng === '' || !globalData.yongjin;
+    if (needRefresh) {
+      this.getDashouInfo();
+    } else {
+      this.setDataFromGlobalData();
+    }
+  },
+
+  setDataFromGlobalData() {
+    const app = getApp();
+    const {
+      dashouNicheng = '', zhanghaoStatus = '', yongjin = '0.00', zonge = '0.00',
+      yajin = '0.00', chenghao = '', jinfen = '0', clumber = [],
+      chengjiaoliang = '0', zaixianZhuangtai = 0
+      // 🔥 chenghaoList 不再从全局取，避免旧数据干扰
+    } = app.globalData || {};
+    this.setData({
+      dashouNicheng, zhanghaoStatus, yongjin, zonge, yajin,
+      chenghao, jinfen,
+      clumber: Array.isArray(clumber) ? clumber : [],
+      chengjiaoliang,
+      zaixianZhuangtai: zaixianZhuangtai === 1 ? 1 : 0
+    });
+  },
+
+  async getDashouInfo() {
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({ url: '/yonghu/dashouxinxi', method: 'POST' });
+      if (res && res.data.code == 200) {
+        const data = res.data.data;
+        const app = getApp();
+        const updateData = {
+          dashouNicheng: data.dashounicheng || '',
+          zhanghaoStatus: data.zhanghaostatus || '',
+          yongjin: data.yongjin || '0.00',
+          zonge: data.zonge || '0.00',
+          yajin: data.yajin || '0.00',
+          chenghao: data.chenghao || '',
+          jinfen: data.jifen || '0',
+          clumber: data.clumber || [],
+          chengjiaoliang: data.chengjiaoliang || '0',
+          zaixianZhuangtai: data.zaixianzhuangtai || 0,
+          dashouzhuangtai: data.dashouzhuangtai || '',
+          // 🔥 不再包含 chenghaoList
+        };
+        Object.assign(app.globalData, updateData);
+        if (data.dashoustatus !== undefined) {
+          wx.setStorageSync('dashoustatus', data.dashoustatus);
+          app.globalData.dashoustatus = data.dashoustatus;
+        }
+        if (data.guanshistatus !== undefined) {
+          wx.setStorageSync('guanshistatus', data.guanshistatus);
+          app.globalData.guanshistatus = data.guanshistatus;
+        }
+        this.setData({ ...updateData, isLoading: false });
+        if (this.data.isAutoRegistering) {
+          this.setData({ isAutoRegistering: false });
+          wx.showToast({ title: '注册成功！', icon: 'success', duration: 2000 });
+        } else {
+          wx.showToast({ title: '信息已更新', icon: 'success', duration: 1500 });
+        }
+        this.handleJinpaiStatus(data.chenghao);
+      }
+    } catch (error) {
+      console.error('获取打手信息失败:', error);
+      this.setData({ isLoading: false, isAutoRegistering: false });
+      wx.showToast({ title: '获取信息失败', icon: 'error', duration: 2000 });
+    }
+  },
+
+  refreshDashouInfo() {
+    const now = Date.now();
+    if (!this.data.canRefresh || (now - this.data.lastRefreshTime < 3000)) return;
+    this.setData({ lastRefreshTime: now, canRefresh: false });
+    this.getDashouInfo();
+    this.fetchChenghaoList();   // 🆕 同时刷新标签
+    setTimeout(() => this.setData({ canRefresh: true }), 3000);
+  },
+
+  onInviteCodeInput(e) {
+    this.setData({ inviteCode: e.detail.value.trim() });
+  },
+
+  async onRegister() {
+    const { inviteCode } = this.data;
+    if (!inviteCode) {
+      wx.showToast({ title: '请输入邀请码', icon: 'none', duration: 2000 });
+      return;
+    }
+    if (inviteCode.length > 100) {
+      wx.showToast({ title: '邀请码不能超过100字符', icon: 'none', duration: 2000 });
+      return;
+    }
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({
+        url: '/yonghu/dashouzhuce',
+        method: 'POST',
+        data: { inviteCode: inviteCode }
+      });
+      if (res && res.data.code == 200) {
+        const data = res.data.data;
+        const app = getApp();
+        const identityFields = ['dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus'];
+        identityFields.forEach(field => {
+          if (data[field] !== undefined) {
+            wx.setStorageSync(field, data[field]);
+            app.globalData[field] = data[field];
+          }
+        });
+        if (data.dashoustatus === undefined) {
+          wx.setStorageSync('dashoustatus', 1);
+          app.globalData.dashoustatus = 1;
+        }
+        const updateData = {
+          dashouNicheng: data.dashounicheng || '',
+          zhanghaoStatus: data.zhanghaostatus || '',
+          yongjin: data.yongjin || '0.00',
+          zonge: data.zonge || '0.00',
+          yajin: data.yajin || '0.00',
+          chenghao: data.chenghao || '',
+          jinfen: data.jinfen || '0',
+          clumber: data.clumber || [],
+          chengjiaoliang: data.chengjiaoliang || '0',
+          zaixianZhuangtai: data.zaixianzhuangtai || 0,
+          dashouzhuangtai: data.dashouzhuangtai || '',
+          // chenghaoList 不从这取
+        };
+        Object.assign(app.globalData, updateData);
+        this.setData({
+          isDashou: true,
+          ...updateData,
+          isLoading: false,
+          isAutoRegistering: false
+        });
+        this.loadAvatar();
+        if (this.data.isAutoRegistering || !wx.getStorageSync('token')) {
+          this.switchToDashouRole();
+        }
+        wx.showToast({ title: '注册成功！', icon: 'success', duration: 2000 });
+        this.handleJinpaiStatus(data.chenghao);
+      } else {
+        this.setData({ isLoading: false, isAutoRegistering: false });
+        wx.showToast({ title: (res.data && res.data.message) || '注册失败', icon: 'error', duration: 2000 });
+      }
+    } catch (error) {
+      console.error('注册失败:', error);
+      this.setData({ isLoading: false, isAutoRegistering: false });
+      wx.showToast({ title: error.message || '注册失败', icon: 'error', duration: 2000 });
+    }
+  },
+
+  switchToDashouRole() {
+    const app = getApp();
+    app.globalData.currentRole = 'dashou';
+    wx.setStorageSync('currentRole', 'dashou');
+    const tabBar = this.getTabBar();
+    if (tabBar && tabBar.refresh) tabBar.refresh();
+    if (app.connectForCurrentRole) {
+      app.connectForCurrentRole();
+    } else if (app.ensureConnection) {
+      app.ensureConnection();
+    }
+  },
+
+  copyUid() {
+    const { uid } = this.data;
+    if (!uid) {
+      wx.showToast({ title: 'UID不存在', icon: 'none', duration: 1500 });
+      return;
+    }
+    wx.setClipboardData({
+      data: uid,
+      success: () => wx.showToast({ title: '已复制UID', icon: 'success', duration: 1500 }),
+      fail: () => wx.showToast({ title: '复制失败', icon: 'error', duration: 1500 })
+    });
+  },
+
+  previewAvatar() {
+    const { avatarUrl } = this.data;
+    if (avatarUrl) wx.previewImage({ urls: [avatarUrl] });
+  },
+
+  goToWithdraw() { wx.navigateTo({ url: '/pages/tixian/tixian' }) },
+  goToReceiveOrder() { wx.navigateTo({ url: '/pages/jiedan/jiedan' }) },
+  goToMyOrders() { wx.navigateTo({ url: '/pages/dashoudingdan/dashoudingdan' }) },
+  goToMyPunishment() { wx.navigateTo({ url: '/pages/cfss/cfss/cfss' }) },
+  goToRecharge() { wx.navigateTo({ url: '/pages/dashouchongzhi/dashouchongzhi' }) },
+  goToRanking() { wx.navigateTo({ url: '/pages/dashoupaihang/dashoupaihang' }) },
+  goToModifyInfo() { wx.navigateTo({ url: '/pages/dashouxiugai/dashouxiugai' }) },
+  goToRules() { wx.navigateTo({ url: '/pages/dashouguize/dashouguize' }) },
+  // 跳转到考核金牌
+goToKaohe() {
+    wx.navigateTo({ url: '/pages/kaohe_jinpai/kaohe_jinpai' });
+  },
+
+  quickRegisterAsPlatform() {
+    const that = this;
+    wx.showModal({
+      title: '提示',
+      content: '使用此功能后，您将不属于任何管事，确认注册吗？',
+      success: (res) => {
+        if (res.confirm) {
+          that.setData({ inviteCode: PLATFORM_INVITE_CODE });
+          that.onRegister();
+        }
+      }
+    });
+  },
+
+  checkAndRedirectToJinpai() {
+    const isJinpai = wx.getStorageSync('isJinpai');
+    if (isJinpai === 1) {
+      wx.redirectTo({ url: '/pages/jinpaids/jinpaids' });
+    }
+  },
+
+  handleJinpaiStatus(chenghao) {
+    const isJinpai = (chenghao === '金牌选手') ? 1 : 0;
+    wx.setStorageSync('isJinpai', isJinpai);
+    if (isJinpai) {
+      wx.redirectTo({ url: '/pages/jinpaids/jinpaids' });
+    }
+  }
+})
\ No newline at end of file
diff --git a/pages/dashouduan/dashouduan.json b/pages/dashouduan/dashouduan.json
new file mode 100644
index 0000000..e0bbde6
--- /dev/null
+++ b/pages/dashouduan/dashouduan.json
@@ -0,0 +1,14 @@
+{
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification",
+        "chenghao-tag": "/components/chenghao-tag/chenghao-tag"
+        
+    },
+    "navigationBarBackgroundColor": "#0F0A1F",
+    "navigationBarTextStyle": "white",
+    "navigationBarTitleText": "服务中心",
+    "backgroundColor": "#0F0A1F",
+    "backgroundTextStyle": "light",
+    "enablePullDownRefresh": false,
+    "onReachBottomDistance": 50
+  }
\ No newline at end of file
diff --git a/pages/dashouduan/dashouduan.wxml b/pages/dashouduan/dashouduan.wxml
new file mode 100644
index 0000000..38433d1
--- /dev/null
+++ b/pages/dashouduan/dashouduan.wxml
@@ -0,0 +1,212 @@
+
+<view class="page-container unregistered-page" wx:if="{{!isDashou}}">
+  
+  <view class="status-tip">您还未解锁此功能，请输入邀请码解锁</view>
+  
+  <view class="input-container">
+    <input 
+      class="invite-input" 
+      type="text" 
+      placeholder="请输入100位以内邀请码" 
+      maxlength="100"
+      value="{{inviteCode}}"
+      bindinput="onInviteCodeInput"
+      placeholder-class="placeholder"
+    />
+  </view>
+  
+  <view class="register-view-btn" bindtap="onRegister">
+    <text class="register-text">输入邀请码注册</text>
+    <view class="register-glow"></view>
+  </view>
+
+  <view class="quick-register-btn" bindtap="quickRegisterAsPlatform">
+    
+    <view class="quick-register-glow"></view>
+  </view>
+</view>
+
+
+<view class="page-container registered-page" wx:else>
+  
+  <view class="refresh-btn" bindtap="refreshDashouInfo">
+    <text class="refresh-icon">↻</text>
+  </view>
+  
+  
+  <view class="avatar-section">
+    <view class="avatar-info">
+      <image 
+        class="avatar-img" 
+        src="{{avatarUrl}}" 
+        mode="aspectFill"
+        bindtap="previewAvatar"
+      />
+      <view class="user-info">
+        
+        <view class="nickname-row">
+          <text class="dashou-nicheng">{{dashouNicheng || '打手昵称'}}</text>
+          
+        </view>
+        
+        <view class="uid-row">
+          <text class="uid-label">UID:</text>
+          <text class="uid-value">{{uid || '未获取'}}</text>
+          <view class="copy-btn" bindtap="copyUid">
+            <text class="copy-icon">⎘</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="badge-area" wx:if="{{chenghaoList.length > 0}}">
+    <scroll-view class="badge-scroll" scroll-y="true" enable-flex>
+      <view class="badge-grid">
+        <view class="badge-item" wx:for="{{chenghaoList}}" wx:key="index">
+          <chenghao-tag 
+            mingcheng="{{item.mingcheng}}" 
+            texiaoJson="{{item.texiao_json}}" 
+          />
+        </view>
+      </view>
+    </scroll-view>
+  </view>
+  
+  
+  
+  <view class="assets-section">
+    <view class="black-card">
+      <view class="card-header">
+        <text class="card-title">资产总览</text>
+      </view>
+      
+      <view class="yongjin-row">
+        <view class="yongjin-info">
+          <text class="asset-label">我的佣金</text>
+          <view class="asset-value-container">
+            <text class="asset-value">{{yongjin || '0.00'}}</text>
+            <text class="asset-unit">元</text>
+          </view>
+        </view>
+        
+        <view class="withdraw-view-btn" bindtap="goToWithdraw">
+          <text class="withdraw-text">提现</text>
+          <view class="withdraw-glow"></view>
+        </view>
+      </view>
+      
+      <view class="assets-bottom">
+        <view class="bottom-item">
+          <text class="bottom-label">积分</text>
+          <text class="bottom-value">{{jinfen || '0'}}</text>
+        </view>
+        
+        <view class="vertical-divider"></view>
+        
+        <view class="bottom-item">
+          <text class="bottom-label">保证金</text>
+          <text class="bottom-value">{{yajin || '0.00'}}元</text>
+        </view>
+      </view>
+    </view>
+  </view>
+  
+  
+  <view class="function-section">
+    <view class="main-function" bindtap="goToReceiveOrder">
+      <text class="main-function-icon">🎮</text>
+      <text class="main-function-text">抢单大厅</text>
+      <view class="main-function-glow"></view>
+    </view>
+    
+    <view class="function-grid-second">
+      <view class="function-item-second" bindtap="goToRecharge">
+        <text class="function-icon-second">💳</text>
+        <text class="function-text-second">充值会员保证金</text>
+      </view>
+      
+      <view class="function-item-second" bindtap="goToMyOrders">
+        <text class="function-icon-second">📦</text>
+        <text class="function-text-second">我的订单</text>
+      </view>
+    </view>
+    
+    <view class="function-grid-third">
+      <view class="function-item-third" bindtap="goToMyPunishment">
+        <text class="function-icon-third">⚖️</text>
+        <text class="function-text-third">我的处罚</text>
+      </view>
+      
+      <view class="function-item-third" bindtap="goToRanking">
+        <text class="function-icon-third">🏆</text>
+        <text class="function-text-third">排行榜</text>
+      </view>
+    </view>
+  </view>
+  
+  
+  
+  <view class="other-section">
+    <view class="other-list">
+
+
+
+      <view class="other-item" wx:if="{{inviterCache && inviterCache.uid}}">
+        <view class="other-item-left" bindtap="contactInviter">
+          <image class="inviter-avatar" src="{{inviterCache.avatar}}" mode="aspectFill" />
+          <view class="inviter-text-info">
+            <text class="other-text">邀请人：{{inviterCache.nicheng || '未知'}}</text>
+            <text class="inviter-uid-text">ID: {{inviterCache.uid}}</text>
+          </view>
+        </view>
+        <view class="contact-badge" bindtap="contactInviter">联系</view>
+      </view>
+      <view class="other-item" wx:else bindtap="contactInviter">
+      
+        <view class="other-item-left">
+          <text class="other-icon">🤝</text>
+          <text class="other-text">联系邀请人</text>
+        </view>
+        <text class="arrow-icon">›</text>
+      </view>
+
+      
+<view class="other-item" bindtap="goToKaohe">
+  <view class="other-item-left">
+    <text class="other-icon">🏅</text>
+    <text class="other-text">考核金牌</text>
+  </view>
+  <text class="arrow-icon">›</text>
+</view>
+
+      <view class="other-item" bindtap="goToModifyInfo">
+        <view class="other-item-left">
+          <text class="other-icon">✏️</text>
+          <text class="other-text">修改个人信息</text>
+        </view>
+        <text class="arrow-icon">›</text>
+      </view>
+      
+      <view class="other-item" bindtap="goToRules">
+        <view class="other-item-left">
+          <text class="other-icon">📖</text>
+          <text class="other-text">用户规则</text>
+        </view>
+        <text class="arrow-icon">›</text>
+      </view>
+    </view>
+  </view>
+</view>
+
+
+<view class="loading-mask" wx:if="{{isLoading}}">
+  <view class="loading-content">
+    <view class="loading-spinner"></view>
+    <text class="loading-text">加载中...</text>
+  </view>
+</view>
+<global-notification id="global-notification" />
+<custom-tab-bar />
+<popup-notice id="popupNotice" />
\ No newline at end of file
diff --git a/pages/dashouduan/dashouduan.wxss b/pages/dashouduan/dashouduan.wxss
new file mode 100644
index 0000000..3429296
--- /dev/null
+++ b/pages/dashouduan/dashouduan.wxss
@@ -0,0 +1,860 @@
+/* pages/dashouzhongxin/dashouzhongxin.wxss */
+
+/* =========== 全局样式 =========== */
+page {
+    background: linear-gradient(135deg, #121212 0%, #1a1a2e 30%, #16213e 70%, #0f3460 100%);
+    min-height: 100vh;
+    color: #FFFFFF;
+    font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', sans-serif;
+    background-attachment: fixed;
+    background-size: cover;
+}
+
+.page-container {
+    min-height: 100vh;
+    position: relative;
+    box-sizing: border-box;
+}
+
+/* =========== 未注册状态页面 =========== */
+.unregistered-page {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding-top: 200rpx;
+    min-height: 100vh;
+    box-sizing: border-box;
+}
+
+.status-tip {
+    font-size: 32rpx;
+    color: #FFFFFF;
+    margin-bottom: 80rpx;
+    font-weight: 500;
+    text-align: center;
+    opacity: 0;
+    animation: fadeIn 1s ease-out forwards;
+    line-height: 1.5;
+    padding: 0 40rpx;
+}
+
+.input-container {
+    width: 85%;
+    margin-bottom: 60rpx;
+    box-sizing: border-box;
+}
+
+.invite-input {
+    width: 100%;
+    height: 90rpx;
+    background: rgba(255, 255, 255, 0.1);
+    border-radius: 20rpx;
+    padding: 0 30rpx;
+    font-size: 30rpx;
+    color: #FFFFFF;
+    box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.3);
+    border: 1rpx solid rgba(255, 215, 0, 0.3);
+    transition: all 0.3s;
+    box-sizing: border-box;
+}
+
+.invite-input:focus {
+    border-color: #FFD700;
+    box-shadow: 0 15rpx 40rpx rgba(255, 215, 0, 0.25);
+    transform: translateY(-2rpx);
+}
+
+.placeholder {
+    color: rgba(255, 255, 255, 0.5);
+    font-size: 28rpx;
+}
+
+.register-view-btn {
+    width: 85%;
+    height: 80rpx;
+    background: linear-gradient(135deg, #FFD700 0%, #FFA500 100%);
+    border-radius: 40rpx;
+    position: relative;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-shadow: 0 10rpx 30rpx rgba(255, 215, 0, 0.3);
+    transition: all 0.3s ease;
+    margin-top: 20rpx;
+}
+
+.register-view-btn:active {
+    transform: scale(0.98);
+}
+
+.register-text {
+    font-size: 34rpx;
+    font-weight: bold;
+    color: #333;
+    letter-spacing: 4rpx;
+    position: relative;
+    z-index: 2;
+    text-shadow: 0 2rpx 4rpx rgba(255, 255, 255, 0.2);
+    line-height: 80rpx;
+}
+
+.register-glow {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, 
+      transparent, 
+      rgba(255, 255, 255, 0.4), 
+      transparent);
+    animation: shine 2s infinite;
+}
+
+/* 一键注册按钮样式 */
+.quick-register-btn {
+    width: 85%;
+    height: 80rpx;
+    background: linear-gradient(135deg, #4CAF50 0%, #2E7D32 100%);
+    border-radius: 40rpx;
+    position: relative;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-shadow: 0 10rpx 30rpx rgba(76, 175, 80, 0.4);
+    transition: all 0.3s ease;
+    margin-top: 20rpx;
+}
+
+.quick-register-btn:active {
+    transform: scale(0.98);
+}
+
+.quick-register-text {
+    font-size: 34rpx;
+    font-weight: bold;
+    color: white;
+    letter-spacing: 4rpx;
+    position: relative;
+    z-index: 2;
+    text-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.2);
+    line-height: 80rpx;
+}
+
+.quick-register-glow {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, 
+      transparent, 
+      rgba(255, 255, 255, 0.3), 
+      transparent);
+    animation: shine 2s infinite;
+}
+
+/* =========== 已注册状态页面 =========== */
+.registered-page {
+    padding: 30rpx 25rpx;
+    box-sizing: border-box;
+}
+
+.refresh-btn {
+    position: absolute;
+    top: 30rpx;
+    right: 25rpx;
+    width: 60rpx;
+    height: 60rpx;
+    background: rgba(255, 255, 255, 0.08);
+    border-radius: 50%;
+    box-shadow: 0 6rpx 20rpx rgba(0, 0, 0, 0.25);
+    z-index: 10;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 1rpx solid rgba(255, 255, 255, 0.1);
+    transition: all 0.3s ease;
+}
+
+.refresh-btn:active {
+    transform: rotate(180deg);
+    background: rgba(255, 255, 255, 0.12);
+}
+
+.refresh-icon {
+    font-size: 32rpx;
+    color: #FFD700;
+    font-weight: bold;
+}
+
+/* 头像区域 */
+.avatar-section {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 30rpx;
+    margin-top: 40rpx;
+    position: relative;
+}
+
+.avatar-info {
+    display: flex;
+    align-items: center;
+    flex: 1;
+}
+
+.avatar-img {
+    width: 120rpx;
+    height: 120rpx;
+    border-radius: 50%;
+    box-shadow: 0 0 0 3rpx rgba(255, 215, 0, 0.5), 
+                0 8rpx 25rpx rgba(0, 0, 0, 0.4);
+    margin-right: 25rpx;
+    transition: transform 0.3s ease;
+    background: linear-gradient(45deg, #2a2a2a, #1a1a1a);
+}
+
+.avatar-img:active {
+    transform: scale(0.95);
+}
+
+.user-info {
+    margin-left: 25rpx;
+    flex: 1;
+}
+
+.nickname-row {
+    display: flex;
+    align-items: center;
+    margin-bottom: 15rpx;
+    flex-wrap: wrap;
+}
+
+.dashou-nicheng {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #FFFFFF;
+    margin-right: 15rpx;
+    max-width: 200rpx;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    text-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.5);
+}
+
+.chenghao-tag {
+    background: linear-gradient(135deg, 
+      rgba(255, 215, 0, 0.9) 0%, 
+      rgba(255, 165, 0, 0.9) 100%);
+    padding: 4rpx 16rpx;
+    border-radius: 20rpx;
+    height: 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 1rpx solid rgba(255, 215, 0, 0.5);
+    box-shadow: 0 4rpx 12rpx rgba(255, 215, 0, 0.3);
+}
+
+.chenghao-text {
+    font-size: 22rpx;
+    font-weight: bold;
+    color: #333;
+    text-shadow: 0 1rpx 1rpx rgba(255, 255, 255, 0.8);
+    letter-spacing: 1rpx;
+}
+
+.uid-row {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+}
+
+.uid-label {
+    font-size: 26rpx;
+    color: rgba(255, 255, 255, 0.7);
+    margin-right: 10rpx;
+    font-weight: 500;
+}
+
+.uid-value {
+    font-size: 26rpx;
+    color: #FFFFFF;
+    font-family: 'Courier New', monospace;
+    margin-right: 15rpx;
+    background: rgba(255, 255, 255, 0.08);
+    padding: 6rpx 12rpx;
+    border-radius: 8rpx;
+    border: 1rpx solid rgba(255, 255, 255, 0.1);
+}
+
+.copy-btn {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.3s ease;
+    width: 50rpx;
+    height: 50rpx;
+    border-radius: 50%;
+    background: rgba(255, 215, 0, 0.1);
+    border: 1rpx solid rgba(255, 215, 0, 0.3);
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.2);
+}
+
+.copy-btn:active {
+    transform: scale(0.95);
+    background: rgba(255, 215, 0, 0.2);
+}
+
+.copy-icon {
+    font-size: 28rpx;
+    color: #FFD700;
+    font-weight: 500;
+}
+
+/* 资产区域 */
+.assets-section {
+    position: relative;
+    margin-bottom: 30rpx;
+}
+
+.black-card {
+    background: linear-gradient(135deg, 
+        rgba(30, 30, 46, 0.9) 0%, 
+        rgba(22, 33, 62, 0.9) 100%);
+    border-radius: 20rpx;
+    padding: 30rpx;
+    position: relative;
+    box-shadow: 
+        0 15rpx 40rpx rgba(0, 0, 0, 0.4);
+    overflow: hidden;
+    border: 1rpx solid rgba(255, 215, 0, 0.15);
+    min-height: 180rpx;
+}
+
+.card-header {
+    margin-bottom: 25rpx;
+}
+
+.card-title {
+    font-size: 28rpx;
+    color: #FFD700;
+    letter-spacing: 2rpx;
+    font-weight: bold;
+}
+
+.yongjin-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 25rpx;
+}
+
+.yongjin-info {
+    flex: 1;
+}
+
+.asset-label {
+    font-size: 24rpx;
+    color: rgba(255, 255, 255, 0.7);
+    font-weight: 400;
+    margin-bottom: 8rpx;
+    display: block;
+}
+
+.asset-value-container {
+    display: flex;
+    align-items: baseline;
+}
+
+.asset-value {
+    font-size: 48rpx;
+    font-weight: bold;
+    color: #FFD700;
+    font-family: 'Arial', sans-serif;
+    letter-spacing: 1rpx;
+}
+
+.asset-unit {
+    font-size: 28rpx;
+    color: #FFD700;
+    margin-left: 8rpx;
+    font-weight: 500;
+}
+
+.withdraw-view-btn {
+    width: 120rpx;
+    height: 55rpx;
+    background: linear-gradient(135deg, 
+        rgba(255, 215, 0, 0.9) 0%, 
+        rgba(255, 165, 0, 0.9) 100%);
+    border-radius: 10rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-shadow: 
+        0 6rpx 20rpx rgba(255, 215, 0, 0.4);
+    transition: all 0.3s ease;
+    border: 1rpx solid rgba(255, 215, 0, 0.3);
+    position: relative;
+    overflow: hidden;
+}
+
+.withdraw-view-btn:active {
+    transform: scale(0.95);
+}
+
+.withdraw-text {
+    font-size: 26rpx;
+    font-weight: bold;
+    color: #333;
+    letter-spacing: 2rpx;
+    position: relative;
+    z-index: 2;
+    text-shadow: 0 1rpx 2rpx rgba(255, 255, 255, 0.5);
+}
+
+.assets-bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-top: 25rpx;
+    border-top: 1rpx solid rgba(255, 255, 255, 0.1);
+}
+
+.bottom-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    flex: 1;
+}
+
+.bottom-label {
+    font-size: 22rpx;
+    color: rgba(255, 255, 255, 0.7);
+    margin-bottom: 8rpx;
+    font-weight: 400;
+}
+
+.bottom-value {
+    font-size: 30rpx;
+    font-weight: bold;
+    color: #FFD700;
+}
+
+.vertical-divider {
+    width: 1rpx;
+    height: 40rpx;
+    background: linear-gradient(to bottom, 
+        transparent, 
+        rgba(255, 215, 0, 0.5) 50%, 
+        transparent);
+}
+
+/* 功能区域 */
+.function-section {
+    background: rgba(255, 255, 255, 0.05);
+    border-radius: 20rpx;
+    padding: 30rpx 25rpx;
+    margin-bottom: 30rpx;
+    box-shadow: 
+        0 10rpx 25rpx rgba(0, 0, 0, 0.2);
+    border: 1rpx solid rgba(255, 215, 0, 0.1);
+}
+
+/* 抢单大厅 */
+.main-function {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 35rpx 0;
+    border-radius: 20rpx;
+    background: linear-gradient(135deg, 
+        rgba(0, 150, 255, 0.2) 0%, 
+        rgba(0, 100, 200, 0.2) 100%);
+    transition: all 0.3s ease;
+    position: relative;
+    overflow: hidden;
+    margin-bottom: 25rpx;
+    border: 1rpx solid rgba(0, 150, 255, 0.3);
+}
+
+.main-function:active {
+    transform: scale(0.98);
+    background: linear-gradient(135deg, 
+        rgba(0, 150, 255, 0.3) 0%, 
+        rgba(0, 100, 200, 0.3) 100%);
+}
+
+.main-function-icon {
+    font-size: 60rpx;
+    margin-bottom: 20rpx;
+}
+
+.main-function-text {
+    font-size: 32rpx;
+    color: #FFFFFF;
+    font-weight: bold;
+    text-align: center;
+    position: relative;
+    z-index: 2;
+    letter-spacing: 2rpx;
+}
+
+.main-function-glow {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, 
+        transparent, 
+        rgba(255, 255, 255, 0.2), 
+        transparent);
+    animation: shine 3s infinite;
+}
+
+/* 第二行：充值和订单 */
+.function-grid-second {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 20rpx;
+}
+
+.function-grid-second .function-item-second:nth-child(1) {
+    position: relative;
+    overflow: hidden;
+    background: linear-gradient(135deg, 
+        rgba(255, 215, 0, 0.2) 0%, 
+        rgba(255, 165, 0, 0.2) 100%);
+    border: 1rpx solid rgba(255, 215, 0, 0.4);
+    box-shadow: 
+        0 8rpx 25rpx rgba(255, 215, 0, 0.3),
+        0 0 15rpx rgba(255, 215, 0, 0.2);
+}
+
+.function-grid-second .function-item-second:nth-child(1):active {
+    transform: scale(0.96);
+    background: linear-gradient(135deg, 
+        rgba(255, 215, 0, 0.3) 0%, 
+        rgba(255, 165, 0, 0.3) 100%);
+}
+
+.function-grid-second .function-item-second:nth-child(1) .function-icon-second {
+    font-size: 48rpx;
+    color: #FFD700;
+    text-shadow: 
+        0 2rpx 8rpx rgba(255, 215, 0, 0.5),
+        0 0 15rpx rgba(255, 215, 0, 0.3);
+    animation: goldPulse 2s infinite ease-in-out;
+}
+
+.function-grid-second .function-item-second:nth-child(1) .function-text-second {
+    font-size: 26rpx;
+    font-weight: bold;
+    color: #FFD700;
+    text-shadow: 0 1rpx 3rpx rgba(0, 0, 0, 0.5);
+    letter-spacing: 1rpx;
+}
+
+.function-grid-second .function-item-second:nth-child(1)::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, 
+        transparent, 
+        rgba(255, 255, 255, 0.3), 
+        transparent);
+    animation: shine 2.5s infinite;
+}
+
+.function-item-second {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 25rpx 0;
+    border-radius: 16rpx;
+    background: rgba(255, 255, 255, 0.08);
+    transition: all 0.3s ease;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 
+        0 5rpx 15rpx rgba(0, 0, 0, 0.2);
+    width: 48%;
+}
+
+.function-item-second:active {
+    transform: scale(0.96);
+    background: rgba(255, 255, 255, 0.12);
+}
+
+.function-icon-second {
+    font-size: 44rpx;
+    margin-bottom: 15rpx;
+}
+
+.function-text-second {
+    font-size: 26rpx;
+    color: #FFFFFF;
+    font-weight: 500;
+    text-align: center;
+    position: relative;
+    z-index: 2;
+}
+
+/* 第三行：我的处罚和排行 */
+.function-grid-third {
+    display: flex;
+    justify-content: space-between;
+}
+
+.function-item-third {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 22rpx 0;
+    border-radius: 16rpx;
+    background: rgba(255, 255, 255, 0.06);
+    transition: all 0.3s ease;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 
+        0 4rpx 12rpx rgba(0, 0, 0, 0.2);
+    width: 48%;
+}
+
+.function-item-third:active {
+    transform: scale(0.96);
+    background: rgba(255, 255, 255, 0.09);
+}
+
+.function-icon-third {
+    font-size: 40rpx;
+    margin-bottom: 12rpx;
+}
+
+.function-text-third {
+    font-size: 24rpx;
+    color: rgba(255, 255, 255, 0.9);
+    font-weight: 500;
+    text-align: center;
+    position: relative;
+    z-index: 2;
+}
+
+/* 其他功能区域 */
+.other-section {
+    background: rgba(255, 255, 255, 0.05);
+    border-radius: 20rpx;
+    padding: 0 25rpx;
+    box-shadow: 
+        0 10rpx 25rpx rgba(0, 0, 0, 0.2);
+    border: 1rpx solid rgba(255, 215, 0, 0.1);
+}
+
+.other-list {
+    padding: 20rpx 0;
+}
+
+.other-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 28rpx 0;
+    border-bottom: 1rpx solid rgba(255, 255, 255, 0.05);
+    transition: all 0.3s ease;
+}
+
+.other-item:active {
+    background: rgba(255, 215, 0, 0.05);
+    transform: translateX(5rpx);
+}
+
+.other-item:last-child {
+    border-bottom: none;
+}
+
+.other-item-left {
+    display: flex;
+    align-items: center;
+}
+
+.other-icon {
+    font-size: 36rpx;
+    margin-right: 20rpx;
+}
+
+.other-text {
+    font-size: 28rpx;
+    color: #FFFFFF;
+    font-weight: 500;
+}
+
+.arrow-icon {
+    font-size: 36rpx;
+    color: rgba(255, 255, 255, 0.5);
+    font-weight: bold;
+    transition: all 0.3s ease;
+}
+
+.other-item:active .arrow-icon {
+    color: #FFD700;
+    transform: translateX(5rpx);
+}
+
+/* 邀请人专属样式（新增） */
+.inviter-avatar {
+    width: 70rpx;
+    height: 70rpx;
+    border-radius: 50%;
+    margin-right: 20rpx;
+    border: 2rpx solid rgba(255, 215, 0, 0.5);
+    box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.4);
+}
+
+.inviter-text-info {
+    display: flex;
+    flex-direction: column;
+}
+
+.inviter-uid-text {
+    font-size: 22rpx;
+    color: rgba(255, 255, 255, 0.5);
+    margin-top: 6rpx;
+}
+
+.contact-badge {
+    background: rgba(255, 215, 0, 0.2);
+    border: 1rpx solid rgba(255, 215, 0, 0.5);
+    color: #FFD700;
+    font-size: 24rpx;
+    padding: 8rpx 20rpx;
+    border-radius: 20rpx;
+    font-weight: 500;
+    transition: all 0.3s;
+}
+
+.contact-badge:active {
+    background: rgba(255, 215, 0, 0.4);
+}
+
+/* 加载遮罩 */
+.loading-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(18, 18, 18, 0.9);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 9999;
+}
+
+.loading-content {
+    background: rgba(30, 30, 46, 0.95);
+    padding: 60rpx 80rpx;
+    border-radius: 30rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    box-shadow: 0 20rpx 60rpx rgba(0, 0, 0, 0.5);
+    border: 1rpx solid rgba(255, 215, 0, 0.2);
+}
+
+.loading-spinner {
+    width: 80rpx;
+    height: 80rpx;
+    border: 6rpx solid rgba(255, 215, 0, 0.2);
+    border-top: 6rpx solid #FFD700;
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+    margin-bottom: 30rpx;
+}
+
+.loading-text {
+    font-size: 28rpx;
+    color: #FFFFFF;
+    font-weight: 500;
+}
+
+/* =========== 动画定义 =========== */
+@keyframes fadeIn {
+    from { opacity: 0; transform: translateY(30rpx); }
+    to { opacity: 1; transform: translateY(0); }
+}
+
+@keyframes shine {
+    0% { left: -100%; }
+    100% { left: 100%; }
+}
+
+@keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+}
+
+@keyframes goldPulse {
+    0%, 100% { transform: scale(1); opacity: 0.9; }
+    50% { transform: scale(1.05); opacity: 1; }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* ========== 🆕 称号标签展示区 ========== */
+/* ========== 🆕 称号标签展示区 ========== */
+.badge-area {
+    width: 100%;
+    margin: 20rpx 0 30rpx 0;
+    padding: 0 20rpx;
+    box-sizing: border-box;
+  }
+  
+  .badge-scroll {
+    width: 100%;
+    max-height: 140rpx;      /* 最多两行高度（52*2=104 + 间距36rpx） */
+    overflow-y: auto;        /* 超出自动滚动 */
+    background: transparent;
+  }
+  
+  .badge-grid {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8rpx;
+    padding: 6rpx 0;
+    align-items: center;
+    justify-content: flex-start;
+  }
+  
+  .badge-item {
+    flex-shrink: 0;
+    /* 不设宽度限制，由组件自身宽度决定 */
+  }
+
+  .other-icon-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin-right: 20rpx;
+  }
\ No newline at end of file
diff --git a/pages/dashouguize/dashouguize.js b/pages/dashouguize/dashouguize.js
new file mode 100644
index 0000000..28163aa
--- /dev/null
+++ b/pages/dashouguize/dashouguize.js
@@ -0,0 +1,103 @@
+Page({
+    onShow() {
+        // 原有代码...
+        
+        // 🆕 注册通知组件
+        this.registerNotificationComponent();
+    },
+    
+    // 🆕 新增：注册通知组件
+    registerNotificationComponent() {
+        const app = getApp();
+        const notificationComp = this.selectComponent('#global-notification');
+        
+        if (notificationComp && notificationComp.showNotification) {
+            console.log('🏪 商城页面注册通知组件');
+            app.globalData.globalNotification = {
+                show: (data) => notificationComp.showNotification(data),
+                hide: () => notificationComp.hideNotification()
+            };
+        }
+    },
+    data: {
+      // 图片URL（带时间戳避免缓存）
+      imageUrl: '',
+      // 容器高度（初始为100vh，加载后调整为图片高度）
+      containerHeight: 0
+    },
+  
+    onLoad() {
+      // 初始设置容器高度为屏幕高度
+      this.getSystemInfo()
+      // 构建图片URL（带时间戳）
+      this.buildImageUrl()
+    },
+  
+    // 获取系统信息
+    getSystemInfo() {
+      const res = wx.getSystemInfoSync()
+      this.setData({
+        containerHeight: res.windowHeight
+      })
+    },
+  
+    // 构建图片URL（关键：加时间戳避免缓存）
+    buildImageUrl() {
+      const app = getApp()
+      const ossImageUrl = app.globalData.ossImageUrl || ''
+      const dashouguize = app.globalData.dashouguize || ''
+      
+      // 加上时间戳参数，强制每次重新加载
+      const timestamp = new Date().getTime()
+      const fullImageUrl = ossImageUrl + dashouguize + '?t=' + timestamp
+      
+      //console.log('规则图片URL（带时间戳）:', fullImageUrl)
+      
+      this.setData({
+        imageUrl: fullImageUrl
+      })
+    },
+  
+    // 图片加载成功
+    onImageLoad(e) {
+      //console.log('图片加载成功，原始尺寸:', e.detail.width, 'x', e.detail.height)
+      
+      // 根据图片实际高度设置容器高度
+      // 图片宽度为屏幕宽度，高度按比例计算
+      const systemInfo = wx.getSystemInfoSync()
+      const screenWidth = systemInfo.screenWidth // 单位：px
+      
+      // 图片的实际像素尺寸
+      const imageWidth = e.detail.width
+      const imageHeight = e.detail.height
+      
+      // 计算在小程序中显示的高度（保持比例）
+      // 图片在小程序中宽度为100%屏幕宽度，高度按比例缩放
+      const displayHeight = (imageHeight / imageWidth) * screenWidth
+      
+      //console.log('计算后显示高度:', displayHeight, 'px')
+      
+      // 设置容器高度为图片高度
+      this.setData({
+        containerHeight: displayHeight
+      })
+    },
+  
+    // 图片加载失败
+    onImageError() {
+      console.error('图片加载失败')
+      wx.showToast({
+        title: '图片加载失败',
+        icon: 'none',
+        duration: 2000
+      })
+    },
+  
+    // 下拉刷新
+    onPullDownRefresh() {
+      // 重新构建图片URL（带新时间戳）
+      this.buildImageUrl()
+      // 停止下拉刷新
+      wx.stopPullDownRefresh()
+    }
+  })
\ No newline at end of file
diff --git a/pages/dashouguize/dashouguize.json b/pages/dashouguize/dashouguize.json
new file mode 100644
index 0000000..62ab6de
--- /dev/null
+++ b/pages/dashouguize/dashouguize.json
@@ -0,0 +1,11 @@
+{
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    },
+    "navigationBarTitleText": "用户规则",
+    "navigationBarBackgroundColor": "#ffffff",
+    "navigationBarTextStyle": "black",
+    "backgroundColor": "#ffffff",
+    "enablePullDownRefresh": false,
+    "backgroundTextStyle": "dark"
+  }
\ No newline at end of file
diff --git a/pages/dashouguize/dashouguize.wxml b/pages/dashouguize/dashouguize.wxml
new file mode 100644
index 0000000..5b0e643
--- /dev/null
+++ b/pages/dashouguize/dashouguize.wxml
@@ -0,0 +1,12 @@
+
+<view class="container" style="height:{{containerHeight}}px">
+  <image 
+    src="{{ imageUrl }}" 
+    mode="widthFix" 
+    class="rule-image"
+    bindload="onImageLoad"
+    binderror="onImageError"
+    style="width:100%;height:auto"
+  ></image>
+</view>
+<global-notification id="global-notification" />
diff --git a/pages/dashouguize/dashouguize.wxss b/pages/dashouguize/dashouguize.wxss
new file mode 100644
index 0000000..f72837c
--- /dev/null
+++ b/pages/dashouguize/dashouguize.wxss
@@ -0,0 +1,15 @@
+/* 页面容器 */
+.container {
+    width: 100%;
+    position: relative;
+    overflow-y: auto;
+    background-color: #ffffff;
+  }
+  
+  /* 规则图片样式 - 绝对定位，从顶部开始 */
+  .rule-image {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: block;
+  }
\ No newline at end of file
diff --git a/pages/dashoupaihang/dashoupaihang.js b/pages/dashoupaihang/dashoupaihang.js
new file mode 100644
index 0000000..733ff73
--- /dev/null
+++ b/pages/dashoupaihang/dashoupaihang.js
@@ -0,0 +1,395 @@
+const app = getApp()
+import request from '../../utils/request.js'
+
+Page({
+  data: {
+    // 页面加载状态
+    jiazaiZhuangtai: true,
+    
+    // 排行榜类型：1=今日收入，2=今月收入
+    paihangLeixing: 1,
+    
+    // 榜单数据
+    paihangShuju: [],
+    
+    // 是否展示真实数据（后端控制）
+    xianshiZhenshiShuju: false,
+    
+    // 虚拟数据（用于当后端不允许展示时）
+    xuniShuju: [],
+    
+    // 按钮防抖控制
+    btnFangdou: false,
+    
+    // OSS图片基础URL（从全局变量获取）
+    ossImageUrl: '',
+    
+    // 默认头像（相对路径，需要与OSS基础URL拼接）
+    morentouxiang: '',
+    
+    // 用户类型：1=打手，2=管事，3=商家（当前页面固定为打手）
+    yonghuLeixing: 1,
+    
+    // 前三名特殊数据
+    qiansanMing: [],
+    
+    // 动画相关
+    crownScale: 1,
+    crownAnimation: null,
+    
+    // 卡片点击特效
+    flashCardIndex: -1,
+    flashCardType: '',
+    flashAnimation: null,
+    
+    // 切换按钮选中状态
+    switchBgPosition: 0
+  },
+
+  onLoad() {
+    // 设置页面标题
+    wx.setNavigationBarTitle({
+      title: '大神排行榜'
+    })
+    
+    // 初始化全局变量
+    this.setData({
+      ossImageUrl: app.globalData.ossImageUrl || '',
+      morentouxiang: app.globalData.morentouxiang || ''
+    })
+    
+    // 初始化虚拟数据
+    this.initXuniShuju()
+    
+    // 加载排行榜数据
+    this.huoquPaihangShuju()
+    
+    // 开始皇冠动画
+    this.startCrownAnimation()
+  },
+
+  onShow() {
+    // 页面显示时恢复动画
+    this.registerNotificationComponent();
+    this.startCrownAnimation()
+  },
+  // 🆕 新增：注册通知组件
+    registerNotificationComponent() {
+        const app = getApp();
+        const notificationComp = this.selectComponent('#global-notification');
+        
+        if (notificationComp && notificationComp.showNotification) {
+            console.log('🏪 商城页面注册通知组件');
+            app.globalData.globalNotification = {
+                show: (data) => notificationComp.showNotification(data),
+                hide: () => notificationComp.hideNotification()
+            };
+        }
+    },
+
+  onHide() {
+    // 页面隐藏时停止动画
+    this.stopCrownAnimation()
+  },
+
+  onUnload() {
+    // 页面卸载时停止动画
+    this.stopCrownAnimation()
+  },
+
+  // 初始化虚拟数据
+  initXuniShuju() {
+    const xuniShuju = []
+    const names = ['赛博幽灵', '数据猎手', '代码武士', '算法骑士', '二进制游侠', 
+                   '矩阵先知', '网络行者', '云端刺客', '量子武士', '像素狂徒']
+    
+    for (let i = 0; i < 10; i++) {
+      xuniShuju.push({
+        mingci: i + 1,
+        touxiang: '',
+        nicheng: names[i] || `虚拟玩家${i + 1}`,
+        uid: `V${100000 + i}`,
+        jine: (1888.88 - i * 150).toFixed(2),
+        jineClass: 'normal'  // 金额样式
+      })
+    }
+    this.setData({ xuniShuju })
+  },
+
+  // 开始皇冠动画（缩放效果）
+  startCrownAnimation() {
+    this.stopCrownAnimation()
+    
+    const animation = wx.createAnimation({
+      duration: 800,
+      timingFunction: 'ease-in-out'
+    })
+    
+    let scale = 1
+    const animate = () => {
+      scale = scale === 1 ? 1.15 : 1
+      
+      animation.scale(scale).step({
+        duration: 800,
+        timingFunction: 'ease-in-out'
+      })
+      
+      this.setData({
+        crownAnimation: animation.export()
+      })
+      
+      this.data.crownAnimationTimer = setTimeout(() => {
+        animate()
+      }, 800)
+    }
+    
+    animate()
+  },
+
+  // 停止皇冠动画
+  stopCrownAnimation() {
+    if (this.data.crownAnimationTimer) {
+      clearTimeout(this.data.crownAnimationTimer)
+      this.setData({
+        crownAnimationTimer: null
+      })
+    }
+  },
+
+  // 卡片点击特效
+  handleCardTap(e) {
+    const index = e.currentTarget.dataset.index
+    const type = e.currentTarget.dataset.type // 'top3' 或 'normal'
+    
+    // 创建闪光动画
+    const animation = wx.createAnimation({
+      duration: 300,
+      timingFunction: 'ease-out'
+    })
+    
+    // 快速闪光效果
+    animation.opacity(0.9).step({
+      duration: 50,
+      timingFunction: 'linear'
+    })
+    
+    animation.opacity(1).step({
+      duration: 250,
+      timingFunction: 'ease-out'
+    })
+    
+    this.setData({
+      flashCardIndex: index,
+      flashCardType: type,
+      flashAnimation: animation.export()
+    })
+    
+    // 300ms后重置闪光状态
+    setTimeout(() => {
+      this.setData({
+        flashCardIndex: -1,
+        flashCardType: ''
+      })
+    }, 300)
+  },
+
+  // 获取排行榜数据
+  async huoquPaihangShuju() {
+    this.setData({
+      jiazaiZhuangtai: true
+    })
+    
+    try {
+      // 准备请求参数
+      const requestData = {
+        leixing: this.data.paihangLeixing,
+        yonghu_leixing: this.data.yonghuLeixing
+      }
+      
+      // 使用封装的request发送请求
+      const res = await request({
+        url: '/peizhi/dsph',
+        method: 'POST',
+        data: requestData,
+        header: {
+          'content-type': 'application/json'
+        }
+      })
+      
+      // 处理返回数据
+      if (res && res.data && res.data.code === 0) {
+        const responseData = res.data.data
+        
+        // 检查后端是否允许展示
+        if (responseData.xianshi && responseData.paihang_list && responseData.paihang_list.length > 0) {
+          // 处理头像URL拼接和金额样式
+          const processedList = this.processData(responseData.paihang_list)
+          
+          // 提取前三名特殊展示
+          const qiansanMing = processedList.slice(0, 3)
+          const qitaPaihang = processedList.slice(3)
+          
+          this.setData({
+            paihangShuju: qitaPaihang,
+            qiansanMing: qiansanMing,
+            xianshiZhenshiShuju: true,
+            jiazaiZhuangtai: false
+          })
+        } else {
+          // 后端不允许展示或数据不足，显示虚拟数据
+          this.xianshiXuniShuju()
+        }
+      } else {
+        // 请求失败，显示虚拟数据
+        const errorMsg = res && res.data ? (res.data.msg || '获取数据失败') : '网络请求失败'
+        
+        wx.showToast({
+          title: errorMsg,
+          icon: 'none',
+          duration: 2000
+        })
+        
+        this.xianshiXuniShuju()
+      }
+    } catch (error) {
+      console.error('获取排行榜数据失败:', error)
+      
+      wx.showToast({
+        title: '网络请求异常，请重试',
+        icon: 'none',
+        duration: 2000
+      })
+      
+      this.xianshiXuniShuju()
+    }
+  },
+
+  // 处理数据（头像拼接和金额样式）
+  processData(list) {
+    const { ossImageUrl, morentouxiang } = this.data
+    
+    return list.map(item => {
+      // 优先使用返回的头像URL
+      let finalTouxiang = item.touxiang
+      
+      // 如果返回的头像为空，使用默认头像
+      if (!finalTouxiang && morentouxiang) {
+        finalTouxiang = morentouxiang
+      }
+      
+      // 拼接完整的URL
+      let fullTouxiangUrl = ''
+      if (finalTouxiang && ossImageUrl) {
+        // 确保路径不以斜杠开头
+        let touxiangPath = finalTouxiang
+        if (touxiangPath.startsWith('/')) {
+          touxiangPath = touxiangPath.substring(1)
+        }
+        fullTouxiangUrl = ossImageUrl + touxiangPath
+      }
+      
+      // 处理金额样式
+      const jine = parseFloat(item.jine || 0)
+      let jineClass = 'normal'
+      const jineStr = jine.toFixed(2)
+      
+      // 判断金额位数
+      const integerPart = jineStr.split('.')[0]
+      if (integerPart.length >= 7) {  // 7位数及以上
+        jineClass = 'very-small'
+      } else if (integerPart.length >= 6) {  // 6位数
+        jineClass = 'small'
+      } else if (integerPart.length >= 5) {  // 5位数
+        jineClass = 'medium'
+      }
+      
+      return {
+        ...item,
+        full_touxiang: fullTouxiangUrl,
+        jine: jineStr,
+        jineClass: jineClass
+      }
+    })
+  },
+
+  // 显示虚拟数据
+  xianshiXuniShuju() {
+    const processedList = this.processData(this.data.xuniShuju)
+    const qiansanMing = processedList.slice(0, 3)
+    const qitaPaihang = processedList.slice(3)
+    
+    this.setData({
+      paihangShuju: qitaPaihang,
+      qiansanMing: qiansanMing,
+      xianshiZhenshiShuju: false,
+      jiazaiZhuangtai: false
+    })
+  },
+
+  // 切换排行榜类型（今日/今月）
+  qiehuangPaihangLeixing(e) {
+    // 防抖处理：防止连续点击
+    if (this.data.btnFangdou) return
+    
+    const leixing = e.currentTarget.dataset.leixing
+    if (leixing == this.data.paihangLeixing) return
+    
+    // 设置防抖状态
+    this.setData({
+      btnFangdou: true
+    })
+    
+    // 更新切换按钮位置
+    this.setData({
+      paihangLeixing: leixing,
+      switchBgPosition: leixing == 1 ? 0 : 1
+    })
+    
+    // 重新加载数据
+    this.huoquPaihangShuju()
+    
+    // 1秒后解除防抖
+    setTimeout(() => {
+      this.setData({
+        btnFangdou: false
+      })
+    }, 1000)
+  },
+
+  // 用户下拉刷新
+  onPullDownRefresh() {
+    this.huoquPaihangShuju()
+    wx.stopPullDownRefresh()
+  },
+
+  // 图片加载失败处理
+  tupianJiazaiShibai(e) {
+    const index = e.currentTarget.dataset.index
+    const type = e.currentTarget.dataset.type // 'top3' 或 'normal'
+    
+    // 使用默认头像
+    const { ossImageUrl, morentouxiang } = this.data
+    let defaultUrl = ''
+    if (morentouxiang && ossImageUrl) {
+      let defaultPath = morentouxiang
+      if (defaultPath.startsWith('/')) {
+        defaultPath = defaultPath.substring(1)
+      }
+      defaultUrl = ossImageUrl + defaultPath
+    }
+    
+    if (type === 'top3') {
+      // 前三名头像加载失败
+      const key = `qiansanMing[${index}].full_touxiang`
+      this.setData({
+        [key]: defaultUrl
+      })
+    } else {
+      // 普通排名头像加载失败
+      const key = `paihangShuju[${index}].full_touxiang`
+      this.setData({
+        [key]: defaultUrl
+      })
+    }
+  }
+})
\ No newline at end of file
diff --git a/pages/dashoupaihang/dashoupaihang.json b/pages/dashoupaihang/dashoupaihang.json
new file mode 100644
index 0000000..6918d46
--- /dev/null
+++ b/pages/dashoupaihang/dashoupaihang.json
@@ -0,0 +1,12 @@
+{
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    },
+    "navigationBarTitleText": "大神排行榜",
+    "navigationBarBackgroundColor": "#000000",
+    "navigationBarTextStyle": "white",
+    "enablePullDownRefresh": false,
+    "backgroundColor": "#000000",
+    "backgroundTextStyle": "dark",
+    "onReachBottomDistance": 50
+  }
\ No newline at end of file
diff --git a/pages/dashoupaihang/dashoupaihang.wxml b/pages/dashoupaihang/dashoupaihang.wxml
new file mode 100644
index 0000000..9a0f1f8
--- /dev/null
+++ b/pages/dashoupaihang/dashoupaihang.wxml
@@ -0,0 +1,289 @@
+
+<view class="dashou-paihang-page">
+  
+  
+  <view class="cyber-bg">
+    
+    <view class="cyber-grid"></view>
+    
+    <view class="cyber-scanline"></view>
+    
+    <view class="data-streams">
+      <view class="stream stream-1"></view>
+      <view class="stream stream-2"></view>
+      <view class="stream stream-3"></view>
+    </view>
+    
+    <view class="floating-particles">
+      <view class="particle" wx:for="{{12}}" wx:key="index"></view>
+    </view>
+  </view>
+  
+  
+  <view class="page-header">
+    
+    <view class="title-container">
+      <text class="main-title">大神排行榜</text>
+      <view class="title-line"></view>
+      <text class="sub-title">DASHOU RANKING</text>
+    </view>
+    
+    
+    <view class="toggle-container">
+      <view class="toggle-bg" style="transform: translateX({{paihangLeixing == 1 ? '0' : '100%'}});"></view>
+      <view 
+        class="toggle-btn {{paihangLeixing == 1 ? 'active' : ''}} {{btnFangdou ? 'disabled' : ''}}"
+        data-leixing="1"
+        bindtap="qiehuangPaihangLeixing"
+      >
+        <text class="toggle-text">今日收入</text>
+        <view class="toggle-line {{paihangLeixing == 1 ? 'active' : ''}}"></view>
+      </view>
+      <view 
+        class="toggle-btn {{paihangLeixing == 2 ? 'active' : ''}} {{btnFangdou ? 'disabled' : ''}}"
+        data-leixing="2"
+        bindtap="qiehuangPaihangLeixing"
+      >
+        <text class="toggle-text">今月收入</text>
+        <view class="toggle-line {{paihangLeixing == 2 ? 'active' : ''}}"></view>
+      </view>
+    </view>
+  </view>
+  
+  
+  <view wx:if="{{jiazaiZhuangtai}}" class="loading-state">
+    <view class="loading-content">
+      <view class="loading-spinner">
+        <view class="spinner-outer"></view>
+        <view class="spinner-inner"></view>
+        <view class="spinner-core"></view>
+      </view>
+      <text class="loading-text">数据加载中</text>
+      <text class="loading-sub">Connecting to server...</text>
+    </view>
+  </view>
+  
+  
+  <view wx:else class="ranking-content">
+    
+    
+    <view wx:if="{{!xianshiZhenshiShuju}}" class="demo-notice">
+      <view class="notice-icon">📡</view>
+      <view class="notice-content">
+        <text class="notice-title">排行榜数据准备中</text>
+        <text class="notice-desc">当前显示为模拟数据，实时排名即将开放</text>
+      </view>
+      <view class="notice-glow"></view>
+    </view>
+    
+    
+    <view class="top-three-section" wx:if="{{qiansanMing.length > 0}}">
+      
+      
+      <view class="rank-card rank-2 {{flashCardIndex == 1 && flashCardType == 'top3' ? 'flash' : ''}}"
+            animation="{{flashCardIndex == 1 && flashCardType == 'top3' ? flashAnimation : ''}}"
+            data-index="1" data-type="top3" bindtap="handleCardTap">
+        
+        <view class="podium-base podium-silver">
+          <view class="podium-glow"></view>
+          <text class="podium-number">2</text>
+        </view>
+        
+        <view class="rank-content">
+          
+          <view class="avatar-frame frame-silver">
+            <view class="avatar-container">
+              <image class="avatar-image" src="{{qiansanMing[1] ? qiansanMing[1].full_touxiang : ''}}" mode="aspectFill" binderror="tupianJiazaiShibai"></image>
+              <view class="avatar-halo halo-silver"></view>
+              <view class="avatar-sparkles">
+                <view class="sparkle s1"></view>
+                <view class="sparkle s2"></view>
+                <view class="sparkle s3"></view>
+              </view>
+            </view>
+            <view class="rank-badge badge-silver">2</view>
+          </view>
+          
+          
+          <view class="user-info-card">
+            <view class="info-header">
+              <text class="user-name">{{qiansanMing[1] ? qiansanMing[1].nicheng : '等待上榜'}}</text>
+            </view>
+            <view class="info-body">
+              <view class="uid-row">
+                <text class="uid-label">ID:</text>
+                <text class="uid-value">{{qiansanMing[1] ? qiansanMing[1].uid : '----'}}</text>
+              </view>
+              <view class="income-row">
+                <text class="income-label">收入:</text>
+                <view class="income-value">
+                  <text class="currency">¥</text>
+                  <text class="amount {{qiansanMing[1] ? qiansanMing[1].jineClass : ''}}">{{qiansanMing[1] ? qiansanMing[1].jine : '0.00'}}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      
+      
+      <view class="rank-card rank-1 {{flashCardIndex == 0 && flashCardType == 'top3' ? 'flash' : ''}}"
+            animation="{{flashCardIndex == 0 && flashCardType == 'top3' ? flashAnimation : ''}}"
+            data-index="0" data-type="top3" bindtap="handleCardTap">
+        
+        
+        <view class="crown-container" animation="{{crownAnimation}}">
+          <view class="crown">
+            <text class="crown-icon">👑</text>
+            <view class="crown-rays">
+              <view class="ray ray-1"></view>
+              <view class="ray ray-2"></view>
+              <view class="ray ray-3"></view>
+              <view class="ray ray-4"></view>
+              <view class="ray ray-5"></view>
+              <view class="ray ray-6"></view>
+            </view>
+            <view class="crown-glow"></view>
+          </view>
+        </view>
+        
+        <view class="podium-base podium-gold">
+          <view class="podium-glow"></view>
+          <text class="podium-number">1</text>
+        </view>
+        
+        <view class="rank-content">
+          
+          <view class="avatar-frame frame-gold">
+            <view class="avatar-container">
+              <image class="avatar-image" src="{{qiansanMing[0] ? qiansanMing[0].full_touxiang : ''}}" mode="aspectFill" binderror="tupianJiazaiShibai"></image>
+              <view class="avatar-halo halo-gold"></view>
+              <view class="avatar-sparkles">
+                <view class="sparkle s1"></view>
+                <view class="sparkle s2"></view>
+                <view class="sparkle s3"></view>
+                <view class="sparkle s4"></view>
+              </view>
+            </view>
+            <view class="rank-badge badge-gold">1</view>
+          </view>
+          
+          
+          <view class="user-info-card">
+            <view class="info-header">
+              <text class="user-name">{{qiansanMing[0] ? qiansanMing[0].nicheng : '等待上榜'}}</text>
+            </view>
+            <view class="info-body">
+              <view class="uid-row">
+                <text class="uid-label">ID:</text>
+                <text class="uid-value">{{qiansanMing[0] ? qiansanMing[0].uid : '----'}}</text>
+              </view>
+              <view class="income-row">
+                <text class="income-label">收入:</text>
+                <view class="income-value">
+                  <text class="currency">¥</text>
+                  <text class="amount {{qiansanMing[0] ? qiansanMing[0].jineClass : ''}}">{{qiansanMing[0] ? qiansanMing[0].jine : '0.00'}}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      
+      
+      <view class="rank-card rank-3 {{flashCardIndex == 2 && flashCardType == 'top3' ? 'flash' : ''}}"
+            animation="{{flashCardIndex == 2 && flashCardType == 'top3' ? flashAnimation : ''}}"
+            data-index="2" data-type="top3" bindtap="handleCardTap">
+        
+        <view class="podium-base podium-bronze">
+          <view class="podium-glow"></view>
+          <text class="podium-number">3</text>
+        </view>
+        
+        <view class="rank-content">
+          
+          <view class="avatar-frame frame-bronze">
+            <view class="avatar-container">
+              <image class="avatar-image" src="{{qiansanMing[2] ? qiansanMing[2].full_touxiang : ''}}" mode="aspectFill" binderror="tupianJiazaiShibai"></image>
+              <view class="avatar-halo halo-bronze"></view>
+              <view class="avatar-sparkles">
+                <view class="sparkle s1"></view>
+                <view class="sparkle s2"></view>
+                <view class="sparkle s3"></view>
+              </view>
+            </view>
+            <view class="rank-badge badge-bronze">3</view>
+          </view>
+          
+          
+          <view class="user-info-card">
+            <view class="info-header">
+              <text class="user-name">{{qiansanMing[2] ? qiansanMing[2].nicheng : '等待上榜'}}</text>
+            </view>
+            <view class="info-body">
+              <view class="uid-row">
+                <text class="uid-label">ID:</text>
+                <text class="uid-value">{{qiansanMing[2] ? qiansanMing[2].uid : '----'}}</text>
+              </view>
+              <view class="income-row">
+                <text class="income-label">收入:</text>
+                <view class="income-value">
+                  <text class="currency">¥</text>
+                  <text class="amount {{qiansanMing[2] ? qiansanMing[2].jineClass : ''}}">{{qiansanMing[2] ? qiansanMing[2].jine : '0.00'}}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    
+    
+    <view class="other-ranks-section" wx:if="{{paihangShuju.length > 0}}">
+      <view class="section-title">
+        <view class="title-line"></view>
+        <text class="title-text">其他排名</text>
+        <view class="title-line"></view>
+      </view>
+      
+      <view class="rank-list">
+        <view class="rank-item {{flashCardIndex == index && flashCardType == 'normal' ? 'flash' : ''}}"
+              wx:for="{{paihangShuju}}" wx:key="index"
+              animation="{{flashCardIndex == index && flashCardType == 'normal' ? flashAnimation : ''}}"
+              data-index="{{index}}" data-type="normal" bindtap="handleCardTap">
+          
+          <view class="rank-number">
+            <text class="number-text">{{xianshiZhenshiShuju ? index + 4 : index + 1}}</text>
+            <view class="number-glow"></view>
+          </view>
+          
+          <view class="rank-avatar">
+            <image class="rank-avatar-img" src="{{item.full_touxiang}}" mode="aspectFill" binderror="tupianJiazaiShibai"></image>
+            <view class="rank-avatar-halo"></view>
+          </view>
+          
+          <view class="rank-info">
+            <text class="rank-name">{{item.nicheng}}</text>
+            <text class="rank-uid">UID: {{item.uid}}</text>
+          </view>
+          
+          <view class="rank-income">
+            <text class="income-currency">¥</text>
+            <text class="income-amount {{item.jineClass}}">{{item.jine}}</text>
+            <view class="income-glow"></view>
+          </view>
+          
+          <view class="rank-hover"></view>
+        </view>
+      </view>
+    </view>
+    
+    
+    <view wx:if="{{xianshiZhenshiShuju && paihangShuju.length === 0 && qiansanMing.length === 0}}" class="empty-state">
+      <view class="empty-icon">🏆</view>
+      <text class="empty-title">暂无排名数据</text>
+      <text class="empty-desc">成为第一个登榜的大手吧</text>
+    </view>
+  </view>
+</view>
+<global-notification id="global-notification" />
diff --git a/pages/dashoupaihang/dashoupaihang.wxss b/pages/dashoupaihang/dashoupaihang.wxss
new file mode 100644
index 0000000..af885db
--- /dev/null
+++ b/pages/dashoupaihang/dashoupaihang.wxss
@@ -0,0 +1,1403 @@
+/* pages/dashou-paihang/dashou-paihang.wxss */
+
+/* ========== 基础页面样式 ========== */
+.dashou-paihang-page {
+    min-height: 100vh;
+    background: #000;
+    color: #fff;
+    position: relative;
+    overflow-x: hidden;
+    padding: 40rpx 30rpx;
+    box-sizing: border-box;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif;
+  }
+  
+  /* ========== 赛博朋克背景 ========== */
+  .cyber-bg {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1;
+    pointer-events: none;
+  }
+  
+  .cyber-grid {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-image: 
+      linear-gradient(rgba(0, 255, 255, 0.05) 1px, transparent 1px),
+      linear-gradient(90deg, rgba(0, 255, 255, 0.05) 1px, transparent 1px);
+    background-size: 50rpx 50rpx;
+    opacity: 0.3;
+  }
+  
+  .cyber-scanline {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 3rpx;
+    background: linear-gradient(90deg, 
+      transparent 0%, 
+      #00ffff 30%, 
+      #ff00ff 50%, 
+      #00ffff 70%, 
+      transparent 100%);
+    animation: scanline 3s linear infinite;
+    filter: blur(1rpx);
+    box-shadow: 0 0 20rpx #00ffff;
+    z-index: 2;
+  }
+  
+  @keyframes scanline {
+    0% { top: 0; }
+    100% { top: 100%; }
+  }
+  
+  .data-streams {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    overflow: hidden;
+  }
+  
+  .stream {
+    position: absolute;
+    width: 1rpx;
+    height: 100rpx;
+    background: linear-gradient(to bottom, transparent, #00ffff, transparent);
+    filter: blur(0.5rpx);
+    animation: streamFlow 8s linear infinite;
+  }
+  
+  .stream-1 {
+    left: 20%;
+    animation-delay: 0s;
+  }
+  
+  .stream-2 {
+    left: 50%;
+    animation-delay: 2s;
+  }
+  
+  .stream-3 {
+    left: 80%;
+    animation-delay: 4s;
+  }
+  
+  @keyframes streamFlow {
+    0% {
+      top: -100rpx;
+      opacity: 0;
+    }
+    10% {
+      opacity: 1;
+    }
+    90% {
+      opacity: 1;
+    }
+    100% {
+      top: 100%;
+      opacity: 0;
+    }
+  }
+  
+  .floating-particles {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+  }
+  
+  .particle {
+    position: absolute;
+    width: 6rpx;
+    height: 6rpx;
+    background: #00ffff;
+    border-radius: 50%;
+    filter: blur(1rpx);
+    box-shadow: 0 0 10rpx #00ffff;
+    animation: particleFloat 20s infinite linear;
+  }
+  
+  .particle:nth-child(odd) {
+    background: #ff00ff;
+    box-shadow: 0 0 10rpx #ff00ff;
+  }
+  
+  @keyframes particleFloat {
+    0%, 100% {
+      transform: translate(0, 0);
+    }
+    25% {
+      transform: translate(100rpx, -100rpx);
+    }
+    50% {
+      transform: translate(-50rpx, 150rpx);
+    }
+    75% {
+      transform: translate(150rpx, 50rpx);
+    }
+  }
+  
+  /* ========== 页面头部 ========== */
+  .page-header {
+    position: relative;
+    z-index: 10;
+    margin-bottom: 60rpx;
+  }
+  
+  .title-container {
+    text-align: center;
+    margin-bottom: 50rpx;
+  }
+  
+  .main-title {
+    display: block;
+    font-size: 60rpx;
+    font-weight: 900;
+    background: linear-gradient(90deg, #00ffff, #ff00ff, #ffff00);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    text-shadow: 0 0 30rpx rgba(0, 255, 255, 0.5);
+    letter-spacing: 4rpx;
+    margin-bottom: 10rpx;
+  }
+  
+  .title-line {
+    width: 200rpx;
+    height: 3rpx;
+    background: linear-gradient(90deg, transparent, #00ffff, #ff00ff, transparent);
+    margin: 15rpx auto;
+    position: relative;
+  }
+  
+  .title-line::before {
+    content: '';
+    position: absolute;
+    top: -2rpx;
+    left: 0;
+    right: 0;
+    height: 7rpx;
+    background: linear-gradient(90deg, 
+      transparent 0%, 
+      rgba(0, 255, 255, 0.3) 20%, 
+      rgba(255, 0, 255, 0.3) 80%, 
+      transparent 100%);
+    filter: blur(4rpx);
+  }
+  
+  .sub-title {
+    display: block;
+    font-size: 24rpx;
+    color: rgba(255, 255, 255, 0.6);
+    letter-spacing: 8rpx;
+    text-transform: uppercase;
+  }
+  
+  .toggle-container {
+    display: flex;
+    background: rgba(10, 10, 30, 0.8);
+    border-radius: 60rpx;
+    padding: 6rpx;
+    position: relative;
+    border: 1rpx solid rgba(0, 255, 255, 0.2);
+    backdrop-filter: blur(20rpx);
+    max-width: 400rpx;
+    margin: 0 auto;
+    box-shadow: 
+      0 10rpx 40rpx rgba(0, 0, 0, 0.8),
+      inset 0 0 20rpx rgba(0, 255, 255, 0.05);
+  }
+  
+  .toggle-bg {
+    position: absolute;
+    top: 6rpx;
+    bottom: 6rpx;
+    width: 50%;
+    background: linear-gradient(90deg, 
+      rgba(0, 255, 255, 0.15), 
+      rgba(255, 0, 255, 0.15));
+    border-radius: 54rpx;
+    transition: transform 0.4s cubic-bezier(0.68, -0.55, 0.265, 1.55);
+    z-index: 1;
+  }
+  
+  .toggle-btn {
+    flex: 1;
+    text-align: center;
+    padding: 28rpx 0;
+    font-size: 30rpx;
+    font-weight: 600;
+    color: rgba(255, 255, 255, 0.7);
+    position: relative;
+    z-index: 2;
+    transition: all 0.3s ease;
+    border-radius: 54rpx;
+  }
+  
+  .toggle-btn.active {
+    color: #ffffff;
+    text-shadow: 0 0 15rpx rgba(255, 255, 255, 0.5);
+  }
+  
+  .toggle-btn.disabled {
+    opacity: 0.5;
+    pointer-events: none;
+  }
+  
+  .toggle-text {
+    position: relative;
+    z-index: 1;
+  }
+  
+  .toggle-line {
+    position: absolute;
+    bottom: 15rpx;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 40rpx;
+    height: 3rpx;
+    background: linear-gradient(90deg, #00ffff, #ff00ff);
+    border-radius: 2rpx;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+  }
+  
+  .toggle-line.active {
+    opacity: 1;
+    box-shadow: 0 0 15rpx rgba(0, 255, 255, 0.5);
+  }
+  
+  /* ========== 加载状态 ========== */
+  .loading-state {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 60vh;
+    position: relative;
+    z-index: 10;
+  }
+  
+  .loading-content {
+    text-align: center;
+  }
+  
+  .loading-spinner {
+    position: relative;
+    width: 120rpx;
+    height: 120rpx;
+    margin: 0 auto 30rpx;
+  }
+  
+  .spinner-outer {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    border: 8rpx solid transparent;
+    border-top-color: #00ffff;
+    border-right-color: #ff00ff;
+    border-radius: 50%;
+    animation: spinOuter 2s linear infinite;
+  }
+  
+  .spinner-inner {
+    position: absolute;
+    top: 15rpx;
+    left: 15rpx;
+    right: 15rpx;
+    bottom: 15rpx;
+    border: 6rpx solid transparent;
+    border-bottom-color: #ffff00;
+    border-left-color: #00ffff;
+    border-radius: 50%;
+    animation: spinInner 1.5s linear infinite reverse;
+  }
+  
+  .spinner-core {
+    position: absolute;
+    top: 30rpx;
+    left: 30rpx;
+    right: 30rpx;
+    bottom: 30rpx;
+    background: radial-gradient(circle, 
+      rgba(0, 255, 255, 0.2) 0%, 
+      rgba(255, 0, 255, 0.1) 50%, 
+      transparent 100%);
+    border-radius: 50%;
+  }
+  
+  @keyframes spinOuter {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+  }
+  
+  @keyframes spinInner {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(-360deg); }
+  }
+  
+  .loading-text {
+    display: block;
+    font-size: 32rpx;
+    color: #00ffff;
+    margin-bottom: 10rpx;
+    text-shadow: 0 0 10rpx rgba(0, 255, 255, 0.5);
+  }
+  
+  .loading-sub {
+    display: block;
+    font-size: 24rpx;
+    color: rgba(255, 255, 255, 0.6);
+  }
+  
+  /* ========== 虚拟数据提示 ========== */
+  .demo-notice {
+    background: rgba(15, 15, 35, 0.9);
+    border-radius: 25rpx;
+    padding: 30rpx;
+    margin-bottom: 40rpx;
+    position: relative;
+    z-index: 10;
+    border: 1rpx solid rgba(255, 0, 255, 0.3);
+    backdrop-filter: blur(20rpx);
+    display: flex;
+    align-items: center;
+    overflow: hidden;
+    box-shadow: 
+      0 10rpx 40rpx rgba(0, 0, 0, 0.8),
+      0 0 30rpx rgba(255, 0, 255, 0.2);
+  }
+  
+  .notice-icon {
+    font-size: 60rpx;
+    margin-right: 30rpx;
+    background: linear-gradient(45deg, #ff00ff, #00ffff);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    flex-shrink: 0;
+  }
+  
+  .notice-content {
+    flex: 1;
+  }
+  
+  .notice-title {
+    display: block;
+    font-size: 32rpx;
+    font-weight: 700;
+    color: #ff00ff;
+    margin-bottom: 10rpx;
+    text-shadow: 0 0 15rpx rgba(255, 0, 255, 0.5);
+  }
+  
+  .notice-desc {
+    display: block;
+    font-size: 26rpx;
+    color: rgba(255, 255, 255, 0.7);
+    line-height: 1.4;
+  }
+  
+  .notice-glow {
+    position: absolute;
+    top: -100%;
+    left: -100%;
+    right: -100%;
+    bottom: -100%;
+    background: radial-gradient(circle at center, 
+      rgba(255, 0, 255, 0.1) 0%, 
+      transparent 70%);
+    z-index: -1;
+  }
+  
+  /* ========== 前三名区域 ========== */
+  .top-three-section {
+    display: flex;
+    justify-content: center;
+    align-items: flex-end;
+    position: relative;
+    z-index: 10;
+    margin-bottom: 50rpx;
+    gap: 20rpx;
+  }
+  
+  .rank-card {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    transition: all 0.3s ease;
+  }
+  
+  .rank-1 {
+    width: 280rpx;
+    z-index: 30;
+    margin-bottom: 30rpx;
+  }
+  
+  .rank-2 {
+    width: 220rpx;
+    z-index: 20;
+    margin-bottom: 0rpx;
+    margin-right: -20rpx;
+  }
+  
+  .rank-3 {
+    width: 220rpx;
+    z-index: 20;
+    margin-bottom: 0rpx;
+    margin-left: -20rpx;
+  }
+  
+  .rank-card.flash {
+    animation: cardFlash 0.4s ease-out;
+  }
+  
+  @keyframes cardFlash {
+    0% { 
+      filter: brightness(1) drop-shadow(0 0 0 rgba(255, 255, 255, 0));
+    }
+    50% { 
+      filter: brightness(1.4) drop-shadow(0 0 40rpx rgba(255, 255, 255, 0.8));
+    }
+    100% { 
+      filter: brightness(1) drop-shadow(0 0 0 rgba(255, 255, 255, 0));
+    }
+  }
+  
+  /* 奖台底座 */
+  .podium-base {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 60rpx;
+    border-radius: 30rpx 30rpx 0 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 1;
+  }
+  
+  .rank-1 .podium-base {
+    height: 80rpx;
+  }
+  
+  .podium-gold {
+    background: linear-gradient(180deg, 
+      rgba(255, 215, 0, 0.3) 0%, 
+      rgba(255, 215, 0, 0.1) 100%);
+    border: 1rpx solid rgba(255, 215, 0, 0.4);
+  }
+  
+  .podium-silver {
+    background: linear-gradient(180deg, 
+      rgba(192, 192, 192, 0.3) 0%, 
+      rgba(192, 192, 192, 0.1) 100%);
+    border: 1rpx solid rgba(192, 192, 192, 0.4);
+  }
+  
+  .podium-bronze {
+    background: linear-gradient(180deg, 
+      rgba(205, 127, 50, 0.3) 0%, 
+      rgba(205, 127, 50, 0.1) 100%);
+    border: 1rpx solid rgba(205, 127, 50, 0.4);
+  }
+  
+  .podium-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    border-radius: 30rpx 30rpx 0 0;
+    background: radial-gradient(ellipse at center, 
+      rgba(255, 255, 255, 0.2) 0%, 
+      transparent 70%);
+    z-index: -1;
+  }
+  
+  .podium-number {
+    font-size: 32rpx;
+    font-weight: 900;
+    color: rgba(255, 255, 255, 0.9);
+    text-shadow: 0 0 10rpx currentColor;
+  }
+  
+  /* 皇冠 */
+  .crown-container {
+    position: absolute;
+    top: -100rpx;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 120rpx;
+    height: 120rpx;
+    z-index: 40;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .crown {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .crown-icon {
+    font-size: 90rpx;
+    position: relative;
+    z-index: 2;
+    filter: drop-shadow(0 0 10rpx rgba(255, 215, 0, 0.8));
+    animation: crownFloat 3s ease-in-out infinite;
+  }
+  
+  @keyframes crownFloat {
+    0%, 100% { 
+      transform: translateY(0) rotate(0deg);
+      filter: drop-shadow(0 0 10rpx rgba(255, 215, 0, 0.8));
+    }
+    50% { 
+      transform: translateY(-20rpx) rotate(5deg);
+      filter: drop-shadow(0 0 30rpx rgba(255, 215, 0, 1));
+    }
+  }
+  
+  .crown-rays {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 180rpx;
+    height: 180rpx;
+    z-index: 1;
+  }
+  
+  .ray {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 2rpx;
+    height: 80rpx;
+    background: linear-gradient(to top, 
+      transparent, 
+      rgba(255, 215, 0, 0.8), 
+      rgba(255, 215, 0, 1), 
+      rgba(255, 215, 0, 0.8), 
+      transparent);
+    transform-origin: bottom center;
+    filter: blur(1rpx);
+  }
+  
+  .ray-1 { transform: translate(-50%, -100%) rotate(0deg); }
+  .ray-2 { transform: translate(-50%, -100%) rotate(60deg); }
+  .ray-3 { transform: translate(-50%, -100%) rotate(120deg); }
+  .ray-4 { transform: translate(-50%, -100%) rotate(180deg); }
+  .ray-5 { transform: translate(-50%, -100%) rotate(240deg); }
+  .ray-6 { transform: translate(-50%, -100%) rotate(300deg); }
+  
+  .crown-glow {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 200rpx;
+    height: 200rpx;
+    background: radial-gradient(circle, 
+      rgba(255, 215, 0, 0.3) 0%, 
+      rgba(255, 215, 0, 0.1) 40%, 
+      transparent 70%);
+    z-index: 0;
+    animation: glowPulse 2s ease-in-out infinite;
+  }
+  
+  @keyframes glowPulse {
+    0%, 100% { opacity: 0.5; }
+    50% { opacity: 0.8; }
+  }
+  
+  /* 排名内容 */
+  .rank-content {
+    position: relative;
+    width: 100%;
+    z-index: 2;
+  }
+  
+  /* 头像框架 */
+  .avatar-frame {
+    position: relative;
+    width: 160rpx;
+    height: 160rpx;
+    margin: 0 auto 30rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .rank-1 .avatar-frame {
+    width: 200rpx;
+    height: 200rpx;
+  }
+  
+  .frame-gold {
+    filter: drop-shadow(0 0 30rpx rgba(255, 215, 0, 0.5));
+  }
+  
+  .frame-silver {
+    filter: drop-shadow(0 0 25rpx rgba(192, 192, 192, 0.5));
+  }
+  
+  .frame-bronze {
+    filter: drop-shadow(0 0 25rpx rgba(205, 127, 50, 0.5));
+  }
+  
+  .avatar-container {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    overflow: hidden;
+    background: rgba(20, 20, 40, 0.8);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 4rpx solid transparent;
+  }
+  
+  .rank-1 .avatar-container {
+    border-width: 6rpx;
+  }
+  
+  .frame-gold .avatar-container {
+    border-color: rgba(255, 215, 0, 0.3);
+  }
+  
+  .frame-silver .avatar-container {
+    border-color: rgba(192, 192, 192, 0.3);
+  }
+  
+  .frame-bronze .avatar-container {
+    border-color: rgba(205, 127, 50, 0.3);
+  }
+  
+  .avatar-image {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    object-fit: cover;
+    position: relative;
+    z-index: 2;
+  }
+  
+  /* 头像光晕 */
+  .avatar-halo {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    border-radius: 50%;
+    z-index: 1;
+    pointer-events: none;
+    animation: haloRotate 10s linear infinite;
+  }
+  
+  .halo-gold {
+    width: 220rpx;
+    height: 220rpx;
+    background: radial-gradient(circle, 
+      rgba(255, 215, 0, 0.4) 0%, 
+      rgba(255, 215, 0, 0.2) 30%, 
+      transparent 70%);
+  }
+  
+  .rank-1 .halo-gold {
+    width: 260rpx;
+    height: 260rpx;
+  }
+  
+  .halo-silver {
+    width: 200rpx;
+    height: 200rpx;
+    background: radial-gradient(circle, 
+      rgba(192, 192, 192, 0.4) 0%, 
+      rgba(192, 192, 192, 0.2) 30%, 
+      transparent 70%);
+  }
+  
+  .halo-bronze {
+    width: 200rpx;
+    height: 200rpx;
+    background: radial-gradient(circle, 
+      rgba(205, 127, 50, 0.4) 0%, 
+      rgba(205, 127, 50, 0.2) 30%, 
+      transparent 70%);
+  }
+  
+  @keyframes haloRotate {
+    0% { transform: translate(-50%, -50%) rotate(0deg); }
+    100% { transform: translate(-50%, -50%) rotate(360deg); }
+  }
+  
+  /* 头像闪烁粒子 */
+  .avatar-sparkles {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    border-radius: 50%;
+    z-index: 3;
+  }
+  
+  .sparkle {
+    position: absolute;
+    width: 8rpx;
+    height: 8rpx;
+    background: #fff;
+    border-radius: 50%;
+    filter: blur(1rpx);
+    opacity: 0;
+    animation: sparkleTwinkle 3s ease-in-out infinite;
+  }
+  
+  .rank-1 .sparkle {
+    width: 10rpx;
+    height: 10rpx;
+  }
+  
+  .s1 { top: 15%; left: 15%; animation-delay: 0s; }
+  .s2 { top: 25%; right: 25%; animation-delay: 0.5s; }
+  .s3 { bottom: 35%; left: 35%; animation-delay: 1s; }
+  .s4 { bottom: 15%; right: 15%; animation-delay: 1.5s; }
+  
+  @keyframes sparkleTwinkle {
+    0%, 100% { 
+      opacity: 0; 
+      transform: scale(0.5); 
+    }
+    50% { 
+      opacity: 1; 
+      transform: scale(1); 
+    }
+  }
+  
+  /* 排名徽章 */
+  .rank-badge {
+    position: absolute;
+    bottom: -10rpx;
+    right: -10rpx;
+    width: 60rpx;
+    height: 60rpx;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 28rpx;
+    font-weight: 900;
+    color: #fff;
+    z-index: 10;
+    border: 3rpx solid rgba(255, 255, 255, 0.3);
+    box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.5);
+  }
+  
+  .rank-1 .rank-badge {
+    width: 70rpx;
+    height: 70rpx;
+    font-size: 32rpx;
+    bottom: -15rpx;
+    right: -15rpx;
+  }
+  
+  .badge-gold {
+    background: linear-gradient(135deg, #ffd700, #ff9800);
+  }
+  
+  .badge-silver {
+    background: linear-gradient(135deg, #c0c0c0, #808080);
+  }
+  
+  .badge-bronze {
+    background: linear-gradient(135deg, #cd7f32, #a0522d);
+  }
+  
+  /* 用户信息卡片 */
+  .user-info-card {
+    background: rgba(15, 15, 35, 0.95);
+    border-radius: 25rpx;
+    padding: 30rpx 25rpx;
+    backdrop-filter: blur(20rpx);
+    border: 1rpx solid rgba(255, 255, 255, 0.1);
+    box-shadow: 
+      0 20rpx 60rpx rgba(0, 0, 0, 0.8),
+      inset 0 0 30rpx rgba(255, 255, 255, 0.05);
+    position: relative;
+    overflow: hidden;
+  }
+  
+  .rank-1 .user-info-card {
+    border-color: rgba(255, 215, 0, 0.3);
+    background: rgba(20, 15, 5, 0.95);
+  }
+  
+  .rank-2 .user-info-card {
+    border-color: rgba(192, 192, 192, 0.3);
+    background: rgba(25, 25, 35, 0.95);
+  }
+  
+  .rank-3 .user-info-card {
+    border-color: rgba(205, 127, 50, 0.3);
+    background: rgba(30, 20, 10, 0.95);
+  }
+  
+  .info-header {
+    margin-bottom: 20rpx;
+    text-align: center;
+  }
+  
+  .user-name {
+    font-size: 32rpx;
+    font-weight: 700;
+    color: #fff;
+    display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  
+  .rank-1 .user-name {
+    color: #ffd700;
+    text-shadow: 0 0 15rpx rgba(255, 215, 0, 0.7);
+    font-size: 34rpx;
+  }
+  
+  .rank-2 .user-name {
+    color: #c0c0c0;
+    text-shadow: 0 0 10rpx rgba(192, 192, 192, 0.7);
+  }
+  
+  .rank-3 .user-name {
+    color: #cd7f32;
+    text-shadow: 0 0 10rpx rgba(205, 127, 50, 0.7);
+  }
+  
+  .info-body {
+    border-top: 1rpx solid rgba(255, 255, 255, 0.1);
+    padding-top: 15rpx;
+  }
+  
+  .uid-row, .income-row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 12rpx;
+  }
+  
+  .uid-row:last-child, .income-row:last-child {
+    margin-bottom: 0;
+  }
+  
+  .uid-label, .income-label {
+    font-size: 24rpx;
+    color: rgba(255, 255, 255, 0.6);
+  }
+  
+  .uid-value {
+    font-size: 24rpx;
+    color: rgba(255, 255, 255, 0.9);
+    font-family: 'Courier New', monospace;
+  }
+  
+  .income-value {
+    display: flex;
+    align-items: baseline;
+  }
+  
+  .currency {
+    font-size: 26rpx;
+    color: #4ade80;
+    margin-right: 4rpx;
+  }
+  
+  .rank-1 .currency {
+    color: #ffd700;
+  }
+  
+  .rank-2 .currency {
+    color: #c0c0c0;
+  }
+  
+  .rank-3 .currency {
+    color: #cd7f32;
+  }
+  
+  .amount {
+    font-size: 32rpx;
+    font-weight: 700;
+    color: #4ade80;
+    text-shadow: 0 0 10rpx rgba(74, 222, 128, 0.5);
+  }
+  
+  .rank-1 .amount {
+    color: #ffd700;
+    text-shadow: 0 0 15rpx rgba(255, 215, 0, 0.7);
+  }
+  
+  .rank-2 .amount {
+    color: #c0c0c0;
+    text-shadow: 0 0 10rpx rgba(192, 192, 192, 0.7);
+  }
+  
+  .rank-3 .amount {
+    color: #cd7f32;
+    text-shadow: 0 0 10rpx rgba(205, 127, 50, 0.7);
+  }
+  
+  .amount.medium {
+    font-size: 30rpx;
+  }
+  
+  .amount.small {
+    font-size: 28rpx;
+  }
+  
+  .amount.very-small {
+    font-size: 26rpx;
+  }
+  
+  /* ========== 其他排名区域 ========== */
+  .other-ranks-section {
+    position: relative;
+    z-index: 10;
+  }
+  
+  .section-title {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 40rpx;
+  }
+  
+  .title-line {
+    flex: 1;
+    height: 2rpx;
+    background: linear-gradient(90deg, 
+      transparent, 
+      #00ffff, 
+      #ff00ff, 
+      #00ffff, 
+      transparent);
+  }
+  
+  .title-text {
+    font-size: 32rpx;
+    font-weight: 700;
+    color: #00ffff;
+    margin: 0 30rpx;
+    text-shadow: 0 0 15rpx rgba(0, 255, 255, 0.5);
+  }
+  
+  .rank-list {
+    position: relative;
+  }
+  
+  .rank-item {
+    display: flex;
+    align-items: center;
+    background: rgba(20, 20, 40, 0.8);
+    border-radius: 25rpx;
+    padding: 25rpx 30rpx;
+    margin-bottom: 20rpx;
+    border: 1rpx solid rgba(0, 255, 255, 0.1);
+    backdrop-filter: blur(20rpx);
+    position: relative;
+    overflow: hidden;
+    transition: all 0.3s ease;
+    box-shadow: 
+      0 10rpx 40rpx rgba(0, 0, 0, 0.6),
+      inset 0 0 20rpx rgba(0, 255, 255, 0.05);
+  }
+  
+  .rank-item.flash {
+    animation: cardFlash 0.4s ease-out;
+  }
+  
+  .rank-item::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, 
+      transparent, 
+      rgba(0, 255, 255, 0.1), 
+      transparent);
+    transition: left 0.6s ease;
+  }
+  
+  .rank-item:hover::before {
+    left: 100%;
+  }
+  
+  .rank-number {
+    width: 80rpx;
+    text-align: center;
+    position: relative;
+    margin-right: 30rpx;
+    flex-shrink: 0;
+  }
+  
+  .number-text {
+    font-size: 42rpx;
+    font-weight: 900;
+    color: rgba(255, 255, 255, 0.9);
+    position: relative;
+    z-index: 1;
+  }
+  
+  .number-glow {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 80rpx;
+    height: 80rpx;
+    background: radial-gradient(circle, 
+      rgba(0, 255, 255, 0.2) 0%, 
+      transparent 70%);
+    z-index: 0;
+  }
+  
+  .rank-avatar {
+    position: relative;
+    width: 100rpx;
+    height: 100rpx;
+    margin-right: 25rpx;
+    flex-shrink: 0;
+  }
+  
+  .rank-avatar-img {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    object-fit: cover;
+    position: relative;
+    z-index: 2;
+    border: 3rpx solid rgba(0, 255, 255, 0.2);
+  }
+  
+  .rank-avatar-halo {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 120rpx;
+    height: 120rpx;
+    background: radial-gradient(circle, 
+      rgba(0, 255, 255, 0.2) 0%, 
+      rgba(0, 255, 255, 0.1) 30%, 
+      transparent 70%);
+    z-index: 1;
+    border-radius: 50%;
+  }
+  
+  .rank-info {
+    flex: 1;
+    min-width: 0;
+  }
+  
+  .rank-name {
+    display: block;
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #ffffff;
+    margin-bottom: 8rpx;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  
+  .rank-uid {
+    display: block;
+    font-size: 24rpx;
+    color: rgba(255, 255, 255, 0.6);
+    font-family: 'Courier New', monospace;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  
+  .rank-income {
+    position: relative;
+    flex-shrink: 0;
+    display: flex;
+    align-items: baseline;
+    margin-left: 20rpx;
+  }
+  
+  .income-currency {
+    font-size: 28rpx;
+    color: #00ffff;
+    margin-right: 4rpx;
+    opacity: 0.9;
+  }
+  
+  .income-amount {
+    font-size: 36rpx;
+    font-weight: 700;
+    color: #4ade80;
+    text-shadow: 0 0 10rpx rgba(74, 222, 128, 0.5);
+    white-space: nowrap;
+    line-height: 1;
+  }
+  
+  .income-amount.medium {
+    font-size: 34rpx;
+  }
+  
+  .income-amount.small {
+    font-size: 32rpx;
+  }
+  
+  .income-amount.very-small {
+    font-size: 30rpx;
+  }
+  
+  .income-glow {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 140rpx;
+    height: 70rpx;
+    background: radial-gradient(ellipse, 
+      rgba(74, 222, 128, 0.2) 0%, 
+      transparent 70%);
+    z-index: 0;
+  }
+  
+  .rank-hover {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    border-radius: 25rpx;
+    border: 1rpx solid transparent;
+    background: linear-gradient(45deg, 
+      rgba(0, 255, 255, 0.1), 
+      rgba(255, 0, 255, 0.1)) border-box;
+    mask: linear-gradient(#fff 0 0) padding-box, linear-gradient(#fff 0 0);
+    -webkit-mask: linear-gradient(#fff 0 0) padding-box, linear-gradient(#fff 0 0);
+    -webkit-mask-composite: xor;
+    mask-composite: exclude;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+    pointer-events: none;
+  }
+  
+  .rank-item:hover .rank-hover {
+    opacity: 1;
+  }
+  
+  /* ========== 空状态 ========== */
+  .empty-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 120rpx 0;
+    text-align: center;
+    position: relative;
+    z-index: 10;
+  }
+  
+  .empty-icon {
+    font-size: 120rpx;
+    margin-bottom: 30rpx;
+    opacity: 0.5;
+    animation: iconFloat 3s ease-in-out infinite;
+  }
+  
+  @keyframes iconFloat {
+    0%, 100% { transform: translateY(0); }
+    50% { transform: translateY(-30rpx); }
+  }
+  
+  .empty-title {
+    font-size: 36rpx;
+    color: rgba(255, 255, 255, 0.8);
+    margin-bottom: 15rpx;
+  }
+  
+  .empty-desc {
+    font-size: 28rpx;
+    color: rgba(255, 255, 255, 0.5);
+  }
+
+
+
+
+
+
+
+  /* ========== 修改1：皇冠位置调整 ========== */
+/* 方案：让皇冠稍微歪一点，看起来像斜戴着 */
+.crown-container {
+    position: absolute;
+    top: -55rpx;  /* 稍微上移一点 */
+    left: 55%;    /* 不再是50%，向右偏移一点 */
+    transform: translateX(20%) rotate(35deg)!important;  /* 旋转8度，让它歪一点 */
+    width: 110rpx;
+    height: 110rpx;
+    z-index: 40;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .crown-icon {
+    font-size: 85rpx;
+    position: relative;
+    z-index: 2;
+    filter: drop-shadow(0 0 10rpx rgba(255, 215, 0, 0.8));
+    animation: crownFloat 3s ease-in-out infinite;
+    transform: rotate(5deg);  /* 图标本身也稍微旋转 */
+  }
+  
+  /* 调整皇冠浮动动画，让它有轻微的歪斜感 */
+  @keyframes crownFloat {
+    0%, 100% { 
+      transform: translateY(0) rotate(5deg) scale(1);
+      filter: drop-shadow(0 0 10rpx rgba(255, 215, 0, 0.8));
+    }
+    50% { 
+      transform: translateY(-15rpx) rotate(10deg) scale(1.1);  /* 浮起时旋转更多 */
+      filter: drop-shadow(0 0 25rpx rgba(255, 215, 0, 1));
+    }
+  }
+  
+  /* ========== 修改2：切换按钮调整 ========== */
+  /* 调整整个页面头部位置，向上移动 */
+  .page-header {
+    position: relative;
+    z-index: 10;
+    margin-bottom: 55rpx;  /* 减少底部间距，让整体上移 */
+    margin-top: -40rpx;    /* 向上移动10rpx */
+  }
+  
+  /* 调整标题容器位置 */
+  .title-container {
+    text-align: center;
+    margin-bottom: 40rpx;  /* 减少间距 */
+  }
+  
+  /* 调整切换按钮容器宽度和位置 */
+  .toggle-container {
+    display: flex;
+    background: rgba(10, 10, 30, 0.8);
+    border-radius: 60rpx;
+    padding: 6rpx;
+    position: relative;
+    border: 1rpx solid rgba(0, 255, 255, 0.2);
+    backdrop-filter: blur(20rpx);
+    max-width: 700rpx;  /* 增加最大宽度 */
+    width: 90%;         /* 使用百分比宽度，更灵活 */
+    margin: 0 auto;
+    box-shadow: 
+      0 10rpx 40rpx rgba(0, 0, 0, 0.8),
+      inset 0 0 20rpx rgba(0, 255, 255, 0.05);
+  }
+  
+  /* 调整切换按钮内部文字大小和间距 */
+  .toggle-btn {
+    flex: 1;
+    text-align: center;
+    padding: 30rpx 0;  /* 增加垂直内边距 */
+    font-size: 32rpx;  /* 增加字体大小 */
+    font-weight: 600;
+    color: rgba(255, 255, 255, 0.7);
+    position: relative;
+    z-index: 2;
+    transition: all 0.3s ease;
+    border-radius: 54rpx;
+    min-width: 200rpx;  /* 设置最小宽度 */
+  }
+  
+  /* 调整切换背景宽度 */
+  .toggle-bg {
+    position: absolute;
+    top: 6rpx;
+    bottom: 6rpx;
+    width: 50%;
+    background: linear-gradient(90deg, 
+      rgba(0, 255, 255, 0.2),  /* 提高透明度 */
+      rgba(255, 0, 255, 0.2));
+    border-radius: 54rpx;
+    transition: transform 0.4s cubic-bezier(0.68, -0.55, 0.265, 1.55);
+    z-index: 1;
+  }
+  
+  /* 调整主标题位置，也向上移动一点 */
+  .main-title {
+    display: block;
+    font-size: 58rpx;  /* 稍微减小字体，让整体更紧凑 */
+    font-weight: 900;
+    background: linear-gradient(90deg, #00ffff, #ff00ff, #ffff00);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    text-shadow: 0 0 30rpx rgba(0, 255, 255, 0.5);
+    letter-spacing: 4rpx;
+    margin-bottom: 8rpx;  /* 减少底部间距 */
+  }
+  
+  /* 调整标题下划线位置 */
+  .title-line {
+    width: 220rpx;  /* 增加宽度 */
+    height: 3rpx;
+    background: linear-gradient(90deg, transparent, #00ffff, #ff00ff, transparent);
+    margin: 12rpx auto;  /* 减少上下间距 */
+    position: relative;
+  }
+  
+  /* 调整副标题位置 */
+  .sub-title {
+    display: block;
+    font-size: 22rpx;  /* 稍微减小字体 */
+    color: rgba(255, 255, 255, 0.6);
+    letter-spacing: 6rpx;  /* 减少字母间距 */
+    text-transform: uppercase;
+    margin-top: 5rpx;  /* 减少上边距 */
+  }
+  
+  /* 调整整个内容区域的上边距 */
+  .ranking-content {
+    position: relative;
+    z-index: 5;
+    margin-top: 10rpx;  /* 减少上边距 */
+  }
+  
+  /* 调整前三名区域的上边距 */
+  .top-three-section {
+    display: flex;
+    justify-content: center;
+    align-items: flex-end;
+    position: relative;
+    z-index: 10;
+    margin-bottom: 40rpx;  /* 减少底部间距 */
+    gap: 20rpx;
+    margin-top: 10rpx;  /* 减少上边距 */
+  }
\ No newline at end of file
diff --git a/pages/dashouxiaoxi/dashouxiaoxi.js b/pages/dashouxiaoxi/dashouxiaoxi.js
new file mode 100644
index 0000000..3b7e862
--- /dev/null
+++ b/pages/dashouxiaoxi/dashouxiaoxi.js
@@ -0,0 +1,684 @@
+// pages/cfss/cfss.js
+import request from '../../utils/request.js'
+const app = getApp()
+const MEIYE_TIAOSHU = 5
+
+Page({
+  data: {
+    zongshu: 0,
+    daichuli: 0,
+    yichuli: 0,
+    shenfen: 0,
+    chufaList: [],
+    dangqianye: 1,
+    haiyougengduo: true,
+    jiazhaozhong: false,
+    jiazhaigengduo: false,
+    scrollHeight: 0,
+    showXiangqing: false,
+    xuanzhongChufa: {},
+    showShensuModal: false,
+    shensuLiyou: '',
+    shensuTupian: [],
+    shensuTupianUrls: [],
+    shangchuanJindu: 0,
+    shangchuanZongshu: 0,
+    jinduWidth: '0%',
+    isShangchuanzhong: false,
+    ossImageUrl: '',
+    fangdouTimer: null
+  },
+
+  onLoad(options) {
+    this.registerNotificationComponent()
+    this.initOSSUrl()
+    this.jisuanGaodu()
+    this.chushihuaShuju()
+  },
+
+
+
+  
+    
+    
+
+  onShow() {
+    this.registerNotificationComponent()
+  },
+
+  onUnload() {
+    if (this.data.fangdouTimer) clearTimeout(this.data.fangdouTimer)
+  },
+
+  onReachBottom() {
+    this.shanglaShuaxin()
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification')
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      }
+    }
+  },
+
+  initOSSUrl() {
+    const ossImageUrl = app.globalData.ossImageUrl || ''
+    this.setData({ ossImageUrl })
+  },
+
+  jisuanGaodu() {
+    const systemInfo = wx.getSystemInfoSync()
+    const windowHeight = systemInfo.windowHeight
+    const height = windowHeight - 200 - 100 - 40
+    this.setData({
+      scrollHeight: height > 0 ? height : 400
+    })
+  },
+
+  chushihuaShuju() {
+    this.setData({
+      dangqianye: 1,
+      chufaList: [],
+      haiyougengduo: true
+    })
+    this.jiazhuoquTongji()
+    this.jiazhuoquChufaList()
+  },
+
+  async jiazhuoquTongji() {
+    try {
+      const res = await request({
+        url: '/yonghu/dshqcfjl',
+        method: 'POST',
+        data: { qingqiu_tongji: true }
+      })
+      if (res.statusCode === 200 && res.data.code === 0) {
+        const data = res.data.data
+        this.setData({
+          zongshu: data.zongshu || 0,
+          daichuli: data.daichuli || 0,
+          yichuli: data.yichuli || 0
+        })
+      }
+    } catch (error) {
+      console.error('获取统计信息失败:', error)
+    }
+  },
+
+  async jiazhuoquChufaList(isLoadMore = false) {
+    if (this.data.jiazhaozhong || this.data.jiazhaigengduo) return
+    if (isLoadMore) {
+      if (!this.data.haiyougengduo) return
+      this.setData({ jiazhaigengduo: true })
+    } else {
+      this.setData({ jiazhaozhong: true })
+    }
+    
+    try {
+      const params = {
+        page: this.data.dangqianye,
+        page_size: MEIYE_TIAOSHU
+      }
+      if (this.data.shenfen === 0) {
+        params.zhuangtai = 0
+      } else {
+        params.zhuangtai = 1
+      }
+      
+      const res = await request({
+        url: '/yonghu/dshqcfjl',
+        method: 'POST',
+        data: params
+      })
+      
+      //console.log('🔴【后端返回的数据】:', res.data)
+      
+      if (res.statusCode === 200 && res.data.code === 0) {
+        const data = res.data.data
+        
+        if (data.list && Array.isArray(data.list)) {
+          // 🔴【关键修复】在数据加载时就处理好显示字段
+          const processedList = data.list.map(item => {
+            // 处理显示时间
+            let displayTime = '--'
+            if (item.create_time) {
+              if (typeof item.create_time === 'number') {
+                displayTime = String(item.create_time)
+              } else if (typeof item.create_time === 'string') {
+                displayTime = item.create_time
+              } else {
+                displayTime = String(item.create_time)
+              }
+            }
+            
+            // 处理显示状态
+            let displayStatus = '未知状态'
+            let statusClass = 'zhuangtai-weizhi'
+            const statusNum = Number(item.sqzhuangtai)
+            
+            if (!isNaN(statusNum)) {
+              if (statusNum === 0) {
+                displayStatus = '待处罚'
+                statusClass = 'zhuangtai-daichuli'
+              } else if (statusNum === 1) {
+                displayStatus = '已处罚'
+                statusClass = 'zhuangtai-yichufa'
+              } else if (statusNum === 2) {
+                displayStatus = '已驳回'
+                statusClass = 'zhuangtai-yibohui'
+              } else if (statusNum === 3) {
+                displayStatus = '申诉中'
+                statusClass = 'zhuangtai-shensuzhong'
+              }
+            }
+            
+            // 处理图片URL（在数据加载时就拼接完整URL）
+            const fullZhengjuTupian = (item.zhengju_tupian || []).map(url => this.getFullImageUrl(url))
+            const fullShensuTupian = (item.shensu_tupian || []).map(url => this.getFullImageUrl(url))
+            
+            return {
+              ...item,
+              display_time: displayTime, // 🔴 处理好的显示时间
+              display_status: displayStatus, // 🔴 处理好的显示状态
+              status_class: statusClass, // 🔴 处理好的状态样式类
+              zhengju_tupian: item.zhengju_tupian || [],
+              shensu_tupian: item.shensu_tupian || [],
+              full_zhengju_tupian: fullZhengjuTupian, // 🔴 完整图片URL
+              full_shensu_tupian: fullShensuTupian // 🔴 完整图片URL
+            }
+          })
+          
+          //console.log('🔴【处理后的数据】:', processedList)
+          
+          let newList
+          if (isLoadMore) {
+            newList = [...this.data.chufaList, ...processedList]
+          } else {
+            newList = processedList
+          }
+          
+          const hasMore = data.has_more === true
+          this.setData({
+            chufaList: newList,
+            haiyougengduo: hasMore,
+            dangqianye: this.data.dangqianye + 1
+          })
+        } else {
+          this.setData({ haiyougengduo: false })
+        }
+      } else {
+        throw new Error(res.data?.msg || '加载处罚记录失败')
+      }
+    } catch (error) {
+      console.error('加载处罚记录失败:', error)
+      wx.showToast({
+        title: error.message || '加载失败',
+        icon: 'none'
+      })
+      this.setData({ haiyougengduo: false })
+    } finally {
+      if (isLoadMore) {
+        this.setData({ jiazhaigengduo: false })
+      } else {
+        this.setData({ jiazhaozhong: false })
+      }
+    }
+  },
+
+  qiehuanShenfen(e) {
+    const type = parseInt(e.currentTarget.dataset.type)
+    if (this.data.shenfen === type) return
+    this.setData({
+      shenfen: type,
+      dangqianye: 1,
+      chufaList: [],
+      haiyougengduo: true
+    })
+    this.jiazhuoquChufaList()
+  },
+
+  shanglaShuaxin() {
+    if (this.data.fangdouTimer) clearTimeout(this.data.fangdouTimer)
+    const timer = setTimeout(() => {
+      if (this.data.jiazhaozhong || this.data.jiazhaigengduo) return
+      if (!this.data.haiyougengduo) return
+      this.jiazhuoquChufaList(true)
+    }, 300)
+    this.setData({ fangdouTimer: timer })
+  },
+
+  chakanXiangqing(e) {
+    const item = e.currentTarget.dataset.item
+    this.setData({
+      xuanzhongChufa: item,
+      showXiangqing: true
+    })
+  },
+
+  guanbiXiangqing() {
+    this.setData({
+      showXiangqing: false,
+      xuanzhongChufa: {}
+    })
+  },
+
+  openShensuModal() {
+    if (this.data.xuanzhongChufa.ssliyou || 
+        (this.data.xuanzhongChufa.shensu_tupian && this.data.xuanzhongChufa.shensu_tupian.length > 0)) {
+      wx.showToast({
+        title: '您已经提交过申诉，请等待处理结果',
+        icon: 'none'
+      })
+      return
+    }
+    this.setData({
+      showShensuModal: true,
+      shensuLiyou: '',
+      shensuTupian: [],
+      shensuTupianUrls: [],
+      shangchuanJindu: 0,
+      shangchuanZongshu: 0,
+      jinduWidth: '0%'
+    })
+  },
+
+  closeShensuModal() {
+    this.setData({
+      showShensuModal: false,
+      shensuLiyou: '',
+      shensuTupian: [],
+      shensuTupianUrls: []
+    })
+  },
+
+  onShensuLiyouInput(e) {
+    const value = e.detail.value.slice(0, 500)
+    this.setData({ shensuLiyou: value })
+  },
+
+  chooseShensuTupian() {
+    if (this.data.isShangchuanzhong) return
+    const shengyu = 9 - this.data.shensuTupian.length
+    if (shengyu <= 0) {
+      wx.showToast({
+        title: '最多只能上传9张图片',
+        icon: 'none'
+      })
+      return
+    }
+    wx.chooseMedia({
+      count: shengyu,
+      mediaType: ['image'],
+      sourceType: ['album', 'camera'],
+      success: (res) => {
+        const newTupian = [...this.data.shensuTupian, ...res.tempFiles.map(file => file.tempFilePath)]
+        this.setData({ shensuTupian: newTupian.slice(0, 9) })
+      }
+    })
+  },
+
+  deleteShensuTupian(e) {
+    const index = e.currentTarget.dataset.index
+    const newTupian = [...this.data.shensuTupian]
+    newTupian.splice(index, 1)
+    this.setData({ shensuTupian: newTupian })
+  },
+
+  yulanShensuTupian(e) {
+    const index = e.currentTarget.dataset.index
+    const urls = this.data.shensuTupian
+    if (!urls[index]) return
+    wx.previewImage({
+      current: urls[index],
+      urls: urls
+    })
+  },
+
+  lianxiKefu() {
+    const kefuLink = app.globalData.kefuConfig?.link || '';
+    const corpId = app.globalData.kefuConfig?.enterpriseId || '';
+
+    if (!kefuLink || !corpId) {
+        wx.showToast({
+            title: '客服配置未加载',
+            icon: 'none'
+        });
+        return;
+    }
+
+    wx.openCustomerServiceChat({
+        extInfo: { url: kefuLink },
+        corpId: corpId,
+        success: (res) => {
+            console.log('跳转客服成功', res);
+        },
+        fail: (err) => {
+            console.error('跳转客服失败', err);
+            wx.showToast({
+                title: '暂时无法连接客服',
+                icon: 'none'
+            });
+        }
+    });
+  },
+
+  async getCOSZhengshu() {
+    try {
+      const res = await request({
+        url: '/dingdan/dsscpz',
+        method: 'POST',
+        data: { 
+          dingdan_id: this.data.xuanzhongChufa.dingdan_id,
+          yongtu: 'chufa'
+        }
+      })
+      if (res.statusCode === 200 && res.data.code === 0 && res.data.data) {
+        return res.data.data
+      } else {
+        throw new Error(res?.data?.msg || '获取上传凭证失败')
+      }
+    } catch (error) {
+      console.error('获取COS凭证失败:', error)
+      throw error
+    }
+  },
+
+  initCOSClient(tokenData) {
+    const COS = require('../../utils/cos-wx-sdk-v5.js')
+    const credentials = tokenData.credentials || tokenData
+    const bucket = tokenData.bucket || 'julebu-1361527063'
+    const region = tokenData.region || 'ap-shanghai'
+    const cos = new COS({
+      SimpleUploadMethod: 'putObject',
+      getAuthorization: async (options, callback) => {
+        const authParams = {
+          TmpSecretId: credentials.tmpSecretId,
+          TmpSecretKey: credentials.tmpSecretKey,
+          SecurityToken: credentials.sessionToken || '',
+          StartTime: tokenData.startTime || Math.floor(Date.now() / 1000),
+          ExpiredTime: tokenData.expiredTime || (Math.floor(Date.now() / 1000) + 7200)
+        }
+        callback(authParams)
+      }
+    })
+    return { cos, bucket, region }
+  },
+
+  async shangchuanDanZhangTupian(filePath, cosKey, index, cosInstance, bucket, region) {
+    return new Promise((resolve) => {
+      const timeoutId = setTimeout(() => {
+        resolve({ status: 'optimistic_success', key: cosKey })
+      }, 2000)
+      cosInstance.uploadFile({
+        Bucket: bucket,
+        Region: region,
+        Key: cosKey,
+        FilePath: filePath,
+        onProgress: (progressInfo) => {
+          const percent = Math.round(progressInfo.percent * 100)
+          if (percent === 100) {
+            clearTimeout(timeoutId)
+            resolve({ status: 'optimistic_success', key: cosKey })
+          }
+        }
+      })
+    })
+  },
+
+  async piliangShangchuanShensuTupian() {
+    const total = this.data.shensuTupian.length
+    if (total === 0) return []
+    this.setData({
+      shangchuanZongshu: total,
+      shangchuanJindu: 0,
+      jinduWidth: '0%',
+      isShangchuanzhong: true
+    })
+    let yonghuid = ''
+  
+  // 方案1：直接从全局缓存获取
+  const uid = wx.getStorageSync('uid')
+  if (uid) {
+    yonghuid = String(uid).padStart(7, '0')
+    //console.log('🔴【从uid获取yonghuid】', yonghuid)
+  } 
+  
+  // 方案2：如果还没有，从用户信息获取
+  if (!yonghuid && app.globalData.userInfo && app.globalData.userInfo.yonghuid) {
+    yonghuid = String(app.globalData.userInfo.yonghuid).padStart(7, '0')
+    //console.log('🔴【从userInfo获取yonghuid】', yonghuid)
+  }
+  
+  // 方案3：如果还没有，直接提示并返回
+  if (!yonghuid) {
+    wx.showToast({
+      title: '请先登录',
+      icon: 'none'
+    })
+    this.setData({ isShangchuanzhong: false })
+    return []
+  }
+  
+
+    
+    const preGeneratedUrls = []
+    for (let i = 0; i < total; i++) {
+      const timestamp = Date.now() + i
+      const random = Math.floor(Math.random() * 10000)
+      const fileExt = this.getFileExtension(this.data.shensuTupian[i])
+      const fileName = `${yonghuid}_${timestamp}_${random}${fileExt}`
+      const cosKey = `a_long/chfajltp/dssstp/${fileName}`
+      preGeneratedUrls.push(cosKey)
+    }
+    
+    let cosClient, bucket, region
+    try {
+      const tokenData = await this.getCOSZhengshu()
+      const { cos, bucket: cosBucket, region: cosRegion } = this.initCOSClient(tokenData)
+      cosClient = cos
+      bucket = cosBucket
+      region = cosRegion
+    } catch (error) {
+      wx.showToast({ title: '上传初始化失败', icon: 'none' })
+      this.setData({ isShangchuanzhong: false })
+      return []
+    }
+    
+    const uploadTasks = []
+    for (let i = 0; i < total; i++) {
+      const task = this.shangchuanDanZhangTupian(
+        this.data.shensuTupian[i],
+        preGeneratedUrls[i],
+        i,
+        cosClient,
+        bucket,
+        region
+      ).then((result) => {
+        const currentDone = i + 1
+        const jinduPercent = ((currentDone / total) * 100).toFixed(0)
+        this.setData({
+          shangchuanJindu: currentDone,
+          jinduWidth: `${jinduPercent}%`
+        })
+        return result
+      })
+      uploadTasks.push(task)
+    }
+    await Promise.all(uploadTasks)
+    this.setData({ isShangchuanzhong: false })
+    return preGeneratedUrls
+  },
+
+  getFileExtension(filePath) {
+    const lastDotIndex = filePath.lastIndexOf('.')
+    if (lastDotIndex === -1) return '.jpg'
+    const ext = filePath.substring(lastDotIndex).toLowerCase()
+    const allowedExts = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp']
+    return allowedExts.includes(ext) ? ext : '.jpg'
+  },
+
+  async submitShensu() {
+    if (!this.data.shensuLiyou.trim()) {
+      wx.showToast({ title: '请输入申诉理由', icon: 'none' }); return
+    }
+    if (this.data.shensuTupian.length === 0) {
+      wx.showModal({
+        title: '提示',
+        content: '未上传任何图片，确定要提交申诉吗？',
+        success: async (res) => {
+          if (res.confirm) await this.tijiaoShensuData([])
+        }
+      })
+      return
+    }
+    wx.showToast({ title: '开始上传图片...', icon: 'none' })
+    try {
+      const tupianUrls = await this.piliangShangchuanShensuTupian()
+      if (!tupianUrls || tupianUrls.length === 0) throw new Error('图片上传失败')
+      await this.tijiaoShensuData(tupianUrls)
+    } catch (error) {
+      console.error('提交申诉失败:', error)
+      wx.showToast({ title: error.message || '提交失败', icon: 'none' })
+    }
+  },
+
+  async tijiaoShensuData(tupianUrls) {
+    wx.showToast({ title: '提交申诉中...', icon: 'none' })
+    try {
+      const res = await request({
+        url: '/yonghu/dscfss',
+        method: 'POST',
+        data: {
+          chufa_id: this.data.xuanzhongChufa.id,
+          shensu_liyou: this.data.shensuLiyou,
+          shensu_tupian_urls: tupianUrls
+        }
+      })
+      if (res.statusCode === 200 && res.data.code === 0) {
+        this.updateChufaRecord({
+          sqzhuangtai: 3,
+          ssliyou: this.data.shensuLiyou,
+          shensu_tupian: tupianUrls
+        })
+        this.setData({
+          showShensuModal: false,
+          showXiangqing: false,
+          shensuLiyou: '',
+          shensuTupian: [],
+          xuanzhongChufa: {}
+        })
+        wx.showToast({ title: '申诉提交成功，请等待处理', icon: 'success' })
+        setTimeout(() => { this.chushihuaShuju() }, 500)
+      } else {
+        throw new Error(res.data?.msg || '提交申诉失败')
+      }
+    } catch (error) {
+      console.error('提交申诉数据失败:', error)
+      wx.showToast({ title: error.message || '提交失败', icon: 'none' })
+    }
+  },
+
+  updateChufaRecord(newData) {
+    const newList = this.data.chufaList.map(item => {
+      if (item.id === this.data.xuanzhongChufa.id) {
+        const updatedItem = { ...item, ...newData }
+        // 🔴 更新显示字段
+        if (newData.sqzhuangtai === 3) {
+          updatedItem.display_status = '申诉中'
+          updatedItem.status_class = 'zhuangtai-shensuzhong'
+        }
+        if (newData.shensu_tupian) {
+          updatedItem.full_shensu_tupian = newData.shensu_tupian.map(url => this.getFullImageUrl(url))
+        }
+        return updatedItem
+      }
+      return item
+    })
+    this.setData({ chufaList: newList })
+  },
+
+  // 🔴【图片URL拼接 - 确保返回完整URL】
+  getFullImageUrl(relativeUrl) {
+    //console.log('🔴【图片拼接】输入:', relativeUrl)
+    
+    if (!relativeUrl) return ''
+    if (relativeUrl.startsWith('http')) {
+      //console.log('🔴【已经是完整URL】返回:', relativeUrl)
+      return relativeUrl
+    }
+    
+    const ossUrl = this.data.ossImageUrl
+    if (!ossUrl) {
+      //console.log('🔴【OSS地址为空】返回原始URL:', relativeUrl)
+      return relativeUrl
+    }
+    
+    let fullUrl
+    if (ossUrl.endsWith('/') && relativeUrl.startsWith('/')) {
+      fullUrl = ossUrl + relativeUrl.substring(1)
+    } else if (!ossUrl.endsWith('/') && !relativeUrl.startsWith('/')) {
+      fullUrl = ossUrl + '/' + relativeUrl
+    } else {
+      fullUrl = ossUrl + relativeUrl
+    }
+    
+   // console.log('🔴【拼接后URL】:', fullUrl)
+    return fullUrl
+  },
+
+  yulanTupian(e) {
+    const currentUrl = e.currentTarget.dataset.url
+    const urls = e.currentTarget.dataset.urls || []
+    if (!currentUrl) return
+    
+    const fullCurrentUrl = currentUrl.startsWith('http') ? currentUrl : this.getFullImageUrl(currentUrl)
+    const fullUrls = urls.map(url => url.startsWith('http') ? url : this.getFullImageUrl(url))
+    
+    wx.previewImage({
+      current: fullCurrentUrl,
+      urls: fullUrls.length > 0 ? fullUrls : [fullCurrentUrl]
+    })
+  },
+
+  fuzhiWenben(e) {
+    const text = e.currentTarget.dataset.text
+    if (!text) return
+    
+    wx.setClipboardData({
+      data: text,
+      success: () => {
+        wx.showToast({ title: '复制成功', icon: 'success' })
+      },
+      fail: () => {
+        wx.showToast({ title: '复制失败', icon: 'none' })
+      }
+    })
+  },
+
+  // 🔴【保留原函数但已不再使用（用于向后兼容）】
+  formatShijian(shijian) {
+    if (!shijian) return '--'
+    return String(shijian)
+  },
+
+  getZhuangtaiText(zhuangtai) {
+    const statusNum = Number(zhuangtai)
+    if (statusNum === 0) return '待处罚'
+    if (statusNum === 1) return '已处罚'
+    if (statusNum === 2) return '已驳回'
+    if (statusNum === 3) return '申诉中'
+    return '未知状态'
+  },
+
+  getZhuangtaiClass(zhuangtai) {
+    const statusNum = Number(zhuangtai)
+    if (statusNum === 0) return 'zhuangtai-daichuli'
+    if (statusNum === 1) return 'zhuangtai-yichufa'
+    if (statusNum === 2) return 'zhuangtai-yibohui'
+    if (statusNum === 3) return 'zhuangtai-shensuzhong'
+    return 'zhuangtai-weizhi'
+  }
+})
\ No newline at end of file
diff --git a/pages/dashouxiaoxi/dashouxiaoxi.json b/pages/dashouxiaoxi/dashouxiaoxi.json
new file mode 100644
index 0000000..e3c4071
--- /dev/null
+++ b/pages/dashouxiaoxi/dashouxiaoxi.json
@@ -0,0 +1,10 @@
+{
+    "usingComponents": {
+      "global-notification": "/components/global-notification/global-notification"
+    },
+    "navigationBarTitleText": "处罚记录",
+    "navigationBarBackgroundColor": "#0a0a12",
+    "navigationBarTextStyle": "white",
+    "backgroundColor": "#0a0a12",
+    "enablePullDownRefresh": false
+  }
\ No newline at end of file
diff --git a/pages/dashouxiaoxi/dashouxiaoxi.wxml b/pages/dashouxiaoxi/dashouxiaoxi.wxml
new file mode 100644
index 0000000..a1e1265
--- /dev/null
+++ b/pages/dashouxiaoxi/dashouxiaoxi.wxml
@@ -0,0 +1,316 @@
+
+<view class="cfss-container">
+  
+  <view class="tongji-card">
+    <view class="tongji-title">处罚统计</view>
+    <view class="tongji-content">
+      <view class="tongji-item">
+        <text class="tongji-label">总记录</text>
+        <text class="tongji-value">{{ zongshu }}</text>
+      </view>
+      <view class="tongji-item">
+        <text class="tongji-label">待处理</text>
+        <text class="tongji-value daichuli-value">{{ daichuli }}</text>
+      </view>
+      <view class="tongji-item">
+        <text class="tongji-label">已处理</text>
+        <text class="tongji-value yichuli-value">{{ yichuli }}</text>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="leixing-qiehuan">
+    <view 
+      class="leixing-item {{ shenfen === 0 ? 'leixing-active' : '' }}"
+      bindtap="qiehuanShenfen"
+      data-type="0"
+    >
+      <text class="leixing-text">待处理</text>
+      <text class="leixing-count">{{ daichuli }}</text>
+    </view>
+    <view 
+      class="leixing-item {{ shenfen === 1 ? 'leixing-active' : '' }}"
+      bindtap="qiehuanShenfen"
+      data-type="1"
+    >
+      <text class="leixing-text">已处理</text>
+      <text class="leixing-count">{{ yichuli }}</text>
+    </view>
+  </view>
+
+  
+  <scroll-view 
+    class="chufa-list"
+    scroll-y
+    enable-back-to-top
+    scroll-with-animation
+    style="height: {{ scrollHeight }}px"
+    bindscrolltolower="shanglaShuaxin"
+  >
+    
+    <view wx:if="{{ jiazhaozhong && chufaList.length === 0 }}" class="jiazai-zhong">
+      <view class="loading-animation">
+        <view class="loading-dot"></view>
+        <view class="loading-dot"></view>
+        <view class="loading-dot"></view>
+      </view>
+      <text>加载中...</text>
+    </view>
+
+    
+    <block wx:for="{{ chufaList }}" wx:key="index">
+      <view 
+        class="chufa-card"
+        bindtap="chakanXiangqing"
+        data-item="{{ item }}"
+      >
+        
+        <view class="card-top">
+          
+          <text class="shijian">{{ item.display_time }}</text>
+          
+          <view class="zhuangtai-badge {{ item.status_class }}">
+            {{ item.display_status }}
+          </view>
+        </view>
+
+        
+        <view class="qingqiu-row">
+          <text class="qingqiu-label">申请人：</text>
+          <text class="qingqiu-value">{{ item.qingqiuid || '--' }}</text>
+        </view>
+
+        
+        <view class="liyou-row">
+          <text class="liyou-label">处罚理由：</text>
+          <text class="liyou-value">{{ item.cfliyou || '无' }}</text>
+        </view>
+
+        
+        <view class="dingdan-row">
+          <text class="dingdan-label">订单编号：</text>
+          <text class="dingdan-value">{{ item.dingdan_id || '--' }}</text>
+        </view>
+        
+        
+        <view class="card-border"></view>
+        <view class="card-glow"></view>
+      </view>
+    </block>
+
+    
+    <view wx:if="{{ jiazhaigengduo }}" class="jiazai-gengduo">
+      <view class="scan-line"></view>
+      <text>加载更多...</text>
+    </view>
+
+    
+    <view wx:if="{{ !haiyougengduo && chufaList.length > 0 }}" class="meiyou-gengduo">
+      <text>—— 没有更多记录了 ——</text>
+    </view>
+
+    
+    <view wx:if="{{ !jiazhaozhong && chufaList.length === 0 }}" class="kong-zhuangtai">
+      <view class="empty-icon">⚡</view>
+      <text class="empty-text">暂无处罚记录</text>
+      <text class="empty-subtext">所有事务已处理完毕</text>
+    </view>
+  </scroll-view>
+
+  
+  <view wx:if="{{ showXiangqing }}" class="xiangqing-modal">
+    <view class="modal-mask" bindtap="guanbiXiangqing"></view>
+    <view class="modal-content">
+      
+      <view class="modal-header">
+        <text class="modal-title">处罚详情</text>
+        <view class="modal-close" bindtap="guanbiXiangqing">
+          <text class="close-icon">×</text>
+        </view>
+      </view>
+
+      
+      <scroll-view class="modal-body" scroll-y style="max-height: 1000rpx;">
+        
+        <view class="detail-section">
+          <view class="section-title">基本信息</view>
+          <view class="detail-row">
+            <text class="detail-label">订单编号：</text>
+            <view class="detail-value-container">
+              <text class="detail-value">{{ xuanzhongChufa.dingdan_id || '--' }}</text>
+              <text class="fuzhi-btn" bindtap="fuzhiWenben" data-text="{{ xuanzhongChufa.dingdan_id }}">复制</text>
+            </view>
+          </view>
+          <view class="detail-row">
+            <text class="detail-label">申请人ID：</text>
+            <view class="detail-value-container">
+              <text class="detail-value">{{ xuanzhongChufa.qingqiuid || '--' }}</text>
+              <text class="fuzhi-btn" bindtap="fuzhiWenben" data-text="{{ xuanzhongChufa.qingqiuid }}">复制</text>
+            </view>
+          </view>
+          <view class="detail-row">
+            
+            <text class="detail-label">创建时间：</text>
+            <text class="detail-value">{{ xuanzhongChufa.display_time || '--' }}</text>
+          </view>
+        </view>
+
+        
+        <view class="detail-section">
+          <view class="section-title">处罚信息</view>
+          <view class="detail-row">
+            <text class="detail-label">处罚状态：</text>
+            
+            <view class="zhuangtai-badge-inline {{ xuanzhongChufa.status_class }}">
+              {{ xuanzhongChufa.display_status }}
+            </view>
+          </view>
+          <view class="detail-row full-row">
+            <text class="detail-label">处罚理由：</text>
+            <text class="detail-value liyou-full">{{ xuanzhongChufa.cfliyou || '无' }}</text>
+          </view>
+          
+          
+          <view wx:if="{{ xuanzhongChufa.full_zhengju_tupian && xuanzhongChufa.full_zhengju_tupian.length > 0 }}" class="detail-row full-row">
+            <text class="detail-label">证据图片：</text>
+            <view class="tupian-grid">
+              <block wx:for="{{ xuanzhongChufa.full_zhengju_tupian }}" wx:key="index">
+                <view class="tupian-item" bindtap="yulanTupian" data-url="{{ item }}" data-urls="{{ xuanzhongChufa.full_zhengju_tupian }}">
+                  <image 
+                    src="{{ item }}" 
+                    class="tupian-image"
+                    mode="aspectFill"
+                  />
+                </view>
+              </block>
+            </view>
+          </view>
+        </view>
+
+        
+        <view wx:if="{{ xuanzhongChufa.ssliyou || (xuanzhongChufa.full_shensu_tupian && xuanzhongChufa.full_shensu_tupian.length > 0) }}" class="detail-section">
+          <view class="section-title">申诉信息</view>
+          <view wx:if="{{ xuanzhongChufa.ssliyou }}" class="detail-row full-row">
+            <text class="detail-label">申诉理由：</text>
+            <text class="detail-value liyou-full">{{ xuanzhongChufa.ssliyou }}</text>
+          </view>
+          
+          <view wx:if="{{ xuanzhongChufa.full_shensu_tupian && xuanzhongChufa.full_shensu_tupian.length > 0 }}" class="detail-row full-row">
+            <text class="detail-label">申诉图片：</text>
+            <view class="tupian-grid">
+              <block wx:for="{{ xuanzhongChufa.full_shensu_tupian }}" wx:key="index">
+                <view class="tupian-item" bindtap="yulanTupian" data-url="{{ item }}" data-urls="{{ xuanzhongChufa.full_shensu_tupian }}">
+                  <image 
+                    src="{{ item }}" 
+                    class="tupian-image"
+                    mode="aspectFill"
+                  />
+                </view>
+              </block>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+
+      
+      <view class="modal-footer">
+        <view class="btn-group">
+          
+          <view class="btn btn-kefu" bindtap="lianxiKefu">
+            <text>联系客服</text>
+          </view>
+          
+          <view 
+            class="btn {{ xuanzhongChufa.sqzhuangtai === 0 ? 'btn-shensu' : 'btn-shensu-disabled' }}"
+            bindtap="{{ xuanzhongChufa.sqzhuangtai === 0 ? 'openShensuModal' : '' }}"
+          >
+            <text>申诉</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view wx:if="{{ showShensuModal }}" class="shensu-modal">
+    <view class="modal-mask" bindtap="closeShensuModal"></view>
+    <view class="modal-content small-modal">
+      <view class="modal-header">
+        <text class="modal-title">提交申诉</text>
+      </view>
+      <view class="modal-body">
+        
+        <view class="input-group">
+          <view class="input-label">申诉理由</view>
+          <textarea 
+            class="shensu-textarea"
+            value="{{ shensuLiyou }}"
+            bindinput="onShensuLiyouInput"
+            placeholder="请输入申诉理由（最多500字）..."
+            maxlength="500"
+            auto-height
+          />
+          <view class="word-count">{{ shensuLiyou.length }}/500</view>
+        </view>
+
+        
+        <view class="input-group">
+          <view class="input-label">申诉图片</view>
+          <view class="upload-tip">最多可上传9张图片</view>
+          
+          
+          <view class="tupian-grid-upload">
+            
+            <block wx:for="{{ shensuTupian }}" wx:key="index">
+              <view class="tupian-item-upload">
+                <image 
+                  src="{{ item }}" 
+                  class="tupian-image-upload"
+                  mode="aspectFill"
+                  bindtap="yulanShensuTupian"
+                  data-index="{{ index }}"
+                />
+                <view class="tupian-delete" bindtap="deleteShensuTupian" data-index="{{ index }}">
+                  <text>×</text>
+                </view>
+              </view>
+            </block>
+            
+            
+            <view 
+              wx:if="{{ shensuTupian.length < 9 }}"
+              class="tupian-add-btn" 
+              bindtap="chooseShensuTupian"
+            >
+              <view class="add-icon">+</view>
+              <text class="add-text">添加图片</text>
+            </view>
+          </view>
+        </view>
+
+        
+        <view wx:if="{{ shangchuanZongshu > 0 }}" class="upload-progress">
+          <view class="progress-title">上传进度</view>
+          <view class="progress-bar">
+            <view class="progress-inner" style="width: {{ jinduWidth }}"></view>
+          </view>
+          <view class="progress-text">{{ shangchuanJindu }}/{{ shangchuanZongshu }}</view>
+        </view>
+      </view>
+      <view class="modal-footer">
+        <view class="btn-group">
+          <view class="btn btn-quxiao" bindtap="closeShensuModal">
+            <text>取消</text>
+          </view>
+          <view class="btn btn-queren" bindtap="submitShensu">
+            <text>提交申诉</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  
+  <global-notification id="global-notification" />
+</view>
\ No newline at end of file
diff --git a/pages/dashouxiaoxi/dashouxiaoxi.wxss b/pages/dashouxiaoxi/dashouxiaoxi.wxss
new file mode 100644
index 0000000..c9a6d32
--- /dev/null
+++ b/pages/dashouxiaoxi/dashouxiaoxi.wxss
@@ -0,0 +1,963 @@
+/* pages/cfss/cfss.wxss */
+/* 🔴【恢复您原来的深色背景，但调淡一点】 */
+
+:root {
+    /* 🔴【颜色调淡方案】 */
+    --cyber-blue: rgba(0, 243, 255, 0.7);       /* 蓝色调淡70% */
+    --cyber-pink: rgba(255, 0, 255, 0.7);       /* 粉色调淡70% */
+    --cyber-purple: rgba(157, 0, 255, 0.7);     /* 紫色调淡70% */
+    --cyber-green: rgba(0, 255, 157, 0.7);      /* 绿色调淡70% */
+    --cyber-red: rgba(255, 0, 102, 0.7);        /* 红色调淡70% */
+    
+    /* 🔴【背景改为淡灰色，不是深色，也不是白色】 */
+    --cyber-bg: #2a2a3a;                        /* 深灰色背景，比原来的淡 */
+    --cyber-card: #333344;                      /* 卡片：比背景稍深的灰色 */
+    --cyber-border: rgba(255, 255, 255, 0.15);  /* 边框：半透明白色 */
+    --cyber-glow: rgba(0, 243, 255, 0.2);       /* 光效：调淡 */
+    
+    /* 文字颜色保持不变 */
+    --cyber-text: #ffffff;
+    --cyber-text-light: #e6e6e6;
+    --cyber-text-lighter: #cccccc;
+}
+
+.cfss-container {
+    padding: 30rpx;
+    background: var(--cyber-bg);
+    min-height: 100vh;
+    color: var(--cyber-text) !important;
+    position: relative;
+    overflow: hidden;
+    box-sizing: border-box;
+}
+
+/* 恢复网格背景 */
+.cfss-container::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-image: 
+      linear-gradient(rgba(0, 243, 255, 0.05) 1px, transparent 1px),
+      linear-gradient(90deg, rgba(0, 243, 255, 0.05) 1px, transparent 1px);
+    background-size: 40rpx 40rpx;
+    pointer-events: none;
+    opacity: 0.15;
+    z-index: 0;
+}
+
+/* ====== 统计卡片 ====== */
+.tongji-card {
+    background: rgba(255, 0, 102, 0.3); /* 🔴 调淡为30%透明度 */
+    border-radius: 20rpx;
+    padding: 30rpx;
+    margin-bottom: 30rpx;
+    border: 1rpx solid var(--cyber-border);
+    box-shadow: 
+      0 0 20rpx rgba(255, 0, 102, 0.2),
+      inset 0 0 10rpx rgba(0, 243, 255, 0.05);
+    position: relative;
+    overflow: hidden;
+    z-index: 1;
+}
+
+.tongji-title {
+    color: var(--cyber-blue);
+    font-size: 34rpx;
+    font-weight: bold;
+    margin-bottom: 30rpx;
+    text-shadow: 0 0 8rpx var(--cyber-blue);
+    letter-spacing: 2rpx;
+}
+
+.tongji-content {
+    display: flex;
+    justify-content: space-between;
+}
+
+.tongji-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    flex: 1;
+}
+
+.tongji-label {
+    color: var(--cyber-text-light) !important;
+    font-size: 26rpx;
+    margin-bottom: 15rpx;
+    opacity: 0.9;
+}
+
+.tongji-value {
+    color: var(--cyber-text) !important;
+    font-size: 44rpx;
+    font-weight: bold;
+    text-shadow: 0 0 8rpx currentColor;
+}
+
+.daichuli-value {
+    color: var(--cyber-red) !important;
+    text-shadow: 0 0 8rpx rgba(255, 0, 102, 0.3);
+}
+
+.yichuli-value {
+    color: var(--cyber-green) !important;
+    text-shadow: 0 0 8rpx rgba(0, 255, 157, 0.3);
+}
+
+/* ====== 类型切换 ====== */
+.leixing-qiehuan {
+    display: flex;
+    background: rgba(255, 0, 102, 0.3); /* 🔴 调淡为30%透明度 */
+    border-radius: 16rpx;
+    padding: 10rpx;
+    margin-bottom: 30rpx;
+    border: 1rpx solid var(--cyber-border);
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.2);
+    z-index: 1;
+}
+
+.leixing-item {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 25rpx 0;
+    border-radius: 12rpx;
+    transition: all 0.3s;
+}
+
+.leixing-item:active {
+    transform: scale(0.98);
+}
+
+.leixing-active {
+    background: linear-gradient(135deg, rgba(0, 243, 255, 0.15), rgba(157, 0, 255, 0.15));
+    box-shadow: 0 0 15rpx rgba(0, 243, 255, 0.2);
+}
+
+.leixing-text {
+    font-size: 28rpx;
+    font-weight: bold;
+    margin-bottom: 8rpx;
+    color: var(--cyber-text-light) !important;
+}
+
+.leixing-active .leixing-text {
+    color: var(--cyber-text) !important;
+    text-shadow: 0 0 8rpx var(--cyber-blue);
+}
+
+.leixing-count {
+    font-size: 24rpx;
+    color: var(--cyber-text-lighter) !important;
+    opacity: 0.9;
+}
+
+.leixing-active .leixing-count {
+    color: rgba(255, 255, 255, 0.9) !important;
+}
+
+/* ====== 处罚列表 ====== */
+.chufa-list {
+    margin-bottom: 0;
+    padding-bottom: 30rpx;
+    z-index: 1;
+}
+
+/* 加载动画 */
+.jiazai-zhong {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 60rpx 0;
+    color: var(--cyber-blue);
+}
+
+.loading-animation {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 20rpx;
+}
+
+.loading-dot {
+    width: 20rpx;
+    height: 20rpx;
+    border-radius: 50%;
+    background-color: var(--cyber-blue);
+    margin: 0 10rpx;
+    animation: pulse 1.5s infinite ease-in-out;
+}
+
+.loading-dot:nth-child(2) {
+    animation-delay: 0.2s;
+}
+
+.loading-dot:nth-child(3) {
+    animation-delay: 0.4s;
+}
+
+@keyframes pulse {
+    0%, 100% { 
+        transform: scale(0.8);
+        opacity: 0.5;
+    }
+    50% { 
+        transform: scale(1.2);
+        opacity: 1;
+    }
+}
+
+/* 🔴【关键：处罚卡片背景改为淡灰色】 */
+.chufa-card {
+    background: rgba(50, 50, 65, 0.8); /* 🔴 淡灰色卡片，半透明 */
+    border-radius: 20rpx;
+    padding: 30rpx;
+    margin-bottom: 30rpx;
+    border: 1rpx solid var(--cyber-border);
+    position: relative;
+    overflow: hidden;
+    transition: all 0.3s;
+    z-index: 1;
+}
+
+.chufa-card:active {
+    transform: translateY(-4rpx);
+    box-shadow: 
+      0 10rpx 30rpx rgba(0, 0, 0, 0.3),
+      0 0 25rpx var(--cyber-glow);
+}
+
+.card-border {
+    position: absolute;
+    top: -1px;
+    left: -1px;
+    right: -1px;
+    bottom: -1px;
+    border-radius: 21rpx;
+    background: linear-gradient(45deg, rgba(255, 0, 255, 0.3), rgba(0, 243, 255, 0.3), rgba(255, 0, 255, 0.3), rgba(0, 243, 255, 0.3));
+    z-index: -1;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+}
+
+.chufa-card:active .card-border {
+    opacity: 0.3;
+}
+
+.card-top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 25rpx;
+}
+
+/* 🔴【时间必须显示】 */
+.shijian {
+    color: var(--cyber-text-light) !important;
+    font-size: 26rpx;
+    font-family: 'Courier New', monospace;
+    letter-spacing: 1rpx;
+    opacity: 0.9;
+}
+
+/* 🔴【状态标签 - 必须显示出来】 */
+.zhuangtai-badge {
+    padding: 8rpx 25rpx;
+    border-radius: 20rpx;
+    font-size: 24rpx;
+    font-weight: bold;
+    text-transform: uppercase;
+    letter-spacing: 2rpx;
+    border: 1rpx solid;
+    box-shadow: 0 0 8rpx;
+    color: #ffffff !important;
+}
+
+.zhuangtai-daichuli {
+    background: rgba(255, 0, 102, 0.2);
+    border-color: var(--cyber-red);
+    box-shadow: 0 0 8rpx rgba(255, 0, 102, 0.2);
+}
+
+.zhuangtai-yichufa {
+    background: rgba(0, 255, 157, 0.2);
+    border-color: var(--cyber-green);
+    box-shadow: 0 0 8rpx rgba(0, 255, 157, 0.2);
+}
+
+.zhuangtai-yibohui {
+    background: rgba(102, 102, 102, 0.2);
+    border-color: #666;
+    box-shadow: 0 0 8rpx rgba(102, 102, 102, 0.2);
+}
+
+.zhuangtai-shensuzhong {
+    background: rgba(255, 165, 0, 0.2);
+    border-color: #FFA500;
+    box-shadow: 0 0 8rpx rgba(255, 165, 0, 0.2);
+}
+
+.zhuangtai-weizhi {
+    background: rgba(128, 0, 255, 0.2); /* 未知状态：紫色 */
+    border-color: rgba(128, 0, 255, 0.5);
+    box-shadow: 0 0 8rpx rgba(128, 0, 255, 0.2);
+}
+
+/* 其他文字内容 */
+.qingqiu-row, .liyou-row, .dingdan-row {
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 20rpx;
+}
+
+.qingqiu-label, .liyou-label, .dingdan-label {
+    color: var(--cyber-text-light) !important;
+    font-size: 26rpx;
+    font-weight: bold;
+    margin-right: 15rpx;
+    opacity: 0.9;
+    flex-shrink: 0;
+}
+
+.qingqiu-value, .liyou-value, .dingdan-value {
+    color: var(--cyber-text) !important;
+    font-size: 26rpx;
+    flex: 1;
+    word-break: break-all;
+}
+
+.liyou-value {
+    line-height: 1.5;
+}
+
+.dingdan-value {
+    font-family: 'Courier New', monospace;
+    letter-spacing: 1rpx;
+}
+
+/* 加载更多 */
+.jiazai-gengduo {
+    text-align: center;
+    padding: 40rpx 0;
+    color: var(--cyber-blue);
+    position: relative;
+    overflow: hidden;
+}
+
+.scan-line {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 2rpx;
+    background: linear-gradient(90deg, transparent, var(--cyber-blue), transparent);
+    animation: scan 2s linear infinite;
+}
+
+@keyframes scan {
+    0% { left: -100%; }
+    100% { left: 100%; }
+}
+
+/* 没有更多数据 */
+.meiyou-gengduo {
+    text-align: center;
+    padding: 40rpx 0;
+    color: var(--cyber-green);
+    font-size: 28rpx;
+    opacity: 0.9;
+}
+
+/* 空状态 */
+.kong-zhuangtai {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 100rpx 40rpx;
+    text-align: center;
+    z-index: 1;
+}
+
+.empty-icon {
+    font-size: 120rpx;
+    color: var(--cyber-blue);
+    margin-bottom: 30rpx;
+    text-shadow: 0 0 15rpx var(--cyber-blue);
+    animation: pulse 2s infinite;
+}
+
+.empty-text {
+    font-size: 34rpx;
+    color: var(--cyber-text) !important;
+    margin-bottom: 15rpx;
+    font-weight: bold;
+}
+
+.empty-subtext {
+    font-size: 28rpx;
+    color: var(--cyber-text-light) !important;
+    opacity: 0.8;
+}
+
+/* ====== 弹窗样式 ====== */
+.xiangqing-modal,
+.shensu-modal {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.modal-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.7);
+}
+
+/* 🔴【关键：弹窗背景改为不透明的淡灰色】 */
+.modal-content {
+    position: relative;
+    background: #3a3a4a; /* 🔴 淡灰色，不透明 */
+    border-radius: 30rpx;
+    width: 90%;
+    max-height: 80vh;
+    display: flex;
+    flex-direction: column;
+    border: 1rpx solid var(--cyber-border);
+    box-shadow: 0 0 35rpx rgba(0, 243, 255, 0.3);
+    z-index: 1001;
+    backdrop-filter: blur(0px); /* 去掉模糊效果 */
+}
+
+.small-modal {
+    max-height: 85vh;
+    width: 85%;
+}
+
+.modal-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 40rpx 30rpx 30rpx 30rpx;
+    border-bottom: 1rpx solid rgba(0, 243, 255, 0.2);
+    flex-shrink: 0;
+}
+
+.modal-title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: var(--cyber-blue);
+    text-shadow: 0 0 8rpx var(--cyber-blue);
+}
+
+.modal-close {
+    width: 60rpx;
+    height: 60rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 50%;
+    background: rgba(0, 243, 255, 0.1);
+    border: 1rpx solid rgba(0, 243, 255, 0.3);
+}
+
+.modal-close:active {
+    background: rgba(0, 243, 255, 0.2);
+    transform: scale(0.95);
+}
+
+.close-icon {
+    font-size: 40rpx;
+    color: var(--cyber-blue);
+    line-height: 1;
+}
+
+/* 弹窗主体 */
+.modal-body {
+    flex: 1;
+    padding: 30rpx;
+    overflow-y: auto;
+    min-height: 200rpx;
+    box-sizing: border-box;
+}
+
+/* 详情区域 */
+.detail-section {
+    margin-bottom: 40rpx;
+}
+
+.section-title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: var(--cyber-blue);
+    margin-bottom: 25rpx;
+    padding-bottom: 15rpx;
+    border-bottom: 1rpx solid rgba(0, 243, 255, 0.2);
+    text-shadow: 0 0 8rpx var(--cyber-blue);
+}
+
+.detail-row {
+    display: flex;
+    margin-bottom: 25rpx;
+    align-items: center;
+}
+
+.detail-label {
+    color: var(--cyber-text-light) !important;
+    font-size: 30rpx;
+    min-width: 180rpx;
+    margin-right: 20rpx;
+    line-height: 1.5;
+    opacity: 0.9;
+    flex-shrink: 0;
+}
+
+.detail-value-container {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.detail-value {
+    color: var(--cyber-text) !important;
+    font-size: 30rpx;
+    line-height: 1.5;
+    word-break: break-all;
+    opacity: 0.95;
+    flex: 1;
+    margin-right: 20rpx;
+}
+
+.fuzhi-btn {
+    color: var(--cyber-blue);
+    font-size: 24rpx;
+    padding: 8rpx 20rpx;
+    border-radius: 8rpx;
+    background: rgba(0, 243, 255, 0.1);
+    border: 1rpx solid rgba(0, 243, 255, 0.3);
+    flex-shrink: 0;
+}
+
+.fuzhi-btn:active {
+    background: rgba(0, 243, 255, 0.2);
+}
+
+.full-row {
+    flex-direction: column;
+    align-items: flex-start;
+}
+
+.full-row .detail-label {
+    margin-bottom: 10rpx;
+    min-width: auto;
+}
+
+/* 弹窗内的状态标签 */
+.zhuangtai-badge-inline {
+    padding: 8rpx 24rpx;
+    border-radius: 20rpx;
+    font-size: 26rpx;
+    font-weight: bold;
+    text-transform: uppercase;
+    letter-spacing: 1rpx;
+    border: 1rpx solid;
+    min-width: 120rpx;
+    text-align: center;
+    color: #ffffff !important;
+}
+
+/* 理由方框 */
+.liyou-full {
+    background: rgba(255, 255, 255, 0.05);
+    padding: 25rpx 30rpx;
+    border-radius: 15rpx;
+    line-height: 1.6;
+    border: 1rpx solid rgba(255, 255, 255, 0.1);
+    color: var(--cyber-text) !important;
+    width: 100%;
+    box-sizing: border-box;
+    margin: 0;
+    display: block;
+    opacity: 0.95;
+}
+
+/* 图片网格样式 */
+.tupian-grid {
+    display: flex;
+    flex-wrap: wrap;
+    margin-top: 10rpx;
+    margin-left: -5rpx;
+    margin-right: -5rpx;
+}
+
+.tupian-item {
+    width: calc(33.333% - 10rpx);
+    margin: 5rpx;
+    aspect-ratio: 1;
+    border-radius: 10rpx;
+    overflow: hidden;
+    position: relative;
+    border: 1rpx solid rgba(0, 243, 255, 0.2);
+}
+
+.tupian-image {
+    width: 100%;
+    height: 100%;
+}
+
+/* 弹窗底部按钮 */
+.modal-footer {
+    padding: 30rpx;
+    border-top: 1rpx solid rgba(0, 243, 255, 0.2);
+    flex-shrink: 0;
+}
+
+.btn-group {
+    display: flex;
+    gap: 20rpx;
+}
+
+.btn {
+    flex: 1;
+    height: 90rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 15rpx;
+    font-size: 32rpx;
+    font-weight: bold;
+    transition: all 0.3s;
+    border: 1rpx solid;
+    box-shadow: 0 0 12rpx;
+    color: var(--cyber-text) !important;
+}
+
+.btn:active {
+    transform: scale(0.98);
+}
+
+/* 按钮样式 */
+.btn-kefu {
+    background: rgba(0, 243, 255, 0.1);
+    border-color: var(--cyber-blue);
+    box-shadow: 0 0 12rpx rgba(0, 243, 255, 0.2);
+}
+
+.btn-shensu {
+    background: rgba(255, 165, 0, 0.1);
+    border-color: #FFA500;
+    box-shadow: 0 0 12rpx rgba(255, 165, 0, 0.2);
+}
+
+.btn-shensu-disabled {
+    background: rgba(102, 102, 102, 0.1);
+    border-color: #666;
+    box-shadow: 0 0 12rpx rgba(102, 102, 102, 0.2);
+    opacity: 0.5;
+}
+
+.btn-quxiao {
+    background: rgba(255, 255, 255, 0.07);
+    border-color: rgba(255, 255, 255, 0.2);
+    box-shadow: 0 0 12rpx rgba(255, 255, 255, 0.1);
+}
+
+.btn-queren {
+    background: rgba(0, 255, 157, 0.1);
+    border-color: var(--cyber-green);
+    box-shadow: 0 0 12rpx rgba(0, 255, 157, 0.2);
+}
+
+/* 申诉弹窗输入样式 */
+.input-group {
+    margin-bottom: 40rpx;
+}
+
+.input-label {
+    color: var(--cyber-text-light) !important;
+    font-size: 30rpx;
+    margin-bottom: 15rpx;
+    font-weight: bold;
+}
+
+.shensu-textarea {
+    width: 100%;
+    min-height: 200rpx;
+    padding: 25rpx 30rpx;
+    background: rgba(255, 255, 255, 0.05);
+    border-radius: 15rpx;
+    font-size: 30rpx;
+    line-height: 1.5;
+    color: var(--cyber-text) !important;
+    border: 1rpx solid rgba(0, 243, 255, 0.2);
+    box-sizing: border-box;
+}
+
+.shensu-textarea::placeholder {
+    color: var(--cyber-text-lighter) !important;
+    opacity: 0.6;
+}
+
+.word-count {
+    text-align: right;
+    color: var(--cyber-text-lighter) !important;
+    font-size: 24rpx;
+    margin-top: 10rpx;
+    opacity: 0.7;
+}
+
+.upload-tip {
+    color: var(--cyber-text-lighter) !important;
+    font-size: 26rpx;
+    margin-bottom: 20rpx;
+    opacity: 0.8;
+}
+
+/* 上传图片网格 */
+.tupian-grid-upload {
+    display: flex;
+    flex-wrap: wrap;
+    margin-left: -5rpx;
+    margin-right: -5rpx;
+}
+
+.tupian-item-upload {
+    width: calc(33.333% - 10rpx);
+    margin: 5rpx;
+    aspect-ratio: 1;
+    border-radius: 10rpx;
+    overflow: hidden;
+    position: relative;
+    border: 1rpx solid rgba(0, 243, 255, 0.2);
+}
+
+.tupian-image-upload {
+    width: 100%;
+    height: 100%;
+}
+
+.tupian-delete {
+    position: absolute;
+    top: 5rpx;
+    right: 5rpx;
+    width: 40rpx;
+    height: 40rpx;
+    border-radius: 50%;
+    background: rgba(255, 0, 102, 0.7);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: white;
+    font-size: 30rpx;
+    font-weight: bold;
+}
+
+.tupian-add-btn {
+    width: calc(33.333% - 10rpx);
+    margin: 5rpx;
+    aspect-ratio: 1;
+    border-radius: 10rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border: 2rpx dashed rgba(0, 243, 255, 0.4);
+    color: var(--cyber-blue);
+}
+
+.tupian-add-btn:active {
+    border-color: var(--cyber-blue);
+    background: rgba(0, 243, 255, 0.07);
+}
+
+.add-icon {
+    font-size: 60rpx;
+    margin-bottom: 10rpx;
+}
+
+.add-text {
+    font-size: 24rpx;
+}
+
+/* 上传进度 */
+.upload-progress {
+    margin-top: 30rpx;
+    padding: 25rpx 30rpx;
+    background: rgba(255, 255, 255, 0.05);
+    border-radius: 15rpx;
+    border: 1rpx solid rgba(0, 243, 255, 0.2);
+}
+
+.progress-title {
+    color: var(--cyber-blue);
+    font-size: 28rpx;
+    margin-bottom: 15rpx;
+    font-weight: bold;
+}
+
+.progress-bar {
+    height: 20rpx;
+    background: rgba(255, 255, 255, 0.07);
+    border-radius: 10rpx;
+    overflow: hidden;
+    margin-bottom: 10rpx;
+}
+
+.progress-inner {
+    height: 100%;
+    background: linear-gradient(90deg, var(--cyber-blue), var(--cyber-purple));
+    border-radius: 10rpx;
+    transition: width 0.3s ease;
+}
+
+.progress-text {
+    text-align: center;
+    color: var(--cyber-text-light) !important;
+    font-size: 26rpx;
+    opacity: 0.9;
+}
+
+/* 响应式调整 */
+@media (max-width: 375px) {
+    .tongji-value {
+        font-size: 36rpx;
+    }
+    
+    .shijian,
+    .qingqiu-label,
+    .liyou-label,
+    .dingdan-label {
+        font-size: 24rpx;
+    }
+    
+    .qingqiu-value,
+    .liyou-value,
+    .dingdan-value {
+        font-size: 24rpx;
+    }
+    
+    .modal-content {
+        width: 95%;
+    }
+}
+
+
+/* 🔴【颜色调整】卡片和弹窗背景色稍微调淡一点 */
+:root {
+    --cyber-bg: #2c2c3c;      /* 从#2a2a3a调亮一点 */
+    --cyber-card: #363648;    /* 从#333344调亮一点 */
+}
+
+/* 🔴【卡片背景色调整 - 更淡一点】 */
+.chufa-card {
+    background: rgba(130, 141, 146, 0.8); /* 从rgba(50,50,65,0.8)调亮 */
+}
+
+/* 🔴【弹窗背景色调整 - 更淡一点】 */
+.modal-content {
+    
+    background: #acacda; /* 从#3a3a4a调亮 */
+}
+
+/* 🔴【增加弹窗高度】 */
+.modal-content {
+    max-height: 88vh; /* 从80vh增加 */
+}
+
+.small-modal {
+    max-height: 88vh; /* 从85vh调整 */
+}
+
+/* 🔴【增加弹窗内部滚动区域高度】 */
+/* 修改wxml中对应的style */
+/* 需要将：<scroll-view class="modal-body" scroll-y style="max-height: 500rpx;"> */
+/* 改为：<scroll-view class="modal-body" scroll-y style="max-height: 600rpx;"> */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* pages/cfss/cfss.wxss 中新增样式 */
+
+/* 🔴【关键修改】图片网格和图片样式 */
+.tupian-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 12rpx;
+    margin-top: 10rpx;
+    width: 100%;
+  }
+  
+  .tupian-item {
+    position: relative;
+    width: 100%;
+    aspect-ratio: 1;
+    border-radius: 12rpx;
+    overflow: hidden;
+    border: 1rpx solid rgba(0, 243, 255, 0.3);
+    background-color: rgba(0, 0, 0, 0.2);
+  }
+  
+  .tupian-image {
+    width: 100%;
+    height: 100%;
+    display: block;
+    object-fit: cover;
+  }
+  
+  /* 图片预览遮罩 */
+  .tupian-preview {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.3);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+  }
+  
+  .tupian-item:hover .tupian-preview {
+    opacity: 1;
+  }
+  
+  .preview-text {
+    color: white;
+    font-size: 24rpx;
+    background: rgba(0, 243, 255, 0.7);
+    padding: 8rpx 16rpx;
+    border-radius: 8rpx;
+  }
\ No newline at end of file
diff --git a/pages/dashouxiugai/dashouxiugai.js b/pages/dashouxiugai/dashouxiugai.js
new file mode 100644
index 0000000..9b50cb3
--- /dev/null
+++ b/pages/dashouxiugai/dashouxiugai.js
@@ -0,0 +1,422 @@
+import request from '../../utils/request.js'
+
+Page({
+  data: {
+    // 头像相关
+    touxiangUrl: '', // 完整头像URL
+    touxiangRelative: '', // 头像相对URL（用于上传后更新）
+    
+    // 打手信息字段
+    dashouUid: '', // UID（不可修改）
+    dashouNicheng: '', // 昵称
+    dashouJieshao: '', // 个人介绍
+    dashouDianhua: '', // 电话
+    dashouWeixin: '', // 微信
+    
+    // 页面状态
+    isLoading: false, // 是否正在加载
+    isDataFromApi: false, // 数据是否来自API（用于显示提示）
+    isSubmitting: false, // 是否正在提交
+    hasLoadedFromCache: false, // 是否已从缓存加载
+    
+    // 验证状态
+    nichengValid: true,
+    dianhuaValid: true,
+    weixinValid: true,
+    jieshaoValid: true
+  },
+
+  onLoad() {
+    // 页面加载时初始化数据
+    this.initPageData()
+  },
+
+  onShow() {
+    // 每次页面显示时检查头像是否需要更新
+    this.registerNotificationComponent();
+    this.checkAvatarUpdate()
+  },
+   // 🆕 新增：注册通知组件
+   registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+    
+    if (notificationComp && notificationComp.showNotification) {
+        console.log('🏪 商城页面注册通知组件');
+        app.globalData.globalNotification = {
+            show: (data) => notificationComp.showNotification(data),
+            hide: () => notificationComp.hideNotification()
+        };
+    }
+},
+
+  // 初始化页面数据
+  async initPageData() {
+    this.setData({ isLoading: true })
+    
+    try {
+      // 1. 从缓存加载基本信息
+      const cachedData = this.loadFromCache()
+      
+      // 2. 检查是否需要从API加载
+      const needApiLoad = this.checkNeedApiLoad(cachedData)
+      
+      if (needApiLoad) {
+        // 从API加载数据
+        await this.loadFromApi()
+        this.setData({ isDataFromApi: true })
+      } else {
+        // 使用缓存数据
+        this.setDataFromCache(cachedData)
+        this.setData({ isDataFromApi: false })
+      }
+      
+      // 3. 构建完整头像URL
+      this.buildAvatarUrl()
+      
+    } catch (error) {
+      console.error('初始化页面数据失败:', error)
+      wx.showToast({
+        title: '数据加载失败',
+        icon: 'error',
+        duration: 2000
+      })
+    } finally {
+      this.setData({ isLoading: false, hasLoadedFromCache: true })
+    }
+  },
+
+  // 从缓存加载数据
+  loadFromCache() {
+    const app = getApp()
+    
+    return {
+      // 从缓存获取头像相对URL
+      touxiang: wx.getStorageSync('touxiang') || '',
+      
+      // 从缓存获取用户ID
+      uid: wx.getStorageSync('uid') || '',
+      
+      // 从缓存获取打手信息
+      dsnc: wx.getStorageSync('dsnc') || '',
+      dsjieshao: wx.getStorageSync('dsjieshao') || '',
+      dsdianhua: wx.getStorageSync('dsdianhua') || '',
+      dsweixin: wx.getStorageSync('dsweixin') || ''
+    }
+  },
+
+  // 检查是否需要从API加载数据
+  checkNeedApiLoad(cachedData) {
+    // 如果昵称或介绍有一个为空，则需要从API加载
+    return !cachedData.dsnc || !cachedData.dsjieshao
+  },
+
+  // 设置缓存数据到页面
+  setDataFromCache(cachedData) {
+    const app = getApp()
+    
+    // 处理空值显示
+    const formatEmptyValue = (value) => {
+      return value && value.trim() !== '' ? value : '暂未填写'
+    }
+    
+    this.setData({
+      dashouUid: cachedData.uid || '',
+      dashouNicheng: cachedData.dsnc || '',
+      dashouJieshao: cachedData.dsjieshao || '',
+      dashouDianhua: formatEmptyValue(cachedData.dsdianhua),
+      dashouWeixin: formatEmptyValue(cachedData.dsweixin),
+      touxiangRelative: cachedData.touxiang || ''
+    })
+  },
+
+  // 从API加载数据
+  async loadFromApi() {
+    try {
+      const res = await request({
+        url: '/yonghu/dszjxxhq',
+        method: 'POST'
+      })
+      
+      if (res && res.data.code === 200) {
+        const data = res.data.data || {}
+        
+        // 格式化空值
+        const formatValue = (value) => {
+          if (value === null || value === undefined || value.trim() === '') {
+            return '暂未填写'
+          }
+          return value
+        }
+        
+        // 更新页面数据
+        this.setData({
+          dashouNicheng: formatValue(data.nicheng),
+          dashouJieshao: formatValue(data.jieshao),
+          dashouDianhua: formatValue(data.dianhua),
+          dashouWeixin: formatValue(data.wechat)
+        })
+        
+        // 更新缓存（即使为空也存储，避免重复请求）
+        this.updateCache(data)
+        
+      } else {
+        throw new Error(res?.data?.msg || '获取信息失败')
+      }
+    } catch (error) {
+      console.error('API加载失败:', error)
+      throw error
+    }
+  },
+
+  // 更新缓存
+  updateCache(data) {
+    // 存储到缓存，确保字段存在（即使为空）
+    wx.setStorageSync('dsnc', data.nicheng || '')
+    wx.setStorageSync('dsjieshao', data.jieshao || '')
+    wx.setStorageSync('dsdianhua', data.dianhua || '')
+    wx.setStorageSync('dsweixin', data.wechat || '')
+  },
+
+  // 构建完整头像URL
+  buildAvatarUrl() {
+    const app = getApp()
+    
+    // 获取头像相对路径
+    const touxiangRelative = this.data.touxiangRelative || ''
+    
+    // 获取全局配置
+    const ossImageUrl = app.globalData.ossImageUrl || ''
+    const morentouxiang = app.globalData.morentouxiang || ''
+    
+    // 构建完整URL
+    let fullUrl = ''
+    
+    if (touxiangRelative && touxiangRelative.trim() !== '') {
+      fullUrl = ossImageUrl + touxiangRelative
+    } else {
+      fullUrl = ossImageUrl + morentouxiang
+    }
+    
+    this.setData({ touxiangUrl: fullUrl })
+  },
+
+  // 检查头像是否需要更新
+  checkAvatarUpdate() {
+    const app = getApp()
+    const currentAvatar = wx.getStorageSync('touxiang') || ''
+    
+    // 如果缓存中的头像与当前显示的不同，重新构建URL
+    if (currentAvatar !== this.data.touxiangRelative) {
+      this.setData({ touxiangRelative: currentAvatar })
+      this.buildAvatarUrl()
+    }
+  },
+
+  // 事件处理函数
+  onAvatarTap() {
+    // 头像点击事件（后续可扩展为更换头像）
+    wx.showToast({
+      title: '头像上传功能待实现',
+      icon: 'none',
+      duration: 2000
+    })
+  },
+
+  onNichengInput(e) {
+    const value = e.detail.value
+    this.setData({
+      dashouNicheng: value,
+      nichengValid: value.length <= 20
+    })
+  },
+
+  onDianhuaInput(e) {
+    const value = e.detail.value
+    // 简单的手机号验证
+    const isValid = /^1[3-9]\d{9}$/.test(value) || value === '' || value === '暂未填写'
+    this.setData({
+      dashouDianhua: value,
+      dianhuaValid: isValid
+    })
+  },
+
+  onWeixinInput(e) {
+    const value = e.detail.value
+    this.setData({
+      dashouWeixin: value,
+      weixinValid: value.length <= 30
+    })
+  },
+
+  onJieshaoInput(e) {
+    const value = e.detail.value
+    this.setData({
+      dashouJieshao: value,
+      jieshaoValid: value.length <= 200
+    })
+  },
+
+  // 表单验证
+  validateForm() {
+    const {
+      dashouNicheng,
+      dashouDianhua,
+      dashouWeixin,
+      dashouJieshao,
+      nichengValid,
+      dianhuaValid,
+      weixinValid,
+      jieshaoValid
+    } = this.data
+    
+    // 1. 验证昵称
+    if (!dashouNicheng || dashouNicheng.trim() === '') {
+      wx.showToast({
+        title: '昵称不能为空',
+        icon: 'none',
+        duration: 2000
+      })
+      return false
+    }
+    
+    if (dashouNicheng.length > 20) {
+      wx.showToast({
+        title: '昵称不能超过20字',
+        icon: 'none',
+        duration: 2000
+      })
+      return false
+    }
+    
+    // 2. 验证手机号（非必填，但填写时必须正确）
+    if (dashouDianhua && dashouDianhua !== '暂未填写') {
+      if (!/^1[3-9]\d{9}$/.test(dashouDianhua)) {
+        wx.showToast({
+          title: '手机号格式不正确',
+          icon: 'none',
+          duration: 2000
+        })
+        return false
+      }
+    }
+    
+    // 3. 验证微信号（非必填）
+    if (dashouWeixin && dashouWeixin.length > 30) {
+      wx.showToast({
+        title: '微信号不能超过30字符',
+        icon: 'none',
+        duration: 2000
+      })
+      return false
+    }
+    
+    // 4. 验证个人介绍
+    if (dashouJieshao && dashouJieshao.length > 200) {
+      wx.showToast({
+        title: '介绍不能超过200字',
+        icon: 'none',
+        duration: 2000
+      })
+      return false
+    }
+    
+    return true
+  },
+
+  // 格式化提交数据
+  formatSubmitData() {
+    const {
+      dashouNicheng,
+      dashouDianhua,
+      dashouWeixin,
+      dashouJieshao
+    } = this.data
+    
+    // 将"暂未填写"转换为空字符串
+    const formatValue = (value) => {
+      return value === '暂未填写' ? '' : value.trim()
+    }
+    
+    return {
+      nicheng: formatValue(dashouNicheng),
+      dianhua: formatValue(dashouDianhua),
+      wechat: formatValue(dashouWeixin),
+      jieshao: formatValue(dashouJieshao)
+    }
+  },
+
+  // 提交修改
+  async onSubmit() {
+    // 防止重复提交
+    if (this.data.isSubmitting) return
+    
+    // 表单验证
+    if (!this.validateForm()) return
+    
+    this.setData({ isSubmitting: true })
+    
+    // 准备提交数据
+    const postData = this.formatSubmitData()
+    
+    try {
+      const res = await request({
+        url: '/yonghu/dsgxxx',
+        method: 'POST',
+        data: postData
+      })
+      
+      if (res && res.data.code === 200) {
+        // 更新成功
+        wx.showToast({
+          title: '修改成功',
+          icon: 'success',
+          duration: 2000
+        })
+        
+        // 更新本地缓存
+        this.updateLocalCache(postData)
+        
+        // 延迟返回上一页
+        setTimeout(() => {
+          wx.navigateBack()
+        }, 1500)
+        
+      } else {
+        // 更新失败
+        const errorMsg = res?.data?.msg || '修改失败，请重试'
+        wx.showModal({
+          title: '修改失败',
+          content: errorMsg,
+          showCancel: false
+        })
+        this.setData({ isSubmitting: false })
+      }
+      
+    } catch (error) {
+      console.error('提交修改失败:', error)
+      wx.showModal({
+        title: '请求失败',
+        content: error.message || '网络错误，请检查连接',
+        showCancel: false
+      })
+      this.setData({ isSubmitting: false })
+    }
+  },
+
+  // 更新本地缓存
+  updateLocalCache(data) {
+    if (data.nicheng !== undefined) {
+      wx.setStorageSync('dsnc', data.nicheng)
+    }
+    if (data.jieshao !== undefined) {
+      wx.setStorageSync('dsjieshao', data.jieshao)
+    }
+    if (data.dianhua !== undefined) {
+      wx.setStorageSync('dsdianhua', data.dianhua)
+    }
+    if (data.wechat !== undefined) {
+      wx.setStorageSync('dsweixin', data.wechat)
+    }
+  }
+})
\ No newline at end of file
diff --git a/pages/dashouxiugai/dashouxiugai.json b/pages/dashouxiugai/dashouxiugai.json
new file mode 100644
index 0000000..8eb3bea
--- /dev/null
+++ b/pages/dashouxiugai/dashouxiugai.json
@@ -0,0 +1,11 @@
+{
+    
+    "navigationBarTitleText": "服务者信息修改",
+    "navigationBarBackgroundColor": "#ffffff",
+    "navigationBarTextStyle": "black",
+    "backgroundColor": "#f8f9fa",
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    }
+  }
\ No newline at end of file
diff --git a/pages/dashouxiugai/dashouxiugai.wxml b/pages/dashouxiugai/dashouxiugai.wxml
new file mode 100644
index 0000000..5861902
--- /dev/null
+++ b/pages/dashouxiugai/dashouxiugai.wxml
@@ -0,0 +1,103 @@
+
+<view class="container">
+  
+  <view class="avatar-section">
+    <view class="avatar-wrapper">
+      <image 
+        src="{{ touxiangUrl }}" 
+        mode="aspectFill" 
+        class="avatar"
+        bindtap="onAvatarTap"
+      ></image>
+      <view class="avatar-halo"></view>
+      <text class="avatar-hint">点击更换头像</text>
+    </view>
+  </view>
+
+  
+  <view class="info-section">
+    
+    <view class="info-item">
+      <text class="info-label">服务者UID</text>
+      <text class="info-value info-value-disabled">{{ dashouUid }}</text>
+    </view>
+
+    
+    <view class="info-item">
+      <text class="info-label">服务昵称</text>
+      <input 
+        value="{{ dashouNicheng }}"
+        placeholder="请输入昵称"
+        maxlength="20"
+        bindinput="onNichengInput"
+        class="info-input"
+      />
+      <text class="char-count">{{ dashouNicheng.length || 0 }}/20</text>
+    </view>
+
+    
+    <view class="info-item">
+      <text class="info-label">联系电话</text>
+      <input 
+        value="{{ dashouDianhua }}"
+        placeholder="请输入手机号"
+        type="number"
+        maxlength="11"
+        bindinput="onDianhuaInput"
+        class="info-input"
+      />
+    </view>
+
+    
+    <view class="info-item">
+      <text class="info-label">微信号</text>
+      <input 
+        value="{{ dashouWeixin }}"
+        placeholder="请输入微信号"
+        maxlength="30"
+        bindinput="onWeixinInput"
+        class="info-input"
+      />
+      <text class="char-count">{{ dashouWeixin.length || 0 }}/30</text>
+    </view>
+
+    
+    <view class="info-item info-item-textarea">
+      <text class="info-label">个人介绍</text>
+      <textarea 
+        value="{{ dashouJieshao }}"
+        placeholder="请简单介绍一下自己..."
+        maxlength="200"
+        bindinput="onJieshaoInput"
+        class="info-textarea"
+      >

+ {{ dashouJieshao.length || 0 }}/200 + + + + + + 提示：已从服务器加载最新信息 + + + + + + + + + + +

+ 加载中... + + + + diff --git a/pages/dashouxiugai/dashouxiugai.wxss b/pages/dashouxiugai/dashouxiugai.wxss new file mode 100644 index 0000000..653e8db --- /dev/null +++ b/pages/dashouxiugai/dashouxiugai.wxss @@ -0,0 +1,197 @@ +/* 页面容器 */ +.container { + min-height: 100vh; + background: linear-gradient(135deg, #fffacd 0%, #e6f7ff 100%); + padding: 20rpx; + box-sizing: border-box; + } + + /* 头像区域 */ + .avatar-section { + display: flex; + justify-content: center; + align-items: center; + padding: 40rpx 0; + position: relative; + } + + .avatar-wrapper { + position: relative; + display: flex; + flex-direction: column; + align-items: center; + } + + .avatar { + width: 180rpx; + height: 180rpx; + border-radius: 50%; + border: 6rpx solid #ffffff; + box-shadow: 0 0 30rpx rgba(255, 215, 0, 0.4); + z-index: 2; + position: relative; + background-color: #f5f5f5; + } + + .avatar-halo { + position: absolute; + width: 220rpx; + height: 220rpx; + border-radius: 50%; + background: radial-gradient(circle, rgba(255, 215, 0, 0.2) 0%, transparent 70%); + z-index: 1; + animation: halo-pulse 2s infinite ease-in-out; + } + + @keyframes halo-pulse { + 0%, 100% { opacity: 0.6; transform: scale(1); } + 50% { opacity: 0.8; transform: scale(1.05); } + } + + .avatar-hint { + margin-top: 20rpx; + font-size: 26rpx; + color: #666; + text-align: center; + } + + /* 信息区域 */ + .info-section { + background: rgba(255, 255, 255, 0.9); + border-radius: 20rpx; + padding: 30rpx; + margin-bottom: 40rpx; + box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.05); + } + + .info-item { + display: flex; + flex-direction: column; + margin-bottom: 40rpx; + position: relative; + padding-bottom: 30rpx; + border-bottom: 1rpx solid #f0f0f0; + } + + .info-item:last-child { + border-bottom: none; + } + + .info-label { + font-size: 28rpx; + color: #333; + font-weight: 600; + margin-bottom: 15rpx; + } + + .info-value-disabled { + font-size: 32rpx; + color: #999; + font-weight: bold; + background: #f9f9f9; + padding: 20rpx; + border-radius: 10rpx; + } + + .info-input { + font-size: 32rpx; + color: #333; + padding: 20rpx; + background: #f9f9f9; + border-radius: 10rpx; + border: 1rpx solid #e0e0e0; + } + + .info-textarea { + font-size: 30rpx; + color: #333; + padding: 20rpx; + background: #f9f9f9; + border-radius: 10rpx; + border: 1rpx solid #e0e0e0; + min-height: 200rpx; + line-height: 1.5; + } + + .info-item-textarea { + padding-bottom: 20rpx; + } + + .char-count { + position: absolute; + right: 0; + bottom: 5rpx; + font-size: 24rpx; + color: #999; + } + + /* 状态提示 */ + .status-section { + background: #e8f4fd; + border-radius: 10rpx; + padding: 20rpx; + margin-bottom: 30rpx; + border-left: 6rpx solid #1890ff; + } + + .status-text { + font-size: 26rpx; + color: #1890ff; + } + + /* 按钮区域 */ + .button-section { + padding: 20rpx 0 40rpx; + } + + .submit-btn { + background: linear-gradient(90deg, #52c41a, #73d13d); + color: white; + font-size: 32rpx; + font-weight: 600; + height: 90rpx; + line-height: 70rpx; + border-radius: 45rpx; + border: none; + box-shadow: 0 10rpx 20rpx rgba(82, 196, 26, 0.2); + } + + .submit-btn:disabled { + background: #cccccc; + box-shadow: none; + } + + .submit-btn::after { + border: none; + } + + /* 加载中 */ + .loading-wrapper { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: rgba(255, 255, 255, 0.9); + display: flex; + justify-content: center; + align-items: center; + z-index: 1000; + } + + .loading-content { + display: flex; + flex-direction: column; + align-items: center; + } + + .loading-icon { + width: 120rpx; + height: 120rpx; + margin-bottom: 30rpx; + } + + .loading-text { + font-size: 28rpx; + color: #666; + } \ No newline at end of file diff --git a/pages/dingdan/dingdan.js b/pages/dingdan/dingdan.js new file mode 100644 index 0000000..9e31b53 --- /dev/null +++ b/pages/dingdan/dingdan.js @@ -0,0 +1,287 @@ +// pages/dingdan/dingdan.js +const app = getApp() +import request from '../../utils/request.js' + +Page({ + data: { + // 订单状态tab配置 + dingdanZhuangtaiTabs: [ + { name: '全部', key: 'all', zhuangtaiList: [1, 2, 3, 4, 5, 6, 7, 8] }, + { name: '已下单', key: 'yixiadan', zhuangtaiList: [1, 7] }, + { name: '进行中', key: 'jinxingzhong', zhuangtaiList: [2] }, + { name: '争议订单', key: 'zhengyi', zhuangtaiList: [4, 5, 6] }, + { name: '已完成', key: 'yiwancheng', zhuangtaiList: [3] }, + { name: '结算中', key: 'jiesuanzhong', zhuangtaiList: [8] } + ], + + // 当前选中的tab索引 + xuanzhongTabIndex: 0, + // 当前选中的tab的key + currentTabKey: 'all', + + // 每个tab对应的订单数据 + dingdanShuju: { + all: { list: [], page: 1, hasMore: true, isLoading: false }, + yixiadan: { list: [], page: 1, hasMore: true, isLoading: false }, + jinxingzhong: { list: [], page: 1, hasMore: true, isLoading: false }, + zhengyi: { list: [], page: 1, hasMore: true, isLoading: false }, + yiwancheng: { list: [], page: 1, hasMore: true, isLoading: false }, + jiesuanzhong: { list: [], page: 1, hasMore: true, isLoading: false } + }, + + // 个人中心传递过来的type参数 + gerenzhongxinType: '', + + // 是否显示加载更多 + xianshiJiazaigengduo: false, + + // 页面加载状态 + isLoading: true + }, + + onLoad(options) { + const type = options.type || '' + + wx.setNavigationBarTitle({ + title: '我的订单' + }) + + this.qingkongGerenzhongxinJishu(type) + + const tabIndex = this.yingsheTypeToTabIndex(type) + const tabKey = this.data.dingdanZhuangtaiTabs[tabIndex].key + + this.setData({ + gerenzhongxinType: type, + xuanzhongTabIndex: tabIndex, + currentTabKey: tabKey, + isLoading: false + }) + + this.jiazaiDingdanShuju(tabIndex) + }, + onShow() { + // 原有代码... + + // 🆕 注册通知组件 + this.registerNotificationComponent(); +}, + +// 🆕 新增：注册通知组件 +registerNotificationComponent() { + const app = getApp(); + const notificationComp = this.selectComponent('#global-notification'); + + if (notificationComp && notificationComp.showNotification) { + console.log('🏪 商城页面注册通知组件'); + app.globalData.globalNotification = { + show: (data) => notificationComp.showNotification(data), + hide: () => notificationComp.hideNotification() + }; + } +}, + + + qingkongGerenzhongxinJishu(type) { + const jishuMap = { + 'daifuwu': 'daifuwu', + 'fuwuzhong': 'fuwuzhong', + 'yiwancheng': 'yiwancheng', + 'yituikuan': 'yituikuan' + } + + const jishuKey = jishuMap[type] + if (jishuKey && app.globalData.dingdanTiaoshu) { + app.globalData.dingdanTiaoshu[jishuKey] = 0 + } + }, + + yingsheTypeToTabIndex(type) { + const yingsheMap = { + 'daifuwu': 1, + 'fuwuzhong': 2, + 'yiwancheng': 4, + 'yituikuan': 3 + } + + return yingsheMap[type] || 0 + }, + + switchDingdanTab(e) { + const tabIndex = e.currentTarget.dataset.index + if (tabIndex === this.data.xuanzhongTabIndex) return + + const tabKey = this.data.dingdanZhuangtaiTabs[tabIndex].key + + this.setData({ + xuanzhongTabIndex: tabIndex, + currentTabKey: tabKey + }) + + this.jiazaiDingdanShuju(tabIndex) + }, + + async jiazaiDingdanShuju(tabIndex, isLoadMore = false) { + const tab = this.data.dingdanZhuangtaiTabs[tabIndex] + const tabKey = tab.key + + const tabData = this.data.dingdanShuju[tabKey] + + const page = isLoadMore ? tabData.page + 1 : 1 + + if (tabData.isLoading) return + + // 重置逻辑：如果不是加载更多，清空已有数据 + if (!isLoadMore) { + this.setData({ + [`dingdanShuju.${tabKey}.list`]: [], + [`dingdanShuju.${tabKey}.page`]: 1 + }) + } + + this.setData({ + [`dingdanShuju.${tabKey}.isLoading`]: true + }) + + wx.showLoading({ + title: isLoadMore ? '加载更多...' : '加载订单...', + mask: true + }) + + try { + const requestData = { + zhuangtai_list: tab.zhuangtaiList, + page: page, + page_size: 10 + } + + + + const res = await request({ + url: '/dingdan/dingdanhuoqu', + method: 'POST', + data: requestData, + header: { + 'content-type': 'application/json' + } + }) + + + + wx.hideLoading() + + // ✅ 关键修正：res是直接返回的数据对象，不是res.data + if (res && res.data.code === 0) { + // ✅ 关键修正：直接使用res.data.list + const newDingdanList = res.data.data.list || [] + const hasMore = res.data.data.has_more || false + + + + // 处理图片URL，拼接完整路径 + const processedList = newDingdanList.map(item => { + let tupianUrl = item.tupian || '' + + // 如果图片URL不是完整路径，拼接ossImageUrl + if (tupianUrl && !tupianUrl.startsWith('http')) { + const ossImageUrl = app.globalData.ossImageUrl || '' + tupianUrl = ossImageUrl + tupianUrl + } + + const zhuangtaiZh = this.getZhuangtaiZhongwen(item.zhuangtai) + + + return { + ...item, + tupian: tupianUrl, + zhuangtaiZh: zhuangtaiZh + } + }) + + const currentList = this.data.dingdanShuju[tabKey].list + const updatedList = isLoadMore + ? [...currentList, ...processedList] + : processedList + + this.setData({ + [`dingdanShuju.${tabKey}.list`]: updatedList, + [`dingdanShuju.${tabKey}.page`]: page, + [`dingdanShuju.${tabKey}.hasMore`]: hasMore, + [`dingdanShuju.${tabKey}.isLoading`]: false, + xianshiJiazaigengduo: hasMore + }) + + } else { + wx.showToast({ + title: res ? (res.msg || '加载失败') : '请求失败', + icon: 'none', + duration: 2000 + }) + + this.setData({ + [`dingdanShuju.${tabKey}.isLoading`]: false + }) + } + + } catch (error) { + console.error('加载订单数据失败:', error) + wx.hideLoading() + wx.showToast({ + title: '网络请求失败，请重试', + icon: 'none', + duration: 2000 + }) + + this.setData({ + [`dingdanShuju.${tabKey}.isLoading`]: false + }) + } + }, + + getZhuangtaiZhongwen(zhuangtai) { + const zhuangtaiMap = { + 1: '已下单', + 2: '进行中', + 3: '已完成', + 4: '退款中', + 5: '已退款', + 6: '退款失败', + 7: '指定中', + 8: '结算中' + } + + return zhuangtaiMap[zhuangtai] || '未知状态' + }, + + onReachBottom() { + const tabKey = this.data.currentTabKey + const tabData = this.data.dingdanShuju[tabKey] + + if (tabData.hasMore && !tabData.isLoading) { + const tabIndex = this.data.xuanzhongTabIndex + this.jiazaiDingdanShuju(tabIndex, true) + } + }, + + goToDingdanXiangqing(e) { + const dingdanItem = e.currentTarget.dataset.item + if (!dingdanItem) return + + const dingdanDataStr = encodeURIComponent(JSON.stringify(dingdanItem)) + + wx.navigateTo({ + url: `/pages/dingdanxiangqing/dingdanxiangqing?dingdanData=${dingdanDataStr}` + }) + }, + + onImageError(e) { + const index = e.currentTarget.dataset.index + const tabKey = this.data.currentTabKey + + const defaultImage = app.globalData.lunbozhanwei || '/images/default.jpg' + + this.setData({ + [`dingdanShuju.${tabKey}.list[${index}].tupian`]: defaultImage + }) + } +}) \ No newline at end of file diff --git a/pages/dingdan/dingdan.json b/pages/dingdan/dingdan.json new file mode 100644 index 0000000..837f016 --- /dev/null +++ b/pages/dingdan/dingdan.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "global-notification": "/components/global-notification/global-notification" + } +} \ No newline at end of file diff --git a/pages/dingdan/dingdan.wxml b/pages/dingdan/dingdan.wxml new file mode 100644 index 0000000..9d64425 --- /dev/null +++ b/pages/dingdan/dingdan.wxml @@ -0,0 +1,111 @@ + + + + + + + + + {{item.name}} + + + + + + + + + + + + + 加载中... + + + + +

+ 暂无订单 + 快去下单体验服务吧 + + + + + + + + +

+ + + + + + {{item.jieshao || '暂无描述'}} + + + + + + + + {{item.zhuangtaiZh || '未知状态'}} + + + + + ¥ + {{item.jine || '0.00'}} + + + + + + + + + + 上拉加载更多 + + + + + + 没有更多订单了 + + + + + + diff --git a/pages/dingdan/dingdan.wxss b/pages/dingdan/dingdan.wxss new file mode 100644 index 0000000..afb2316 --- /dev/null +++ b/pages/dingdan/dingdan.wxss @@ -0,0 +1,262 @@ +/* pages/dingdan/dingdan.wxss */ + +.dingdan-page { + min-height: 100vh; + background-color: #f8f9fa; + padding-bottom: 20rpx; + } + + .dingdan-tabs-scroll { + width: 100%; + height: 90rpx; + white-space: nowrap; + background-color: #ffffff; + border-bottom: 1rpx solid #f0f0f0; + box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.03); + } + + .dingdan-tabs-container { + display: flex; + align-items: center; + height: 100%; + padding: 0 20rpx; + } + + .dingdan-tab-item { + display: inline-flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 60rpx; + padding: 0 30rpx; + margin-right: 20rpx; + border-radius: 30rpx; + background-color: #f5f5f5; + color: #666666; + font-size: 28rpx; + transition: all 0.3s ease; + position: relative; + flex-shrink: 0; + } + + .dingdan-tab-item:last-child { + margin-right: 0; + } + + .dingdan-tab-item.tab-active { + background-color: #e8f5e9; + color: #2e7d32; + font-weight: 500; + box-shadow: 0 4rpx 12rpx rgba(46, 125, 50, 0.1); + } + + .tab-active-line { + width: 40rpx; + height: 4rpx; + background-color: #4caf50; + border-radius: 2rpx; + margin-top: 6rpx; + animation: fadeIn 0.3s ease; + } + + @keyframes fadeIn { + from { opacity: 0; transform: scale(0.8); } + to { opacity: 1; transform: scale(1); } + } + + .tab-text { + font-weight: 400; + } + + .dingdan-list-container { + padding: 20rpx; + } + + .loading-container { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 400rpx; + } + + .loading-spinner { + width: 60rpx; + height: 60rpx; + border: 6rpx solid #e0e0e0; + border-top-color: #4caf50; + border-radius: 50%; + animation: spin 1s linear infinite; + margin-bottom: 20rpx; + } + + @keyframes spin { + from { transform: rotate(0deg); } + to { transform: rotate(360deg); } + } + + .loading-text { + font-size: 28rpx; + color: #999999; + } + + .empty-container { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 500rpx; + padding-top: 80rpx; + } + + .empty-image { + width: 200rpx; + height: 200rpx; + margin-bottom: 30rpx; + opacity: 0.6; + } + + .empty-text { + font-size: 32rpx; + color: #999999; + margin-bottom: 10rpx; + } + + .empty-subtext { + font-size: 26rpx; + color: #cccccc; + } + + .dingdan-card { + display: flex; + align-items: center; + background-color: #ffffff; + border-radius: 16rpx; + padding: 24rpx; + margin-bottom: 20rpx; + box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05); + transition: transform 0.2s ease, box-shadow 0.2s ease; + } + + .dingdan-card:active { + transform: translateY(-2rpx); + box-shadow: 0 6rpx 24rpx rgba(0, 0, 0, 0.08); + } + + .dingdan-card-left { + flex-shrink: 0; + margin-right: 24rpx; + } + + .dingdan-image { + width: 160rpx; + height: 160rpx; + border-radius: 12rpx; + background-color: #f5f5f5; + } + + .dingdan-card-center { + flex: 1; + height: 160rpx; + display: flex; + align-items: flex-start; + } + + .dingdan-jieshao { + font-size: 28rpx; + line-height: 40rpx; + color: #333333; + font-weight: 400; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; + overflow: hidden; + text-overflow: ellipsis; + } + + .dingdan-card-right { + display: flex; + flex-direction: column; + align-items: flex-end; + justify-content: space-between; + height: 160rpx; + margin-left: 20rpx; + } + + .dingdan-zhuangtai { + font-size: 24rpx; + color: #ff6b6b; + font-weight: 500; + padding: 6rpx 16rpx; + border-radius: 20rpx; + background-color: #fff5f5; + white-space: nowrap; + } + + /* ✅ 修正后的价格样式 - 简单明了 */ + .dingdan-jine { + display: flex; + align-items: center; /* 垂直居中 */ + } + + .jine-symbol { + font-size: 28rpx; + color: #333333; + font-weight: 500; + margin-right: 4rpx; /* 添加右边距，让符号和数字有间隔 */ + } + + .jine-number { + font-size: 32rpx; /* 整数和小数一样大 */ + color: #333333; + font-weight: 600; + } + + .load-more-container { + display: flex; + align-items: center; + justify-content: center; + padding: 40rpx 0; + } + + .load-more-line { + width: 80rpx; + height: 1rpx; + background-color: #e0e0e0; + margin: 0 20rpx; + } + + .load-more-text { + font-size: 26rpx; + color: #999999; + white-space: nowrap; + } + + .no-more-container { + text-align: center; + padding: 40rpx 0; + } + + .no-more-text { + font-size: 26rpx; + color: #cccccc; + } + + @media (max-width: 375px) { + .dingdan-image { + width: 140rpx; + height: 140rpx; + } + + .dingdan-card-center { + height: 140rpx; + } + + .dingdan-card-right { + height: 140rpx; + } + + .jine-number { + font-size: 30rpx; + } + } \ No newline at end of file diff --git a/pages/dingdanxiangqing/dingdanxiangqing.js b/pages/dingdanxiangqing/dingdanxiangqing.js new file mode 100644 index 0000000..9e5fa60 --- /dev/null +++ b/pages/dingdanxiangqing/dingdanxiangqing.js @@ -0,0 +1,412 @@ +// pages/dingdanxiangqing/dingdanxiangqing.js +const app = getApp() +import request from '../../utils/request.js' + +Page({ + data: { + // 从跳转参数获取的基础数据 + jibenShuju: { + dingdanId: '', + tupian: '', + jieshao: '', + chuangjianshijian: '', + jine: '', + nicheng: '', + beizhu: '', + zhuangtai: 0 + }, + + // 从后端获取的详细数据 + xiangxiShuju: { + zhiding: '', // 指定打手 + dashou: '', // 服务打手 + dashoujiaofu: [], // 打手交付图片列表 + dashouliuyan: '' // 打手留言 + }, + + // 结算相关数据 + jiesuanShuju: { + pingfen: 0, // 评分 0-5 + liuyan: '' // 留言 + }, + + // 页面状态 + isLoading: true, // 页面加载中 + isJiesuanLoading: false, // 结单请求中 + + // 状态颜色映射 + zhuangtaiYanseMap: { + 1: '#E8F5E9', // 已下单 - 浅绿色 + 2: '#E3F2FD', // 进行中 - 浅蓝色 + 3: '#F3E5F5', // 已完成 - 浅紫色 + 4: '#FFF3E0', // 退款中 - 浅橙色 + 5: '#FFEBEE', // 已退款 - 浅红色 + 6: '#EFEBE9', // 退款失败 - 浅棕色 + 7: '#E0F7FA', // 指定中 - 浅青色 + 8: '#FFF8E1' // 结算中 - 浅黄色 + }, + + // 状态文字映射 + zhuangtaiWenziMap: { + 1: '已下单', + 2: '进行中', + 3: '已完成', + 4: '退款中', + 5: '已退款', + 6: '退款失败', + 7: '指定中', + 8: '结算中' + }, + + // 星星评分数据 + xingxingData: [ + { id: 1, active: false }, + { id: 2, active: false }, + { id: 3, active: false }, + { id: 4, active: false }, + { id: 5, active: false } + ] + }, + + onLoad(options) { + // 设置页面标题 + wx.setNavigationBarTitle({ + title: '订单详情' + }) + + // 解析跳转参数 + this.jiexiTiaozhuanCanshu(options) + }, + onShow() { + // 原有代码... + + // 🆕 注册通知组件 + this.registerNotificationComponent(); +}, + +// 🆕 新增：注册通知组件 +registerNotificationComponent() { + const app = getApp(); + const notificationComp = this.selectComponent('#global-notification'); + + if (notificationComp && notificationComp.showNotification) { + console.log('🏪 商城页面注册通知组件'); + app.globalData.globalNotification = { + show: (data) => notificationComp.showNotification(data), + hide: () => notificationComp.hideNotification() + }; + } +}, + + /** + * 解析跳转参数 + */ + jiexiTiaozhuanCanshu(options) { + try { + const dingdanDataStr = options.dingdanData || '' + if (!dingdanDataStr) { + wx.showToast({ + title: '订单数据错误', + icon: 'none' + }) + setTimeout(() => { + wx.navigateBack() + }, 1500) + return + } + + // 解析订单数据 + const dingdanData = JSON.parse(decodeURIComponent(dingdanDataStr)) + + + + // 处理图片URL（拼接完整路径） + let tupianUrl = dingdanData.tupian || '' + if (tupianUrl && !tupianUrl.startsWith('http')) { + const ossImageUrl = app.globalData.ossImageUrl || '' + tupianUrl = ossImageUrl + tupianUrl + } + + // 格式化价格 + let jine = dingdanData.jine || 0 + jine = parseFloat(jine) + if (isNaN(jine)) { + jine = 0 + } + const formattedJine = jine.toFixed(2) + + // 设置基础数据（状态先用跳转的，等后端返回后更新） + this.setData({ + 'jibenShuju.dingdanId': dingdanData.dingdanId || '', + 'jibenShuju.tupian': tupianUrl, + 'jibenShuju.jieshao': dingdanData.jieshao || '', + 'jibenShuju.chuangjianshijian': dingdanData.chuangjianshijian || '', + 'jibenShuju.jine': formattedJine, + 'jibenShuju.nicheng': dingdanData.nicheng || '', + 'jibenShuju.beizhu': dingdanData.beizhu || '', + // 这里先使用跳转的状态，等后端返回后会被覆盖 + 'jibenShuju.zhuangtai': dingdanData.zhuangtai || 0, + isLoading: false + }) + + + + // 加载详细数据 + this.jiazaiXiangxiShuju(dingdanData.dingdanId) + + } catch (error) { + console.error('解析订单数据失败:', error) + wx.showToast({ + title: '数据解析失败', + icon: 'none' + }) + setTimeout(() => { + wx.navigateBack() + }, 1500) + } + }, + + /** + * 加载详细数据 + */ + async jiazaiXiangxiShuju(dingdanId) { + if (!dingdanId) return + + + + try { + const res = await request({ + url: '/dingdan/dingdanxiangqing', + method: 'POST', + data: { dingdanId: dingdanId }, + header: { 'content-type': 'application/json' } + }) + + + + // 关键修正：使用正确的数据访问路径 + if (res && res.data.code === 0 && res.data.data) { + const data = res.data.data + + + + // 处理打手交付图片（拼接完整URL） + let dashoujiaofuList = data.dashoujiaofu || [] + dashoujiaofuList = dashoujiaofuList.map(imgUrl => { + if (imgUrl && !imgUrl.startsWith('http')) { + const ossImageUrl = app.globalData.ossImageUrl || '' + return ossImageUrl + imgUrl + } + return imgUrl + }) + + // 核心修正：使用后端返回的订单状态，覆盖跳转时的状态 + this.setData({ + 'xiangxiShuju.zhiding': data.zhiding || '', + 'xiangxiShuju.dashou': data.dashou || '', + 'xiangxiShuju.dashoujiaofu': dashoujiaofuList, + 'xiangxiShuju.dashouliuyan': data.dashouliuyan || '', + // 关键：使用后端返回的状态覆盖跳转的状态 + 'jibenShuju.zhuangtai': data.zhuangtai || 0 + }) + + + + } else { + console.warn('获取详细数据失败:', res?.msg || '未知错误') + wx.showToast({ + title: res?.msg || '获取订单详情失败', + icon: 'none', + duration: 2000 + }) + } + + } catch (error) { + console.error('加载详细数据失败:', error) + wx.showToast({ + title: '加载数据失败，请重试', + icon: 'none', + duration: 2000 + }) + } + }, + + /** + * 复制文本到剪贴板 + */ + async fuzhiWenben(e) { + const text = e.currentTarget.dataset.text + if (!text) return + + + + try { + await wx.setClipboardData({ + data: text + }) + + wx.showToast({ + title: '复制成功', + icon: 'success', + duration: 1500 + }) + + } catch (error) { + console.error('复制失败:', error) + wx.showToast({ + title: '复制失败', + icon: 'none' + }) + } + }, + + /** + * 预览图片 + */ + yulanTupian(e) { + const currentUrl = e.currentTarget.dataset.url + const urls = e.currentTarget.dataset.urls || [] + + if (!currentUrl) return + + wx.previewImage({ + current: currentUrl, + urls: urls.length > 0 ? urls : [currentUrl] + }) + }, + + /** + * 点击星星评分 + */ + dianjiXingxing(e) { + const pingfen = e.currentTarget.dataset.index + + // 更新星星状态 + const xingxingData = this.data.xingxingData.map((item, index) => ({ + ...item, + active: index < pingfen + })) + + this.setData({ + xingxingData: xingxingData, + 'jiesuanShuju.pingfen': pingfen + }) + + + }, + + /** + * 输入留言 + */ + shuruLiuyan(e) { + const liuyan = e.detail.value.slice(0, 50) // 限制50字 + this.setData({ + 'jiesuanShuju.liuyan': liuyan + }) + }, + + /** + * 提交结单 + */ + async tijiaoJiedan() { + const { jibenShuju, jiesuanShuju } = this.data + + console.log('提交结单，数据:', { + dingdanId: jibenShuju.dingdanId, + pingfen: jiesuanShuju.pingfen, + liuyan: jiesuanShuju.liuyan + }) + + // 验证订单状态 + if (jibenShuju.zhuangtai !== 8) { + wx.showToast({ + title: '订单不在结算状态', + icon: 'none' + }) + return + } + + // 验证评分范围 + if (jiesuanShuju.pingfen < 0 || jiesuanShuju.pingfen > 5) { + wx.showToast({ + title: '请选择0-5分评分', + icon: 'none' + }) + return + } + + // 验证订单ID + if (!jibenShuju.dingdanId) { + wx.showToast({ + title: '订单信息错误', + icon: 'none' + }) + return + } + + // 显示加载中 + this.setData({ isJiesuanLoading: true }) + wx.showLoading({ + title: '提交中...', + mask: true + }) + + try { + const res = await request({ + url: '/dingdan/jiedan', + method: 'POST', + data: { + dingdanId: jibenShuju.dingdanId, + pingfen: jiesuanShuju.pingfen, + liuyan: jiesuanShuju.liuyan + }, + header: { 'content-type': 'application/json' } + }) + + + + wx.hideLoading() + this.setData({ isJiesuanLoading: false }) + + // 使用正确的数据访问路径 + if (res && res.data.code === 0) { + // 结单成功，更新订单状态 + this.setData({ + 'jibenShuju.zhuangtai': 3, // 变为已完成状态 + 'jiesuanShuju.pingfen': 0, + 'jiesuanShuju.liuyan': '' + }) + + // 重置星星 + const resetXingxingData = this.data.xingxingData.map(item => ({ + ...item, + active: false + })) + this.setData({ xingxingData: resetXingxingData }) + + wx.showToast({ + title: '结单成功', + icon: 'success', + duration: 2000 + }) + + } else { + wx.showToast({ + title: res?.msg || '结单失败', + icon: 'none' + }) + } + + } catch (error) { + console.error('结单失败:', error) + wx.hideLoading() + this.setData({ isJiesuanLoading: false }) + wx.showToast({ + title: '网络错误，请重试', + icon: 'none' + }) + } + }, + + +}) \ No newline at end of file diff --git a/pages/dingdanxiangqing/dingdanxiangqing.json b/pages/dingdanxiangqing/dingdanxiangqing.json new file mode 100644 index 0000000..837f016 --- /dev/null +++ b/pages/dingdanxiangqing/dingdanxiangqing.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "global-notification": "/components/global-notification/global-notification" + } +} \ No newline at end of file diff --git a/pages/dingdanxiangqing/dingdanxiangqing.wxml b/pages/dingdanxiangqing/dingdanxiangqing.wxml new file mode 100644 index 0000000..d0a1ab8 --- /dev/null +++ b/pages/dingdanxiangqing/dingdanxiangqing.wxml @@ -0,0 +1,202 @@ + + + + + + + 加载订单详情... + + + + + + + + +

+ + + {{jibenShuju.jieshao || '暂无描述'}} + + + + + + 订单信息 + + + + 游戏昵称： + {{jibenShuju.nicheng}} + + + + + 备注信息： + {{jibenShuju.beizhu}} + + + + + 指定打手： + {{xiangxiShuju.zhiding}} + + + + + 订单ID： + + {{jibenShuju.dingdanId}} + + 📋 + 复制 + + + + + + + 创建时间： + {{jibenShuju.chuangjianshijian}} + + + + + 订单价格： + ¥{{jibenShuju.jine}} + + + + + 订单状态： + {{zhuangtaiWenziMap[jibenShuju.zhuangtai] || '未知状态'}} + + + + + + 服务详情 + + + + 服务打手： + + {{xiangxiShuju.dashou}} + + 📋 + 复制 + + + + + + + 打手交付 + + + +

+ + + + + + + + 打手留言 + + {{xiangxiShuju.dashouliuyan}} + + + + + + + 订单结算 + + + + + 打星评分： + + + + {{item.active ? '★' : '☆'}} + + + + + + + + + 订单留言（可选） + + + 已输入 {{jiesuanShuju.liuyan.length}}/50 字 + + + + + + + + + + + + + + diff --git a/pages/dingdanxiangqing/dingdanxiangqing.wxss b/pages/dingdanxiangqing/dingdanxiangqing.wxss new file mode 100644 index 0000000..686128a --- /dev/null +++ b/pages/dingdanxiangqing/dingdanxiangqing.wxss @@ -0,0 +1,422 @@ +/* pages/dingdanxiangqing/dingdanxiangqing.wxss */ + +/* 页面基础样式 */ +.dingdanxiangqing-page { + min-height: 100vh; + background-color: #f8f9fa; + padding-bottom: 140rpx; + } + + /* 加载中状态 */ + .loading-container { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 60vh; + } + + .loading-spinner { + width: 80rpx; + height: 80rpx; + border: 8rpx solid #e0e0e0; + border-top-color: #4caf50; + border-radius: 50%; + animation: spin 1.2s linear infinite; + margin-bottom: 30rpx; + } + + @keyframes spin { + from { transform: rotate(0deg); } + to { transform: rotate(360deg); } + } + + .loading-text { + font-size: 30rpx; + color: #666666; + } + + /* 内容区域 */ + .content-container { + padding: 25rpx; + } + + /* 商品图片和介绍区域 */ + .shangpin-area { + display: flex; + background-color: #ffffff; + border-radius: 20rpx; + padding: 25rpx; + margin-bottom: 25rpx; + box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.06); + } + + .shangpin-image-container { + flex-shrink: 0; + width: 180rpx; + height: 180rpx; + margin-right: 25rpx; + } + + .shangpin-image { + width: 100%; + height: 100%; + border-radius: 12rpx; + background-color: #f5f5f5; + } + + .shangpin-jieshao { + flex: 1; + display: flex; + align-items: flex-start; + } + + .jieshao-text { + font-size: 28rpx; + line-height: 42rpx; + color: #333333; + font-weight: 400; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 4; + overflow: hidden; + text-overflow: ellipsis; + } + + /* 通用区域样式 */ + .info-title { + font-size: 32rpx; + color: #333333; + font-weight: 600; + margin-bottom: 20rpx; + padding-bottom: 12rpx; + border-bottom: 2rpx solid rgba(0, 0, 0, 0.08); + } + + .section-subtitle { + font-size: 28rpx; + color: #555555; + font-weight: 500; + display: block; + } + + /* 左右布局的订单信息项 */ + .dingdan-info-area { + background-color: #ffffff; + border-radius: 20rpx; + padding: 25rpx; + margin-bottom: 25rpx; + box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.06); + } + + .info-item-row { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 18rpx; + padding: 12rpx 0; + } + + .info-item-row:last-child { + margin-bottom: 0; + } + + .item-label { + font-size: 28rpx; + color: #666666; + font-weight: 400; + flex-shrink: 0; + min-width: 150rpx; + } + + /* 右侧区域容器 */ + .item-right-area { + flex: 1; + display: flex; + align-items: center; + justify-content: flex-end; + } + + .item-value { + font-size: 28rpx; + color: #333333; + font-weight: 500; + word-break: break-all; + text-align: right; + margin-right: 15rpx; + } + + /* 特殊样式 */ + .jine-red { + color: #ff4444 !important; + font-weight: 600 !important; + font-size: 32rpx !important; + } + + .zhuangtai-text { + font-weight: 600 !important; + font-size: 30rpx !important; + color: #333333 !important; + } + + /* 复制按钮 */ + .copy-btn { + display: flex; + align-items: center; + justify-content: center; + font-size: 24rpx; + color: #4caf50; + background-color: #e8f5e9; + padding: 6rpx 16rpx; + border-radius: 20rpx; + border: 1rpx solid #4caf50; + transition: all 0.2s ease; + white-space: nowrap; + flex-shrink: 0; + } + + .copy-btn-hover { + background-color: #c8e6c9; + transform: scale(0.95); + } + + .copy-icon { + font-size: 20rpx; + margin-right: 6rpx; + } + + .copy-text { + font-weight: 500; + } + + /* 服务区域 */ + .fuwu-area { + background-color: #ffffff; + border-radius: 20rpx; + padding: 25rpx; + margin-bottom: 25rpx; + box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.06); + } + + /* 打手交付图片网格 */ + .dashou-jiaofu-container { + margin-bottom: 20rpx; + margin-top: 15rpx; + } + + .jiaofu-grid { + display: flex; + flex-wrap: wrap; + margin: -5rpx; + } + + .jiaofu-image-item { + width: calc(33.333% - 10rpx); + margin: 5rpx; + aspect-ratio: 1/1; + } + + .jiaofu-image { + width: 100%; + height: 100%; + border-radius: 12rpx; + background-color: #f5f5f5; + transition: transform 0.2s ease; + } + + .jiaofu-image:active { + transform: scale(0.95); + } + + /* 打手留言 */ + .dashou-liuyan-container { + margin-top: 15rpx; + } + + .liuyan-content { + font-size: 26rpx; + line-height: 40rpx; + color: #555555; + padding: 15rpx; + background-color: #f9f9f9; + border-radius: 12rpx; + border-left: 4rpx solid #4caf50; + } + + /* 结算区域 */ + .jiesuan-area { + background-color: #ffffff; + border-radius: 20rpx; + padding: 25rpx; + margin-bottom: 25rpx; + box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.06); + } + + /* 星星评分布局修正 */ + .pingfen-container { + margin-bottom: 25rpx; + } + + .xingxing-layout { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 10rpx; + } + + .xingxing-wrapper { + display: flex; + align-items: center; + } + + .xingxing-icon { + font-size: 52rpx; + color: #cccccc; + margin-right: 10rpx; + transition: all 0.3s ease; + cursor: pointer; + /* 去掉点击时的蓝色矩形框 */ + user-select: none; + -webkit-tap-highlight-color: transparent; + outline: none; + border: none; + background: none; + } + + .xingxing-icon:last-child { + margin-right: 0; + } + + .xingxing-active { + color: #FFD700; + text-shadow: 0 0 10rpx rgba(255, 215, 0, 0.5); + transform: scale(1.1); + } + + .xingxing-icon:active { + transform: scale(0.9); + } + + /* 留言输入 */ + .liuyan-input-container { + margin-top: 15rpx; + } + + .liuyan-textarea { + width: 100%; + min-height: 120rpx; + font-size: 28rpx; + color: #333333; + background-color: #f9f9f9; + border-radius: 12rpx; + padding: 20rpx; + margin-top: 10rpx; + box-sizing: border-box; + } + + .zi-shu { + display: block; + text-align: right; + font-size: 24rpx; + color: #999999; + margin-top: 8rpx; + } + + /* 底部安全区域 */ + .safe-area { + height: 40rpx; + } + + /* 结单按钮容器修正 */ + .jiedan-btn-container { + position: fixed; + bottom: 0; + left: 0; + right: 0; + background: linear-gradient(to top, rgba(255,255,255,0.9), transparent); + padding: 20rpx 30rpx; + backdrop-filter: blur(10rpx); + z-index: 100; + } + + .jiedan-btn { + background: linear-gradient(135deg, #4caf50, #2e7d32); + color: #ffffff; + border: none; + border-radius: 50rpx; + height: 90rpx; + font-size: 32rpx; + font-weight: 600; + position: relative; + overflow: hidden; + box-shadow: 0 6rpx 20rpx rgba(76, 175, 80, 0.3); + transition: all 0.3s ease; + width: 100%; + /* 垂直居中 */ + display: flex; + align-items: center; + justify-content: center; + } + + .jiedan-btn::after { + border: none; + } + + .btn-hover { + transform: translateY(-2rpx); + box-shadow: 0 8rpx 25rpx rgba(76, 175, 80, 0.4); + } + + .btn-text { + position: relative; + z-index: 2; + /* 确保文字垂直居中 */ + line-height: 1; + } + + /* 按钮闪光特效 */ + .btn-sparkle { + position: absolute; + top: -50%; + left: -50%; + width: 200%; + height: 200%; + background: radial-gradient(circle, rgba(255,255,255,0.3) 1%, transparent 10%); + animation: sparkle 2s infinite linear; + z-index: 1; + } + + @keyframes sparkle { + from { transform: rotate(0deg); } + to { transform: rotate(360deg); } + } + + /* 响应式调整 */ + @media (max-width: 375px) { + .shangpin-image-container { + width: 160rpx; + height: 160rpx; + } + + .xingxing-icon { + font-size: 48rpx; + } + + .jiedan-btn { + height: 85rpx; + font-size: 30rpx; + } + + .item-label { + min-width: 140rpx; + font-size: 26rpx; + } + + .item-value { + font-size: 26rpx; + } + + .jiedan-btn-container { + padding: 20rpx 25rpx; + } + } \ No newline at end of file diff --git a/pages/dsddxq/dsddxq.js b/pages/dsddxq/dsddxq.js new file mode 100644 index 0000000..e39e235 --- /dev/null +++ b/pages/dsddxq/dsddxq.js @@ -0,0 +1,721 @@ +// pages/dsddxq/dsddxq.js - 【最终版：提交前公告弹窗 + 修改图片至少保留一张】 +const app = getApp() +import request from '../../utils/request.js' +const COS = require('../../utils/cos-wx-sdk-v5.js') +import connectionManager from '../../utils/xiaoxilj.js' + +Page({ + data: { + jibenShuju: { + dingdan_id: '', + tupian: '', + jieshao: '', + create_time: '', + jine: '', + nicheng: '', + beizhu: '', + zhuangtai: 0, + fadanpingtai: 0 + }, + xiangxiShuju: { + shangjia_id: '', + shangjia_nicheng: '', + shangjia_liuyan: '', + tuikuan_liyou: '', + chufa_liyou: '', + chufa_zhuangtai: 0, + chufa_jieguo: '', + bohui_liyou: '', + dashou_jiaofu: [], + dashou_liuyan: '', + laoban_id: '' + }, + zhuangtaiYanseMap: { + 1: '#E8F5E9', 2: '#E3F2FD', 3: '#F3E5F5', 4: '#FFF3E0', + 5: '#FFEBEE', 6: '#EFEBE9', 7: '#E0F7FA', 8: '#FFF8E1' + }, + zhuangtaiWenziMap: { + 1: '已下单', 2: '进行中', 3: '已完成', 4: '退款中', + 5: '已退款', 6: '退款失败', 7: '指定中', 8: '结算中' + }, + isLoading: true, + isSubmitting: false, + liuyan: '', + xuanzhongTupian: [], + shangchuanJindu: 0, + shangchuanZongshu: 0, + jinduWidth: '0%', + showWanzhengJieshao: false, + wanzhengJieshao: '', + showWanzhengBeizhu: false, + wanzhengBeizhu: '', + ossImageUrl: '', + morentouxiang: '', + showRefundInfo: false, + + // 修改功能所需字段 + isModifying: false, + originalDashouJiaofu: [], + originalDashouLiuyan: '', + remainingOriginals: [], + modifiedLiuyan: '', + deletedImages: [], + newImages: [], + isConfirming: false, + modifyUploadProgress: { total: 0, current: 0, width: '0%' } + }, + + onLoad(options) { + wx.setNavigationBarTitle({ title: '订单详情' }) + this.initGlobalData() + this.jiexiTiaozhuanCanshu(options) + }, + onHide() { + const popupComp = this.selectComponent('#popupNotice'); + if (popupComp && popupComp.cleanup) { + popupComp.cleanup(); + } + }, + + onShow() { + this.registerNotificationComponent(); + }, + + registerNotificationComponent() { + const app = getApp(); + const notificationComp = this.selectComponent('#global-notification'); + if (notificationComp && notificationComp.showNotification) { + app.globalData.globalNotification = { + show: (data) => notificationComp.showNotification(data), + hide: () => notificationComp.hideNotification() + }; + } + }, + + initGlobalData() { + const app = getApp() + const ossImageUrl = app.globalData.ossImageUrl || 'https://your-oss-domain.com/' + const morentouxiang = app.globalData.morentouxiang || '/images/default-avatar.png' + this.setData({ ossImageUrl, morentouxiang }) + }, + + jiexiTiaozhuanCanshu(options) { + try { + const dingdanDataStr = options.dingdanData || '' + if (!dingdanDataStr) { + wx.showToast({ title: '订单数据错误', icon: 'none' }) + setTimeout(() => wx.navigateBack(), 1500) + return + } + const dingdanData = JSON.parse(decodeURIComponent(dingdanDataStr)) + let tupianUrl = dingdanData.tupian || '' + if (!tupianUrl) tupianUrl = this.getTupianUrl() + let jine = parseFloat(dingdanData.jine || 0) + if (isNaN(jine)) jine = 0 + const formattedJine = jine.toFixed(2) + this.setData({ + 'jibenShuju.dingdan_id': dingdanData.dingdan_id || '', + 'jibenShuju.tupian': tupianUrl, + 'jibenShuju.jieshao': dingdanData.jieshao || '', + 'jibenShuju.create_time': dingdanData.create_time || '', + 'jibenShuju.jine': formattedJine, + 'jibenShuju.nicheng': dingdanData.nicheng || '', + 'jibenShuju.beizhu': dingdanData.beizhu || '', + 'jibenShuju.zhuangtai': dingdanData.zhuangtai || 0, + 'jibenShuju.fadanpingtai': dingdanData.fadanpingtai || 0, + isLoading: false + }) + this.jiazaiXiangxiShuju(dingdanData.dingdan_id) + } catch (error) { + console.error('解析订单数据失败:', error) + wx.showToast({ title: '数据解析失败', icon: 'none' }) + setTimeout(() => wx.navigateBack(), 1500) + } + }, + + getTupianUrl() { + const cacheTouxiang = wx.getStorageSync('touxiang') || '' + let tupianPath = cacheTouxiang || app.globalData.morentouxiang || '' + const ossImageUrl = app.globalData.ossImageUrl || '' + if (tupianPath && ossImageUrl) { + if (tupianPath.startsWith('/')) tupianPath = tupianPath.substring(1) + return ossImageUrl + tupianPath + } + return '' + }, + + async jiazaiXiangxiShuju(dingdanId) { + if (!dingdanId) return + wx.showLoading({ title: '加载中...', mask: true }) + try { + const res = await request({ + url: '/dingdan/dsddxq', + method: 'POST', + data: { dingdan_id: dingdanId }, + header: { 'content-type': 'application/json' } + }) + wx.hideLoading() + if (res && res.data.code === 0 && res.data.data) { + const data = res.data.data + let dashouJiaofuList = data.dashou_jiaofu || [] + dashouJiaofuList = dashouJiaofuList.map(imgUrl => { + if (imgUrl && !imgUrl.startsWith('http')) { + const ossImageUrl = app.globalData.ossImageUrl || '' + if (imgUrl.startsWith('/')) imgUrl = imgUrl.substring(1) + return ossImageUrl + imgUrl + } + return imgUrl + }) + this.setData({ + 'xiangxiShuju.shangjia_id': data.shangjia_id || '', + 'xiangxiShuju.shangjia_nicheng': data.shangjia_nicheng || '', + 'xiangxiShuju.shangjia_liuyan': data.shangjia_liuyan || '', + 'xiangxiShuju.tuikuan_liyou': data.tuikuan_liyou || '', + 'xiangxiShuju.chufa_liyou': data.chufa_liyou || '', + 'xiangxiShuju.chufa_zhuangtai': data.chufa_zhuangtai || 0, + 'xiangxiShuju.chufa_jieguo': data.chufa_jieguo || '', + 'xiangxiShuju.bohui_liyou': data.bohui_liyou || '', + 'xiangxiShuju.dashou_jiaofu': dashouJiaofuList, + 'xiangxiShuju.dashou_liuyan': data.dashou_liuyan || '', + 'xiangxiShuju.laoban_id': data.laoban_id || '', + 'jibenShuju.zhuangtai': data.zhuangtai || 0, + 'jibenShuju.beizhu': data.beizhu || '', + 'liuyan': data.dashou_liuyan || '', + 'jibenShuju.fadanpingtai': data.fadanpingtai || 0 + }) + const currentStatus = data.zhuangtai || 0 + const showRefund = [4,5,6].includes(currentStatus) + this.setData({ showRefundInfo: showRefund }) + } else { + const errorMsg = res?.data?.msg || '获取订单详情失败' + wx.showToast({ title: errorMsg, icon: 'none', duration: 2000 }) + } + } catch (error) { + console.error('加载详细数据失败:', error) + wx.hideLoading() + wx.showToast({ title: '加载数据失败，请重试', icon: 'none', duration: 2000 }) + } + }, + + // ========== 原有提交功能（部分修改） ========== + xuanzeTupian() { + if (this.data.isSubmitting) return + const shengyu = 9 - this.data.xuanzhongTupian.length + if (shengyu <= 0) { + wx.showToast({ title: '最多只能选择9张图片', icon: 'none' }) + return + } + wx.chooseImage({ + count: shengyu, + sizeType: ['compressed'], + sourceType: ['album', 'camera'], + success: (res) => { + const newTupian = [...this.data.xuanzhongTupian, ...res.tempFilePaths] + this.setData({ xuanzhongTupian: newTupian.slice(0, 9) }) + } + }) + }, + shanchuTupian(e) { + const index = e.currentTarget.dataset.index + const newTupian = [...this.data.xuanzhongTupian] + newTupian.splice(index, 1) + this.setData({ xuanzhongTupian: newTupian }) + }, + yulanTupian(e) { + const currentUrl = e.currentTarget.dataset.url + const urls = e.currentTarget.dataset.urls || [] + if (!currentUrl) return + wx.previewImage({ current: currentUrl, urls: urls.length > 0 ? urls : [currentUrl] }) + }, + getFileExtension(filePath) { + const lastDotIndex = filePath.lastIndexOf('.') + if (lastDotIndex === -1) return '.jpg' + const ext = filePath.substring(lastDotIndex).toLowerCase() + const allowedExts = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp'] + return allowedExts.includes(ext) ? ext : '.jpg' + }, + shuruLiuyan(e) { + const liuyan = e.detail.value.slice(0, 50) + this.setData({ liuyan }) + }, + chakanWanzhengJieshao() { + this.setData({ showWanzhengJieshao: true, wanzhengJieshao: this.data.jibenShuju.jieshao || '无' }) + }, + guanbiWanzhengJieshao() { this.setData({ showWanzhengJieshao: false }) }, + chakanWanzhengBeizhu() { + this.setData({ showWanzhengBeizhu: true, wanzhengBeizhu: this.data.jibenShuju.beizhu || '无' }) + }, + guanbiWanzhengBeizhu() { this.setData({ showWanzhengBeizhu: false }) }, + async fuzhiWenben(e) { + const text = e.currentTarget.dataset.text + if (!text) return + try { + await wx.setClipboardData({ data: text }) + wx.showToast({ title: '复制成功', icon: 'success', duration: 1500 }) + } catch (error) { + console.error('复制失败:', error) + wx.showToast({ title: '复制失败', icon: 'none' }) + } + }, + goToKefu() { + const kefuLink = app.globalData.kefuConfig?.link || ''; + const corpId = app.globalData.kefuConfig?.enterpriseId || ''; + + if (!kefuLink || !corpId) { + wx.showToast({ + title: '客服配置未加载', + icon: 'none' + }); + return; + } + + wx.openCustomerServiceChat({ + extInfo: { url: kefuLink }, + corpId: corpId, + success: (res) => { + console.log('跳转客服成功', res); + }, + fail: (err) => { + console.error('跳转客服失败', err); + wx.showToast({ + title: '暂时无法连接客服', + icon: 'none' + }); + } + }); + }, + + // ===== 联系老板按钮（改为跳转订单群聊） ===== + // ===== 联系老板按钮（智能查找订单群聊） ===== +// ===== 联系老板按钮（智能查找订单群聊） ===== +goToChatWithBoss() { + const uid = wx.getStorageSync('uid') + if (!uid) return + + const orderId = this.data.jibenShuju.dingdan_id + if (!orderId) { + wx.showToast({ title: '订单ID缺失', icon: 'none' }) + return + } + + const identityType = 'dashou' + const userId = 'Ds' + uid + + connectionManager.connectToGroupChat({ + identityType, + userId, + orderId, + groupName: this.data.jibenShuju.nicheng + '的订单群', + isCross: this.data.jibenShuju.fadanpingtai || 0 + }).catch(err => { + console.error('跳转群聊失败', err) + }) + }, + + async getCOSZhengshu() { + try { + const res = await request({ + url: '/dingdan/dsscpz', + method: 'POST', + data: { dingdan_id: this.data.jibenShuju.dingdan_id } + }) + if (res && res.data.code === 0 && res.data.data) return res.data.data + else throw new Error(res?.data?.msg || '获取上传凭证失败') + } catch (error) { + console.error('获取COS凭证失败:', error) + throw error + } + }, + + initCOSClient(tokenData) { + const credentials = tokenData.credentials || tokenData + const bucket = tokenData.bucket || 'julebu-1361527063' + const region = tokenData.region || 'ap-shanghai' + const cos = new COS({ + SimpleUploadMethod: 'putObject', + getAuthorization: async (options, callback) => { + const authParams = { + TmpSecretId: credentials.tmpSecretId, + TmpSecretKey: credentials.tmpSecretKey, + SecurityToken: credentials.sessionToken || '', + StartTime: tokenData.startTime || Math.floor(Date.now() / 1000), + ExpiredTime: tokenData.expiredTime || (Math.floor(Date.now() / 1000) + 7200) + } + callback(authParams) + } + }) + return { cos, bucket, region } + }, + + async shangchuanDanZhangTupian(filePath, cosKey, index, cosInstance, bucket, region) { + return new Promise((resolve) => { + const timeoutId = setTimeout(() => resolve({ status: 'optimistic_success', key: cosKey }), 2000) + cosInstance.uploadFile({ + Bucket: bucket, + Region: region, + Key: cosKey, + FilePath: filePath, + onProgress: (progressInfo) => { + const percent = Math.round(progressInfo.percent * 100) + if (percent === 100) { + clearTimeout(timeoutId) + resolve({ status: 'optimistic_success', key: cosKey }) + } + } + }) + }) + }, + + async piliangShangchuanTupian() { + const total = this.data.xuanzhongTupian.length + this.setData({ shangchuanZongshu: total, shangchuanJindu: 0, jinduWidth: '0%' }) + wx.showLoading({ title: '正在准备...', mask: true }) + const preGeneratedUrls = [] + for (let i = 0; i < total; i++) { + const timestamp = Date.now() + i + const random = Math.floor(Math.random() * 10000) + const fileExt = this.getFileExtension(this.data.xuanzhongTupian[i]) + const fileName = `${timestamp}_${random}${fileExt}` + const cosKey = `order/${this.data.jibenShuju.dingdan_id}/${fileName}` + preGeneratedUrls.push(cosKey) + } + let cosClient, bucket, region + try { + const tokenData = await this.getCOSZhengshu() + const { cos, bucket: cosBucket, region: cosRegion } = this.initCOSClient(tokenData) + cosClient = cos + bucket = cosBucket + region = cosRegion + } catch (error) { + wx.hideLoading() + wx.showToast({ title: '上传初始化失败', icon: 'none' }) + return [] + } + const uploadTasks = [] + for (let i = 0; i < total; i++) { + const task = this.shangchuanDanZhangTupian( + this.data.xuanzhongTupian[i], + preGeneratedUrls[i], + i, + cosClient, + bucket, + region + ).then((result) => { + const currentDone = i + 1 + const jinduPercent = ((currentDone / total) * 100).toFixed(0) + this.setData({ shangchuanJindu: currentDone, jinduWidth: `${jinduPercent}%` }) + return result + }) + uploadTasks.push(task) + } + wx.showLoading({ title: `上传中...`, mask: true }) + await Promise.all(uploadTasks) + wx.hideLoading() + return preGeneratedUrls + }, + + tijiaoDingdan() { + this.showAnnouncementAndConfirm() + }, + + async showAnnouncementAndConfirm() { + try { + const res = await request({ + url: '/peizhi/tanchuang', + method: 'POST', + data: { pageKey: 'dsddxq' } + }) + if (res.statusCode !== 200 || res.data.code !== 0) { + this.showOriginalConfirmAndSubmit() + return + } + const { popups = [], serverTime } = res.data.data + if (!popups.length) { + this.showOriginalConfirmAndSubmit() + return + } + const popup = popups[0] + const popupComp = this.selectComponent('#popupNotice') + if (!popupComp) { + console.error('未找到弹窗组件 #popupNotice') + this.showOriginalConfirmAndSubmit() + return + } + const showData = { + popupId: popup.popup_id, + title: popup.title || '', + duration: popup.duration || 0, + images: popup.images || [], + showMuteCheckbox: false, + serverTime: serverTime + } + popupComp.show(showData, (result) => { + this.showOriginalConfirmAndSubmit() + }) + } catch (error) { + console.error('获取公告配置失败', error) + this.showOriginalConfirmAndSubmit() + } + }, + + showOriginalConfirmAndSubmit() { + if (this.data.isSubmitting) { + wx.showToast({ title: '正在提交中', icon: 'none' }) + return + } + if (this.data.jibenShuju.zhuangtai !== 2) { + wx.showToast({ title: '订单状态不可提交', icon: 'none' }) + return + } + if (this.data.xuanzhongTupian.length === 0) { + wx.showToast({ title: '请至少上传一张图片', icon: 'none' }) + return + } + wx.showModal({ + title: '⚠️ 提交确认', + content: '在提交订单之前，请确保您已在打手端页面认真阅读打手规则。如有漏交图片，订单被退款，概不申诉。', + confirmText: '我已阅读', + cancelText: '我再想想', + success: (res) => { + if (res.confirm) this._doSubmit() + }, + fail: (err) => { + console.error('弹窗失败', err) + wx.showToast({ title: '系统异常，请重试', icon: 'none' }) + } + }) + }, + + async _doSubmit() { + this.setData({ isSubmitting: true }) + wx.showLoading({ title: '开始提交...', mask: true }) + try { + const tupianUrls = await this.piliangShangchuanTupian() + if (!tupianUrls || tupianUrls.length === 0) throw new Error('无法生成上传路径') + wx.showLoading({ title: '提交订单数据...', mask: true }) + const res = await request({ + url: '/dingdan/dstijiao', + method: 'POST', + data: { + dingdan_id: this.data.jibenShuju.dingdan_id, + liuyan: this.data.liuyan || '', + jiaofu_tupian_urls: tupianUrls + }, + header: { 'content-type': 'application/json' } + }) + wx.hideLoading() + this.setData({ isSubmitting: false }) + if (res && res.data.code === 0) { + const ossImageUrl = app.globalData.ossImageUrl || '' + const fullUrls = tupianUrls.map(url => { + if (url && !url.startsWith('http')) { + if (url.startsWith('/')) url = url.substring(1) + return ossImageUrl + url + } + return url + }) + this.setData({ + 'jibenShuju.zhuangtai': 8, + 'xiangxiShuju.dashou_liuyan': this.data.liuyan || '', + 'xiangxiShuju.dashou_jiaofu': fullUrls, + xuanzhongTupian: [], + liuyan: '', + shangchuanJindu: 0, + shangchuanZongshu: 0, + jinduWidth: '0%', + }) + if (app.globalData.dashouzhuangtai != 1) app.globalData.dashouzhuangtai = 1 + wx.showToast({ title: '提交成功！', icon: 'success', duration: 2000 }) + setTimeout(() => wx.navigateBack(), 1500) + } else { + const errorMsg = res?.data?.msg || '提交失败' + wx.showToast({ title: errorMsg, icon: 'none' }) + } + } catch (error) { + console.error('提交失败:', error) + wx.hideLoading() + this.setData({ isSubmitting: false }) + wx.showToast({ title: error.message || '提交失败', icon: 'none' }) + } + }, + + // ========== 修改功能（增加最少一张图片校验） ========== + extractRelativePath(fullUrl) { + const ossImageUrl = this.data.ossImageUrl + if (fullUrl.startsWith(ossImageUrl)) return fullUrl.substring(ossImageUrl.length) + return fullUrl + }, + enterModify() { + const { dashou_jiaofu, dashou_liuyan } = this.data.xiangxiShuju + this.setData({ + isModifying: true, + originalDashouJiaofu: dashou_jiaofu.slice(), + remainingOriginals: dashou_jiaofu.slice(), + originalDashouLiuyan: dashou_liuyan || '', + modifiedLiuyan: dashou_liuyan || '', + deletedImages: [], + newImages: [] + }) + }, + cancelModify() { + this.setData({ + isModifying: false, + originalDashouJiaofu: [], + remainingOriginals: [], + originalDashouLiuyan: '', + modifiedLiuyan: '', + deletedImages: [], + newImages: [] + }) + }, + handleDeleteImage(e) { + const fullUrl = e.currentTarget.dataset.url + const { originalDashouJiaofu, remainingOriginals, deletedImages, newImages } = this.data + if (originalDashouJiaofu.includes(fullUrl)) { + const newRemaining = remainingOriginals.filter(url => url !== fullUrl) + this.setData({ + remainingOriginals: newRemaining, + deletedImages: [...deletedImages, fullUrl] + }) + } else { + const index = newImages.indexOf(fullUrl) + if (index > -1) { + const newImagesCopy = [...newImages] + newImagesCopy.splice(index, 1) + this.setData({ newImages: newImagesCopy }) + } + } + }, + handleAddImage() { + if (this.data.isConfirming) return + const currentCount = this.getCurrentImageCount() + const maxCount = 9 - currentCount + if (maxCount <= 0) { + wx.showToast({ title: '最多9张图片', icon: 'none' }) + return + } + wx.chooseImage({ + count: maxCount, + sizeType: ['compressed'], + sourceType: ['album', 'camera'], + success: (res) => { + const newImages = [...this.data.newImages, ...res.tempFilePaths] + this.setData({ newImages: newImages.slice(0, 9) }) + } + }) + }, + getCurrentImageCount() { + const { remainingOriginals, newImages } = this.data + return remainingOriginals.length + newImages.length + }, + onModifyLiuyanInput(e) { + this.setData({ modifiedLiuyan: e.detail.value.slice(0, 50) }) + }, + + async confirmModify() { + if (this.data.isConfirming) return + const { dingdan_id } = this.data.jibenShuju + const { remainingOriginals, deletedImages, newImages, modifiedLiuyan, originalDashouLiuyan } = this.data + const hasLiuyanChange = modifiedLiuyan !== originalDashouLiuyan + const hasDelete = deletedImages.length > 0 + const hasAdd = newImages.length > 0 + + if (!hasLiuyanChange && !hasDelete && !hasAdd) { + wx.showToast({ title: '没有修改内容', icon: 'none' }) + return + } + + const finalImageCount = remainingOriginals.length + newImages.length + if (finalImageCount === 0) { + wx.showToast({ title: '至少保留一张图片', icon: 'none' }) + return + } + + this.setData({ isConfirming: true }) + wx.showLoading({ title: '提交修改...', mask: true }) + try { + const tokenData = await this.getCOSZhengshu() + const { cos, bucket, region } = this.initCOSClient(tokenData) + + let newImageRelativePaths = [] + if (hasAdd) { + const total = newImages.length + this.setData({ 'modifyUploadProgress.total': total, 'modifyUploadProgress.current': 0, 'modifyUploadProgress.width': '0%' }) + const preGeneratedKeys = [] + for (let i = 0; i < total; i++) { + const timestamp = Date.now() + i + const random = Math.floor(Math.random() * 10000) + const fileExt = this.getFileExtension(newImages[i]) + const fileName = `${timestamp}_${random}${fileExt}` + const cosKey = `order/${this.data.jibenShuju.dingdan_id}/${fileName}` + preGeneratedKeys.push(cosKey) + } + const uploadTasks = [] + for (let i = 0; i < total; i++) { + const task = this.shangchuanDanZhangTupian( + newImages[i], + preGeneratedKeys[i], + i, + cos, + bucket, + region + ).then((result) => { + const currentDone = i + 1 + const jinduPercent = ((currentDone / total) * 100).toFixed(0) + this.setData({ + 'modifyUploadProgress.current': currentDone, + 'modifyUploadProgress.width': `${jinduPercent}%` + }) + return result.key + }) + uploadTasks.push(task) + } + wx.showLoading({ title: `上传中...`, mask: true }) + newImageRelativePaths = await Promise.all(uploadTasks) + wx.hideLoading() + this.setData({ 'modifyUploadProgress.total': 0, 'modifyUploadProgress.current': 0, 'modifyUploadProgress.width': '0%' }) + } + + const deletedRelativePaths = deletedImages.map(fullUrl => this.extractRelativePath(fullUrl)) + + const res = await request({ + url: '/dingdan/dsxiugaidd', + method: 'POST', + data: { + dingdan_id, + liuyan: modifiedLiuyan, + deleted_images: deletedRelativePaths, + new_images: newImageRelativePaths + }, + header: { 'content-type': 'application/json' } + }) + wx.hideLoading() + this.setData({ isConfirming: false }) + if (res && res.data.code === 0) { + const ossImageUrl = this.data.ossImageUrl + const newFullUrls = newImageRelativePaths.map(rel => ossImageUrl + rel) + const newDashouJiaofu = [...remainingOriginals, ...newFullUrls] + this.setData({ + 'xiangxiShuju.dashou_jiaofu': newDashouJiaofu, + 'xiangxiShuju.dashou_liuyan': modifiedLiuyan, + isModifying: false, + originalDashouJiaofu: [], + remainingOriginals: [], + originalDashouLiuyan: '', + deletedImages: [], + newImages: [], + modifiedLiuyan: '' + }) + wx.showToast({ title: '修改成功', icon: 'success' }) + } else { + const errorMsg = res?.data?.msg || '修改失败' + wx.showToast({ title: errorMsg, icon: 'none' }) + } + } catch (error) { + console.error('修改失败:', error) + wx.hideLoading() + this.setData({ isConfirming: false }) + wx.showToast({ title: error.message || '修改失败', icon: 'none' }) + } + } +}) \ No newline at end of file diff --git a/pages/dsddxq/dsddxq.json b/pages/dsddxq/dsddxq.json new file mode 100644 index 0000000..837f016 --- /dev/null +++ b/pages/dsddxq/dsddxq.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "global-notification": "/components/global-notification/global-notification" + } +} \ No newline at end of file diff --git a/pages/dsddxq/dsddxq.wxml b/pages/dsddxq/dsddxq.wxml new file mode 100644 index 0000000..7a715d6 --- /dev/null +++ b/pages/dsddxq/dsddxq.wxml @@ -0,0 +1,478 @@ + + + + + + 加载订单详情... + + + + + + + + +

+ + + + {{jibenShuju.jieshao || '暂无描述'}} + + + 点击上面字体查看完整介绍 + + + + + + + 订单信息 + + + + 游戏昵称： + {{jibenShuju.nicheng}} + + 📋 + 复制 + + + + + + 备注信息： + + {{jibenShuju.beizhu.length > 20 ? jibenShuju.beizhu.substring(0, 20) + '...' : jibenShuju.beizhu}} + + 查看完整 + + + + + + + 订单ID： + + {{jibenShuju.dingdan_id}} + + 📋 + 复制 + + + + + + + 创建时间： + {{jibenShuju.create_time}} + + + + + 订单价格： + ¥{{jibenShuju.jine}} + + + + + 订单状态： + {{zhuangtaiWenziMap[jibenShuju.zhuangtai] || '未知状态'}} + + + + + 发单平台： + + {{jibenShuju.fadanpingtai == 1 ? '平台发单' : (jibenShuju.fadanpingtai == 2 ? '商家发单' : '未知')}} + + + + + + + 商家信息 + + + + 商家ID： + + {{xiangxiShuju.shangjia_id}} + + 📋 + 复制 + + + + + + + 商家昵称： + {{xiangxiShuju.shangjia_nicheng}} + + + + + 商家留言 + + {{xiangxiShuju.shangjia_liuyan}} + + + + + + + 退款信息 + + + 退款理由： + {{xiangxiShuju.tuikuan_liyou}} + + + + + + 处罚申请 + + + + 申请原因： + {{xiangxiShuju.chufa_liyou}} + + + + + 申请状态： + + {{xiangxiShuju.chufa_zhuangtai == 0 ? '审核中' : (xiangxiShuju.chufa_zhuangtai == 1 ? '处罚成功' : '处罚驳回')}} + + + + + + 处罚结果： + {{xiangxiShuju.chufa_jieguo}} + + + + + 驳回理由： + {{xiangxiShuju.bohui_liyou}} + + + + + + 我的交付 + + + + 交付图片 + + + +

+ + + + + + + + 我的留言 + + {{xiangxiShuju.dashou_liuyan}} + + + + + + + 修改交付 + + + + 交付图片（点击叉号删除） + + + + + + +

+ + × + + + + + + + +

+ + × + + + + + + + + + 添加图片 + ({{9 - (remainingOriginals.length + newImages.length)}}/9) + + + + + + + 留言（可选，最多50字） + + + 已输入 {{modifiedLiuyan.length}}/50 字 + + + + + + + 提交订单 + + + + 选择交付图片（最多9张） + + + + + +

+ + × + + + + + + + + + 添加图片 + ({{9 - xuanzhongTupian.length}}/9) + + + + + + + + + + 上传中: {{shangchuanJindu}}/{{shangchuanZongshu}} + + + + + 留言（可选，最多50字） + + + 已输入 {{liuyan.length}}/50 字 + + + + + + + + + + + + + 取消修改 + + + {{isConfirming ? '提交中...' : '确认修改'}} + + + + + + + + + + 联系客服 + + + 联系老板 + + + + + + 联系客服 + + + + + + + 修改交付 + + + + + + {{isSubmitting ? '提交中...' : '立即提交'}} + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/dsddxq/dsddxq.wxss b/pages/dsddxq/dsddxq.wxss new file mode 100644 index 0000000..7e9a205 --- /dev/null +++ b/pages/dsddxq/dsddxq.wxss @@ -0,0 +1,589 @@ +/* pages/dsddxq/dsddxq.wxss */ + +/* 页面基础样式 */ +.dsddxq-page { + min-height: 100vh; + background-color: #f8f9fa; + position: relative; + box-sizing: border-box; +} + +/* 加载中状态 */ +.loading-container { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 60vh; +} + +.loading-spinner { + width: 80rpx; + height: 80rpx; + border: 8rpx solid #e0e0e0; + border-top-color: #2196f3; + border-radius: 50%; + animation: spin 1.2s linear infinite; + margin-bottom: 30rpx; +} + +@keyframes spin { + from { transform: rotate(0deg); } + to { transform: rotate(360deg); } +} + +.loading-text { + font-size: 30rpx; + color: #666666; +} + +/* 内容区域 */ +.content-container { + padding: 25rpx 25rpx 220rpx; /* 减少底部内边距，避免过多空白 */ +} + +/* 商品图片和介绍区域 */ +.shangpin-area { + display: flex; + background-color: #ffffff; + border-radius: 20rpx; + padding: 25rpx; + margin-bottom: 25rpx; + box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.06); +} + +.shangpin-image-container { + flex-shrink: 0; + width: 180rpx; + height: 180rpx; + margin-right: 25rpx; +} + +.shangpin-image { + width: 100%; + height: 100%; + border-radius: 12rpx; + background-color: #f5f5f5; +} + +.shangpin-jieshao { + flex: 1; + display: flex; + flex-direction: column; +} + +.jieshao-text { + font-size: 28rpx; + line-height: 42rpx; + color: #333333; + font-weight: 400; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 4; + overflow: hidden; + text-overflow: ellipsis; +} + +.chakan-wanzheng { + margin-top: 10rpx; +} + +.chakan-wanzheng text { + font-size: 24rpx; + color: #2196f3; + text-decoration: underline; +} + +/* 通用区域样式 */ +.info-title { + font-size: 32rpx; + color: #333333; + font-weight: 600; + margin-bottom: 20rpx; + padding-bottom: 12rpx; + border-bottom: 2rpx solid rgba(0, 0, 0, 0.08); +} + +.section-subtitle { + font-size: 28rpx; + color: #555555; + font-weight: 500; + display: block; + margin: 15rpx 0 10rpx; +} + +/* 订单信息区域 */ +.dingdan-info-area, +.shangjia-area, +.tuikuan-area, +.chufa-area, +.dashou-jiaofu-area, +.tijiao-area { + background-color: #ffffff; + border-radius: 20rpx; + padding: 25rpx; + margin-bottom: 25rpx; + box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.06); +} + +.info-item-row { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 18rpx; + padding: 12rpx 0; +} + +.info-item-row:last-child { + margin-bottom: 0; +} + +.item-label { + font-size: 28rpx; + color: #666666; + font-weight: 400; + flex-shrink: 0; + min-width: 150rpx; +} + +/* 右侧区域容器 */ +.item-right-area { + flex: 1; + display: flex; + align-items: center; + justify-content: flex-end; +} + +.item-value { + font-size: 28rpx; + color: #333333; + font-weight: 500; + word-break: break-all; + text-align: right; + margin-right: 15rpx; +} + +/* 特殊样式 */ +.jine-green { + color: #4caf50 !important; + font-weight: 600 !important; + font-size: 32rpx !important; +} + +.zhuangtai-text { + font-weight: 600 !important; + font-size: 30rpx !important; + color: #333333 !important; +} + +/* 按钮样式（复制、查看） */ +.copy-btn, +.chakan-btn { + display: flex; + align-items: center; + justify-content: center; + font-size: 24rpx; + color: #4caf50; + background-color: #e8f5e9; + padding: 6rpx 16rpx; + border-radius: 20rpx; + border: 1rpx solid #4caf50; + transition: all 0.2s ease; + white-space: nowrap; + flex-shrink: 0; +} + +.chakan-btn { + color: #2196f3; + background-color: #e3f2fd; + border-color: #2196f3; + margin-left: 10rpx; +} + +.copy-btn-hover, +.chakan-btn:active { + background-color: #c8e6c9; + transform: scale(0.95); +} + +.copy-icon { + font-size: 20rpx; + margin-right: 6rpx; +} + +.copy-text { + font-weight: 500; +} + +/* 打手交付图片网格 */ +.jiaofu-grid { + display: flex; + flex-wrap: wrap; + margin: -5rpx; +} + +.jiaofu-image-item { + width: calc(33.333% - 10rpx); + margin: 5rpx; + aspect-ratio: 1/1; +} + +.jiaofu-image { + width: 100%; + height: 100%; + border-radius: 12rpx; + background-color: #f5f5f5; + transition: transform 0.2s ease; +} + +.jiaofu-image:active { + transform: scale(0.95); +} + +/* 留言内容样式 */ +.liuyan-content { + font-size: 26rpx; + line-height: 40rpx; + color: #555555; + padding: 15rpx; + background-color: #f9f9f9; + border-radius: 12rpx; + margin-top: 8rpx; +} + +/* 选择图片区域 */ +.yixuan-tupian-grid { + display: flex; + flex-wrap: wrap; + margin: -8rpx; +} + +.yixuan-tupian-item { + width: calc(33.333% - 16rpx); + margin: 8rpx; + aspect-ratio: 1/1; + position: relative; +} + +.yixuan-tupian { + width: 100%; + height: 100%; + border-radius: 12rpx; + background-color: #f5f5f5; +} + +.shanchu-btn { + position: absolute; + top: -10rpx; + right: -10rpx; + width: 40rpx; + height: 40rpx; + background-color: #ff4444; + color: white; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + font-size: 24rpx; + font-weight: bold; + z-index: 10; +} + +.tianjia-btn { + width: calc(33.333% - 16rpx); + margin: 8rpx; + aspect-ratio: 1/1; + background-color: #f5f5f5; + border-radius: 12rpx; + border: 2rpx dashed #cccccc; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + color: #666666; +} + +.tianjia-icon { + font-size: 48rpx; + font-weight: 300; + margin-bottom: 10rpx; +} + +.tianjia-text { + font-size: 24rpx; + margin-bottom: 4rpx; +} + +.tianjia-tip { + font-size: 20rpx; + color: #999999; +} + +/* 上传进度 */ +.shangchuan-jindu-container { + margin-top: 20rpx; +} + +.jindu-bar { + width: 100%; + height: 20rpx; + background-color: #f0f0f0; + border-radius: 10rpx; + overflow: hidden; + margin-bottom: 10rpx; +} + +.jindu-fill { + height: 100%; + background-color: #4caf50; + border-radius: 10rpx; + transition: width 0.3s ease; +} + +.jindu-text { + font-size: 24rpx; + color: #666666; + text-align: center; + display: block; +} + +/* 留言输入 */ +.liuyan-textarea { + width: 100%; + min-height: 120rpx; + font-size: 28rpx; + color: #333333; + background-color: #f9f9f9; + border-radius: 12rpx; + padding: 20rpx; + margin-top: 10rpx; + box-sizing: border-box; +} + +.zi-shu { + display: block; + text-align: right; + font-size: 24rpx; + color: #999999; + margin-top: 8rpx; +} + +/* ==================== 底部按钮区域 ==================== */ +.bottom-btns-container { + position: fixed; + bottom: 0; + left: 0; + right: 0; + background-color: #ffffff; + padding: 20rpx 30rpx; + border-top: 1rpx solid #f0f0f0; + box-shadow: 0 -2rpx 20rpx rgba(0, 0, 0, 0.08); + z-index: 100; + display: flex; + flex-direction: column; + gap: 10rpx; /* 减小按钮间距 */ +} + +/* 🆕 新增：按钮行布局（用于并排两个按钮） */ +.btn-row { + display: flex; + justify-content: space-between; + width: 100%; +} + +/* 🆕 当有两个按钮时，各占一半（减去gap的一半） */ +.btn-row .bottom-btn { + width: calc(50% - 10rpx); +} + +/* 🆕 当只有一个按钮时，占满 */ +.btn-row .full-width { + width: 100%; +} + +/* 统一底部按钮样式 */ +.bottom-btn { + width: 100%; + height: 88rpx; /* 统一高度 */ + border-radius: 44rpx; /* 圆角 */ + display: flex; + align-items: center; + justify-content: center; + font-size: 32rpx; + font-weight: 600; + transition: all 0.3s ease; + position: relative; + overflow: hidden; + border: none; + box-sizing: border-box; +} + +.btn-hover { + opacity: 0.9; + transform: scale(0.98); +} + +/* 联系客服按钮 */ +.contact-btn { + background-color: #2196F3; + color: #ffffff; + box-shadow: 0 4rpx 15rpx rgba(33, 150, 243, 0.3); +} + +/* 🆕 新增：联系老板按钮 */ +.boss-btn { + background-color: #ff9800; + color: #ffffff; + box-shadow: 0 4rpx 15rpx rgba(255, 152, 0, 0.3); +} + +/* 🆕 新增：修改按钮（黑色） */ +.modify-btn { + background-color: #333333; + color: #ffffff; + box-shadow: 0 4rpx 15rpx rgba(51, 51, 51, 0.3); +} + +/* 🆕 新增：取消修改按钮 */ +.cancel-modify-btn { + background-color: #9e9e9e; + color: #ffffff; + box-shadow: 0 4rpx 15rpx rgba(158, 158, 158, 0.3); +} + +/* 🆕 新增：确认修改按钮 */ +.confirm-modify-btn { + background-color: #4caf50; + color: #ffffff; + box-shadow: 0 4rpx 15rpx rgba(76, 175, 80, 0.3); +} + +/* 提交按钮 */ +.submit-btn { + background: linear-gradient(135deg, #4caf50 0%, #2e7d32 100%); + color: #ffffff; + box-shadow: 0 4rpx 15rpx rgba(76, 175, 80, 0.3); +} + +/* 提交按钮闪光特效 */ +.submit-btn::before { + content: ''; + position: absolute; + top: 0; + left: -100%; + width: 100%; + height: 100%; + background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent); + animation: flash 2s infinite; +} + +@keyframes flash { + 0% { left: -100%; } + 100% { left: 100%; } +} + +.btn-text { + position: relative; + z-index: 1; +} + +/* ==================== 弹窗样式 ==================== */ +.modal-container { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 1000; + display: flex; + align-items: center; + justify-content: center; +} + +.modal-mask { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: rgba(0, 0, 0, 0.5); +} + +.modal-content { + position: relative; + width: 600rpx; + max-height: 70vh; + background-color: #ffffff; + border-radius: 20rpx; + overflow: hidden; + box-shadow: 0 10rpx 40rpx rgba(0, 0, 0, 0.15); + z-index: 1001; +} + +.modal-header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 30rpx; + border-bottom: 1rpx solid #f0f0f0; +} + +.modal-title { + font-size: 34rpx; + color: #333333; + font-weight: 600; +} + +.modal-close { + font-size: 40rpx; + color: #999999; + width: 40rpx; + height: 40rpx; + display: flex; + align-items: center; + justify-content: center; +} + +.modal-body { + padding: 30rpx; + max-height: 50vh; + overflow: hidden; +} + +.modal-scroll { + height: 100%; + max-height: 50vh; +} + +.modal-content-text { + font-size: 28rpx; + line-height: 44rpx; + color: #333333; + white-space: pre-wrap; +} + +/* 响应式调整 */ +@media (max-width: 375px) { + .shangpin-image-container { + width: 160rpx; + height: 160rpx; + } + + .bottom-btn { + height: 80rpx; + font-size: 30rpx; + } + + .item-label { + min-width: 140rpx; + font-size: 26rpx; + } + + .item-value { + font-size: 26rpx; + } + + .modal-content { + width: 560rpx; + } +} \ No newline at end of file diff --git a/pages/fenlei/fenlei.js b/pages/fenlei/fenlei.js new file mode 100644 index 0000000..9cbf998 --- /dev/null +++ b/pages/fenlei/fenlei.js @@ -0,0 +1,452 @@ +// pages/fenlei/fenlei.js +const app = getApp() + +Page({ + /** + * 页面的初始数据 + */ + data: { + // 全局变量引用 + ossImageUrl: '', + + // 搜索相关 + searchText: '', + showSearchResult: false, + searchResults: [], + isSearching: false, + + // 页面数据 + shangpinleixing: [], + shangpinzhuanqu: [], + shangpinliebiao: [], + + // 状态控制 + selectedLeixingId: null, + selectedZhuanquId: null, + filteredZhuanquList: [], // 当前类型下的专区列表 + filteredShangpinList: [], // 当前专区下的商品列表 + zhuanquByLeixing: {}, // 类型->专区映射对象 + shangpinByZhuanqu: {}, // 专区->商品映射对象 + zhuanquGoodsCount: {}, // 专区商品数量统计 + + // UI状态 + isLoading: false, + hasInitialized: false + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + // 获取全局变量 + this.setData({ + ossImageUrl: app.globalData.ossImageUrl + }) + + // 初始化数据 + this.initPageData() + }, + onShow() { + // 原有代码... + + // 🆕 注册通知组件 + this.registerNotificationComponent(); +}, + +// 🆕 新增：注册通知组件 +registerNotificationComponent() { + const app = getApp(); + const notificationComp = this.selectComponent('#global-notification'); + + if (notificationComp && notificationComp.showNotification) { + console.log('🏪 商城页面注册通知组件'); + app.globalData.globalNotification = { + show: (data) => notificationComp.showNotification(data), + hide: () => notificationComp.hideNotification() + }; + } +}, + + /** + * 初始化页面数据 + */ + initPageData() { + const that = this + this.setData({ isLoading: true }) + + // 检查全局变量是否已有数据 + if (app.globalData.shangpinleixing && app.globalData.shangpinleixing.length > 0) { + this.initFromGlobalData() + } else { + this.loadAllShangpinData() + } + }, + + /** + * 从全局变量初始化数据 + */ + initFromGlobalData() { + const leixingList = app.globalData.shangpinleixing || [] + const zhuanquList = app.globalData.shangpinzhuanqu || [] + const shangpinList = app.globalData.shangpinliebiao || [] + + // 构建映射关系对象 + const zhuanquByLeixing = {} + const shangpinByZhuanqu = {} + const zhuanquGoodsCount = {} + + // 1. 构建专区映射 (按类型分组) + zhuanquList.forEach(zhuanqu => { + const leixingId = zhuanqu.leixing_id + if (!zhuanquByLeixing[leixingId]) { + zhuanquByLeixing[leixingId] = [] + } + zhuanquByLeixing[leixingId].push(zhuanqu) + }) + + // 2. 构建商品映射 (按专区分组)并统计数量 + shangpinList.forEach(shangpin => { + const zhuanquId = shangpin.zhuanqu_id + if (zhuanquId) { + if (!shangpinByZhuanqu[zhuanquId]) { + shangpinByZhuanqu[zhuanquId] = [] + zhuanquGoodsCount[zhuanquId] = 0 + } + + // 处理价格显示 + const jiage = parseFloat(shangpin.jiage) || 0 + const priceInteger = Math.floor(jiage) + let priceDecimal = '00' + + const decimalPart = (jiage - priceInteger).toFixed(2) + if (decimalPart > 0) { + priceDecimal = decimalPart.toString().split('.')[1] + } + + shangpinByZhuanqu[zhuanquId].push({ + id: shangpin.id, + biaoqian: shangpin.biaoqian, + jiage: jiage, + priceInteger: priceInteger, + priceDecimal: priceDecimal, + tupian_url: shangpin.tupian_url, + duiwai_xiaoliang: shangpin.duiwai_xiaoliang || 0 + }) + + zhuanquGoodsCount[zhuanquId] += 1 + } + }) + + // 设置初始选中状态（第一个类型和第一个专区） + const firstLeixing = leixingList[0] + let firstZhuanquId = null + + if (firstLeixing && zhuanquByLeixing[firstLeixing.id]) { + firstZhuanquId = zhuanquByLeixing[firstLeixing.id][0]?.id || null + } + + this.setData({ + shangpinleixing: leixingList, + shangpinzhuanqu: zhuanquList, + shangpinliebiao: shangpinList, + zhuanquByLeixing: zhuanquByLeixing, + shangpinByZhuanqu: shangpinByZhuanqu, + zhuanquGoodsCount: zhuanquGoodsCount, + selectedLeixingId: firstLeixing?.id || null, + selectedZhuanquId: firstZhuanquId + }, () => { + // 筛选数据 + this.filterData() + this.setData({ isLoading: false, hasInitialized: true }) + }) + }, + + /** + * 加载所有商品数据 + */ + loadAllShangpinData() { + const that = this + wx.request({ + url: app.globalData.apiBaseUrl + '/shangpin/shangpinhuoqu/', + method: 'POST', + header: { + 'content-type': 'application/json' + }, + success(res) { + if (res.statusCode === 200 && res.data) { + const data = res.data + + // 存储到全局变量 + app.globalData.shangpinleixing = data.shangpinleixing || [] + app.globalData.shangpinzhuanqu = data.shangpinzhuanqu || [] + app.globalData.shangpinliebiao = data.shangpinliebiao || [] + + // 从全局变量初始化 + that.initFromGlobalData() + } else { + that.handleLoadError() + } + }, + fail(error) { + console.error('加载商品数据失败:', error) + that.handleLoadError() + } + }) + }, + + /** + * 处理加载错误 + */ + handleLoadError() { + wx.showToast({ + title: '加载失败，请重试', + icon: 'none' + }) + this.setData({ isLoading: false }) + }, + + /** + * 筛选数据 + */ + filterData() { + const { selectedLeixingId, selectedZhuanquId, zhuanquByLeixing, shangpinByZhuanqu } = this.data + + // 1. 筛选专区列表 + const filteredZhuanquList = zhuanquByLeixing[selectedLeixingId] || [] + + // 2. 筛选商品列表 + let filteredShangpinList = [] + if (selectedZhuanquId) { + filteredShangpinList = shangpinByZhuanqu[selectedZhuanquId] || [] + } else if (filteredZhuanquList.length > 0) { + // 如果没有选中的专区，默认显示第一个专区的商品 + const firstZhuanquId = filteredZhuanquList[0].id + filteredShangpinList = shangpinByZhuanqu[firstZhuanquId] || [] + this.setData({ selectedZhuanquId: firstZhuanquId }) + } + + this.setData({ + filteredZhuanquList: filteredZhuanquList, + filteredShangpinList: filteredShangpinList + }) + }, + + /** + * 选择商品类型 + */ + selectLeixing(e) { + const leixingId = e.currentTarget.dataset.id + + if (this.data.selectedLeixingId === leixingId) { + return + } + + // 获取该类型下的第一个专区 + const zhuanquList = this.data.zhuanquByLeixing[leixingId] || [] + const firstZhuanquId = zhuanquList.length > 0 ? zhuanquList[0].id : null + + this.setData({ + selectedLeixingId: leixingId, + selectedZhuanquId: firstZhuanquId + }, () => { + this.filterData() + }) + }, + + /** + * 选择商品专区 + */ + selectZhuanqu(e) { + const zhuanquId = e.currentTarget.dataset.id + + if (this.data.selectedZhuanquId === zhuanquId) { + return + } + + this.setData({ + selectedZhuanquId: zhuanquId + }, () => { + // 筛选商品列表 + const filteredShangpinList = this.data.shangpinByZhuanqu[zhuanquId] || [] + this.setData({ + filteredShangpinList: filteredShangpinList + }) + }) + }, + + /** + * 搜索框输入事件 + */ + onSearchInput(e) { + this.setData({ + searchText: e.detail.value + }) + }, + + /** + * 点击搜索按钮 + */ + onSearchTap() { + const searchText = this.data.searchText.trim() + if (!searchText) { + wx.showToast({ + title: '请输入搜索内容', + icon: 'none' + }) + return + } + + // 开始搜索 + this.startSearch(searchText) + }, + + /** + * 键盘搜索事件（回车键） + */ + onSearchConfirm(e) { + const searchText = e.detail.value.trim() + if (!searchText) { + wx.showToast({ + title: '请输入搜索内容', + icon: 'none' + }) + return + } + + this.setData({ + searchText: searchText + }) + + // 开始搜索 + this.startSearch(searchText) + }, + + /** + * 执行搜索 + */ + startSearch(searchText) { + this.setData({ + isSearching: true, + showSearchResult: true + }) + + // 本地搜索 + const allShangpin = this.data.shangpinliebiao + const results = [] + + for (const item of allShangpin) { + if (item.biaoqian && item.biaoqian.toLowerCase().includes(searchText.toLowerCase())) { + // 处理价格显示 + const jiage = parseFloat(item.jiage) || 0 + const priceInteger = Math.floor(jiage) + let priceDecimal = '00' + + const decimalPart = (jiage - priceInteger).toFixed(2) + if (decimalPart > 0) { + priceDecimal = decimalPart.toString().split('.')[1] + } + + results.push({ + id: item.id, + biaoqian: item.biaoqian, + jiage: jiage, + priceInteger: priceInteger, + priceDecimal: priceDecimal, + tupian_url: item.tupian_url, + leixing_name: this.getLeixingName(item.leixing_id), + zhuanqu_name: this.getZhuanquName(item.zhuanqu_id) + }) + } + } + + this.setData({ + searchResults: results, + isSearching: false + }) + }, + + /** + * 清空搜索 + */ + onClearSearch() { + this.setData({ + searchText: '', + showSearchResult: false, + searchResults: [] + }) + }, + + /** + * 根据类型ID获取类型名称 + */ + getLeixingName(leixingId) { + const leixingList = this.data.shangpinleixing + for (const item of leixingList) { + if (item.id === leixingId) { + return item.jieshao + } + } + return '' + }, + + /** + * 根据专区ID获取专区名称 + */ + getZhuanquName(zhuanquId) { + const zhuanquList = this.data.shangpinzhuanqu + for (const item of zhuanquList) { + if (item.id === zhuanquId) { + return item.mingzi + } + } + return '' + }, + + /** + * 跳转到商品详情页 + */ + goToDetail(e) { + const shangpinId = e.currentTarget.dataset.id + if (!shangpinId) return + + wx.navigateTo({ + url: `/pages/shangpinxiangqing/shangpinxiangqing?id=${shangpinId}` + }) + }, + + /** + * 刷新所有数据 + */ + onRefresh() { + wx.showLoading({ + title: '刷新中...', + mask: true + }) + + // 清空全局变量 + app.globalData.shangpinleixing = [] + app.globalData.shangpinzhuanqu = [] + app.globalData.shangpinliebiao = [] + + this.loadAllShangpinData() + + setTimeout(() => { + wx.hideLoading() + wx.showToast({ + title: '刷新成功', + icon: 'success', + duration: 1500 + }) + }, 1000) + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + return { + title: '阿龙电竞 - 商品分类', + path: '/pages/fenlei/fenlei' + } + } +}) \ No newline at end of file diff --git a/pages/fenlei/fenlei.json b/pages/fenlei/fenlei.json new file mode 100644 index 0000000..4af9065 --- /dev/null +++ b/pages/fenlei/fenlei.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "global-notification": "/components/global-notification/global-notification", + "custom-tab-bar": "/custom-tab-bar/index" + } + } \ No newline at end of file diff --git a/pages/fenlei/fenlei.wxml b/pages/fenlei/fenlei.wxml new file mode 100644 index 0000000..6f015fa --- /dev/null +++ b/pages/fenlei/fenlei.wxml @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + +

+ + + {{item.jieshao}} + + + + + + + + + + + + + + + + {{item.mingzi}} + ({{zhuanquGoodsCount[item.id] || 0}}) + + + + + + +

+ 暂无专区 + + + + + + + + + + +

+ + + + + {{item.biaoqian}} + + + + + + + + + + +

+ 该专区暂无商品 + + + + + — 已加载全部商品 — + + + + + + + + + + + 搜索结果 + ({{searchResults.length}}个) + + +

+ + + + + + + +

+ + + {{item.biaoqian}} + + {{item.leixing_name}} + · + {{item.zhuanqu_name}} + + + ¥ + {{item.priceInteger}} + .{{item.priceDecimal}} + + + + + + +

+ 未找到相关商品 + + + + + + + 搜索中... + + + + + + + + + + + + + 加载中... + + + + + + + \ No newline at end of file diff --git a/pages/fenlei/fenlei.wxss b/pages/fenlei/fenlei.wxss new file mode 100644 index 0000000..d4a3420 --- /dev/null +++ b/pages/fenlei/fenlei.wxss @@ -0,0 +1,1215 @@ +/* pages/fenlei/fenlei.wxss */ +.fenlei-page { + width: 100%; + height: 100vh; + background: linear-gradient(135deg, #f8f9ff 0%, #f0f2ff 100%); + display: flex; + flex-direction: column; + position: relative; + overflow: hidden; + } + + /* 1. 毛玻璃搜索框区域（固定） */ + .search-container { + padding: 24rpx 32rpx; + background: transparent; + flex-shrink: 0; + position: relative; + z-index: 100; + } + + .search-box { + display: flex; + align-items: center; + background: rgba(255, 255, 255, 0.85); + backdrop-filter: blur(30rpx); + -webkit-backdrop-filter: blur(30rpx); + border-radius: 50rpx; + padding: 0 28rpx; + height: 84rpx; + box-shadow: + 0 8rpx 32rpx rgba(31, 38, 135, 0.1), + inset 0 1rpx 0 rgba(255, 255, 255, 0.8); + border: 1rpx solid rgba(255, 255, 255, 0.3); + position: relative; + overflow: hidden; + } + + .search-box::before { + content: ''; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: linear-gradient(135deg, rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0.1)); + border-radius: 50rpx; + z-index: -1; + } + + .search-icon { + width: 34rpx; + height: 34rpx; + margin-right: 18rpx; + opacity: 0.6; + } + + .search-input { + flex: 1; + height: 100%; + font-size: 28rpx; + color: #222; + font-weight: 400; + } + + .search-placeholder { + color: #aaa; + font-size: 28rpx; + } + + .search-btn { + background: linear-gradient(135deg, #ffcc00, #ffaa00); + border-radius: 40rpx; + padding: 14rpx 32rpx; + margin-left: 20rpx; + position: relative; + overflow: hidden; + box-shadow: 0 6rpx 20rpx rgba(255, 170, 0, 0.3); + transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1); + } + + .search-btn:active { + transform: scale(0.95); + box-shadow: 0 4rpx 15rpx rgba(255, 170, 0, 0.4); + } + + .search-btn-text { + font-size: 26rpx; + color: white; + font-weight: 600; + position: relative; + z-index: 1; + } + + .search-btn-glow { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.4), transparent); + transform: translateX(-100%); + transition: transform 0.6s; + } + + .search-btn:active .search-btn-glow { + transform: translateX(100%); + } + + .search-clear { + width: 36rpx; + height: 36rpx; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + margin-left: 16rpx; + opacity: 0.6; + transition: opacity 0.3s; + } + + .search-clear:active { + opacity: 1; + } + + .clear-icon { + width: 24rpx; + height: 24rpx; + } + + /* 2. 商品类型选择区域（固定）- 恢复原大小 */ + .leixing-container { + padding: 0 32rpx 24rpx; + flex-shrink: 0; + position: relative; + } + + .leixing-bg-glow { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 300rpx; + height: 300rpx; + background: radial-gradient(circle, rgba(255, 204, 0, 0.1) 0%, transparent 70%); + z-index: -1; + } + + .leixing-scroll { + white-space: nowrap; + height: 180rpx; /* 恢复原大小 */ + } + + .leixing-list { + display: inline-flex; + padding-right: 32rpx; + } + + .leixing-item { + display: inline-flex; + flex-direction: column; + align-items: center; + margin-right: 48rpx; /* 增加间距 */ + position: relative; + padding: 12rpx; + } + + .leixing-image-box { + width: 100rpx; /* 恢复原大小 */ + height: 100rpx; /* 恢复原大小 */ + border-radius: 50%; + position: relative; + margin-bottom: 16rpx; + overflow: hidden; + background: white; + box-shadow: + 0 12rpx 30rpx rgba(0, 0, 0, 0.12), + 0 4rpx 8rpx rgba(0, 0, 0, 0.06); + transition: all 0.4s cubic-bezier(0.34, 1.56, 0.64, 1); + } + + .leixing-active .leixing-image-box { + transform: scale(1.12); + box-shadow: + 0 18rpx 40rpx rgba(255, 204, 0, 0.3), + 0 8rpx 16rpx rgba(255, 170, 0, 0.2); + } + + .leixing-image { + width: 100%; + height: 100%; + border-radius: 50%; + object-fit: cover; + } + + .leixing-glow { + position: absolute; + top: -3rpx; + left: -3rpx; + right: -3rpx; + bottom: -3rpx; + border-radius: 50%; + background: linear-gradient(135deg, #ffcc00, #ffaa00, #ff8800); + opacity: 0; + transition: opacity 0.4s; + z-index: -1; + filter: blur(10rpx); + } + + .leixing-glow-active { + opacity: 0.6; + animation: glowPulse 2s infinite; + } + + .leixing-sparkle { + position: absolute; + top: 50%; + left: 50%; + width: 20rpx; + height: 20rpx; + background: white; + border-radius: 50%; + transform: translate(-50%, -50%) scale(0); + opacity: 0; + pointer-events: none; + } + + .sparkle-animation { + animation: sparkleFlash 1.5s infinite; + } + + .leixing-text { + font-size: 24rpx; + color: #555; /* 颜色加深 */ + font-weight: 500; + transition: all 0.3s; + white-space: nowrap; + } + + .leixing-active .leixing-text { + color: #ff9900; + font-weight: 600; + transform: translateY(-2rpx); + text-shadow: 0 2rpx 4rpx rgba(255, 153, 0, 0.2); + } + + .leixing-active-bar { + position: absolute; + bottom: -4rpx; + width: 44rpx; + height: 4rpx; + background: linear-gradient(90deg, #ffcc00, #ffaa00); + border-radius: 2rpx; + opacity: 0; + transform: scaleX(0); + transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1); + box-shadow: 0 2rpx 8rpx rgba(255, 170, 0, 0.4); + } + + .leixing-active-bar-show { + opacity: 1; + transform: scaleX(1); + } + + .leixing-border-effect { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border-radius: 50%; + border: 2rpx solid transparent; + opacity: 0; + pointer-events: none; + } + + .border-effect-active { + opacity: 1; + border-color: rgba(255, 204, 0, 0.5); + animation: borderGlow 2s infinite; + } + + /* 3. 左右分栏布局（可滚动区域） */ + .main-container { + flex: 1; + display: flex; + height: calc(100vh - 300rpx); + overflow: hidden; + } + + /* 左边：商品专区列表 */ + .zhuanqu-left { + width: 200rpx; + background: rgba(255, 255, 255, 0.7); + backdrop-filter: blur(10rpx); + border-right: 1rpx solid rgba(0, 0, 0, 0.08); + flex-shrink: 0; + position: relative; + } + + .zhuanqu-list { + padding: 0; + } + + .zhuanqu-item { + position: relative; + padding: 32rpx 0; + border-bottom: 1rpx solid rgba(0, 0, 0, 0.05); + transition: all 0.3s; + } + + .zhuanqu-item:active { + background: rgba(255, 204, 0, 0.05); + } + + .zhuanqu-item-content { + display: flex; + flex-direction: column; + align-items: center; + padding: 0 20rpx; + } + + .zhuanqu-name { + font-size: 26rpx; + color: #444; /* 颜色加深 */ + text-align: center; + line-height: 1.4; + margin-bottom: 8rpx; + transition: all 0.3s; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + font-weight: 500; + } + + .zhuanqu-active .zhuanqu-name { + color: #ff9900; + font-weight: 600; + text-shadow: 0 2rpx 4rpx rgba(255, 153, 0, 0.2); + } + + .zhuanqu-count { + font-size: 22rpx; + color: #888; + transition: all 0.3s; + } + + .zhuanqu-active .zhuanqu-count { + color: #ffaa00; + font-weight: 500; + } + + .zhuanqu-active-indicator { + position: absolute; + right: 0; + top: 50%; + transform: translateY(-50%); + width: 6rpx; + height: 44rpx; + background: linear-gradient(180deg, #ffcc00, #ffaa00); + border-radius: 3rpx 0 0 3rpx; + opacity: 0; + transition: all 0.3s; + overflow: hidden; + } + + .zhuanqu-indicator-glow { + opacity: 1; + animation: indicatorGlow 2s infinite; + box-shadow: 0 0 20rpx rgba(255, 204, 0, 0.5); + } + + .indicator-sparkle { + position: absolute; + top: 0; + left: 0; + right: 0; + height: 10rpx; + background: rgba(255, 255, 255, 0.6); + animation: sparkleMove 1.5s infinite; + } + + .zhuanqu-hover-glow { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: linear-gradient(90deg, transparent, rgba(255, 204, 0, 0.05), transparent); + opacity: 0; + transition: opacity 0.3s; + pointer-events: none; + } + + .zhuanqu-item:active .zhuanqu-hover-glow { + opacity: 1; + } + + .zhuanqu-click-effect { + position: absolute; + top: 50%; + left: 50%; + width: 0; + height: 0; + border-radius: 50%; + background: rgba(255, 204, 0, 0.1); + transform: translate(-50%, -50%); + opacity: 0; + pointer-events: none; + } + + .zhuanqu-item:active .zhuanqu-click-effect { + animation: rippleEffect 0.6s ease-out; + } + + .zhuanqu-empty { + display: flex; + flex-direction: column; + align-items: center; + padding: 120rpx 0; + } + + .zhuanqu-empty-icon { + width: 120rpx; + height: 120rpx; + opacity: 0.2; + margin-bottom: 28rpx; + } + + .zhuanqu-empty-text { + font-size: 26rpx; + color: #999; + } + + /* 右边：商品列表（紧凑布局） */ + .shangpin-right { + flex: 1; + background: #fafafa; + } + + .shangpin-list { + padding: 0; + } + + .shangpin-item { + background: white; + padding: 28rpx 30rpx 22rpx; /* 底部距离缩小 */ + position: relative; + display: flex; + align-items: flex-start; + min-height: 140rpx; + overflow: hidden; + } + + .shangpin-item:active { + background: rgba(0, 0, 0, 0.02); + } + + .shangpin-image-box { + margin-right: 24rpx; + flex-shrink: 0; + position: relative; + } + + .shangpin-image { + width: 120rpx; + height: 120rpx; + border-radius: 14rpx; + background: #f5f5f5; + object-fit: cover; + } + + .shangpin-image-glow { + position: absolute; + top: -4rpx; + left: -4rpx; + right: -4rpx; + bottom: -4rpx; + border-radius: 18rpx; + background: linear-gradient(135deg, rgba(255, 204, 0, 0.2), transparent); + opacity: 0; + transition: opacity 0.3s; + pointer-events: none; + } + + .shangpin-item:active .shangpin-image-glow { + opacity: 0.5; + } + + .image-corner { + position: absolute; + top: 0; + right: 0; + width: 20rpx; + height: 20rpx; + background: linear-gradient(135deg, #ffcc00, transparent 70%); + border-radius: 0 14rpx 0 0; + } + + .shangpin-info { + flex: 1; + display: flex; + flex-direction: column; + height: 120rpx; + justify-content: space-between; + padding-top: 2rpx; /* 标题与图片顶部对齐 */ + } + + .shangpin-title { + margin-bottom: 0; + position: relative; + } + + .shangpin-title-text { + font-size: 30rpx; + font-weight: 500; + color: #222; /* 黑色加深 */ + line-height: 1.4; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + overflow: hidden; + } + + .title-underline { + position: absolute; + bottom: -4rpx; + left: 0; + width: 0; + height: 2rpx; + background: linear-gradient(90deg, #ffcc00, #ffaa00); + transition: width 0.3s; + } + + .shangpin-item:active .title-underline { + width: 40rpx; + } + + .shangpin-footer { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: auto; + } + + .shangpin-price { + display: flex; + align-items: baseline; + position: relative; + } + + .price-icon { + font-size: 24rpx; + color: #ff6600; + font-weight: 500; + } + + .price-integer { + font-size: 36rpx; /* 适当调整大小 */ + color: #ff6600; + font-weight: 600; + margin-left: 2rpx; + } + + .price-decimal { + font-size: 24rpx; + color: #ff6600; + font-weight: 500; + } + + .price-glow { + position: absolute; + top: 50%; + left: 50%; + width: 80rpx; + height: 80rpx; + background: radial-gradient(circle, rgba(255, 102, 0, 0.1) 0%, transparent 70%); + transform: translate(-50%, -50%); + opacity: 0; + pointer-events: none; + } + + .shangpin-item:active .price-glow { + animation: priceGlow 0.6s; + } + + .detail-btn { + position: relative; + padding: 12rpx 28rpx; + background: linear-gradient(135deg, #ffcc00, #ffaa00); + border-radius: 40rpx; + transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1); + overflow: hidden; + box-shadow: 0 6rpx 20rpx rgba(255, 170, 0, 0.2); + display: flex; + align-items: center; + justify-content: center; + min-width: 120rpx; + } + + .detail-btn:active { + transform: scale(0.95); + box-shadow: 0 4rpx 15rpx rgba(255, 170, 0, 0.4); + } + + .detail-btn-text { + font-size: 24rpx; + color: white; + font-weight: 500; + position: relative; + z-index: 2; + line-height: 1; + } + + .btn-glow-effect { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.4), transparent); + transform: translateX(-100%); + transition: transform 0.6s; + } + + .detail-btn:active .btn-glow-effect { + transform: translateX(100%); + } + + .btn-halo { + position: absolute; + top: 50%; + left: 50%; + width: 0; + height: 0; + border-radius: 50%; + background: rgba(255, 255, 255, 0.3); + transform: translate(-50%, -50%); + opacity: 0; + pointer-events: none; + } + + .detail-btn:active .btn-halo { + animation: buttonHalo 0.6s ease-out; + } + + .btn-star { + position: absolute; + width: 6rpx; + height: 6rpx; + background: white; + border-radius: 50%; + opacity: 0; + pointer-events: none; + } + + .detail-btn:active .btn-star { + animation: starSparkle 0.8s ease-out; + } + + .item-divider { + position: absolute; + left: 30rpx; + right: 30rpx; + bottom: 0; + height: 1rpx; + background: linear-gradient(90deg, rgba(0, 0, 0, 0.08), rgba(0, 0, 0, 0.12), rgba(0, 0, 0, 0.08)); + } + + .item-hover-glow { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: linear-gradient(135deg, transparent, rgba(255, 204, 0, 0.03), transparent); + opacity: 0; + transition: opacity 0.3s; + pointer-events: none; + } + + .shangpin-item:active .item-hover-glow { + opacity: 1; + } + + .item-ripple-effect { + position: absolute; + top: 50%; + left: 50%; + width: 0; + height: 0; + border-radius: 50%; + background: rgba(255, 204, 0, 0.1); + transform: translate(-50%, -50%); + opacity: 0; + pointer-events: none; + } + + .shangpin-item:active .item-ripple-effect { + animation: rippleEffect 0.6s ease-out; + } + + .shangpin-empty { + display: flex; + flex-direction: column; + align-items: center; + padding: 150rpx 0; + } + + .shangpin-empty-icon { + width: 180rpx; + height: 180rpx; + opacity: 0.15; + margin-bottom: 36rpx; + } + + .shangpin-empty-text { + font-size: 28rpx; + color: #999; + margin-bottom: 40rpx; + } + + .shangpin-empty-btn { + background: linear-gradient(135deg, #ffcc00, #ffaa00); + color: white; + font-size: 26rpx; + font-weight: 500; + padding: 16rpx 44rpx; + border-radius: 40rpx; + box-shadow: 0 8rpx 24rpx rgba(255, 170, 0, 0.3); + transition: all 0.3s; + } + + .shangpin-empty-btn:active { + transform: scale(0.95); + box-shadow: 0 4rpx 16rpx rgba(255, 170, 0, 0.4); + } + + .load-more { + display: flex; + align-items: center; + justify-content: center; + padding: 40rpx 0; + } + + .load-more-line { + width: 60rpx; + height: 1rpx; + background: linear-gradient(90deg, transparent, rgba(0, 0, 0, 0.1), transparent); + } + + .load-more-text { + font-size: 24rpx; + color: #bbb; + margin: 0 20rpx; + } + + /* 搜索结果弹窗 */ + .search-results-container { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 2000; + display: flex; + } + + .search-mask { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.5); + backdrop-filter: blur(5rpx); + } + + .search-results-content { + position: absolute; + top: 100rpx; + left: 32rpx; + right: 32rpx; + bottom: 100rpx; + background: rgba(255, 255, 255, 0.95); + backdrop-filter: blur(30rpx); + border-radius: 24rpx; + box-shadow: + 0 20rpx 60rpx rgba(0, 0, 0, 0.2), + inset 0 1rpx 0 rgba(255, 255, 255, 0.8); + border: 1rpx solid rgba(255, 255, 255, 0.3); + display: flex; + flex-direction: column; + overflow: hidden; + } + + .search-results-header { + padding: 32rpx; + border-bottom: 1rpx solid rgba(0, 0, 0, 0.06); + display: flex; + align-items: center; + justify-content: space-between; + flex-shrink: 0; + } + + .search-header-left { + display: flex; + align-items: baseline; + } + + .search-results-title { + font-size: 34rpx; + font-weight: 600; + color: #333; + } + + .search-results-count { + font-size: 24rpx; + color: #999; + margin-left: 12rpx; + } + + .search-close { + width: 44rpx; + height: 44rpx; + border-radius: 50%; + background: rgba(0, 0, 0, 0.05); + display: flex; + align-items: center; + justify-content: center; + transition: all 0.3s; + } + + .search-close:active { + background: rgba(0, 0, 0, 0.1); + transform: scale(0.9); + } + + .close-icon { + width: 20rpx; + height: 20rpx; + opacity: 0.6; + } + + .search-results-list { + flex: 1; + height: 100%; /* 新增：修复滚动问题的关键代码 */ + } + + .search-result-item { + display: flex; + padding: 28rpx 32rpx; + border-bottom: 1rpx solid rgba(0, 0, 0, 0.04); + position: relative; + transition: all 0.3s; + } + + .search-result-item:active { + background: rgba(0, 0, 0, 0.02); + transform: translateY(-2rpx); + } + + .search-result-left { + margin-right: 24rpx; + position: relative; + } + + .search-result-image { + width: 120rpx; + height: 120rpx; + border-radius: 16rpx; + background: #f5f5f5; + object-fit: cover; + } + + .search-image-glow { + position: absolute; + top: -4rpx; + left: -4rpx; + right: -4rpx; + bottom: -4rpx; + border-radius: 20rpx; + background: linear-gradient(135deg, rgba(255, 204, 0, 0.2), transparent); + opacity: 0; + transition: opacity 0.3s; + pointer-events: none; + } + + .search-result-item:active .search-image-glow { + opacity: 0.5; + } + + .search-result-right { + flex: 1; + display: flex; + flex-direction: column; + justify-content: center; + } + + .search-result-title { + font-size: 28rpx; + font-weight: 500; + color: #333; + line-height: 1.4; + margin-bottom: 16rpx; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + } + + .search-result-info { + display: flex; + gap: 12rpx; + margin-bottom: 20rpx; + } + + .info-tag { + padding: 6rpx 12rpx; + background: rgba(255, 204, 0, 0.1); + border-radius: 6rpx; + } + + .search-result-category { + font-size: 22rpx; + color: #666; + } + + .search-result-zhuanqu { + font-size: 22rpx; + color: #888; + } + + .search-result-price { + display: flex; + align-items: baseline; + } + + .search-item-glow { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: linear-gradient(135deg, transparent, rgba(255, 204, 0, 0.05), transparent); + opacity: 0; + transition: opacity 0.3s; + pointer-events: none; + } + + .search-result-item:active .search-item-glow { + opacity: 1; + } + + .search-empty { + display: flex; + flex-direction: column; + align-items: center; + padding: 160rpx 0; + } + + .search-empty-icon { + width: 160rpx; + height: 160rpx; + opacity: 0.2; + margin-bottom: 36rpx; + } + + .search-empty-text { + font-size: 30rpx; + color: #999; + margin-bottom: 16rpx; + } + + .search-empty-tip { + font-size: 24rpx; + color: #bbb; + } + + .search-loading { + display: flex; + flex-direction: column; + align-items: center; + padding: 160rpx 0; + } + + .search-spinner { + width: 60rpx; + height: 60rpx; + position: relative; + margin-bottom: 24rpx; + } + + .spinner-circle { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + border: 4rpx solid transparent; + border-top-color: #ffcc00; + border-radius: 50%; + animation: spin 1s linear infinite; + } + + .search-loading-text { + font-size: 26rpx; + color: #999; + } + + /* 全局加载状态 */ + .loading-toast { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.7); + backdrop-filter: blur(10rpx); + display: flex; + align-items: center; + justify-content: center; + z-index: 3000; + } + + .loading-content { + background: rgba(255, 255, 255, 0.1); + backdrop-filter: blur(20rpx); + padding: 60rpx 80rpx; + border-radius: 24rpx; + display: flex; + flex-direction: column; + align-items: center; + position: relative; + border: 1rpx solid rgba(255, 255, 255, 0.1); + } + + .loading-spinner { + width: 80rpx; + height: 80rpx; + position: relative; + margin-bottom: 30rpx; + } + + .spinner-ring { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + border: 4rpx solid rgba(255, 255, 255, 0.2); + border-radius: 50%; + } + + .spinner-dot { + position: absolute; + top: 0; + left: 50%; + width: 12rpx; + height: 12rpx; + background: #ffcc00; + border-radius: 50%; + transform: translateX(-50%); + animation: spin 1s linear infinite; + } + + .loading-text { + font-size: 28rpx; + color: white; + font-weight: 500; + } + + .loading-glow { + position: absolute; + top: 50%; + left: 50%; + width: 200rpx; + height: 200rpx; + background: radial-gradient(circle, rgba(255, 204, 0, 0.2) 0%, transparent 70%); + transform: translate(-50%, -50%); + z-index: -1; + } + + /* 动画定义 */ + @keyframes glowPulse { + 0%, 100% { + opacity: 0.4; + transform: scale(1); + } + 50% { + opacity: 0.8; + transform: scale(1.05); + } + } + + @keyframes sparkleFlash { + 0%, 100% { + opacity: 0; + transform: translate(-50%, -50%) scale(0); + } + 50% { + opacity: 1; + transform: translate(-50%, -50%) scale(1); + filter: blur(0); + } + } + + @keyframes borderGlow { + 0%, 100% { + border-color: rgba(255, 204, 0, 0.3); + } + 50% { + border-color: rgba(255, 204, 0, 0.8); + } + } + + @keyframes indicatorGlow { + 0%, 100% { + box-shadow: 0 0 20rpx rgba(255, 204, 0, 0.3); + } + 50% { + box-shadow: 0 0 30rpx rgba(255, 204, 0, 0.8); + } + } + + @keyframes sparkleMove { + 0% { + transform: translateY(-100%); + opacity: 0; + } + 50% { + opacity: 1; + } + 100% { + transform: translateY(400%); + opacity: 0; + } + } + + @keyframes rippleEffect { + 0% { + width: 0; + height: 0; + opacity: 0.5; + } + 100% { + width: 200rpx; + height: 200rpx; + opacity: 0; + } + } + + @keyframes priceGlow { + 0% { + opacity: 0; + transform: translate(-50%, -50%) scale(0.5); + } + 50% { + opacity: 0.6; + transform: translate(-50%, -50%) scale(1); + } + 100% { + opacity: 0; + transform: translate(-50%, -50%) scale(1.5); + } + } + + @keyframes buttonHalo { + 0% { + width: 0; + height: 0; + opacity: 0.6; + } + 100% { + width: 200rpx; + height: 200rpx; + opacity: 0; + } + } + + @keyframes starSparkle { + 0% { + opacity: 0; + transform: translate(0, 0) scale(0); + } + 20% { + opacity: 1; + transform: translate(-40rpx, -30rpx) scale(1); + } + 40% { + opacity: 1; + transform: translate(30rpx, -20rpx) scale(1); + } + 60% { + opacity: 1; + transform: translate(-20rpx, 40rpx) scale(1); + } + 80% { + opacity: 1; + transform: translate(40rpx, 20rpx) scale(1); + } + 100% { + opacity: 0; + transform: translate(0, 0) scale(0); + } + } + + @keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } + } \ No newline at end of file diff --git a/pages/guanshiduan/guanshiduan.js b/pages/guanshiduan/guanshiduan.js new file mode 100644 index 0000000..6b3283e --- /dev/null +++ b/pages/guanshiduan/guanshiduan.js @@ -0,0 +1,539 @@ +// pages/guanshizhongxin/guanshizhongxin.js +import request from '../../utils/request.js'; +import popupService from '../../services/popupService.js'; + +Page({ + data: { + // 图片路径对象（逻辑层拼接完整URL） + imgUrls: {}, + + isGuanshi: false, + isLoading: false, + inviteCode: '', + uid: '', + nicheng: '', + avatarUrl: '', + + // 管事信息 + gszhstatus: '', + yaoqingzongshu: 0, + fenyongzonge: '0.00', + fenyongtixian: '0.00', + yichongzhiDashou: 0, + zhuanhualv: 0, + + // 称号列表 + chenghaoList: [], + + // 邀请人（组长）缓存 + inviterCache: null, + }, + + onLoad(options) { + // 拼接所有图片完整路径 + const app = getApp(); + const ossImageUrl = app.globalData.ossImageUrl || ''; + const imgBase = ossImageUrl + 'beijing/guanshiduan/'; + this.setData({ + imgUrls: { + pageBg: imgBase + 'page-bg.jpg', + topDecor: imgBase + 'top-decor.png', + cardBg1: imgBase + 'card-bg1.png', + cardBg2: imgBase + 'card-bg2.png', + iconRefresh: imgBase + 'icon-refresh.png', + iconCopy: imgBase + 'icon-copy.png', + avatarDefault: ossImageUrl + 'avatar/default.jpg', + iconInvite: imgBase + 'icon-invite.png', + iconSub: imgBase + 'icon-sub.png', + iconRecord: imgBase + 'icon-record.png', + iconRank: imgBase + 'icon-rank.png', + iconPoster: imgBase + 'icon-poster.png', + iconWithdraw: imgBase + 'icon-withdraw.png', + iconContact: imgBase + 'icon-contact.png', + iconArrow: imgBase + 'icon-arrow.png', + } + }); + + // 处理扫码 scene + if (options.scene) { + try { + const scene = decodeURIComponent(options.scene); + options.inviteCode = scene; + } catch (e) { + console.error('scene解码失败', e); + } + } + + this.checkGuanshiStatus(); + + const { inviteCode } = options || {}; + if (inviteCode) { + this.setData({ inviteCode }); + setTimeout(() => { + this.handleInviteCodeWithLoginCheck(inviteCode); + }, 500); + } + + if (!app.globalData.hasShownPopupOnColdStart) { + app.globalData.hasShownPopupOnColdStart = true; + setTimeout(() => { + popupService.checkAndShow(this, 'guanshiduan'); + }, 300); + } + }, + + onHide() { + const popupComp = this.selectComponent('#popupNotice'); + if (popupComp && popupComp.cleanup) { + popupComp.cleanup(); + } + }, + + onShow() { + const inviterCache = wx.getStorageSync('inviterCache') || null; + this.setData({ inviterCache }); + + this.registerNotificationComponent(); + + if (this.data.isGuanshi) { + setTimeout(() => { + this.getGuanshiInfo(); + this.fetchChenghaoList(); + }, 300); + } + + const pages = getCurrentPages(); + const currentPage = pages[pages.length - 1]; + const options = currentPage.options || {}; + if (options.inviteCode && !this.data.isGuanshi) { + setTimeout(() => { + this.handleInviteCodeWithLoginCheck(options.inviteCode); + }, 300); + } + }, + + // ========== 全局通知注册 ========== + registerNotificationComponent() { + const app = getApp(); + const comp = this.selectComponent('#global-notification'); + if (comp && comp.showNotification) { + app.globalData.globalNotification = { + show: (data) => comp.showNotification(data), + hide: () => comp.hideNotification() + }; + } + }, + + // ========== 称号列表（新接口，区分管事） ========== + async fetchChenghaoList() { + try { + const res = await request({ + url: '/dengji/chenghao', + method: 'POST', + data: { role: 'guanshi' } + }); + if (res && res.data.code === 0 && res.data.data) { + this.setData({ chenghaoList: res.data.data.chenghao_list || [] }); + } + } catch (e) { + console.error('获取称号失败', e); + } + }, + + // ========== 联系组长（新接口） ========== + // 管事联系组长 —— 获取组长信息并跳转聊天 + // 管事联系组长 +async contactInviter() { + wx.showLoading({ title: '获取组长信息...', mask: true }); + try { + const res = await request({ + url: '/yonghu/guanshi_contact', + method: 'POST' + }); + + if (res && res.data.code === 200 && res.data.data) { + const inviter = res.data.data; + const ossImageUrl = getApp().globalData.ossImageUrl || ''; + const fullAvatar = inviter.touxiang + ? (inviter.touxiang.startsWith('http') ? inviter.touxiang : ossImageUrl + inviter.touxiang) + : ''; + + // 缓存邀请人信息 + const cacheData = { + uid: inviter.uid, + nicheng: inviter.nicheng || '', + avatar: fullAvatar + }; + wx.setStorageSync('inviterCache', cacheData); + this.setData({ inviterCache: cacheData }); + + // 跳转聊天（组长前缀请确认，默认 'Zz'） + const param = { + toUserId: 'Zz' + inviter.uid, + toName: inviter.nicheng || '组长', + toAvatar: fullAvatar + }; + wx.navigateTo({ + url: '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param)) + }); + } else { + wx.showToast({ title: '未绑定邀请人', icon: 'none' }); + } + } catch (e) { + wx.showToast({ title: '网络错误', icon: 'none' }); + } finally { + wx.hideLoading(); + } +}, + // ========== 邀请码处理（完全照搬打手端） ========== + handleInviteCodeWithLoginCheck(inviteCode) { + const token = wx.getStorageSync('token'); + const uid = wx.getStorageSync('uid'); + if (!token || !uid) { + this.loginAndRegisterWithInviteCode(inviteCode); + } else { + if (!this.data.isGuanshi) { + wx.showLoading({ title: '自动注册中...', mask: true }); + this.callRegisterApi(inviteCode); + } else { + wx.showToast({ title: '您已是管事', icon: 'success' }); + } + } + }, + + loginAndRegisterWithInviteCode(inviteCode) { + const that = this; + wx.showLoading({ title: '登录注册中...', mask: true }); + wx.login({ + success: (loginRes) => { + if (loginRes.code) { + that.callLoginRegisterApi(loginRes.code, inviteCode); + } else { + wx.hideLoading(); + wx.showToast({ title: '微信登录失败', icon: 'none' }); + } + }, + fail: () => { + wx.hideLoading(); + wx.reLaunch({ url: '/pages/gerenzhongxin/gerenzhongxin' }); + } + }); + }, + + callLoginRegisterApi(code, inviteCode) { + const that = this; + const app = getApp(); + const apiBaseUrl = app.globalData.apiBaseUrl; + if (!apiBaseUrl) { + wx.hideLoading(); + wx.showToast({ title: '服务器配置错误', icon: 'none' }); + return; + } + wx.request({ + url: apiBaseUrl + '/yonghu/zuzhangyqmzc', + method: 'POST', + data: { code: code, inviteCode: inviteCode }, + header: { 'content-type': 'application/json' }, + success: (res) => { + if (res.statusCode === 200 && res.data && res.data.code === 200 && res.data.data) { + const userData = res.data.data; + if (userData.token) wx.setStorageSync('token', userData.token); + const identityFields = ['nicheng', 'uid', 'touxiang', 'dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus']; + identityFields.forEach(field => { + if (userData[field] !== undefined) { + wx.setStorageSync(field, userData[field]); + app.globalData[field] = userData[field]; + } + }); + if (userData.guanshistatus === undefined) { + wx.setStorageSync('guanshistatus', 1); + app.globalData.guanshistatus = 1; + } + const groupFields = ['dashouqun', 'dashouqunid', 'guanshiqun', 'guanshiqunid']; + groupFields.forEach(field => { + if (userData[field] !== undefined) { + wx.setStorageSync(field, userData[field]); + app.globalData[field] = userData[field]; + } + }); + const guanshiData = { + gszhstatus: userData.gszhstatus || '', + yaoqingzongshu: userData.yaoqingzongshu || 0, + fenyongzonge: userData.fenyongzonge || '0.00', + fenyongtixian: userData.fenyongtixian || '0.00', + yichongzhiDashou: userData.yichongzhiDashou || 0 + }; + if (!app.globalData.guanshi) app.globalData.guanshi = {}; + Object.assign(app.globalData.guanshi, guanshiData); + const zhuanhualv = guanshiData.yaoqingzongshu > 0 + ? (guanshiData.yichongzhiDashou / guanshiData.yaoqingzongshu * 100).toFixed(1) + : 0; + that.setData({ + isGuanshi: true, + uid: userData.uid || '', + nicheng: userData.nicheng || '', + ...guanshiData, + zhuanhualv, + isLoading: false + }); + that.loadUserInfo(); + that.switchToGuanshiRole(); + wx.hideLoading(); + wx.showToast({ title: '注册成功！', icon: 'success', duration: 2000 }); + } else { + wx.hideLoading(); + wx.showToast({ title: (res.data && res.data.msg) || '注册失败', icon: 'none' }); + } + }, + fail: () => { + wx.hideLoading(); + wx.showToast({ title: '网络请求失败', icon: 'none' }); + } + }); + }, + + async callRegisterApi(inviteCode) { + try { + const res = await request({ + url: '/yonghu/guanshizhuce', + method: 'POST', + data: { inviteCode } + }); + if (res && res.data.code === 200 && res.data.data) { + const userData = res.data.data; + const identityFields = ['nicheng', 'uid', 'touxiang', 'dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus']; + const app = getApp(); + identityFields.forEach(field => { + if (userData[field] !== undefined) { + wx.setStorageSync(field, userData[field]); + app.globalData[field] = userData[field]; + } + }); + if (userData.guanshistatus === undefined) { + wx.setStorageSync('guanshistatus', 1); + app.globalData.guanshistatus = 1; + } + const guanshiData = { + gszhstatus: userData.gszhstatus || '', + yaoqingzongshu: userData.yaoqingzongshu || 0, + fenyongzonge: userData.fenyongzonge || '0.00', + fenyongtixian: userData.fenyongtixian || '0.00', + yichongzhiDashou: userData.yichongzhiDashou || 0 + }; + if (!app.globalData.guanshi) app.globalData.guanshi = {}; + Object.assign(app.globalData.guanshi, guanshiData); + const zhuanhualv = guanshiData.yaoqingzongshu > 0 + ? (guanshiData.yichongzhiDashou / guanshiData.yaoqingzongshu * 100).toFixed(1) + : 0; + this.setData({ + isGuanshi: true, + uid: userData.uid || '', + nicheng: userData.nicheng || '', + ...guanshiData, + zhuanhualv, + isLoading: false + }); + this.loadUserInfo(); + this.switchToGuanshiRole(); + wx.hideLoading(); + wx.showToast({ title: '注册成功！', icon: 'success', duration: 2000 }); + } else { + wx.hideLoading(); + wx.showToast({ title: res?.data?.msg || '注册失败', icon: 'none' }); + } + } catch (e) { + console.error('注册失败:', e); + wx.hideLoading(); + wx.showToast({ title: e.message || '注册失败', icon: 'error' }); + } + }, + + switchToGuanshiRole() { + const app = getApp(); + app.globalData.currentRole = 'guanshi'; + wx.setStorageSync('currentRole', 'guanshi'); + const tabBar = this.getTabBar(); + if (tabBar && tabBar.refresh) tabBar.refresh(); + if (app.connectForCurrentRole) { + app.connectForCurrentRole(); + } else if (app.ensureConnection) { + app.ensureConnection(); + } + }, + + checkGuanshiStatus() { + try { + const status = wx.getStorageSync('guanshistatus'); + if (status === 1) { + this.setData({ isGuanshi: true }); + this.loadUserInfo(); + this.checkGlobalData(); + } else { + this.setData({ isGuanshi: false }); + } + } catch (e) { + this.setData({ isGuanshi: false }); + } + }, + + loadUserInfo() { + const app = getApp(); + const globalData = app.globalData || {}; + const touxiang = wx.getStorageSync('touxiang'); + const ossImageUrl = globalData.ossImageUrl || ''; + const morentouxiang = 'avatar/default.jpg'; + let avatarUrl = ''; + if (touxiang) { + avatarUrl = ossImageUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang); + } else { + avatarUrl = ossImageUrl + (morentouxiang.startsWith('/') ? morentouxiang : '/' + morentouxiang); + } + this.setData({ + avatarUrl, + uid: wx.getStorageSync('uid') || '', + nicheng: globalData.nicheng || '' + }); + }, + + checkGlobalData() { + const app = getApp(); + const gd = app.globalData.guanshi || {}; + const needRefresh = !gd.yaoqingzongshu && !gd.fenyongzonge && !gd.fenyongtixian; + if (needRefresh) { + this.getGuanshiInfo(); + } else { + this.setDataFromGlobalData(); + } + }, + + setDataFromGlobalData() { + const gd = getApp().globalData.guanshi || {}; + const zhuanhualv = gd.yaoqingzongshu > 0 + ? (gd.yichongzhiDashou / gd.yaoqingzongshu * 100).toFixed(1) + : 0; + this.setData({ + gszhstatus: gd.gszhstatus || '', + yaoqingzongshu: gd.yaoqingzongshu || 0, + fenyongzonge: gd.fenyongzonge || '0.00', + fenyongtixian: gd.fenyongtixian || '0.00', + yichongzhiDashou: gd.yichongzhiDashou || 0, + zhuanhualv, + isLoading: false + }); + }, + + async getGuanshiInfo() { + this.setData({ isLoading: true }); + try { + const res = await request({ + url: '/yonghu/guanshixinxi', + method: 'POST' + }); + if (res && res.data.code === 200) { + const data = res.data.data; + const app = getApp(); + if (!app.globalData.guanshi) app.globalData.guanshi = {}; + const updateData = { + gszhstatus: data.gszhstatus || '', + yaoqingzongshu: data.yaoqingzongshu || 0, + fenyongzonge: data.fenyongzonge || '0.00', + fenyongtixian: data.fenyongtixian || '0.00', + yichongzhiDashou: data.yichongzhiDashou || 0 + }; + Object.assign(app.globalData.guanshi, updateData); + const zhuanhualv = updateData.yaoqingzongshu > 0 + ? (updateData.yichongzhiDashou / updateData.yaoqingzongshu * 100).toFixed(1) + : 0; + this.setData({ + ...updateData, + zhuanhualv, + isLoading: false + }); + wx.showToast({ title: '信息已更新', icon: 'success', duration: 1500 }); + } + } catch (e) { + this.setData({ isLoading: false }); + wx.showToast({ title: e.message || '获取失败', icon: 'error' }); + } + }, + + refreshGuanshiInfo() { + this.getGuanshiInfo(); + this.fetchChenghaoList(); + }, + + onInviteCodeInput(e) { + this.setData({ inviteCode: e.detail.value.trim() }); + }, + + async onRegister() { + const { inviteCode } = this.data; + if (!inviteCode) { + wx.showToast({ title: '请输入邀请码', icon: 'none' }); + return; + } + if (inviteCode.length > 100) { + wx.showToast({ title: '邀请码过长', icon: 'none' }); + return; + } + this.setData({ isLoading: true }); + try { + const res = await request({ + url: '/yonghu/guanshizhuce', + method: 'POST', + data: { inviteCode } + }); + if (res && res.data.code === 200) { + const userData = res.data.data; + const identityFields = ['dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus']; + const app = getApp(); + identityFields.forEach(field => { + if (userData[field] !== undefined) { + wx.setStorageSync(field, userData[field]); + app.globalData[field] = userData[field]; + } + }); + if (userData.guanshistatus === undefined) { + wx.setStorageSync('guanshistatus', 1); + app.globalData.guanshistatus = 1; + } + if (!app.globalData.guanshi) app.globalData.guanshi = {}; + const updateData = { + gszhstatus: userData.gszhstatus || '', + yaoqingzongshu: userData.yaoqingzongshu || 0, + fenyongzonge: userData.fenyongzonge || '0.00', + fenyongtixian: userData.fenyongtixian || '0.00', + yichongzhiDashou: userData.yichongzhiDashou || 0 + }; + Object.assign(app.globalData.guanshi, updateData); + this.setData({ + isGuanshi: true, + ...updateData, + isLoading: false + }); + this.loadUserInfo(); + wx.showToast({ title: '注册成功！', icon: 'success', duration: 2000 }); + } + } catch (e) { + this.setData({ isLoading: false }); + wx.showToast({ title: e.message || '注册失败', icon: 'error' }); + } + }, + + copyUid() { + const { uid } = this.data; + if (!uid) return; + wx.setClipboardData({ + data: uid, + success: () => wx.showToast({ title: '已复制', icon: 'success' }) + }); + }, + + // ========== 页面跳转 ========== + goToWithdraw() { wx.navigateTo({ url: '/pages/tixian/tixian' }); }, + goToInviteUser() { wx.navigateTo({ url: '/pages/yaoqingdashou/yaoqingdashou' }); }, + goToMySubordinate() { wx.navigateTo({ url: '/pages/wodedashou/wodedashou' }); }, + goToRechargeRecord() { wx.navigateTo({ url: '/pages/czjilu/czjilu' }); }, + goToGuanshiRanking() { wx.navigateTo({ url: '/pages/guanshipaihang/guanshipaihang' }); }, + goToPromoPoster() { wx.navigateTo({ url: '/pages/haibao/haibao' }); } +}); \ No newline at end of file diff --git a/pages/guanshiduan/guanshiduan.json b/pages/guanshiduan/guanshiduan.json new file mode 100644 index 0000000..9aca2d3 --- /dev/null +++ b/pages/guanshiduan/guanshiduan.json @@ -0,0 +1,11 @@ +{ + "usingComponents": { + "global-notification": "/components/global-notification/global-notification", + "chenghao-tag": "/components/chenghao-tag/chenghao-tag" + }, + "navigationBarBackgroundColor": "#f0f4f8", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "管事中心", + "backgroundColor": "#f0f4f8", + "enablePullDownRefresh": false + } \ No newline at end of file diff --git a/pages/guanshiduan/guanshiduan.wxml b/pages/guanshiduan/guanshiduan.wxml new file mode 100644 index 0000000..3ba8dbc --- /dev/null +++ b/pages/guanshiduan/guanshiduan.wxml @@ -0,0 +1,122 @@ + +

+ + + + + ✦ 管事认证 ✦ + + + 立即注册 + + + + + + + + +

+ + + + +

+ + {{nicheng || '管事'}} + + UID: {{uid || '--'}} +

+ + + + + + + + + + + + + + 可提现分成 + + {{fenyongtixian}} + 元 + + + + + {{yaoqingzongshu}} + 邀请总数 + + + {{yichongzhiDashou}} + 已充值 + + + {{fenyongzonge}} + 分成总额 + + + {{zhuanhualv}}% + 有效率 + + + + +

+ 提现 + + + + + + +

+ 邀请用户 + + +

+ 我的下级 + + +

+ 会员记录 + + +

+ 管事排行 + + +

+ 推广海报 + + +

+ 联系组长 + + + + + + +

+ + {{inviterCache.nicheng || '联系组长'}} + ID: {{inviterCache.uid}} + + +

+ + + + + + + + + + + \ No newline at end of file diff --git a/pages/guanshiduan/guanshiduan.wxss b/pages/guanshiduan/guanshiduan.wxss new file mode 100644 index 0000000..3cf8113 --- /dev/null +++ b/pages/guanshiduan/guanshiduan.wxss @@ -0,0 +1,367 @@ +/* ========== 全局背景 ========== */ +page { + background: #F8FAFE; + font-family: -apple-system, BlinkMacSystemFont, 'PingFang SC', sans-serif; + color: #1A1A1A; + } + + /* 背景图清晰可见 */ + .page-bg { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + opacity: 0.4; + z-index: 0; + pointer-events: none; + } + + /* ========== 未注册区域 ========== */ + .unreg-area { + position: relative; + z-index: 2; + display: flex; + align-items: center; + justify-content: center; + min-height: 100vh; + padding: 0 50rpx; + } + + .unreg-card { + width: 100%; + background: rgba(255, 255, 255, 0.75); + backdrop-filter: blur(25rpx); + -webkit-backdrop-filter: blur(25rpx); + border-radius: 48rpx; + padding: 60rpx 50rpx; + text-align: center; + box-shadow: 0 20rpx 50rpx rgba(0,0,0,0.06); + border: 1rpx solid rgba(255,255,255,0.5); + } + + .unreg-title { + font-size: 40rpx; + font-weight: 700; + color: #1A1A1A; + display: block; + margin-bottom: 50rpx; + } + + .unreg-input { + width: 100%; + height: 96rpx; + background: #FFFFFF; + border-radius: 48rpx; + padding: 0 40rpx; + font-size: 30rpx; + color: #1A1A1A; + margin-bottom: 40rpx; + box-shadow: 0 4rpx 16rpx rgba(0,0,0,0.03); + } + + .ph { + color: #999999; + } + + .unreg-btn { + width: 100%; + height: 96rpx; + background: rgba(255,255,255,0.6); + backdrop-filter: blur(15rpx); + border-radius: 48rpx; + display: flex; + align-items: center; + justify-content: center; + border: 2rpx solid rgba(0,0,0,0.08); + box-shadow: 0 12rpx 30rpx rgba(0,0,0,0.05); + } + .unreg-btn:active { opacity: 0.8; } + .unreg-btn-text { + color: #1A1A1A; + font-size: 34rpx; + font-weight: 600; + } + + /* ========== 已注册主区域 ========== */ + .main-body { + position: relative; + z-index: 2; + padding: 0 30rpx 40rpx; + } + + /* 刷新按钮 */ + .refresh-btn { + position: absolute; + top: 40rpx; + right: 40rpx; + width: 68rpx; + height: 68rpx; + background: rgba(255,255,255,0.75); + backdrop-filter: blur(12rpx); + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + z-index: 20; + border: 1rpx solid rgba(255,255,255,0.6); + box-shadow: 0 8rpx 20rpx rgba(0,0,0,0.06); + } + .refresh-icon { + width: 38rpx; + height: 38rpx; + } + + /* 用户卡片 */ + .user-card { + margin-top: 60rpx; + margin-bottom: 30rpx; + background: rgba(255,255,255,0.7); + backdrop-filter: blur(20rpx); + -webkit-backdrop-filter: blur(20rpx); + border-radius: 36rpx; + padding: 28rpx 30rpx; + display: flex; + align-items: center; + border: 1rpx solid rgba(255,255,255,0.5); + box-shadow: 0 12rpx 35rpx rgba(0,0,0,0.05); + } + + .user-avatar { + width: 100rpx; + height: 100rpx; + border-radius: 50%; + border: 3rpx solid #FFFFFF; + margin-right: 24rpx; + } + + .user-name { + font-size: 38rpx; + font-weight: 700; + color: #1A1A1A; + display: block; + margin-bottom: 8rpx; + } + + .uid-row { + display: inline-flex; + align-items: center; + background: rgba(0,0,0,0.03); + border-radius: 20rpx; + padding: 6rpx 18rpx; + } + + .uid-text { + font-size: 26rpx; + color: #1A1A1A; + margin-right: 10rpx; + } + + .copy-icon { + width: 28rpx; + height: 28rpx; + } + + /* 称号区域 */ + .badge-zone { + margin-bottom: 24rpx; + } + .badge-scroll { + white-space: nowrap; + } + + /* 资产卡片（纯玻璃质感） */ + .asset-card { + background: rgba(255,255,255,0.7); + backdrop-filter: blur(20rpx); + -webkit-backdrop-filter: blur(20rpx); + border-radius: 36rpx; + padding: 28rpx 30rpx; + margin-bottom: 28rpx; + border: 1rpx solid rgba(255,255,255,0.5); + box-shadow: 0 12rpx 35rpx rgba(0,0,0,0.05); + } + + .asset-title { + font-size: 26rpx; + color: #1A1A1A; + font-weight: 500; + display: block; + } + + .asset-amount { + display: flex; + align-items: baseline; + margin: 10rpx 0 22rpx; + } + + .amount-number { + font-size: 74rpx; + font-weight: 800; + color: #1A1A1A; + margin-right: 8rpx; + } + + .amount-unit { + font-size: 32rpx; + color: #1A1A1A; + font-weight: 600; + } + + /* 四列数据统计 */ + .four-stats { + display: flex; + align-items: center; + justify-content: space-around; + padding: 20rpx 0; + border-top: 1rpx solid rgba(0,0,0,0.06); + border-bottom: 1rpx solid rgba(0,0,0,0.06); + margin-bottom: 22rpx; + } + + .stat-item { + text-align: center; + flex: 1; + } + + .stat-val { + font-size: 28rpx; + font-weight: 700; + color: #1A1A1A; + display: block; + margin-bottom: 6rpx; + } + + .stat-label { + font-size: 20rpx; + color: #1A1A1A; + font-weight: 500; + } + + /* 提现按钮 */ + .withdraw-btn { + display: flex; + align-items: center; + justify-content: center; + background: rgba(255,255,255,0.55); + backdrop-filter: blur(12rpx); + border-radius: 48rpx; + padding: 16rpx 0; + border: 2rpx solid rgba(0,0,0,0.06); + box-shadow: 0 8rpx 20rpx rgba(0,0,0,0.04); + } + + .withdraw-icon { + width: 36rpx; + height: 36rpx; + margin-right: 12rpx; + } + + .withdraw-text { + font-size: 30rpx; + font-weight: 600; + color: #1A1A1A; + } + + /* 功能入口三列布局 */ + .func-grid { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + margin-bottom: 28rpx; + } + + .func-item { + width: 31%; + aspect-ratio: 1 / 1; + background: rgba(255,255,255,0.7); + backdrop-filter: blur(16rpx); + -webkit-backdrop-filter: blur(16rpx); + border-radius: 28rpx; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + margin-bottom: 20rpx; + border: 1rpx solid rgba(255,255,255,0.5); + box-shadow: 0 8rpx 22rpx rgba(0,0,0,0.04); + } + + .func-icon { + width: 56rpx; + height: 56rpx; + margin-bottom: 12rpx; + } + + .func-label { + font-size: 26rpx; + font-weight: 500; + color: #1A1A1A; + text-align: center; + } + + /* 联系组长卡片（底部横条） */ + .contact-card { + display: flex; + align-items: center; + justify-content: space-between; + background: rgba(255,255,255,0.7); + backdrop-filter: blur(20rpx); + -webkit-backdrop-filter: blur(20rpx); + border-radius: 36rpx; + padding: 20rpx 30rpx; + margin-bottom: 40rpx; + border: 1rpx solid rgba(255,255,255,0.5); + box-shadow: 0 10rpx 25rpx rgba(0,0,0,0.04); + } + + .contact-left { + display: flex; + align-items: center; + flex: 1; + } + + .contact-avatar { + width: 60rpx; + height: 60rpx; + border-radius: 50%; + margin-right: 18rpx; + border: 2rpx solid #FFFFFF; + } + + .contact-name { + font-size: 28rpx; + font-weight: 500; + color: #1A1A1A; + } + + .contact-uid { + font-size: 22rpx; + color: #1A1A1A; + margin-top: 4rpx; + } + + .contact-arrow { + width: 24rpx; + height: 24rpx; + } + + /* 加载遮罩 */ + .loading-mask { + position: fixed; + top:0; left:0; right:0; bottom:0; + background: rgba(255,255,255,0.85); + display: flex; + align-items: center; + justify-content: center; + z-index: 9999; + } + .loading-spinner { + width: 60rpx; + height: 60rpx; + border: 4rpx solid rgba(0,0,0,0.1); + border-top-color: #1A1A1A; + border-radius: 50%; + animation: spin 0.8s linear infinite; + } + @keyframes spin { to { transform: rotate(360deg); } } \ No newline at end of file diff --git a/pages/guanshipaihang/guanshipaihang.js b/pages/guanshipaihang/guanshipaihang.js new file mode 100644 index 0000000..c3771f6 --- /dev/null +++ b/pages/guanshipaihang/guanshipaihang.js @@ -0,0 +1,393 @@ +// pages/guanshi-paihang/guanshi-paihang.js +const app = getApp() +import request from '../../utils/request.js' + +Page({ + data: { + // 页面加载状态 + jiazaiZhuangtai: true, + + // 排行榜类型：1=今日邀请，2=今月邀请 + paihangLeixing: 1, + + // 榜单数据 + paihangShuju: [], + + // 是否展示真实数据（后端控制） + xianshiZhenshiShuju: false, + + // 虚拟数据（用于当后端不允许展示时） + xuniShuju: [], + + // 按钮防抖控制 + btnFangdou: false, + + // OSS图片基础URL（从全局变量获取） + ossImageUrl: '', + + // 默认头像（相对路径，需要与OSS基础URL拼接） + morentouxiang: '', + + // 用户类型：1=打手，2=管事，3=商家（当前页面固定为管事） + yonghuLeixing: 2, + + // 前三名特殊数据 + qiansanMing: [], + + // 动画相关 + crownAnimation: null, + + // 卡片点击特效 + flashCardIndex: -1, + flashCardType: '', + flashAnimation: null, + + // 切换按钮选中状态 + switchBgPosition: 0 + }, + + onLoad() { + // 设置页面标题 + wx.setNavigationBarTitle({ + title: '管事排行榜' + }) + + // 初始化全局变量 + this.setData({ + ossImageUrl: app.globalData.ossImageUrl || '', + morentouxiang: app.globalData.morentouxiang || '' + }) + + // 初始化虚拟数据 + this.initXuniShuju() + + // 加载排行榜数据 + this.huoquPaihangShuju() + + // 开始皇冠动画 + this.startCrownAnimation() + }, + + onShow() { + // 页面显示时恢复动画 + this.registerNotificationComponent(); + this.startCrownAnimation() + }, + registerNotificationComponent() { + const app = getApp(); + const notificationComp = this.selectComponent('#global-notification'); + + if (notificationComp && notificationComp.showNotification) { + console.log('🏪 商城页面注册通知组件'); + app.globalData.globalNotification = { + show: (data) => notificationComp.showNotification(data), + hide: () => notificationComp.hideNotification() + }; + } +}, + + onHide() { + // 页面隐藏时停止动画 + this.stopCrownAnimation() + }, + + onUnload() { + // 页面卸载时停止动画 + this.stopCrownAnimation() + }, + + // 初始化虚拟数据 + initXuniShuju() { + const xuniShuju = [] + const names = ['管事大神', '组织高手', '团队领袖', '精英管理', '运营达人', + '战略专家', '人才猎手', '组织核心', '管理大师', '招募高手'] + + for (let i = 0; i < 10; i++) { + xuniShuju.push({ + mingci: i + 1, + touxiang: '', + nicheng: names[i] || `虚拟管事${i + 1}`, + uid: `G${100000 + i}`, + jine: (88 - i * 7).toString(), // 管事显示的是数量，不是金额 + jineClass: 'normal' // 金额样式 + }) + } + this.setData({ xuniShuju }) + }, + + // 开始皇冠动画 + startCrownAnimation() { + this.stopCrownAnimation() + + const animation = wx.createAnimation({ + duration: 800, + timingFunction: 'ease-in-out' + }) + + let scale = 1 + const animate = () => { + scale = scale === 1 ? 1.15 : 1 + + animation.scale(scale).step({ + duration: 800, + timingFunction: 'ease-in-out' + }) + + this.setData({ + crownAnimation: animation.export() + }) + + this.data.crownAnimationTimer = setTimeout(() => { + animate() + }, 800) + } + + animate() + }, + + // 停止皇冠动画 + stopCrownAnimation() { + if (this.data.crownAnimationTimer) { + clearTimeout(this.data.crownAnimationTimer) + this.setData({ + crownAnimationTimer: null + }) + } + }, + + // 卡片点击特效 + handleCardTap(e) { + const index = e.currentTarget.dataset.index + const type = e.currentTarget.dataset.type // 'top3' 或 'normal' + + // 创建闪光动画 + const animation = wx.createAnimation({ + duration: 300, + timingFunction: 'ease-out' + }) + + // 快速闪光效果 + animation.opacity(0.9).step({ + duration: 50, + timingFunction: 'linear' + }) + + animation.opacity(1).step({ + duration: 250, + timingFunction: 'ease-out' + }) + + this.setData({ + flashCardIndex: index, + flashCardType: type, + flashAnimation: animation.export() + }) + + // 300ms后重置闪光状态 + setTimeout(() => { + this.setData({ + flashCardIndex: -1, + flashCardType: '' + }) + }, 300) + }, + + // 获取排行榜数据 + async huoquPaihangShuju() { + this.setData({ + jiazaiZhuangtai: true + }) + + try { + // 准备请求参数 + const requestData = { + leixing: this.data.paihangLeixing, + yonghu_leixing: this.data.yonghuLeixing + } + + // 使用封装的request发送请求 + const res = await request({ + url: '/peizhi/dsph', + method: 'POST', + data: requestData, + header: { + 'content-type': 'application/json' + } + }) + + // 处理返回数据 + if (res && res.data && res.data.code === 0) { + const responseData = res.data.data + + // 检查后端是否允许展示 + if (responseData.xianshi && responseData.paihang_list && responseData.paihang_list.length > 0) { + // 处理头像URL拼接和金额样式 + const processedList = this.processData(responseData.paihang_list) + + // 提取前三名特殊展示 + const qiansanMing = processedList.slice(0, 3) + const qitaPaihang = processedList.slice(3) + + this.setData({ + paihangShuju: qitaPaihang, + qiansanMing: qiansanMing, + xianshiZhenshiShuju: true, + jiazaiZhuangtai: false + }) + } else { + // 后端不允许展示或数据不足，显示虚拟数据 + this.xianshiXuniShuju() + } + } else { + // 请求失败，显示虚拟数据 + const errorMsg = res && res.data ? (res.data.msg || '获取数据失败') : '网络请求失败' + + wx.showToast({ + title: errorMsg, + icon: 'none', + duration: 2000 + }) + + this.xianshiXuniShuju() + } + } catch (error) { + console.error('获取排行榜数据失败:', error) + + wx.showToast({ + title: '网络请求异常，请重试', + icon: 'none', + duration: 2000 + }) + + this.xianshiXuniShuju() + } + }, + + // 处理数据（头像拼接和金额样式） + processData(list) { + const { ossImageUrl, morentouxiang } = this.data + + return list.map(item => { + // 优先使用返回的头像URL + let finalTouxiang = item.touxiang + + // 如果返回的头像为空，使用默认头像 + if (!finalTouxiang && morentouxiang) { + finalTouxiang = morentouxiang + } + + // 拼接完整的URL + let fullTouxiangUrl = '' + if (finalTouxiang && ossImageUrl) { + // 确保路径不以斜杠开头 + let touxiangPath = finalTouxiang + if (touxiangPath.startsWith('/')) { + touxiangPath = touxiangPath.substring(1) + } + fullTouxiangUrl = ossImageUrl + touxiangPath + } + + // 处理数量样式（管事显示的是数量，不是金额） + const jine = parseInt(item.jine || 0) + let jineClass = 'normal' + const jineStr = jine.toString() // 管事显示整数数量 + + // 判断数量位数 + if (jineStr.length >= 5) { // 5位数及以上 + jineClass = 'very-small' + } else if (jineStr.length >= 4) { // 4位数 + jineClass = 'small' + } else if (jineStr.length >= 3) { // 3位数 + jineClass = 'medium' + } + + return { + ...item, + full_touxiang: fullTouxiangUrl, + jine: jineStr, + jineClass: jineClass + } + }) + }, + + // 显示虚拟数据 + xianshiXuniShuju() { + const processedList = this.processData(this.data.xuniShuju) + const qiansanMing = processedList.slice(0, 3) + const qitaPaihang = processedList.slice(3) + + this.setData({ + paihangShuju: qitaPaihang, + qiansanMing: qiansanMing, + xianshiZhenshiShuju: false, + jiazaiZhuangtai: false + }) + }, + + // 切换排行榜类型（今日/今月） + qiehuangPaihangLeixing(e) { + // 防抖处理：防止连续点击 + if (this.data.btnFangdou) return + + const leixing = e.currentTarget.dataset.leixing + if (leixing == this.data.paihangLeixing) return + + // 设置防抖状态 + this.setData({ + btnFangdou: true + }) + + // 更新切换按钮位置 + this.setData({ + paihangLeixing: leixing, + switchBgPosition: leixing == 1 ? 0 : 1 + }) + + // 重新加载数据 + this.huoquPaihangShuju() + + // 1秒后解除防抖 + setTimeout(() => { + this.setData({ + btnFangdou: false + }) + }, 1000) + }, + + // 用户下拉刷新 + onPullDownRefresh() { + this.huoquPaihangShuju() + wx.stopPullDownRefresh() + }, + + // 图片加载失败处理 + tupianJiazaiShibai(e) { + const index = e.currentTarget.dataset.index + const type = e.currentTarget.dataset.type // 'top3' 或 'normal' + + // 使用默认头像 + const { ossImageUrl, morentouxiang } = this.data + let defaultUrl = '' + if (morentouxiang && ossImageUrl) { + let defaultPath = morentouxiang + if (defaultPath.startsWith('/')) { + defaultPath = defaultPath.substring(1) + } + defaultUrl = ossImageUrl + defaultPath + } + + if (type === 'top3') { + // 前三名头像加载失败 + const key = `qiansanMing[${index}].full_touxiang` + this.setData({ + [key]: defaultUrl + }) + } else { + // 普通排名头像加载失败 + const key = `paihangShuju[${index}].full_touxiang` + this.setData({ + [key]: defaultUrl + }) + } + } +}) \ No newline at end of file diff --git a/pages/guanshipaihang/guanshipaihang.json b/pages/guanshipaihang/guanshipaihang.json new file mode 100644 index 0000000..f6237dd --- /dev/null +++ b/pages/guanshipaihang/guanshipaihang.json @@ -0,0 +1,12 @@ +{ + "usingComponents": { + "global-notification": "/components/global-notification/global-notification" + }, + "navigationBarTitleText": "管事排行榜", + "navigationBarBackgroundColor": "#000000", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "backgroundColor": "#000000", + "backgroundTextStyle": "dark", + "onReachBottomDistance": 50 + } \ No newline at end of file diff --git a/pages/guanshipaihang/guanshipaihang.wxml b/pages/guanshipaihang/guanshipaihang.wxml new file mode 100644 index 0000000..ae0e82e --- /dev/null +++ b/pages/guanshipaihang/guanshipaihang.wxml @@ -0,0 +1,289 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 数据加载中 + Connecting to server... + + + + + + + + + 📡 + + 排行榜数据准备中 + 当前显示为模拟数据，实时排名即将开放 + + + + + + + + + + + + + 2 + + + + + + +

+ + + + + + + + 2 + + + + + + {{qiansanMing[1] ? qiansanMing[1].nicheng : '等待上榜'}} + + + + ID: + {{qiansanMing[1] ? qiansanMing[1].uid : '----'}} + + + 充值大手: + + {{qiansanMing[1] ? qiansanMing[1].jine : '0'}} + 人 + + + + + + + + + + + + + + 👑 + + + + + + + + + + + + + + + 1 + + + + + + +

+ + + + + + + + + 1 + + + + + + {{qiansanMing[0] ? qiansanMing[0].nicheng : '等待上榜'}} + + + + ID: + {{qiansanMing[0] ? qiansanMing[0].uid : '----'}} + + + 充值大手: + + {{qiansanMing[0] ? qiansanMing[0].jine : '0'}} + 人 + + + + + + + + + + + + + 3 + + + + + + +

+ + + + + + + + 3 + + + + + + {{qiansanMing[2] ? qiansanMing[2].nicheng : '等待上榜'}} + + + + ID: + {{qiansanMing[2] ? qiansanMing[2].uid : '----'}} + + + 充值大手: + + {{qiansanMing[2] ? qiansanMing[2].jine : '0'}} + 人 + + + + + + + + + + + + + 其他排名 + + + + + + + + {{xianshiZhenshiShuju ? index + 4 : index + 1}} + + + + +

+ + + + + {{item.nicheng}} + UID: {{item.uid}} + + + + {{item.jine}} + 人 + + + + + + + + + + + 🏆 + 暂无排名数据 + 成为第一个登榜的管事吧 + + + + diff --git a/pages/guanshipaihang/guanshipaihang.wxss b/pages/guanshipaihang/guanshipaihang.wxss new file mode 100644 index 0000000..7dffd55 --- /dev/null +++ b/pages/guanshipaihang/guanshipaihang.wxss @@ -0,0 +1,1276 @@ +/* 管事排行榜和商家排行榜通用样式文件 */ +/* 保存为：pages/guanshi-paihang/guanshi-paihang.wxss 和 pages/shangjia-paihang/shangjia-paihang.wxss */ + +/* ========== 基础页面样式 ========== */ +.guanshi-paihang-page, +.shangjia-paihang-page { + min-height: 100vh; + background: #000; + color: #fff; + position: relative; + overflow-x: hidden; + padding: 40rpx 30rpx; + box-sizing: border-box; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif; +} + +/* ========== 赛博朋克背景 ========== */ +.cyber-bg { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 1; + pointer-events: none; +} + +.cyber-grid { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-image: + linear-gradient(rgba(0, 255, 255, 0.05) 1px, transparent 1px), + linear-gradient(90deg, rgba(0, 255, 255, 0.05) 1px, transparent 1px); + background-size: 50rpx 50rpx; + opacity: 0.3; +} + +.cyber-scanline { + position: absolute; + top: 0; + left: 0; + right: 0; + height: 3rpx; + background: linear-gradient(90deg, + transparent 0%, + #00ffff 30%, + #ff00ff 50%, + #00ffff 70%, + transparent 100%); + animation: scanline 3s linear infinite; + filter: blur(1rpx); + box-shadow: 0 0 20rpx #00ffff; + z-index: 2; +} + +@keyframes scanline { + 0% { top: 0; } + 100% { top: 100%; } +} + +.data-streams { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + overflow: hidden; +} + +.stream { + position: absolute; + width: 1rpx; + height: 100rpx; + background: linear-gradient(to bottom, transparent, #00ffff, transparent); + filter: blur(0.5rpx); + animation: streamFlow 8s linear infinite; +} + +.stream-1 { + left: 20%; + animation-delay: 0s; +} + +.stream-2 { + left: 50%; + animation-delay: 2s; +} + +.stream-3 { + left: 80%; + animation-delay: 4s; +} + +@keyframes streamFlow { + 0% { + top: -100rpx; + opacity: 0; + } + 10% { + opacity: 1; + } + 90% { + opacity: 1; + } + 100% { + top: 100%; + opacity: 0; + } +} + +.floating-particles { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; +} + +.particle { + position: absolute; + width: 6rpx; + height: 6rpx; + background: #00ffff; + border-radius: 50%; + filter: blur(1rpx); + box-shadow: 0 0 10rpx #00ffff; + animation: particleFloat 20s infinite linear; +} + +.particle:nth-child(odd) { + background: #ff00ff; + box-shadow: 0 0 10rpx #ff00ff; +} + +@keyframes particleFloat { + 0%, 100% { + transform: translate(0, 0); + } + 25% { + transform: translate(100rpx, -100rpx); + } + 50% { + transform: translate(-50rpx, 150rpx); + } + 75% { + transform: translate(150rpx, 50rpx); + } +} + +/* ========== 页面头部 ========== */ +.page-header { + position: relative; + z-index: 10; + margin-bottom: 55rpx; + margin-top: -40rpx; +} + +.title-container { + text-align: center; + margin-bottom: 40rpx; +} + +.main-title { + display: block; + font-size: 58rpx; + font-weight: 900; + background: linear-gradient(90deg, #00ffff, #ff00ff, #ffff00); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + text-shadow: 0 0 30rpx rgba(0, 255, 255, 0.5); + letter-spacing: 4rpx; + margin-bottom: 8rpx; +} + +.title-line { + width: 220rpx; + height: 3rpx; + background: linear-gradient(90deg, transparent, #00ffff, #ff00ff, transparent); + margin: 12rpx auto; + position: relative; +} + +.title-line::before { + content: ''; + position: absolute; + top: -2rpx; + left: 0; + right: 0; + height: 7rpx; + background: linear-gradient(90deg, + transparent 0%, + rgba(0, 255, 255, 0.3) 20%, + rgba(255, 0, 255, 0.3) 80%, + transparent 100%); + filter: blur(4rpx); +} + +.sub-title { + display: block; + font-size: 22rpx; + color: rgba(255, 255, 255, 0.6); + letter-spacing: 6rpx; + text-transform: uppercase; + margin-top: 5rpx; +} + +.toggle-container { + display: flex; + background: rgba(10, 10, 30, 0.8); + border-radius: 60rpx; + padding: 6rpx; + position: relative; + border: 1rpx solid rgba(0, 255, 255, 0.2); + backdrop-filter: blur(20rpx); + max-width: 700rpx; + width: 90%; + margin: 0 auto; + box-shadow: + 0 10rpx 40rpx rgba(0, 0, 0, 0.8), + inset 0 0 20rpx rgba(0, 255, 255, 0.05); +} + +.toggle-bg { + position: absolute; + top: 6rpx; + bottom: 6rpx; + width: 50%; + background: linear-gradient(90deg, + rgba(0, 255, 255, 0.2), + rgba(255, 0, 255, 0.2)); + border-radius: 54rpx; + transition: transform 0.4s cubic-bezier(0.68, -0.55, 0.265, 1.55); + z-index: 1; +} + +.toggle-btn { + flex: 1; + text-align: center; + padding: 30rpx 0; + font-size: 32rpx; + font-weight: 600; + color: rgba(255, 255, 255, 0.7); + position: relative; + z-index: 2; + transition: all 0.3s ease; + border-radius: 54rpx; + min-width: 200rpx; +} + +.toggle-btn.active { + color: #ffffff; + text-shadow: 0 0 15rpx rgba(255, 255, 255, 0.5); +} + +.toggle-btn.disabled { + opacity: 0.5; + pointer-events: none; +} + +.toggle-text { + position: relative; + z-index: 1; +} + +.toggle-line { + position: absolute; + bottom: 15rpx; + left: 50%; + transform: translateX(-50%); + width: 40rpx; + height: 3rpx; + background: linear-gradient(90deg, #00ffff, #ff00ff); + border-radius: 2rpx; + opacity: 0; + transition: opacity 0.3s ease; +} + +.toggle-line.active { + opacity: 1; + box-shadow: 0 0 15rpx rgba(0, 255, 255, 0.5); +} + +/* ========== 加载状态 ========== */ +.loading-state { + display: flex; + align-items: center; + justify-content: center; + height: 60vh; + position: relative; + z-index: 10; +} + +.loading-content { + text-align: center; +} + +.loading-spinner { + position: relative; + width: 120rpx; + height: 120rpx; + margin: 0 auto 30rpx; +} + +.spinner-outer { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border: 8rpx solid transparent; + border-top-color: #00ffff; + border-right-color: #ff00ff; + border-radius: 50%; + animation: spinOuter 2s linear infinite; +} + +.spinner-inner { + position: absolute; + top: 15rpx; + left: 15rpx; + right: 15rpx; + bottom: 15rpx; + border: 6rpx solid transparent; + border-bottom-color: #ffff00; + border-left-color: #00ffff; + border-radius: 50%; + animation: spinInner 1.5s linear infinite reverse; +} + +.spinner-core { + position: absolute; + top: 30rpx; + left: 30rpx; + right: 30rpx; + bottom: 30rpx; + background: radial-gradient(circle, + rgba(0, 255, 255, 0.2) 0%, + rgba(255, 0, 255, 0.1) 50%, + transparent 100%); + border-radius: 50%; +} + +@keyframes spinOuter { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } +} + +@keyframes spinInner { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(-360deg); } +} + +.loading-text { + display: block; + font-size: 32rpx; + color: #00ffff; + margin-bottom: 10rpx; + text-shadow: 0 0 10rpx rgba(0, 255, 255, 0.5); +} + +.loading-sub { + display: block; + font-size: 24rpx; + color: rgba(255, 255, 255, 0.6); +} + +/* ========== 虚拟数据提示 ========== */ +.demo-notice { + background: rgba(15, 15, 35, 0.9); + border-radius: 25rpx; + padding: 30rpx; + margin-bottom: 40rpx; + position: relative; + z-index: 10; + border: 1rpx solid rgba(255, 0, 255, 0.3); + backdrop-filter: blur(20rpx); + display: flex; + align-items: center; + overflow: hidden; + box-shadow: + 0 10rpx 40rpx rgba(0, 0, 0, 0.8), + 0 0 30rpx rgba(255, 0, 255, 0.2); +} + +.notice-icon { + font-size: 60rpx; + margin-right: 30rpx; + background: linear-gradient(45deg, #ff00ff, #00ffff); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + flex-shrink: 0; +} + +.notice-content { + flex: 1; +} + +.notice-title { + display: block; + font-size: 32rpx; + font-weight: 700; + color: #ff00ff; + margin-bottom: 10rpx; + text-shadow: 0 0 15rpx rgba(255, 0, 255, 0.5); +} + +.notice-desc { + display: block; + font-size: 26rpx; + color: rgba(255, 255, 255, 0.7); + line-height: 1.4; +} + +.notice-glow { + position: absolute; + top: -100%; + left: -100%; + right: -100%; + bottom: -100%; + background: radial-gradient(circle at center, + rgba(255, 0, 255, 0.1) 0%, + transparent 70%); + z-index: -1; +} + +/* ========== 前三名区域 ========== */ +.top-three-section { + display: flex; + justify-content: center; + align-items: flex-end; + position: relative; + z-index: 10; + margin-bottom: 40rpx; + gap: 20rpx; + margin-top: 10rpx; +} + +.rank-card { + position: relative; + display: flex; + flex-direction: column; + align-items: center; + transition: all 0.3s ease; +} + +.rank-1 { + width: 280rpx; + z-index: 30; + margin-bottom: 30rpx; +} + +.rank-2 { + width: 220rpx; + z-index: 20; + margin-bottom: 0rpx; + margin-right: -20rpx; +} + +.rank-3 { + width: 220rpx; + z-index: 20; + margin-bottom: 0rpx; + margin-left: -20rpx; +} + +.rank-card.flash { + animation: cardFlash 0.4s ease-out; +} + +@keyframes cardFlash { + 0% { + filter: brightness(1) drop-shadow(0 0 0 rgba(255, 255, 255, 0)); + } + 50% { + filter: brightness(1.4) drop-shadow(0 0 40rpx rgba(255, 255, 255, 0.8)); + } + 100% { + filter: brightness(1) drop-shadow(0 0 0 rgba(255, 255, 255, 0)); + } +} + +/* 奖台底座 */ +.podium-base { + position: absolute; + bottom: 0; + left: 0; + right: 0; + height: 60rpx; + border-radius: 30rpx 30rpx 0 0; + display: flex; + align-items: center; + justify-content: center; + z-index: 1; +} + +.rank-1 .podium-base { + height: 80rpx; +} + +.podium-gold { + background: linear-gradient(180deg, + rgba(255, 215, 0, 0.3) 0%, + rgba(255, 215, 0, 0.1) 100%); + border: 1rpx solid rgba(255, 215, 0, 0.4); +} + +.podium-silver { + background: linear-gradient(180deg, + rgba(192, 192, 192, 0.3) 0%, + rgba(192, 192, 192, 0.1) 100%); + border: 1rpx solid rgba(192, 192, 192, 0.4); +} + +.podium-bronze { + background: linear-gradient(180deg, + rgba(205, 127, 50, 0.3) 0%, + rgba(205, 127, 50, 0.1) 100%); + border: 1rpx solid rgba(205, 127, 50, 0.4); +} + +.podium-glow { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border-radius: 30rpx 30rpx 0 0; + background: radial-gradient(ellipse at center, + rgba(255, 255, 255, 0.2) 0%, + transparent 70%); + z-index: -1; +} + +.podium-number { + font-size: 32rpx; + font-weight: 900; + color: rgba(255, 255, 255, 0.9); + text-shadow: 0 0 10rpx currentColor; +} + +/* ========== 皇冠容器 ========== */ +.crown-container { + position: absolute; + top: -55rpx; + left: 55%; + transform: translateX(20%) rotate(35deg)!important; + width: 110rpx; + height: 110rpx; + z-index: 40; + display: flex; + align-items: center; + justify-content: center; +} + +.crown { + position: relative; + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} + +.crown-icon { + font-size: 85rpx; + position: relative; + z-index: 2; + filter: drop-shadow(0 0 10rpx rgba(255, 215, 0, 0.8)); + animation: crownFloat 3s ease-in-out infinite; + transform: rotate(5deg); +} + +@keyframes crownFloat { + 0%, 100% { + transform: translateY(0) rotate(5deg) scale(1); + filter: drop-shadow(0 0 10rpx rgba(255, 215, 0, 0.8)); + } + 50% { + transform: translateY(-15rpx) rotate(10deg) scale(1.1); + filter: drop-shadow(0 0 25rpx rgba(255, 215, 0, 1)); + } +} + +.crown-rays { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 180rpx; + height: 180rpx; + z-index: 1; +} + +.ray { + position: absolute; + top: 50%; + left: 50%; + width: 2rpx; + height: 80rpx; + background: linear-gradient(to top, + transparent, + rgba(255, 215, 0, 0.8), + rgba(255, 215, 0, 1), + rgba(255, 215, 0, 0.8), + transparent); + transform-origin: bottom center; + filter: blur(1rpx); +} + +.ray-1 { transform: translate(-50%, -100%) rotate(0deg); } +.ray-2 { transform: translate(-50%, -100%) rotate(60deg); } +.ray-3 { transform: translate(-50%, -100%) rotate(120deg); } +.ray-4 { transform: translate(-50%, -100%) rotate(180deg); } +.ray-5 { transform: translate(-50%, -100%) rotate(240deg); } +.ray-6 { transform: translate(-50%, -100%) rotate(300deg); } + +.crown-glow { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 200rpx; + height: 200rpx; + background: radial-gradient(circle, + rgba(255, 215, 0, 0.3) 0%, + rgba(255, 215, 0, 0.1) 40%, + transparent 70%); + z-index: 0; + animation: glowPulse 2s ease-in-out infinite; +} + +@keyframes glowPulse { + 0%, 100% { opacity: 0.5; } + 50% { opacity: 0.8; } +} + +/* ========== 排名内容 ========== */ +.rank-content { + position: relative; + width: 100%; + z-index: 2; +} + +/* 头像框架 */ +.avatar-frame { + position: relative; + width: 160rpx; + height: 160rpx; + margin: 0 auto 30rpx; + display: flex; + align-items: center; + justify-content: center; +} + +.rank-1 .avatar-frame { + width: 200rpx; + height: 200rpx; +} + +.frame-gold { + filter: drop-shadow(0 0 30rpx rgba(255, 215, 0, 0.5)); +} + +.frame-silver { + filter: drop-shadow(0 0 25rpx rgba(192, 192, 192, 0.5)); +} + +.frame-bronze { + filter: drop-shadow(0 0 25rpx rgba(205, 127, 50, 0.5)); +} + +.avatar-container { + position: relative; + width: 100%; + height: 100%; + border-radius: 50%; + overflow: hidden; + background: rgba(20, 20, 40, 0.8); + display: flex; + align-items: center; + justify-content: center; + border: 4rpx solid transparent; +} + +.rank-1 .avatar-container { + border-width: 6rpx; +} + +.frame-gold .avatar-container { + border-color: rgba(255, 215, 0, 0.3); +} + +.frame-silver .avatar-container { + border-color: rgba(192, 192, 192, 0.3); +} + +.frame-bronze .avatar-container { + border-color: rgba(205, 127, 50, 0.3); +} + +.avatar-image { + width: 100%; + height: 100%; + border-radius: 50%; + object-fit: cover; + position: relative; + z-index: 2; +} + +/* 头像光晕 */ +.avatar-halo { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + border-radius: 50%; + z-index: 1; + pointer-events: none; + animation: haloRotate 10s linear infinite; +} + +.halo-gold { + width: 220rpx; + height: 220rpx; + background: radial-gradient(circle, + rgba(255, 215, 0, 0.4) 0%, + rgba(255, 215, 0, 0.2) 30%, + transparent 70%); +} + +.rank-1 .halo-gold { + width: 260rpx; + height: 260rpx; +} + +.halo-silver { + width: 200rpx; + height: 200rpx; + background: radial-gradient(circle, + rgba(192, 192, 192, 0.4) 0%, + rgba(192, 192, 192, 0.2) 30%, + transparent 70%); +} + +.halo-bronze { + width: 200rpx; + height: 200rpx; + background: radial-gradient(circle, + rgba(205, 127, 50, 0.4) 0%, + rgba(205, 127, 50, 0.2) 30%, + transparent 70%); +} + +@keyframes haloRotate { + 0% { transform: translate(-50%, -50%) rotate(0deg); } + 100% { transform: translate(-50%, -50%) rotate(360deg); } +} + +/* 头像闪烁粒子 */ +.avatar-sparkles { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border-radius: 50%; + z-index: 3; +} + +.sparkle { + position: absolute; + width: 8rpx; + height: 8rpx; + background: #fff; + border-radius: 50%; + filter: blur(1rpx); + opacity: 0; + animation: sparkleTwinkle 3s ease-in-out infinite; +} + +.rank-1 .sparkle { + width: 10rpx; + height: 10rpx; +} + +.s1 { top: 15%; left: 15%; animation-delay: 0s; } +.s2 { top: 25%; right: 25%; animation-delay: 0.5s; } +.s3 { bottom: 35%; left: 35%; animation-delay: 1s; } +.s4 { bottom: 15%; right: 15%; animation-delay: 1.5s; } + +@keyframes sparkleTwinkle { + 0%, 100% { + opacity: 0; + transform: scale(0.5); + } + 50% { + opacity: 1; + transform: scale(1); + } +} + +/* 排名徽章 */ +.rank-badge { + position: absolute; + bottom: -10rpx; + right: -10rpx; + width: 60rpx; + height: 60rpx; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + font-size: 28rpx; + font-weight: 900; + color: #fff; + z-index: 10; + border: 3rpx solid rgba(255, 255, 255, 0.3); + box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.5); +} + +.rank-1 .rank-badge { + width: 70rpx; + height: 70rpx; + font-size: 32rpx; + bottom: -15rpx; + right: -15rpx; +} + +.badge-gold { + background: linear-gradient(135deg, #ffd700, #ff9800); +} + +.badge-silver { + background: linear-gradient(135deg, #c0c0c0, #808080); +} + +.badge-bronze { + background: linear-gradient(135deg, #cd7f32, #a0522d); +} + +/* 用户信息卡片 */ +.user-info-card { + background: rgba(15, 15, 35, 0.95); + border-radius: 25rpx; + padding: 30rpx 25rpx; + backdrop-filter: blur(20rpx); + border: 1rpx solid rgba(255, 255, 255, 0.1); + box-shadow: + 0 20rpx 60rpx rgba(0, 0, 0, 0.8), + inset 0 0 30rpx rgba(255, 255, 255, 0.05); + position: relative; + overflow: hidden; +} + +.rank-1 .user-info-card { + border-color: rgba(255, 215, 0, 0.3); + background: rgba(20, 15, 5, 0.95); +} + +.rank-2 .user-info-card { + border-color: rgba(192, 192, 192, 0.3); + background: rgba(25, 25, 35, 0.95); +} + +.rank-3 .user-info-card { + border-color: rgba(205, 127, 50, 0.3); + background: rgba(30, 20, 10, 0.95); +} + +.info-header { + margin-bottom: 20rpx; + text-align: center; +} + +.user-name { + font-size: 32rpx; + font-weight: 700; + color: #fff; + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.rank-1 .user-name { + color: #ffd700; + text-shadow: 0 0 15rpx rgba(255, 215, 0, 0.7); + font-size: 34rpx; +} + +.rank-2 .user-name { + color: #c0c0c0; + text-shadow: 0 0 10rpx rgba(192, 192, 192, 0.7); +} + +.rank-3 .user-name { + color: #cd7f32; + text-shadow: 0 0 10rpx rgba(205, 127, 50, 0.7); +} + +.info-body { + border-top: 1rpx solid rgba(255, 255, 255, 0.1); + padding-top: 15rpx; +} + +.uid-row, .income-row { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 12rpx; +} + +.uid-row:last-child, .income-row:last-child { + margin-bottom: 0; +} + +.uid-label, .income-label { + font-size: 24rpx; + color: rgba(255, 255, 255, 0.6); +} + +.uid-value { + font-size: 24rpx; + color: rgba(255, 255, 255, 0.9); + font-family: 'Courier New', monospace; +} + +.income-value { + display: flex; + align-items: baseline; +} + +.currency { + font-size: 26rpx; + color: #4ade80; + margin-right: 4rpx; +} + +.rank-1 .currency { + color: #ffd700; +} + +.rank-2 .currency { + color: #c0c0c0; +} + +.rank-3 .currency { + color: #cd7f32; +} + +.amount { + font-size: 32rpx; + font-weight: 700; + color: #4ade80; + text-shadow: 0 0 10rpx rgba(74, 222, 128, 0.5); +} + +.rank-1 .amount { + color: #ffd700; + text-shadow: 0 0 15rpx rgba(255, 215, 0, 0.7); +} + +.rank-2 .amount { + color: #c0c0c0; + text-shadow: 0 0 10rpx rgba(192, 192, 192, 0.7); +} + +.rank-3 .amount { + color: #cd7f32; + text-shadow: 0 0 10rpx rgba(205, 127, 50, 0.7); +} + +.unit { + font-size: 24rpx; + color: rgba(255, 255, 255, 0.6); + margin-left: 4rpx; +} + +.amount.medium { + font-size: 30rpx; +} + +.amount.small { + font-size: 28rpx; +} + +.amount.very-small { + font-size: 26rpx; +} + +/* ========== 其他排名区域 ========== */ +.other-ranks-section { + position: relative; + z-index: 10; +} + +.section-title { + display: flex; + align-items: center; + justify-content: center; + margin-bottom: 40rpx; +} + +.title-line { + flex: 1; + height: 2rpx; + background: linear-gradient(90deg, + transparent, + #00ffff, + #ff00ff, + #00ffff, + transparent); +} + +.title-text { + font-size: 32rpx; + font-weight: 700; + color: #00ffff; + margin: 0 30rpx; + text-shadow: 0 0 15rpx rgba(0, 255, 255, 0.5); +} + +.rank-list { + position: relative; +} + +.rank-item { + display: flex; + align-items: center; + background: rgba(20, 20, 40, 0.8); + border-radius: 25rpx; + padding: 25rpx 30rpx; + margin-bottom: 20rpx; + border: 1rpx solid rgba(0, 255, 255, 0.1); + backdrop-filter: blur(20rpx); + position: relative; + overflow: hidden; + transition: all 0.3s ease; + box-shadow: + 0 10rpx 40rpx rgba(0, 0, 0, 0.6), + inset 0 0 20rpx rgba(0, 255, 255, 0.05); +} + +.rank-item.flash { + animation: cardFlash 0.4s ease-out; +} + +.rank-item::before { + content: ''; + position: absolute; + top: 0; + left: -100%; + width: 100%; + height: 100%; + background: linear-gradient(90deg, + transparent, + rgba(0, 255, 255, 0.1), + transparent); + transition: left 0.6s ease; +} + +.rank-item:hover::before { + left: 100%; +} + +.rank-number { + width: 80rpx; + text-align: center; + position: relative; + margin-right: 30rpx; + flex-shrink: 0; +} + +.number-text { + font-size: 42rpx; + font-weight: 900; + color: rgba(255, 255, 255, 0.9); + position: relative; + z-index: 1; +} + +.number-glow { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 80rpx; + height: 80rpx; + background: radial-gradient(circle, + rgba(0, 255, 255, 0.2) 0%, + transparent 70%); + z-index: 0; +} + +.rank-avatar { + position: relative; + width: 100rpx; + height: 100rpx; + margin-right: 25rpx; + flex-shrink: 0; +} + +.rank-avatar-img { + width: 100%; + height: 100%; + border-radius: 50%; + object-fit: cover; + position: relative; + z-index: 2; + border: 3rpx solid rgba(0, 255, 255, 0.2); +} + +.rank-avatar-halo { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 120rpx; + height: 120rpx; + background: radial-gradient(circle, + rgba(0, 255, 255, 0.2) 0%, + rgba(0, 255, 255, 0.1) 30%, + transparent 70%); + z-index: 1; + border-radius: 50%; +} + +.rank-info { + flex: 1; + min-width: 0; +} + +.rank-name { + display: block; + font-size: 32rpx; + font-weight: 600; + color: #ffffff; + margin-bottom: 8rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.rank-uid { + display: block; + font-size: 24rpx; + color: rgba(255, 255, 255, 0.6); + font-family: 'Courier New', monospace; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.rank-income { + position: relative; + flex-shrink: 0; + display: flex; + align-items: baseline; + margin-left: 20rpx; +} + +.income-currency { + font-size: 28rpx; + color: #00ffff; + margin-right: 4rpx; + opacity: 0.9; +} + +.income-amount { + font-size: 36rpx; + font-weight: 700; + color: #4ade80; + text-shadow: 0 0 10rpx rgba(74, 222, 128, 0.5); + white-space: nowrap; + line-height: 1; +} + +.income-unit { + font-size: 24rpx; + color: rgba(255, 255, 255, 0.6); + margin-left: 4rpx; +} + +.income-amount.medium { + font-size: 34rpx; +} + +.income-amount.small { + font-size: 32rpx; +} + +.income-amount.very-small { + font-size: 30rpx; +} + +.income-glow { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 140rpx; + height: 70rpx; + background: radial-gradient(ellipse, + rgba(74, 222, 128, 0.2) 0%, + transparent 70%); + z-index: 0; +} + +.rank-hover { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border-radius: 25rpx; + border: 1rpx solid transparent; + background: linear-gradient(45deg, + rgba(0, 255, 255, 0.1), + rgba(255, 0, 255, 0.1)) border-box; + mask: linear-gradient(#fff 0 0) padding-box, linear-gradient(#fff 0 0); + -webkit-mask: linear-gradient(#fff 0 0) padding-box, linear-gradient(#fff 0 0); + -webkit-mask-composite: xor; + mask-composite: exclude; + opacity: 0; + transition: opacity 0.3s ease; + pointer-events: none; +} + +.rank-item:hover .rank-hover { + opacity: 1; +} + +/* ========== 空状态 ========== */ +.empty-state { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding: 120rpx 0; + text-align: center; + position: relative; + z-index: 10; +} + +.empty-icon { + font-size: 120rpx; + margin-bottom: 30rpx; + opacity: 0.5; + animation: iconFloat 3s ease-in-out infinite; +} + +@keyframes iconFloat { + 0%, 100% { transform: translateY(0); } + 50% { transform: translateY(-30rpx); } +} + +.empty-title { + font-size: 36rpx; + color: rgba(255, 255, 255, 0.8); + margin-bottom: 15rpx; +} + +.empty-desc { + font-size: 28rpx; + color: rgba(255, 255, 255, 0.5); +} + +/* ========== 调整整个内容区域的上边距 ========== */ +.ranking-content { + position: relative; + z-index: 5; + margin-top: 10rpx; +} \ No newline at end of file diff --git a/pages/guanzhual/guanzhual.js b/pages/guanzhual/guanzhual.js new file mode 100644 index 0000000..ea8dbfd --- /dev/null +++ b/pages/guanzhual/guanzhual.js @@ -0,0 +1,90 @@ +// pages/guanzhual/guanzhual.js +const app = getApp() +import request from '../../utils/request.js' + +Page({ + data: { + images: [], // 图片完整URL列表 + lastUpdate: '', // 最新更新时间 + visitCount: 0, // 浏览次数 + loading: true, // 加载中 + ossImageUrl: '' // OSS基础地址 + }, + + onLoad() { + // 获取OSS地址 + this.setData({ + ossImageUrl: app.globalData.ossImageUrl || '' + }) + this.loadData() + }, + + onShow() { + this.registerNotificationComponent() + }, + + // 注册全局通知组件 + registerNotificationComponent() { + const notificationComp = this.selectComponent('#global-notification') + if (notificationComp && notificationComp.showNotification) { + app.globalData.globalNotification = { + show: (data) => notificationComp.showNotification(data), + hide: () => notificationComp.hideNotification() + } + } + }, + + // 加载数据 + loadData() { + this.setData({ loading: true }) + + request({ + url: '/peizhi/gzal', + method: 'POST', + header: { 'content-type': 'application/json' } + }) + .then(res => { + if (res && res.data && res.data.code === 0) { + const data = res.data.data || {} + const ossImageUrl = this.data.ossImageUrl + // 拼接完整URL + const fullImages = (data.images || []).map(url => { + if (url && !url.startsWith('http')) { + return ossImageUrl + url + } + return url + }) + this.setData({ + images: fullImages, + lastUpdate: data.last_update || '', + visitCount: data.visit_count || 0, + loading: false + }) + } else { + wx.showToast({ + title: res?.data?.msg || '加载失败', + icon: 'none' + }) + this.setData({ loading: false }) + } + }) + .catch(err => { + console.error('加载关注阿龙数据失败', err) + wx.showToast({ + title: '网络错误', + icon: 'none' + }) + this.setData({ loading: false }) + }) + }, + + // 图片加载成功（可选） + onImageLoad(e) { + // 可忽略 + }, + + // 图片加载失败 + onImageError(e) { + console.warn('图片加载失败', e) + } +}) \ No newline at end of file diff --git a/pages/guanzhual/guanzhual.json b/pages/guanzhual/guanzhual.json new file mode 100644 index 0000000..ac80b22 --- /dev/null +++ b/pages/guanzhual/guanzhual.json @@ -0,0 +1,8 @@ +{ + "navigationBarTitleText": "关注二H", + "usingComponents": { + "global-notification": "/components/global-notification/global-notification" + }, + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } \ No newline at end of file diff --git a/pages/guanzhual/guanzhual.wxml b/pages/guanzhual/guanzhual.wxml new file mode 100644 index 0000000..5394ae8 --- /dev/null +++ b/pages/guanzhual/guanzhual.wxml @@ -0,0 +1,39 @@ + + + + + 关注快手 + {{visitCount}}次浏览 + + + 更新时间：{{lastUpdate}} + + + + + + + +

+ + + + 暂无内容 + + + + + + + 加载中... + + + + + \ No newline at end of file diff --git a/pages/guanzhual/guanzhual.wxss b/pages/guanzhual/guanzhual.wxss new file mode 100644 index 0000000..675b458 --- /dev/null +++ b/pages/guanzhual/guanzhual.wxss @@ -0,0 +1,95 @@ +/* pages/guanzhual/guanzhual.wxss */ +page { + background-color: #ffffff; + min-height: 100vh; + } + + .guanzhual-page { + padding-bottom: 30rpx; + box-sizing: border-box; + } + + /* 头部信息 */ + .header-info { + padding: 30rpx 20rpx 20rpx 20rpx; + border-bottom: 2rpx solid #f5f5f5; + } + + .title-section { + display: flex; + justify-content: space-between; + align-items: baseline; + margin-bottom: 12rpx; + } + + .main-title { + font-size: 40rpx; + font-weight: 600; + color: #333333; + } + + .visit-count { + font-size: 28rpx; + color: #999999; + } + + .sub-info { + display: flex; + justify-content: space-between; + font-size: 26rpx; + color: #aaaaaa; + } + + .update-time { + color: #888888; + } + + /* 图片列表 */ + .image-list { + padding: 0 8rpx; /* 非常微小的左右边距 */ + } + + .image-item { + width: 100%; + margin-bottom: 6rpx; /* 极小的上下间距 */ + background-color: #fafafa; + overflow: hidden; + border-radius: 4rpx; + } + + .image-item image { + width: 100%; + display: block; + } + + /* 空状态提示 */ + .empty-tip { + padding: 100rpx 0; + text-align: center; + color: #999999; + font-size: 28rpx; + } + + /* 加载状态 */ + .loading-container { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding: 100rpx 0; + } + + .loading-spinner { + width: 60rpx; + height: 60rpx; + border: 4rpx solid #e0e0e0; + border-top-color: #00C853; + border-radius: 50%; + animation: spin 1s linear infinite; + margin-bottom: 20rpx; + } + + @keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } + } \ No newline at end of file diff --git a/pages/haibao/haibao.js b/pages/haibao/haibao.js new file mode 100644 index 0000000..3985d30 --- /dev/null +++ b/pages/haibao/haibao.js @@ -0,0 +1,281 @@ +// pages/haibao/haibao.js +import request from '../../utils/request.js'; + +const app = getApp(); + +Page({ + data: { + qrcodeUrl: '', + isLoading: false, + showPosterCanvas: false, + posterImageTemp: '', + avatarUrl: '', + uid: '', + nickName: '', + }, + + onLoad() { + this.loadQRCodeFromCache(); + this.loadUserInfo(); + }, + + onShow() { + this.registerNotificationComponent(); + }, + + registerNotificationComponent() { + const notificationComp = this.selectComponent('#global-notification'); + if (notificationComp && notificationComp.showNotification) { + app.globalData.globalNotification = { + show: (data) => notificationComp.showNotification(data), + hide: () => notificationComp.hideNotification() + }; + } + }, + + loadQRCodeFromCache() { + try { + const relativeUrl = wx.getStorageSync('haibao_url'); + if (relativeUrl) { + const fullUrl = this.getFullImageUrl(relativeUrl); + this.setData({ qrcodeUrl: fullUrl }); + } else { + this.setData({ qrcodeUrl: '' }); + } + } catch (error) { + console.error('读取缓存失败', error); + } + }, + + loadUserInfo() { + const touxiang = wx.getStorageSync('touxiang'); + const ossUrl = app.globalData.ossImageUrl || ''; + const defaultAvatar = ossUrl + (app.globalData.morentouxiang || 'avatar/default.jpg'); + let avatarUrl = defaultAvatar; + if (touxiang && typeof touxiang === 'string' && touxiang.trim() !== '') { + avatarUrl = this.getFullImageUrl(touxiang); + } + const uid = wx.getStorageSync('uid') || ''; + let nickName = app.globalData.nicheng || wx.getStorageSync('nicheng') || '管事'; + this.setData({ avatarUrl, uid, nickName }); + }, + + getFullImageUrl(url) { + if (!url) return ''; + const ossUrl = app.globalData.ossImageUrl || ''; + return url.startsWith('http') ? url : ossUrl + url; + }, + + refreshQRCode() { + if (this.data.isLoading) return; + this.setData({ isLoading: true }); + request({ + url: '/peizhi/guanshiewm', + method: 'POST', + }).then(res => { + if (res.data && res.data.code === 0) { + const relativeUrl = res.data.data.url; + if (relativeUrl) { + wx.setStorageSync('haibao_url', relativeUrl); + const fullUrl = this.getFullImageUrl(relativeUrl); + this.setData({ qrcodeUrl: fullUrl }); + wx.showToast({ title: '获取成功', icon: 'success' }); + } else { + wx.showToast({ title: '返回数据异常', icon: 'none' }); + } + } else { + wx.showToast({ title: res.data.msg || '获取失败', icon: 'none' }); + } + }).catch(err => { + console.error('获取海报失败', err); + wx.showToast({ title: '网络错误', icon: 'none' }); + }).finally(() => { + this.setData({ isLoading: false }); + }); + }, + + // 🔥【修改】保存二维码到相册（先下载网络图片） + saveToAlbum() { + if (!this.data.qrcodeUrl) { + wx.showToast({ title: '暂无二维码', icon: 'none' }); + return; + } + + wx.showLoading({ title: '保存中...', mask: true }); + wx.downloadFile({ + url: this.data.qrcodeUrl, + success: (res) => { + wx.hideLoading(); + if (res.statusCode === 200) { + // 调用已有的保存函数（传入临时路径） + this.downloadAndSave(res.tempFilePath); + } else { + wx.showToast({ title: '下载失败', icon: 'none' }); + } + }, + fail: (err) => { + wx.hideLoading(); + console.error('下载二维码失败', err); + wx.showToast({ title: '下载失败', icon: 'none' }); + } + }); + }, + + generateMyPoster() { + if (!this.data.qrcodeUrl) { + wx.showToast({ title: '请先生成二维码', icon: 'none' }); + return; + } + + wx.showLoading({ title: '生成海报中...', mask: true }); + + const ossUrl = app.globalData.ossImageUrl || ''; + const bgUrl = ossUrl + 'beijing/haibaobeijing.jpg'; + const urls = [bgUrl, this.data.qrcodeUrl, this.data.avatarUrl]; + + const promises = urls.map(url => this.loadImage(url)); + Promise.all(promises) + .then((images) => { + wx.hideLoading(); + this.setData({ showPosterCanvas: true }, () => { + setTimeout(() => { + this.drawPoster(images[0], images[1], images[2]); + }, 200); + }); + }) + .catch((err) => { + wx.hideLoading(); + wx.showToast({ title: '图片加载失败', icon: 'none' }); + console.error('图片加载失败', err); + }); + }, + + loadImage(url) { + return new Promise((resolve, reject) => { + wx.getImageInfo({ + src: url, + success: (res) => resolve(res.path), + fail: reject + }); + }); + }, + + drawPoster(bgPath, qrPath, avatarPath) { + const ctx = wx.createCanvasContext('posterCanvas', this); + const query = wx.createSelectorQuery().in(this); + query.select('.poster-canvas').boundingClientRect(rect => { + if (!rect) { + wx.showToast({ title: '画布获取失败', icon: 'none' }); + return; + } + const canvasWidth = rect.width; + const canvasHeight = rect.height; + + // 1. 绘制背景 + ctx.drawImage(bgPath, 0, 0, canvasWidth, canvasHeight); + + const qrSize = 100; + const margin = 5; + const qrX = canvasWidth - qrSize - margin; + const qrY = canvasHeight - qrSize - margin; + ctx.drawImage(qrPath, qrX, qrY, qrSize, qrSize); + + const avatarSize = 60; + const avatarX = margin + 20; + const avatarY = canvasHeight - avatarSize - margin; + ctx.save(); + ctx.beginPath(); + ctx.arc(avatarX + avatarSize/2, avatarY + avatarSize/2, avatarSize/2, 0, 2 * Math.PI); + ctx.clip(); + ctx.drawImage(avatarPath, avatarX, avatarY, avatarSize, avatarSize); + ctx.restore(); + + ctx.setFontSize(16); + ctx.setFillStyle('#333333'); + ctx.setTextAlign('left'); + + let nick = this.data.nickName || '管事'; + if (nick.length > 3) { + nick = nick.substring(0, 3) + '...'; + } + const nameText = nick; + + const textX = avatarX + avatarSize + 8; + const textY = avatarY + avatarSize/2 + 6; + ctx.fillText(nameText, textX, textY); + + ctx.setFontSize(18); + ctx.setFillStyle('#ffaa00'); + ctx.setTextAlign('left'); + const slogan = '快来加入我们 ✦'; + const sloganX = avatarX; + const sloganY = avatarY - 12; + ctx.fillText(slogan, sloganX, sloganY); + + ctx.draw(false, () => { + wx.canvasToTempFilePath({ + canvasId: 'posterCanvas', + success: (res) => { + this.setData({ posterImageTemp: res.tempFilePath }); + }, + fail: (err) => { + console.error('生成海报临时文件失败', err); + } + }, this); + }); + }).exec(); + }, + + savePoster() { + if (!this.data.posterImageTemp) { + wx.showToast({ title: '海报尚未生成', icon: 'none' }); + return; + } + this.downloadAndSave(this.data.posterImageTemp); + }, + + hidePoster() { + this.setData({ showPosterCanvas: false, posterImageTemp: '' }); + }, + + downloadAndSave(filePath) { + wx.getSetting({ + success: (res) => { + if (!res.authSetting['scope.writePhotosAlbum']) { + wx.authorize({ + scope: 'scope.writePhotosAlbum', + success: () => { + this._saveImage(filePath); + }, + fail: () => { + wx.showModal({ + title: '提示', + content: '需要您授权保存到相册', + success: (modalRes) => { + if (modalRes.confirm) { + wx.openSetting(); + } + } + }); + } + }); + } else { + this._saveImage(filePath); + } + } + }); + }, + + _saveImage(filePath) { + wx.saveImageToPhotosAlbum({ + filePath: filePath, + success: () => { + wx.showToast({ title: '保存成功', icon: 'success' }); + }, + fail: (err) => { + console.error('保存失败', err); + wx.showToast({ title: '保存失败', icon: 'none' }); + } + }); + }, +}); \ No newline at end of file diff --git a/pages/haibao/haibao.json b/pages/haibao/haibao.json new file mode 100644 index 0000000..8f6fba7 --- /dev/null +++ b/pages/haibao/haibao.json @@ -0,0 +1,8 @@ +{ + "usingComponents": { + "global-notification": "/components/global-notification/global-notification" + }, + "navigationBarTitleText": "推广海报", + "navigationBarBackgroundColor": "#0a0e17", + "navigationBarTextStyle": "white" + } \ No newline at end of file diff --git a/pages/haibao/haibao.wxml b/pages/haibao/haibao.wxml new file mode 100644 index 0000000..aa2c48d --- /dev/null +++ b/pages/haibao/haibao.wxml @@ -0,0 +1,71 @@ + + + + + + + + + + ⚡ 推广海报 ⚡ + 邀请打手扫码注册，自动填充邀请码 + + + + + +

+ + + + ⚡ + 点击下方按钮生成您的专属二维码 + + + + + + + + 📥 + 保存二维码 + + + ⟳ + {{qrcodeUrl ? '重新获取' : '获取二维码'}} + + + + 生成中... + + + + 🎨 + 生成我的专属海报 + + + + + + +

+ + + 📥 + 保存海报 + + + ↩️ + 返回 + + + + + + + * 打手扫码后自动进入注册页面，邀请码将自动填充 + + + + + \ No newline at end of file diff --git a/pages/haibao/haibao.wxss b/pages/haibao/haibao.wxss new file mode 100644 index 0000000..e52db1f --- /dev/null +++ b/pages/haibao/haibao.wxss @@ -0,0 +1,269 @@ +/* 机甲风格推广海报页面（含新增专属海报样式） */ + +page { + background: #0a0e17; + min-height: 100vh; + font-family: 'Avenir', 'PingFang SC', 'Helvetica Neue', sans-serif; + color: #fff; + } + + /* 背景网格 */ + .grid-bg { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-image: + linear-gradient(rgba(0, 160, 255, 0.05) 1px, transparent 1px), + linear-gradient(90deg, rgba(0, 160, 255, 0.05) 1px, transparent 1px); + background-size: 50rpx 50rpx; + pointer-events: none; + z-index: 0; + } + + .page-container { + position: relative; + z-index: 2; + min-height: 100vh; + padding: 30rpx 25rpx; + box-sizing: border-box; + } + + /* 机械装饰线条 */ + .mech-line { + position: absolute; + pointer-events: none; + z-index: 1; + } + .line-h { + top: 200rpx; + left: 0; + width: 100%; + height: 2rpx; + background: linear-gradient(90deg, transparent, #00a6ff, transparent); + } + .line-v { + right: 50rpx; + top: 100rpx; + width: 2rpx; + height: 300rpx; + background: linear-gradient(180deg, transparent, #00a6ff, transparent); + } + + .content { + position: relative; + z-index: 3; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + min-height: 100vh; + padding: 40rpx 0; + } + + /* 标题区域 */ + .title-section { + text-align: center; + margin-bottom: 60rpx; + } + .title { + font-size: 44rpx; + font-weight: bold; + color: #fff; + text-shadow: 0 0 30rpx #00a6ff; + letter-spacing: 2rpx; + display: block; + margin-bottom: 20rpx; + } + .subtitle { + font-size: 28rpx; + color: #9cf; + opacity: 0.9; + letter-spacing: 1rpx; + } + + /* 二维码区域（方形，无斜切） */ + .qrcode-section { + width: 100%; + display: flex; + justify-content: center; + align-items: center; + margin-bottom: 60rpx; + } + .qrcode-wrapper { + position: relative; + width: 400rpx; + height: 400rpx; + background: rgba(0, 20, 40, 0.8); + border: 4rpx solid #00a6ff; + /* 移除 clip-path，保持方形 */ + display: flex; + align-items: center; + justify-content: center; + box-shadow: 0 0 80rpx rgba(0, 166, 255, 0.4); + animation: qrcodePulse 2s infinite alternate; + } + .qrcode-img { + width: 90%; + height: 90%; + object-fit: contain; + } + .qrcode-glow { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: radial-gradient(circle at 30% 30%, rgba(0, 166, 255, 0.2), transparent 70%); + pointer-events: none; + } + .empty-qrcode { + width: 400rpx; + height: 400rpx; + background: rgba(0, 20, 40, 0.8); + border: 4rpx dashed #00a6ff; + /* 方形 */ + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + } + .empty-icon { + font-size: 80rpx; + color: #00a6ff; + margin-bottom: 20rpx; + opacity: 0.5; + } + .empty-text { + font-size: 26rpx; + color: #9cf; + text-align: center; + padding: 0 40rpx; + } + + /* 按钮区域（机甲斜切风格） */ + .button-section { + width: 100%; + display: flex; + justify-content: center; + margin-bottom: 40rpx; + } + .btn-group { + display: flex; + gap: 20rpx; + flex-wrap: wrap; + justify-content: center; + } + .btn { + width: 220rpx; + height: 80rpx; + background: rgba(0, 30, 60, 0.8); + border: 2rpx solid #00a6ff; + border-right: none; + border-bottom: none; + clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%); + display: flex; + align-items: center; + justify-content: center; + position: relative; + transition: 0.2s; + cursor: pointer; + } + .btn:active { + transform: scale(0.96); + box-shadow: 0 0 40rpx #00a6ff; + } + .save-btn { + border-color: #00a6ff; + } + .refresh-btn { + border-color: #ffaa00; + } + .refresh-btn .btn-icon { + color: #ffaa00; + } + /* 🔥【新增】生成海报按钮样式 */ + .poster-btn { + border-color: #ffaa00; + } + .poster-btn .btn-icon { + color: #ffaa00; + } + .loading-btn { + opacity: 0.7; + pointer-events: none; + } + .btn-icon { + font-size: 36rpx; + margin-right: 8rpx; + } + .btn-text { + font-size: 26rpx; + font-weight: 500; + color: #fff; + } + .loading-spinner-small { + width: 30rpx; + height: 30rpx; + border: 4rpx solid rgba(255,255,255,0.2); + border-top: 4rpx solid #fff; + border-radius: 50%; + animation: spin 1s linear infinite; + margin-right: 10rpx; + } + + /* 🔥【新增】专属海报展示区 */ + .poster-section { + margin-top: 40rpx; + display: flex; + flex-direction: column; + align-items: center; + width: 100%; + } + .poster-canvas { + width: 600rpx; + height: 900rpx; + background: #1a1f2e; /* 占位色 */ + border: 4rpx solid #00a6ff; + box-shadow: 0 0 60rpx #00a6ff; + /* 保持方形，无斜切 */ + } + .poster-actions { + display: flex; + gap: 30rpx; + margin-top: 30rpx; + justify-content: center; + } + .save-poster-btn { + background: linear-gradient(45deg, #0066cc, #00a6ff); + border-color: #00a6ff; + } + .back-btn { + background: rgba(0, 30, 60, 0.8); + border-color: #00a6ff; + } + + /* 使用说明（保留） */ + .instruction { + margin-top: 30rpx; + padding: 20rpx 40rpx; + background: rgba(0, 30, 50, 0.5); + border-left: 4rpx solid #00a6ff; + clip-path: polygon(0 0, 100% 0, 98% 100%, 0 100%); + } + .instruction-text { + font-size: 24rpx; + color: #9cf; + line-height: 1.6; + } + + /* 动画 */ + @keyframes qrcodePulse { + 0% { box-shadow: 0 0 40rpx rgba(0, 166, 255, 0.3); } + 100% { box-shadow: 0 0 100rpx rgba(0, 166, 255, 0.6); } + } + @keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } + } \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js new file mode 100644 index 0000000..d89bade --- /dev/null +++ b/pages/index/index.js @@ -0,0 +1,494 @@ +// pages/shangpin/shangpin.js +const app = getApp() + +Page({ + /** + * 页面的初始数据 + */ + data: { + // 全局变量引用 + ossImageUrl: '', + lunbozhanwei: '', + + // 页面数据 + shangpingonggao: '', + lunboList: [], + shangpinleixing: [], + shangpinzhuanqu: [], + shangpinliebiao: [], + + // 状态控制 + selectedLeixingId: null, + filteredData: [], + showGonggaoModal: false, + gonggaoAnim: true, + isLoading: false, + isRefreshing: false, + hasInitialized: false, + + // 🔴【新增】当前时间（用于弹窗显示） + currentTime: '' + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + // 🔥 等待全局配置加载完成 + this.waitForConfigAndInit(); + // 🆕 修改：仅在已登录时检查弹窗，避免未登录时发起请求导致 401 弹窗 + const token = wx.getStorageSync('token'); + if (token) { + PopupService.checkAndShow(this, 'index'); + } + }, + // 🆕 页面隐藏时清理弹窗视图 + onHide: function () { + const popupComp = this.selectComponent('#popupNotice'); + if (popupComp && popupComp.cleanup) { + popupComp.cleanup(); + } +}, + + + /** + * 🔥 新增：等待配置加载完成再初始化 + */ + waitForConfigAndInit() { + if (app.globalData.ossImageUrl) { + // 配置已就绪，直接初始化 + this.setData({ + ossImageUrl: app.globalData.ossImageUrl, + lunbozhanwei: app.globalData.lunbozhanwei, + currentTime: this.getCurrentTime() + }); + this.initPageData(); + } else { + // 配置未就绪，延迟重试（最多等待3秒，每100ms检查一次） + + setTimeout(() => this.waitForConfigAndInit(), 100); + } + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + // 如果已经初始化过，只更新时间；否则等待配置 + if (this.data.ossImageUrl) { + this.setData({ + gonggaoAnim: true, + currentTime: this.getCurrentTime() + }); + } + this.registerNotificationComponent(); + }, + + // 注册通知组件 + registerNotificationComponent() { + const app = getApp(); + const notificationComp = this.selectComponent('#global-notification'); + + if (notificationComp && notificationComp.showNotification) { + app.globalData.globalNotification = { + show: (data) => notificationComp.showNotification(data), + hide: () => notificationComp.hideNotification() + }; + } + }, + + /** + * 🔴【新增】获取当前时间（格式化） + */ + getCurrentTime() { + const now = new Date(); + const year = now.getFullYear(); + const month = (now.getMonth() + 1).toString().padStart(2, '0'); + const day = now.getDate().toString().padStart(2, '0'); + const hour = now.getHours().toString().padStart(2, '0'); + const minute = now.getMinutes().toString().padStart(2, '0'); + return `${year}-${month}-${day} ${hour}:${minute}`; + }, + + /** + * 🔴【新增】按paixu字段排序函数 + * 规则：1. paixu大的在前 2. paixu相同时id小的在前 3. 没有paixu的按id排序 + */ + sortByPaixu(list) { + if (!list || !Array.isArray(list)) return [] + + return [...list].sort((a, b) => { + // 获取paixu值，如果没有则默认为0 + const paixuA = a.paixu || 0 + const paixuB = b.paixu || 0 + + // 1. 先按paixu降序（大的在前） + if (paixuB !== paixuA) { + return paixuB - paixuA + } + + // 2. paixu相同时，按id升序（小的在前） + return a.id - b.id + }) + }, + + /** + * 初始化页面数据 + */ + initPageData() { + const that = this + this.setData({ isLoading: true }) + + const needLoad = [] + + // 1. 检查公告和轮播图 + if (!app.globalData.shangpingonggao || app.globalData.shangpinlunbo.length === 0) { + needLoad.push(this.loadGonggaoAndLunbo()) + } else { + this.setData({ + shangpingonggao: app.globalData.shangpingonggao, + lunboList: this.processImageUrls(app.globalData.shangpinlunbo) + }) + } + + // 2. 检查商品数据 + if (app.globalData.shangpinleixing.length === 0) { + needLoad.push(this.loadAllShangpinData()) + } else { + const leixingList = app.globalData.shangpinleixing + + // 🔴【修改】对商品类型进行排序 + const sortedLeixing = this.sortByPaixu(leixingList) + + this.setData({ + shangpinleixing: leixingList, + shangpinzhuanqu: app.globalData.shangpinzhuanqu || [], + shangpinliebiao: app.globalData.shangpinliebiao || [], + selectedLeixingId: sortedLeixing[0]?.id || null + }, () => { + this.filterShangpinData() + }) + } + + if (needLoad.length > 0) { + Promise.all(needLoad) + .then(() => { + that.setData({ isLoading: false }) + }) + .catch(error => { + console.error('数据加载失败:', error) + that.setData({ isLoading: false }) + wx.showToast({ + title: '加载失败，请重试', + icon: 'none' + }) + }) + } else { + this.setData({ isLoading: false }) + } + }, + + /** + * 加载公告和轮播图数据 + */ + loadGonggaoAndLunbo() { + const that = this + return new Promise((resolve, reject) => { + wx.request({ + url: app.globalData.apiBaseUrl + '/peizhi/shangpingonggao/', + method: 'POST', + header: { + 'content-type': 'application/json' + }, + success(res) { + if (res.statusCode === 200 && res.data) { + const data = res.data + + app.globalData.shangpingonggao = data.shangpingonggao || '' + app.globalData.shangpinlunbo = data.shangpinlunbo || [] + + that.setData({ + shangpingonggao: app.globalData.shangpingonggao, + lunboList: that.processImageUrls(app.globalData.shangpinlunbo) + }) + + resolve() + } else { + reject(new Error('请求失败')) + } + }, + fail(error) { + console.error('加载公告失败:', error) + reject(error) + } + }) + }) + }, + + /** + * 加载所有商品数据 + */ + loadAllShangpinData() { + const that = this + return new Promise((resolve, reject) => { + wx.request({ + url: app.globalData.apiBaseUrl + '/shangpin/shangpinhuoqu/', + method: 'POST', + header: { + 'content-type': 'application/json' + }, + success(res) { + if (res.statusCode === 200 && res.data) { + const data = res.data + + // 🔴【修改】对返回的数据进行排序 + const sortedLeixing = that.sortByPaixu(data.shangpinleixing || []) + const sortedZhuanqu = that.sortByPaixu(data.shangpinzhuanqu || []) + const sortedShangpin = that.sortByPaixu(data.shangpinliebiao || []) + + app.globalData.shangpinleixing = sortedLeixing + app.globalData.shangpinzhuanqu = sortedZhuanqu + app.globalData.shangpinliebiao = sortedShangpin + + that.setData({ + shangpinleixing: sortedLeixing, + shangpinzhuanqu: sortedZhuanqu, + shangpinliebiao: sortedShangpin, + selectedLeixingId: sortedLeixing[0]?.id || null + }, () => { + that.filterShangpinData() + resolve() + }) + } else { + reject(new Error('请求失败')) + } + }, + fail(error) { + console.error('加载商品数据失败:', error) + reject(error) + } + }) + }) + }, + + /** + * 处理图片URL（拼接OSS域名） + */ + processImageUrls(urlList) { + if (!urlList || !Array.isArray(urlList)) return [] + + return urlList.map(url => { + if (url.startsWith('http')) { + return url + } else { + return this.data.ossImageUrl + url + } + }) + }, + + /** + * 筛选商品数据 + */ + filterShangpinData() { + const { selectedLeixingId, shangpinzhuanqu, shangpinliebiao } = this.data + + if (!selectedLeixingId || !shangpinzhuanqu || !shangpinliebiao) { + this.setData({ filteredData: [] }) + return + } + + // 1. 构建专区Map（按类型分组，但只处理当前选中的类型） + const zhuanquByLeixing = new Map() + + shangpinzhuanqu.forEach(zhuanqu => { + if (zhuanqu.leixing_id === selectedLeixingId) { + if (!zhuanquByLeixing.has(selectedLeixingId)) { + zhuanquByLeixing.set(selectedLeixingId, []) + } + zhuanquByLeixing.get(selectedLeixingId).push(zhuanqu) + } + }) + + // 2. 构建商品Map（按专区分组） + const shangpinByZhuanqu = new Map() + + shangpinliebiao.forEach(shangpin => { + if (shangpin.leixing_id === selectedLeixingId && shangpin.zhuanqu_id) { + const zhuanquId = shangpin.zhuanqu_id + + if (!shangpinByZhuanqu.has(zhuanquId)) { + shangpinByZhuanqu.set(zhuanquId, []) + } + + // 处理价格显示 + const jiage = parseFloat(shangpin.jiage) || 0 + const priceInteger = Math.floor(jiage) + let priceDecimal = '00' + + const decimalPart = (jiage - priceInteger).toFixed(2) + if (decimalPart > 0) { + priceDecimal = decimalPart.toString().split('.')[1] + } + + shangpinByZhuanqu.get(zhuanquId).push({ + id: shangpin.id, + biaoqian: shangpin.biaoqian, + jiage: jiage, + priceInteger: priceInteger, + priceDecimal: priceDecimal, + tupian_url: shangpin.tupian_url, + duiwai_xiaoliang: shangpin.duiwai_xiaoliang || 0, + paixu: shangpin.paixu || 0 // 🔴 保留排序字段 + }) + } + }) + + // 3. 构建最终数据结构 + const filteredData = [] + const currentZhuanquList = zhuanquByLeixing.get(selectedLeixingId) || [] + + currentZhuanquList.forEach(zhuanqu => { + const shangpinList = shangpinByZhuanqu.get(zhuanqu.id) || [] + + if (shangpinList.length > 0) { + filteredData.push({ + zhuanqu: { + id: zhuanqu.id, + mingzi: zhuanqu.mingzi, + paixu: zhuanqu.paixu || 0 // 🔴 保留排序字段 + }, + shangpinList: shangpinList + }) + } + }) + + // 🔴【修改】对最终数据进行排序（确保专区顺序） + const sortedFilteredData = filteredData.sort((a, b) => { + // 按专区paixu降序 + const paixuA = a.zhuanqu.paixu || 0 + const paixuB = b.zhuanqu.paixu || 0 + if (paixuB !== paixuA) return paixuB - paixuA + // paixu相同时按专区id升序 + return a.zhuanqu.id - b.zhuanqu.id + }) + + this.setData({ filteredData: sortedFilteredData }) + }, + + /** + * 选择商品类型 + */ + selectLeixing(e) { + const leixingId = e.currentTarget.dataset.id + + if (this.data.selectedLeixingId === leixingId) { + return + } + + this.setData({ + selectedLeixingId: leixingId + }, () => { + this.filterShangpinData() + }) + }, + + /** + * 显示公告详情 + */ + showGonggaoDetail() { + this.setData({ + showGonggaoModal: true, + gonggaoAnim: false, + currentTime: this.getCurrentTime() // 🔴 更新弹窗时间 + }) + }, + + /** + * 隐藏公告详情 + */ + hideGonggaoDetail() { + this.setData({ + showGonggaoModal: false, + gonggaoAnim: true + }) + }, + + /** + * 刷新所有数据 + */ + refreshAllData() { + const that = this + this.setData({ isRefreshing: true }) + + wx.showLoading({ + title: '刷新中...', + mask: true + }) + + // 清空全局变量 + app.globalData.shangpingonggao = '' + app.globalData.shangpinlunbo = [] + app.globalData.shangpinleixing = [] + app.globalData.shangpinzhuanqu = [] + app.globalData.shangpinliebiao = [] + + Promise.all([ + that.loadGonggaoAndLunbo(), + that.loadAllShangpinData() + ]) + .then(() => { + wx.hideLoading() + that.setData({ isRefreshing: false }) + wx.showToast({ + title: '刷新成功', + icon: 'success', + duration: 1500 + }) + }) + .catch(error => { + console.error('刷新失败:', error) + wx.hideLoading() + that.setData({ isRefreshing: false }) + wx.showToast({ + title: '刷新失败', + icon: 'none' + }) + }) + }, + + /** + * 跳转到商品详情页 + */ + goToDetail(e) { + const shangpinId = e.currentTarget.dataset.id + if (!shangpinId) return + + wx.navigateTo({ + url: `/pages/shangpinxiangqing/shangpinxiangqing?id=${shangpinId}` + }) + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + // 可以在这里实现分页加载 + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + return { + title: '阿龙电竞', + path: '/pages/shangpin/shangpin' + } + }, + + /** + * 页面卸载时清理 + */ + onUnload() { + this.setData({ gonggaoAnim: false }) + } +}) \ No newline at end of file diff --git a/pages/index/index.json b/pages/index/index.json new file mode 100644 index 0000000..06f55f5 --- /dev/null +++ b/pages/index/index.json @@ -0,0 +1,12 @@ +{ + "usingComponents": { + "global-notification": "/components/global-notification/global-notification", + "custom-tab-bar": "/custom-tab-bar/index" + }, + + "navigationBarTitleText": "商城", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black", + + "backgroundColor": "#f5faff" + } \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml new file mode 100644 index 0000000..d5fff6b --- /dev/null +++ b/pages/index/index.wxml @@ -0,0 +1,172 @@ + + + + + +

+ + + + {{shangpingonggao || '暂无公告'}} + + + + + + + + + + +

+ + + + + + +

+ + + + +

+ + + + + + + + + + + + +

+ + + {{item.jieshao}} + + + + + + + + + + + +

+ + {{item.zhuanqu.mingzi}} + + + + + + + + +

+ + + + + + {{item.biaoqian}} + + + + + + + + + + + +

+ 暂无商品 + + + + + + + + + + + + 加载中... + + + + + + \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss new file mode 100644 index 0000000..beb4936 --- /dev/null +++ b/pages/index/index.wxss @@ -0,0 +1,585 @@ +/* ===== 1. 全局样式 ===== */ +.shangpin-page { + min-height: 100vh; + background: linear-gradient(180deg, #f5faff 0%, #f0f8ff 100%); + } + +/* ===== 2. 公告栏样式 - 物理上移方案 ===== */ +.gonggao-box { + margin: 20rpx 30rpx; + height: 80rpx; + border-radius: 40rpx; + background: linear-gradient(135deg, + rgba(220, 255, 220, 0.85) 0%, + rgba(255, 255, 200, 0.85) 100%); + backdrop-filter: blur(10px); + display: flex; + align-items: center; + padding: 0 25rpx; + box-shadow: 0 4rpx 15rpx rgba(0, 100, 0, 0.08); + border: 1rpx solid rgba(255, 255, 255, 0.3); + position: relative; + overflow: hidden; + } + + .gonggao-icon { + width: 40rpx; + height: 40rpx; + margin-right: 20rpx; + flex-shrink: 0; + display: flex; + align-items: center; + } + + .gonggao-icon image { + width: 100%; + height: 100%; + } + + .gonggao-content { + flex: 1; + overflow: hidden; + height: 100%; + position: relative; + } + + /* 关键修改：使用物理上移 */ + .gonggao-text { + font-size: 26rpx; + color: #333; + white-space: nowrap; + padding-right: 50rpx; + + /* 物理上移方法1：直接调整位置 */ + position: absolute; + top: -5rpx; /* 从顶部开始计算位置 */ + left: 0; + + /* 或者使用方法2：负margin上移 */ + /* position: relative; + top: -10rpx; */ + + /* 或者使用方法3：translate上移 */ + /* transform: translateY(-5rpx); */ + } + + /* 尝试不同的上移值，直到居中为止 */ + /* 可以尝试的值：5rpx, 8rpx, 10rpx, 12rpx, 15rpx, 18rpx, 20rpx */ + + .gonggao-anim { + animation: marquee 10s linear infinite; /* 加快速度到10秒 */ + animation-delay: 0.5s; + } + + @keyframes marquee { + 0% { + transform: translateX(100%); + } + 100% { + transform: translateX(-100%); + } + } + + /* ===== 3. 轮播图样式 ===== */ + .lunbo-container { + margin: 0 30rpx 30rpx; + height: 350rpx; + border-radius: 25rpx; + overflow: hidden; + position: relative; + box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.1); + } + + .lunbo-swiper { + width: 100%; + height: 100%; + } + + .lunbo-image { + width: 100%; + height: 100%; + } + + .lunbo-placeholder { + width: 100%; + height: 100%; + background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); + display: flex; + justify-content: center; + align-items: center; + } + + .lunbo-placeholder image { + width: 100%; + height: 100%; + opacity: 0.8; + } + + /* 刷新按钮 */ + .refresh-btn { + position: absolute; + top: 20rpx; + right: 20rpx; + width: 80rpx; + height: 80rpx; + z-index: 10; + display: flex; + justify-content: center; + align-items: center; + } + + .refresh-icon { + width: 60rpx; + height: 60rpx; + transition: transform 0.3s; + filter: drop-shadow(0 4rpx 8rpx rgba(0, 0, 0, 0.2)); + } + + .refreshing { + animation: rotate360 1s linear infinite; + } + + @keyframes rotate360 { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } + } + + .refresh-dot { + position: absolute; + width: 12rpx; + height: 12rpx; + background: #ffcc00; + border-radius: 50%; + top: 15rpx; + right: 15rpx; + animation: pulse 2s infinite; + } + + @keyframes pulse { + 0%, 100% { + opacity: 0.8; + transform: scale(1); + } + 50% { + opacity: 1; + transform: scale(1.2); + } + } + + /* ===== 4. 商品展示区域 ===== */ + .shangpin-container { + background: rgba(255, 255, 255, 0.95); + border-radius: 40rpx 40rpx 0 0; + margin-top: -20rpx; + padding: 40rpx 30rpx 100rpx; + min-height: 800rpx; + box-shadow: 0 -10rpx 30rpx rgba(0, 0, 0, 0.05); + } + + /* 商品类型选择 - 完全重新设计，确保左对齐且间距协调 */ + .leixing-scroll { + width: 100%; + white-space: nowrap; + margin-bottom: 50rpx; + } + + .leixing-list { + display: inline-flex; + padding-left: 0; /* 完全去掉左内边距，100%左对齐 */ + padding-right: 30rpx; /* 只保留右内边距给最后一个元素一点空间 */ + padding-top: 10rpx; + padding-bottom: 10rpx; + } + + /* 关键：完全协调的间距 */ + .leixing-item { + display: inline-flex; + flex-direction: column; + align-items: center; + margin-right: 30rpx; /* 合适的间距，不会太大也不会太小 */ + transition: all 0.3s; + position: relative; + flex-shrink: 0; + width: 130rpx; /* 固定宽度，确保四个看起来协调 */ + } + + .leixing-item:last-child { + margin-right: 0; + } + + .leixing-image-box { + width: 110rpx; /* 稍微减小，让整体更紧凑 */ + height: 110rpx; + border-radius: 25rpx; + overflow: hidden; + position: relative; + margin-bottom: 12rpx; + transition: all 0.3s; + box-shadow: 0 8rpx 20rpx rgba(0, 0, 0, 0.1); + } + + .leixing-image { + width: 100%; + height: 100%; + } + + .leixing-glow { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border-radius: 25rpx; + border: 4rpx solid transparent; + transition: all 0.3s; + } + + .leixing-active .leixing-glow { + border-color: #ffcc00; + box-shadow: 0 0 20rpx rgba(255, 204, 0, 0.5); + } + + .leixing-active .leixing-image-box { + transform: translateY(-8rpx); + } + + .leixing-text { + font-size: 24rpx; + color: #666; + white-space: nowrap; + transition: all 0.3s; + text-align: center; + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + } + + .leixing-active .leixing-text { + color: #333; + font-weight: bold; + transform: scale(1.05); + } + + /* 专区标题 */ + .zhuanqu-title { + display: flex; + align-items: center; + margin: 40rpx 0 15rpx; + padding-left: 0; + position: relative; + } + + .zhuanqu-icon { + width: 40rpx; + height: 40rpx; + margin-right: 20rpx; + position: relative; + } + + .zhuanqu-icon-image { + width: 100%; + height: 100%; + filter: drop-shadow(0 2rpx 4rpx rgba(255, 204, 0, 0.3)); + } + + .zhuanqu-sparkle { + animation: sparkle 2s infinite; + } + + @keyframes sparkle { + 0%, 100% { + transform: scale(1) rotate(0deg); + filter: drop-shadow(0 2rpx 4rpx rgba(255, 204, 0, 0.3)); + } + 50% { + transform: scale(1.1) rotate(10deg); + filter: drop-shadow(0 4rpx 8rpx rgba(255, 204, 0, 0.6)); + } + } + + .zhuanqu-text { + font-size: 32rpx; + font-weight: bold; + color: #333; + position: relative; + } + + .zhuanqu-text::after { + content: ''; + position: absolute; + left: 0; + bottom: -8rpx; + width: 60rpx; + height: 4rpx; + background: linear-gradient(90deg, #ffcc00, transparent); + border-radius: 2rpx; + } + + /* 商品网格 */ + .shangpin-grid { + display: grid; + grid-template-columns: repeat(3, 1fr); + gap: 25rpx; + margin-bottom: 40rpx; + } + + .shangpin-card { + background: #ffffff; + border-radius: 20rpx; + overflow: hidden; + box-shadow: 0 8rpx 25rpx rgba(0, 0, 0, 0.06); + transition: all 0.3s; + position: relative; + } + + .shangpin-card:active { + transform: scale(0.98); + box-shadow: 0 4rpx 15rpx rgba(0, 0, 0, 0.1); + } + + .shangpin-image-box { + width: 100%; + height: 220rpx; + position: relative; + overflow: hidden; + } + + .shangpin-image { + width: 100%; + height: 100%; + transition: transform 0.5s; + } + + /* 商品标题区域 - 协调紧凑 */ + .shangpin-title { + height: 75rpx; + padding: 6rpx 12rpx 2rpx 12rpx; + display: flex; + align-items: flex-start; + overflow: hidden; + } + + .title-text { + font-size: 26rpx; + color: #000; + line-height: 34rpx; + font-weight: 450; /* 微调粗细，更加协调 */ + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + text-overflow: ellipsis; + } + + /* 价格和购买按钮 - 协调紧凑 */ + .shangpin-footer { + height: 50rpx; + padding: 0 12rpx 8rpx 12rpx; + display: flex; + justify-content: space-between; + align-items: center; + } + + .price-box { + display: flex; + align-items: baseline; + } + + .price-icon { + font-size: 24rpx; + color: #ff4444; + font-weight: bold; + margin-right: 2rpx; + } + + .price-integer { + font-size: 32rpx; + color: #ff4444; + font-weight: bold; + } + + .price-decimal { + font-size: 24rpx; + color: #ff4444; + font-weight: bold; + } + + .buy-btn { + width: 48rpx; + height: 48rpx; + border-radius: 50%; + background: linear-gradient(135deg, #ff4444, #ff6666); + display: flex; + justify-content: center; + align-items: center; + box-shadow: 0 4rpx 12rpx rgba(255, 68, 68, 0.3); + transition: all 0.3s; + } + + .buy-btn:active { + transform: scale(0.9); + } + + .buy-icon { + width: 26rpx; + height: 26rpx; + filter: brightness(0) invert(1); + } + + /* ===== 5. 空状态 ===== */ + .empty-state { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding: 100rpx 0; + } + + .empty-image { + width: 200rpx; + height: 200rpx; + margin-bottom: 40rpx; + opacity: 0.7; + } + + .empty-text { + font-size: 30rpx; + color: #999; + margin-bottom: 40rpx; + } + + .empty-btn { + background: linear-gradient(135deg, #667eea, #764ba2); + color: white; + font-size: 28rpx; + padding: 20rpx 60rpx; + border-radius: 50rpx; + box-shadow: 0 8rpx 25rpx rgba(102, 126, 234, 0.3); + } + + /* ===== 6. 弹窗样式 ===== */ + .gonggao-modal { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 1000; + display: flex; + justify-content: center; + align-items: center; + } + + .modal-mask { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.5); + backdrop-filter: blur(5px); + } + + .modal-content { + width: 600rpx; + background: white; + border-radius: 30rpx; + overflow: hidden; + box-shadow: 0 20rpx 60rpx rgba(0, 0, 0, 0.2); + z-index: 1001; + animation: modalShow 0.3s; + } + + @keyframes modalShow { + from { + opacity: 0; + transform: scale(0.9); + } + to { + opacity: 1; + transform: scale(1); + } + } + + .modal-header { + padding: 40rpx; + border-bottom: 2rpx solid #f0f0f0; + display: flex; + justify-content: space-between; + align-items: center; + } + + .modal-title { + font-size: 32rpx; + font-weight: bold; + color: #333; + } + + .modal-close { + font-size: 40rpx; + color: #999; + width: 60rpx; + height: 60rpx; + display: flex; + justify-content: center; + align-items: center; + border-radius: 50%; + } + + .modal-close:active { + background: #f5f5f5; + } + + .modal-body { + max-height: 600rpx; + padding: 40rpx; + } + + .modal-text { + font-size: 28rpx; + color: #333; + line-height: 1.6; + white-space: normal; + word-break: break-word; + } + + /* ===== 7. 加载提示 ===== */ + .loading-toast { + position: fixed; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + background: rgba(0, 0, 0, 0.7); + backdrop-filter: blur(10px); + padding: 30rpx 50rpx; + border-radius: 25rpx; + display: flex; + flex-direction: column; + align-items: center; + z-index: 999; + } + + .loading-spinner { + width: 60rpx; + height: 60rpx; + border: 6rpx solid rgba(255, 255, 255, 0.3); + border-top-color: white; + border-radius: 50%; + animation: spin 1s linear infinite; + margin-bottom: 20rpx; + } + + @keyframes spin { + to { + transform: rotate(360deg); + } + } + + .loading-text { + font-size: 26rpx; + color: white; + } \ No newline at end of file diff --git a/pages/jiedan/jiedan.js b/pages/jiedan/jiedan.js new file mode 100644 index 0000000..f0e4cbb --- /dev/null +++ b/pages/jiedan/jiedan.js @@ -0,0 +1,528 @@ +// pages/qiangdan/qiangdan.js +const app = getApp(); +import request from '../../utils/request.js'; +import PopupService from '../../services/popupService.js'; + +Page({ + data: { + // 1. 商品类型相关 + shangpinleixing: [], + xuanzhongLeixingId: null, + + // 2. 订单列表与分页相关 + dingdanList: [], + page: 1, + pageSize: 5, + hasMore: true, + isLoading: false, + + // 3. 全局状态字段 + dashoustatus: null, + zhuanghaoStatus: null, + dashouzhuangtai: null, + uid: null, + huiyuanList: [], + yajin: 0, + jifen: 0, + + // 4. 刷新控制字段 + scrollViewRefreshing: false, + lastRefreshTime: 0, + refreshCooldown: 2000, + isLoadingMore: false, + + // 5. 切换类型冷却 + lastSwitchTime: 0, + switchCooldown: 1500, + isSwitching: false, + + // 6. OSS地址 + ossImageUrl: app.globalData.ossImageUrl || '', + + // 🆕 7. 标签筛选相关 + bankuaiBiaoqian: [], // 当前商品类型所属板块的全部标签 + xuanzhongBiaoqianId: 0, // 0=全部 + }, + + async onLoad(options) { + this.loadGlobalStatus(); + await this.loadShangpinLeixing(); + PopupService.checkAndShow(this, 'jiedan'); + }, + + onHide: function () { + const popupComp = this.selectComponent('#popupNotice'); + if (popupComp && popupComp.cleanup) { + popupComp.cleanup(); + } + }, + + onShow() { + this.registerNotificationComponent(); + // 重新加载全局状态 + this.loadGlobalStatus(); + // 如果有选中类型则刷新订单 + if (this.data.xuanzhongLeixingId) { + this.loadDingdanList(true); + } + }, + + registerNotificationComponent() { + const notificationComp = this.selectComponent('#global-notification'); + if (notificationComp && notificationComp.showNotification) { + app.globalData.globalNotification = { + show: (data) => notificationComp.showNotification(data), + hide: () => notificationComp.hideNotification() + }; + } + }, + + loadGlobalStatus() { + const globalData = app.globalData; + this.setData({ + dashoustatus: wx.getStorageSync('dashoustatus'), + zhuanghaoStatus: globalData.zhanghaoStatus, + dashouzhuangtai: globalData.dashouzhuangtai, + uid: wx.getStorageSync('uid'), + huiyuanList: globalData.clumber || [], + yajin: globalData.yajin || 0, + jifen: globalData.jinfen || 0 + }); + }, + + // 加载商品类型 + async loadShangpinLeixing() { + wx.showLoading({ title: '加载商品类型...' }); + try { + const res = await request({ + url: '/dingdan/dsqdhqddlx', + method: 'POST', + header: { 'content-type': 'application/json' } + }); + if (res.statusCode === 200 && res.data) { + const data = res.data; + let list = []; + if (data.code === 200 || data.code === 0) { + if (data.data && Array.isArray(data.data.list)) list = data.data.list; + else if (data.data && Array.isArray(data.data)) list = data.data; + else if (Array.isArray(data.list)) list = data.list; + else if (Array.isArray(data)) list = data; + } + const processedList = this.processTupianUrl(list); + this.setData({ + shangpinleixing: processedList, + xuanzhongLeixingId: processedList[0]?.id || null + }); + if (this.data.xuanzhongLeixingId) { + this.loadDingdanList(true); + // 🆕 加载板块标签 + this.loadBankuaiBiaoqian(); + } + } else { + wx.showToast({ title: res.data?.msg || '加载商品类型失败', icon: 'none' }); + } + } catch (error) { + wx.showToast({ title: '网络错误，加载失败', icon: 'none' }); + } finally { + wx.hideLoading(); + } + }, + + // 处理图片URL + processTupianUrl(list) { + const ossUrl = app.globalData.ossImageUrl || ''; + return list.map(item => ({ + ...item, + full_tupian_url: item.tupian_url && !item.tupian_url.startsWith('http') + ? ossUrl + item.tupian_url + : (item.tupian_url || '/images/default-type.png') + })); + }, + + // 🆕 加载板块标签 + async loadBankuaiBiaoqian() { + const leixingId = this.data.xuanzhongLeixingId; + if (!leixingId) return; + try { + const res = await request({ + url: '/dengji/bkqhbq', + method: 'POST', + data: { leixing_id: leixingId } + }); + if (res && res.data.code === 0) { + this.setData({ + bankuaiBiaoqian: res.data.data.biaoqian_list || [], + xuanzhongBiaoqianId: 0 + }); + } + } catch (e) { + // 标签加载失败不影响主流程 + } + }, + + // 选择商品类型 + async selectLeixing(e) { + const now = Date.now(); + const lastSwitchTime = this.data.lastSwitchTime; + const switchCooldown = this.data.switchCooldown; + + if (now - lastSwitchTime < switchCooldown) { + wx.showToast({ + title: `操作太快，请${Math.ceil((switchCooldown - (now - lastSwitchTime)) / 1000)}秒后再试`, + icon: 'none', + duration: 1500 + }); + return; + } + if (this.data.isSwitching) return; + + const leixingId = e.currentTarget.dataset.id; + if (leixingId === this.data.xuanzhongLeixingId) return; + + this.setData({ isSwitching: true, lastSwitchTime: now }); + wx.showLoading({ title: '切换中...' }); + + try { + this.setData({ + xuanzhongLeixingId: leixingId, + dingdanList: [], + page: 1, + hasMore: true, + xuanzhongBiaoqianId: 0 // 重置标签筛选 + }); + await this.loadDingdanList(true); + // 🆕 切换类型后加载新标签 + await this.loadBankuaiBiaoqian(); + } catch (error) { + console.error('切换类型失败:', error); + } finally { + this.setData({ isSwitching: false }); + wx.hideLoading(); + } + }, + + // 🆕 选择标签筛选 + async selectBiaoqian(e) { + const id = e.currentTarget.dataset.id; + if (id === this.data.xuanzhongBiaoqianId) return; + this.setData({ + xuanzhongBiaoqianId: id, + dingdanList: [], + page: 1, + hasMore: true + }); + await this.loadDingdanList(true); + }, + + // 加载订单列表 + async loadDingdanList(isRefresh = false) { + if (this.data.isLoading || !this.data.xuanzhongLeixingId) return; + + const loadPage = isRefresh ? 1 : this.data.page; + if (!isRefresh && !this.data.hasMore) return; + + this.setData({ + isLoading: true, + isLoadingMore: !isRefresh + }); + + try { + const res = await request({ + url: '/dingdan/ddhq', + method: 'POST', + data: { + leixing_id: this.data.xuanzhongLeixingId, + page: loadPage, + page_size: this.data.pageSize, + // 🆕 传递标签筛选参数（0时不传） + biaoqian_id: this.data.xuanzhongBiaoqianId || undefined + } + }); + + this.setData({ + isLoading: false, + isLoadingMore: false, + scrollViewRefreshing: false + }); + + if (res.data.code === 200 || res.data.code === 0) { + const newList = res.data.data.list || []; + const hasMore = res.data.data.has_more || false; + + const processedList = newList.map(item => this.processDingdanItem(item)); + const updatedList = isRefresh ? processedList : [...this.data.dingdanList, ...processedList]; + updatedList.sort((a, b) => (b.creat_time || '').localeCompare(a.creat_time || '')); + + this.setData({ + dingdanList: updatedList, + page: loadPage, + hasMore: hasMore + }); + + if (isRefresh) { + this.setData({ lastRefreshTime: Date.now() }); + } + } else { + wx.showToast({ title: res.data.msg || '加载失败', icon: 'none' }); + } + } catch (error) { + console.error('加载订单失败:', error); + this.setData({ + isLoading: false, + isLoadingMore: false, + scrollViewRefreshing: false + }); + wx.showToast({ title: '网络请求失败', icon: 'none' }); + } + }, + + // 处理单条订单数据（包含标签） + processDingdanItem(item) { + const ossUrl = app.globalData.ossImageUrl || ''; + let fullTupianUrl = ''; + + if (item.tupian) { + fullTupianUrl = !item.tupian.startsWith('http') ? ossUrl + item.tupian : item.tupian; + } else { + const leixing = this.data.shangpinleixing.find(l => l.id === item.leixing_id); + fullTupianUrl = leixing ? leixing.full_tupian_url : '/images/default-order.png'; + } + + const isZhiding = item.zhuangtai === 7; + + let zhidingAvatar = ''; + if (item.zhiding_avatar) { + zhidingAvatar = !item.zhiding_avatar.startsWith('http') + ? ossUrl + item.zhiding_avatar + : item.zhiding_avatar; + } + const zhidingNicheng = item.zhiding_nicheng || ''; + + return { + ...item, + full_tupian_url: fullTupianUrl, + isZhiding: isZhiding, + isPingtai: item.pingtai == 1, + isShangjia: item.pingtai == 2, + zhiding_avatar_full: zhidingAvatar, + zhiding_nicheng: zhidingNicheng, + // 🆕 三层标签（后端返回，直接保留） + xuqiu_biaoqian: item.xuqiu_biaoqian || [], + dashou_biaoqian: item.dashou_biaoqian || [], + shangjia_biaoqian: item.shangjia_biaoqian || [], + }; + }, + + // 跳转到充值页面（原封不动） + goToChongzhiPage(failureType, huiyuanId = null, requiredYajin = 0) { + let url = '/pages/dashouchongzhi/dashouchongzhi'; + let params = {}; + + switch (failureType) { + case 'huiyuan': + params = { needScroll: '0', scrollTo: 'member' }; + break; + case 'yajin': + params = { needScroll: '1', scrollTo: 'bottom', requiredYajin: requiredYajin }; + break; + case 'jifen': + params = { needScroll: '1', scrollTo: 'bottom' }; + break; + } + + if (huiyuanId) params.huiyuanId = huiyuanId; + + const queryString = Object.keys(params) + .map(key => `${key}=${encodeURIComponent(params[key])}`) + .join('&'); + + wx.navigateTo({ + url: `${url}?${queryString}`, + fail: (err) => { + console.error('跳转失败:', err); + wx.showToast({ title: '跳转失败，请稍后重试', icon: 'none' }); + } + }); + }, + + // 抢单按钮（原封不动） + async onQiangdanTap(e) { + const dingdanItem = e.currentTarget.dataset.item; + if (!dingdanItem) return; + + // 校验1: 打手身份 + if (!this.data.dashoustatus || this.data.dashoustatus != 1) { + wx.showToast({ title: '请先开启打手身份', icon: 'none' }); + return; + } + // 校验2: 账号状态 + if (this.data.zhuanghaoStatus != 1) { + wx.showToast({ title: '账号异常，无法接单', icon: 'none' }); + return; + } + // 校验3: 打手接单状态 + if (this.data.dashouzhuangtai != 1) { + wx.showToast({ title: '您有订单正在接待中', icon: 'none' }); + return; + } + // 校验4: 指定订单 + if (dingdanItem.isZhiding) { + if (!this.data.uid || this.data.uid != dingdanItem.zhiding_uid) { + wx.showToast({ title: '此订单为指定单', icon: 'none' }); + return; + } + } + // 校验5: 会员要求 + if (dingdanItem.yaoqiuleixing == 1) { + const hasHuiyuan = this.data.huiyuanList.some(h => h.huiyuanid == dingdanItem.huiyuan_id); + if (!hasHuiyuan) { + wx.showToast({ + title: '未开通对应会员，无法抢单', + icon: 'none', + duration: 2000 + }); + setTimeout(() => { + this.goToChongzhiPage('huiyuan', dingdanItem.huiyuan_id); + }, 500); + return; + } + } + // 校验6: 押金要求 + if (dingdanItem.yaoqiuleixing == 2) { + if (this.data.yajin < dingdanItem.yajin) { + wx.showToast({ + title: `押金不足，需${dingdanItem.yajin}`, + icon: 'none', + duration: 2000 + }); + setTimeout(() => { + this.goToChongzhiPage('yajin', null, dingdanItem.yajin); + }, 500); + return; + } + } + // 校验7: 积分要求 + if (this.data.jifen < 5) { + wx.showToast({ + title: '积分不足，至少需要5积分', + icon: 'none', + duration: 2000 + }); + setTimeout(() => { + this.goToChongzhiPage('jifen'); + }, 500); + return; + } + + // 确认框 + const that = this; + wx.showModal({ + title: '确认抢单', + content: `确定要抢此订单吗？${dingdanItem.isZhiding ? '(指定订单)' : ''}`, + success: async function (res) { + if (res.confirm) { + wx.showLoading({ title: '抢单中...', mask: true }); + try { + const qiangdanRes = await request({ + url: '/dingdan/qiangdan', + method: 'POST', + data: { dingdan_id: dingdanItem.dingdan_id } + }); + wx.hideLoading(); + + if (qiangdanRes.data.code === 200 || qiangdanRes.data.code === 0) { + that.showQiangdanSuccessEffect(); + if (app.globalData) { + app.globalData.dashouzhuangtai = 0; + that.setData({ dashouzhuangtai: 0 }); + } + const newList = that.data.dingdanList.filter( + item => item.dingdan_id !== dingdanItem.dingdan_id + ); + that.setData({ dingdanList: newList }); + } else { + wx.showToast({ + title: qiangdanRes.data.msg || '抢单失败', + icon: 'none' + }); + } + } catch (error) { + wx.hideLoading(); + console.error('抢单请求失败:', error); + wx.showToast({ title: '网络错误，抢单失败', icon: 'none' }); + } + } + } + }); + }, + + showQiangdanSuccessEffect() { + wx.showToast({ title: '抢单成功！', icon: 'success', duration: 2000 }); + }, + + onViewDetail(e) { + const { type, content } = e.currentTarget.dataset; + wx.showModal({ + title: type === 'jieshao' ? '订单介绍' : '订单备注', + content: content, + showCancel: false, + confirmText: '知道了' + }); + }, + + onReachBottom() { + const now = Date.now(); + const lastTime = this.data.lastRefreshTime; + const cooldown = this.data.refreshCooldown; + + if (now - lastTime < cooldown) { + wx.showToast({ + title: `操作太快，请${Math.ceil((cooldown - (now - lastTime)) / 1000)}秒后再试`, + icon: 'none', + duration: 1500 + }); + return; + } + + if (this.data.isLoading || this.data.isLoadingMore) return; + + if (this.data.hasMore && !this.data.isLoading && this.data.xuanzhongLeixingId) { + this.setData({ page: this.data.page + 1 }); + this.loadDingdanList(false); + } + }, + + onPullDownRefresh() { + const now = Date.now(); + const lastTime = this.data.lastRefreshTime; + const cooldown = this.data.refreshCooldown; + + if (now - lastTime < cooldown) { + this.setData({ scrollViewRefreshing: false }); + wx.showToast({ + title: `操作太快，请${Math.ceil((cooldown - (now - lastTime)) / 1000)}秒后再试`, + icon: 'none', + duration: 1500 + }); + return; + } + + if (this.data.isLoading) { + this.setData({ scrollViewRefreshing: false }); + return; + } + + this.setData({ + scrollViewRefreshing: true, + lastRefreshTime: now, + page: 1, + hasMore: true + }); + + if (this.data.xuanzhongLeixingId) { + this.loadDingdanList(true); + } else { + this.setData({ scrollViewRefreshing: false }); + } + } +}); \ No newline at end of file diff --git a/pages/jiedan/jiedan.json b/pages/jiedan/jiedan.json new file mode 100644 index 0000000..eee9b81 --- /dev/null +++ b/pages/jiedan/jiedan.json @@ -0,0 +1,12 @@ +{ + "navigationBarTitleText": "抢单大厅", + "navigationBarBackgroundColor": "#0b0f1a", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark", + "backgroundColor": "#0b0f1a", + "usingComponents": { + "chenghao-tag": "/components/chenghao-tag/chenghao-tag", + "global-notification": "/components/global-notification/global-notification" + } + } \ No newline at end of file diff --git a/pages/jiedan/jiedan.wxml b/pages/jiedan/jiedan.wxml new file mode 100644 index 0000000..6450749 --- /dev/null +++ b/pages/jiedan/jiedan.wxml @@ -0,0 +1,208 @@ + + + + + + + + + +

+ {{item.jieshao}} + + + + + + + + + + + + 全部 + + + + + + + + + + + + + + + + + ⚡️ 正在刷新... + ▼ 下拉刷新订单 + + + + +

+ 请先选择上方订单类型 + + +

+ 当前类型暂无待抢订单 + + + + + + + {{item.creat_time}} + + ⚙️ 平台订单 + + + + + 指定 +

+ {{item.zhiding_nicheng || '指定打手'}} + UID: {{item.zhiding_uid || '未知'}} + + + + + + + +

+ + 介绍： + {{item.jieshao || '暂无介绍'}} + [点击查看] + + + + + 备注： + {{item.beizhu}} + [点击查看] + + + + + 需求标签： + + + + + + + + 💰 + 分佣 + {{item.dashou_fencheng || 0}} + 元 + + + ⚡ 立即抢单 + + + + + + + + + + + {{item.creat_time}} + + 🏪 商家发单 + + + + + 指定 +

+ {{item.zhiding_nicheng || '指定打手'}} + UID: {{item.zhiding_uid || '未知'}} + + + + + + + +

+ {{item.sjnicheng || '未知商家'}} + + + + + + + + 订单介绍： + {{item.jieshao || '暂无介绍'}} + [点击查看] + + + + 商家备注： + {{item.beizhu}} + [点击查看] + + + + + 需求标签： + + + + + + + + 💰 + 分佣 + {{item.dashou_fencheng || 0}} + 元 + + + ⚡ 立即抢单 + + + + + + + + + ⚙️ 加载更多订单中... + —— 没有更多订单了 —— + + + + + + ⚡ 订单加载中... + + + + + + + \ No newline at end of file diff --git a/pages/jiedan/jiedan.wxss b/pages/jiedan/jiedan.wxss new file mode 100644 index 0000000..52ed1a3 --- /dev/null +++ b/pages/jiedan/jiedan.wxss @@ -0,0 +1,762 @@ +/* pages/qiangdan/qiangdan.wxss - 高级机甲风格重构版（对称优化） */ +.qiangdan-page { + height: 100vh; + display: flex; + flex-direction: column; + background: radial-gradient(ellipse at top, #1a1f30, #0b0f1a); + overflow: hidden; + position: relative; + } + + /* 背景动态纹理，增加层次感 */ + .qiangdan-page::before { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-image: + linear-gradient(45deg, rgba(0, 247, 255, 0.02) 0%, transparent 30%), + radial-gradient(circle at 30% 50%, rgba(255, 77, 109, 0.03) 0%, transparent 50%), + repeating-linear-gradient(45deg, rgba(255,255,255,0.01) 0px, rgba(255,255,255,0.01) 1px, transparent 1px, transparent 6px); + pointer-events: none; + z-index: 0; + } + + /* ====== 1. 商品类型区域 ====== */ + .leixing-quyu { + padding: 30rpx 0 20rpx; + background: rgba(18, 22, 38, 0.9); + backdrop-filter: blur(20rpx); + border-bottom: 1rpx solid rgba(255, 255, 255, 0.05); + position: relative; + z-index: 10; + flex-shrink: 0; + box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.5); + } + + .leixing-scroll { + width: 100%; + white-space: nowrap; + height: 180rpx; + } + + .leixing-container { + display: inline-flex; + padding: 0 30rpx; + gap: 20rpx; + } + + .leixing-item { + display: inline-flex; + flex-direction: column; + align-items: center; + width: 160rpx; + position: relative; + transition: all 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275); + } + + .leixing-active { + transform: translateY(-8rpx); + } + + .guangyun-effect { + position: absolute; + top: -15rpx; + left: -15rpx; + right: -15rpx; + bottom: -15rpx; + background: radial-gradient(circle at center, rgba(0, 200, 255, 0.3) 0%, transparent 70%); + border-radius: 50rpx; + z-index: 0; + animation: guangyun-pulse 2s infinite ease-in-out; + } + + @keyframes guangyun-pulse { + 0%, 100% { opacity: 0.5; transform: scale(1); } + 50% { opacity: 1; transform: scale(1.1); } + } + + .leixing-tupian { + width: 120rpx; + height: 120rpx; + border-radius: 32rpx; + z-index: 1; + box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.6); + transition: all 0.3s ease; + border: 2rpx solid rgba(0, 200, 255, 0.4); + } + + .leixing-active .leixing-tupian { + box-shadow: 0 16rpx 40rpx rgba(0, 200, 255, 0.5); + border: 2rpx solid #00c8ff; + } + + .leixing-jieshao { + margin-top: 16rpx; + font-size: 24rpx; + color: #b0c0e0; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + text-align: center; + z-index: 1; + font-weight: 500; + } + + .leixing-active .leixing-jieshao { + color: #00c8ff; + text-shadow: 0 0 8px rgba(0,200,255,0.5); + } + + /* ====== 2. 分割线 ====== */ + .fenge-xian { + height: 2rpx; + background: linear-gradient(90deg, transparent, #00c8ff, #ff4d6d, transparent); + flex-shrink: 0; + margin: 0 30rpx; + opacity: 0.5; + } + + /* ====== 3. 订单列表容器 ====== */ + .dingdan-container { + flex: 1; + overflow: hidden; + position: relative; + z-index: 1; + padding: 0 20rpx; /* 统一左右内边距 */ + } + + .dingdan-scroll-view { + height: 100%; + -webkit-overflow-scrolling: touch; + } + + .refresher-container { + height: 100rpx; + display: flex; + align-items: center; + justify-content: center; + } + + .refreshing-text, + .pull-down-text { + font-size: 26rpx; + color: #6a9cff; + text-shadow: 0 0 8px rgba(0,200,255,0.3); + } + + /* ====== 4. 空状态提示 ====== */ + .empty-tip { + padding: 160rpx 0; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + } + + .tip-icon { + width: 180rpx; + height: 180rpx; + opacity: 0.5; + margin-bottom: 30rpx; + filter: drop-shadow(0 0 20px rgba(0,200,255,0.3)); + } + + .tip-text { + font-size: 28rpx; + color: #8a9ac0; + letter-spacing: 2rpx; + } + + /* ====== 5. 订单卡片通用样式（移除左右边框，改用顶部标识）====== */ + .dingdan-card { + margin: 20rpx 0; /* 左右由容器控制 */ + border-radius: 36rpx; + padding: 28rpx 24rpx; + position: relative; + overflow: hidden; + box-shadow: 0 20rpx 40rpx rgba(0, 0, 0, 0.6); + transition: all 0.3s ease; + border: 1rpx solid rgba(255, 255, 255, 0.03); + backdrop-filter: blur(30rpx); + } + + .dingdan-card:active { + transform: scale(0.998); + box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.8); + } + + /* 平台订单 - 冷色调，顶部光效 */ + .pingtai-card { + background: linear-gradient(145deg, rgba(18, 28, 48, 0.95), rgba(8, 18, 35, 0.98)); + } + + .pingtai-card::before { + content: ''; + position: absolute; + top: 0; + left: 10%; + width: 80%; + height: 4rpx; + background: linear-gradient(90deg, transparent, #00c8ff, transparent); + border-radius: 2rpx; + opacity: 0.7; + } + + /* 商家订单 - 暖色调，顶部光效 */ + .shangjia-card { + background: linear-gradient(145deg, rgba(38, 18, 48, 0.95), rgba(25, 8, 35, 0.98)); + } + + .shangjia-card::before { + content: ''; + position: absolute; + top: 0; + left: 10%; + width: 80%; + height: 4rpx; + background: linear-gradient(90deg, transparent, #ff4d6d, transparent); + border-radius: 2rpx; + opacity: 0.7; + } + + /* 卡片顶部 */ + .card-top { + display: flex; + align-items: center; + margin-bottom: 20rpx; + padding-bottom: 16rpx; + border-bottom: 1rpx dashed rgba(255, 255, 255, 0.08); + } + + .creat-time { + font-size: 26rpx; + color: #c0d0ff; + font-weight: 500; + text-shadow: 0 0 5px rgba(0,200,255,0.3); + } + + .top-line { + flex: 1; + height: 1rpx; + background: linear-gradient(to right, transparent, rgba(255, 255, 255, 0.2), transparent); + margin: 0 20rpx; + } + + .pingtai-tag { + font-size: 24rpx; + color: #aac8ff; + padding: 6rpx 18rpx; + background: rgba(0,200,255,0.08); + border-radius: 40rpx; + border: 1rpx solid rgba(0,200,255,0.3); + box-shadow: 0 0 10rpx rgba(0,200,255,0.2); + } + + /* ====== 6. 指定单标识行（新设计）====== */ + .zhiding-row { + display: flex; + align-items: center; + margin-bottom: 24rpx; + padding: 12rpx 20rpx; + background: rgba(255, 77, 109, 0.1); + border-radius: 60rpx; + border: 1rpx solid rgba(255, 77, 109, 0.3); + box-shadow: 0 0 20rpx rgba(255, 77, 109, 0.2); + backdrop-filter: blur(10rpx); + gap: 12rpx; + } + + .zhiding-icon { + font-size: 28rpx; + color: #ff4d6d; + font-weight: 700; + background: rgba(255, 77, 109, 0.2); + padding: 4rpx 16rpx; + border-radius: 40rpx; + text-shadow: 0 0 8px #ff4d6d; + letter-spacing: 2rpx; + } + + .zhiding-avatar { + width: 48rpx; + height: 48rpx; + border-radius: 50%; + border: 2rpx solid #ff4d6d; + box-shadow: 0 0 15rpx #ff4d6d; + object-fit: cover; + } + + .zhiding-nicheng { + font-size: 26rpx; + color: #ffc0d0; + font-weight: 500; + max-width: 160rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .zhiding-uid { + font-size: 24rpx; + color: #ff9aab; + flex: 1; + text-align: right; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-family: monospace; + } + + /* ====== 7. 平台订单内容区 ====== */ + .card-content { + display: flex; + margin-bottom: 24rpx; + align-items: center; + } + + .neirong-tupian { + width: 140rpx; + height: 140rpx; + border-radius: 50%; + margin-right: 24rpx; + flex-shrink: 0; + box-shadow: 0 10rpx 30rpx rgba(0,200,255,0.3); + border: 2rpx solid #00c8ff; + object-fit: cover; + } + + .jieshao-box { + flex: 1; + display: flex; + flex-direction: column; + justify-content: center; + min-height: 140rpx; + padding: 8rpx 0; + } + + .jieshao-label { + font-size: 26rpx; + color: #d0e0ff; + font-weight: 600; + margin-bottom: 6rpx; + text-shadow: 0 0 5px rgba(0,200,255,0.3); + } + + .jieshao-text { + font-size: 26rpx; + color: #b0c8f0; + line-height: 1.4; + word-break: break-word; + } + + .jieshao-ellipsis .jieshao-text { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; + overflow: hidden; + text-overflow: ellipsis; + } + + /* ====== 8. 商家订单特有样式 ====== */ + .shangjia-info { + display: flex; + align-items: center; + margin-bottom: 20rpx; + } + + .shangjia-touxiang { + width: 90rpx; + height: 90rpx; + border-radius: 50%; + margin-right: 20rpx; + border: 2rpx solid #ff4d6d; + box-shadow: 0 6rpx 18rpx rgba(255, 77, 109, 0.5); + object-fit: cover; + } + + .shangjia-nicheng { + font-size: 30rpx; + color: #ffb3c6; + font-weight: 600; + text-shadow: 0 0 8px rgba(255, 77, 109, 0.4); + } + + .shangjia-jieshao, + .shangjia-beizhu { + margin-bottom: 16rpx; + padding: 14rpx 18rpx; + background: rgba(255, 255, 255, 0.02); + border-radius: 24rpx; + border: 1rpx solid rgba(255, 77, 109, 0.2); + } + + .shangjia-jieshao .jieshao-label, + .shangjia-beizhu .beizhu-label { + display: block; + margin-bottom: 6rpx; + font-size: 24rpx; + color: #ff9aab; + } + + .shangjia-jieshao .jieshao-text, + .shangjia-beizhu .beizhu-text { + font-size: 24rpx; + color: #e0c8ff; + line-height: 1.4; + } + + .shangjia-jieshao.jieshao-ellipsis .jieshao-text { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + text-overflow: ellipsis; + } + + .shangjia-beizhu.beizhu-ellipsis .beizhu-text { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + text-overflow: ellipsis; + } + + /* ====== 9. 通用备注区 ====== */ + .beizhu-box { + margin-bottom: 20rpx; + padding: 14rpx 18rpx; + background: rgba(255, 255, 255, 0.02); + border-radius: 24rpx; + border: 1rpx solid rgba(0,200,255,0.2); + } + + .beizhu-label { + font-size: 24rpx; + color: #80d0ff; + font-weight: 600; + margin-bottom: 6rpx; + display: block; + } + + .beizhu-text { + font-size: 24rpx; + color: #b0c8f0; + line-height: 1.4; + } + + .beizhu-ellipsis .beizhu-text { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + text-overflow: ellipsis; + } + + .view-more { + display: block; + font-size: 22rpx; + color: #00c8ff; + margin-top: 6rpx; + text-align: right; + opacity: 0.8; + text-shadow: 0 0 5px #00c8ff; + } + + /* ====== 10. 卡片底部：分佣 + 按钮 ====== */ + .card-bottom { + display: flex; + align-items: center; + justify-content: space-between; + padding-top: 20rpx; + border-top: 1rpx solid rgba(255, 255, 255, 0.06); + } + + /* 分佣容器（图标占位，用户可自定义） */ + .fenyong-box { + display: flex; + align-items: baseline; + background: rgba(0, 0, 0, 0.3); + padding: 8rpx 20rpx; + border-radius: 60rpx; + border: 1rpx solid rgba(255, 215, 0, 0.3); + } + + /* 分佣图标占位符，用户可替换为自己图标 */ + .fenyong-icon { + font-size: 32rpx; + margin-right: 10rpx; + filter: drop-shadow(0 0 8px gold); + } + + .fenyong-text { + font-size: 24rpx; + color: #c0b0a0; + margin-right: 8rpx; + } + + .fenyong-price { + font-size: 44rpx; + color: #ffd700; + font-weight: 800; + margin-right: 4rpx; + text-shadow: 0 0 20px rgba(255, 215, 0, 0.8); + } + + .fenyong-unit { + font-size: 24rpx; + color: #a0a0b0; + } + + /* ====== 11. 机甲风格抢单按钮（对称优化）====== */ + .qiangdan-btn { + position: relative; + padding: 16rpx 44rpx; + border: none; + overflow: hidden; + transition: all 0.2s ease; + cursor: pointer; + z-index: 1; + /* 多边形形状，保证上下对称 */ + clip-path: polygon(10% 0%, 90% 0%, 100% 25%, 100% 75%, 90% 100%, 10% 100%, 0% 75%, 0% 25%); + } + + /* 按钮统一基础样式，无上下不对称阴影 */ + .mecha-btn { + background: linear-gradient(145deg, #2a3050, #181e38); + box-shadow: + 0 8rpx 0 #0a0a1a, + 0 12rpx 28rpx rgba(0, 0, 0, 0.7), + inset 0 2rpx 6rpx rgba(255, 255, 255, 0.2), + inset 0 -2rpx 4rpx rgba(0, 0, 0, 0.3); + border: 1rpx solid rgba(255, 255, 255, 0.1); + } + + /* 平台按钮冷光 */ + .pingtai-btn.mecha-btn { + background: linear-gradient(145deg, #1a2a48, #0e1a30); + box-shadow: + 0 8rpx 0 #0a1525, + 0 12rpx 28rpx rgba(0, 0, 0, 0.7), + inset 0 2rpx 6rpx #00c8ff, + inset 0 -2rpx 4rpx rgba(0, 0, 0, 0.3); + } + + /* 商家按钮暖光 */ + .shangjia-btn.mecha-btn { + background: linear-gradient(145deg, #3a2048, #251030); + box-shadow: + 0 8rpx 0 #2a0a1a, + 0 12rpx 28rpx rgba(0, 0, 0, 0.7), + inset 0 2rpx 6rpx #ff4d6d, + inset 0 -2rpx 4rpx rgba(0, 0, 0, 0.3); + } + + .btn-text { + font-size: 32rpx; + color: #fff; + font-weight: 700; + letter-spacing: 3rpx; + position: relative; + z-index: 3; + text-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.7), 0 0 15rpx currentColor; + } + + /* 扫光效果 */ + .btn-shine { + position: absolute; + top: -50%; + left: -50%; + width: 200%; + height: 200%; + background: linear-gradient( + to right, + rgba(255, 255, 255, 0) 0%, + rgba(255, 255, 255, 0.25) 50%, + rgba(255, 255, 255, 0) 100% + ); + transform: rotate(30deg); + animation: btn-shimmer 2.8s infinite linear; + z-index: 2; + } + + /* 内发光，只在悬停/按下时出现，保证对称 */ + .btn-glow { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: radial-gradient(circle at 30% 30%, rgba(255, 255, 255, 0.5), transparent 70%); + opacity: 0; + transition: opacity 0.3s; + z-index: 1; + } + + .mecha-btn:hover .btn-glow, + .mecha-btn:active .btn-glow { + opacity: 0.3; + } + + /* 按下效果，保持对称 */ + .mecha-btn:active { + transform: translateY(4rpx) scale(0.98); + box-shadow: + 0 4rpx 0 #0a0a1a, + 0 8rpx 20rpx rgba(0, 0, 0, 0.7), + inset 0 2rpx 6rpx rgba(255, 255, 255, 0.2), + inset 0 -2rpx 4rpx rgba(0, 0, 0, 0.3); + } + + /* 机械纹理，保持视觉丰富但不过分 */ + .mecha-overlay { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-image: + repeating-linear-gradient(45deg, rgba(255, 255, 255, 0.02) 0px, rgba(255, 255, 255, 0.02) 2px, transparent 2px, transparent 8px); + pointer-events: none; + z-index: 1; + opacity: 0.5; + } + + @keyframes btn-shimmer { + 0% { transform: translateX(-100%) rotate(30deg); } + 100% { transform: translateX(100%) rotate(30deg); } + } + + /* ====== 12. 加载状态 ====== */ + .loading-more, + .no-more { + padding: 40rpx 0; + text-align: center; + } + + .loading-text { + font-size: 26rpx; + color: #6a9cff; + text-shadow: 0 0 10px rgba(0,200,255,0.5); + animation: pulse 1.5s infinite; + } + + .no-more-text { + font-size: 26rpx; + color: #4a5a8a; + letter-spacing: 3rpx; + } + + @keyframes pulse { + 0%, 100% { opacity: 0.7; } + 50% { opacity: 1; } + } + + .loading-mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(5, 8, 18, 0.95); + backdrop-filter: blur(30rpx); + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + z-index: 9999; + } + + .loading-spinner { + width: 90rpx; + height: 90rpx; + border: 6rpx solid rgba(0,200,255,0.2); + border-top: 6rpx solid #00c8ff; + border-right: 6rpx solid #ff4d6d; + border-radius: 50%; + animation: spin 1.2s cubic-bezier(0.68, -0.55, 0.27, 1.55) infinite; + margin-bottom: 30rpx; + box-shadow: 0 0 50rpx #00c8ff; + } + + @keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } + } + + .loading-mask-text { + font-size: 30rpx; + color: #c0d0ff; + text-shadow: 0 0 15px rgba(0,200,255,0.7); + letter-spacing: 4rpx; + } + + + + + +/* 🆕 标签筛选区 */ +.biaoqian-quyu { + padding: 12rpx 20rpx; + background: rgba(18, 22, 38, 0.7); + backdrop-filter: blur(10rpx); + } + .biaoqian-scroll { + white-space: nowrap; + height: 80rpx; + } + .biaoqian-container { + display: inline-flex; + gap: 16rpx; + padding-right: 20rpx; + } + .biaoqian-item { + display: inline-flex; + align-items: center; + justify-content: center; + padding: 0 12rpx; + border-radius: 20rpx; + background: rgba(255,255,255,0.05); + transition: all 0.2s; + } + .biaoqian-active { + background: rgba(0,200,255,0.2); + border: 1rpx solid #00c8ff; + } + .quanbu-text { + font-size: 26rpx; + color: #ccc; + padding: 0 12rpx; + } + + /* 订单卡片内标签滚动 */ + .xuqiu-biaoqian-area { + display: flex; + align-items: center; + margin-top: 16rpx; + padding: 8rpx 0; + } + .xuqiu-label { + font-size: 24rpx; + color: #80d0ff; + margin-right: 12rpx; + flex-shrink: 0; + } + .xuqiu-biaoqian-scroll { + flex: 1; + white-space: nowrap; + } + .biaoqian-inline-scroll { + flex: 1; + white-space: nowrap; + margin-left: 10rpx; + } + /* 调整指定打手行内的标签滚动 */ + .zhiding-row .biaoqian-inline-scroll { + margin-left: auto; + max-width: 50%; + } + diff --git a/pages/jiedanchi/jiedanchi.js b/pages/jiedanchi/jiedanchi.js new file mode 100644 index 0000000..a081b4e --- /dev/null +++ b/pages/jiedanchi/jiedanchi.js @@ -0,0 +1,467 @@ +// pages/jiedanchi/jiedanchi.js +const app = getApp(); +import request from '../../utils/request.js'; +import PopupService from '../../services/popupService.js'; + +Page({ + data: { + // 1. 商品类型相关 + shangpinleixing: [], // 商品类型列表 {id, jieshao, tupian_url} + xuanzhongLeixingId: null, // 当前选中的类型ID + + // 2. 订单列表与分页相关 + dingdanList: [], // 当前展示的订单列表 + page: 1, + pageSize: 10, + hasMore: true, + isLoading: false, + + // 3. 全局状态字段 + dashoustatus: null, + zhuanghaoStatus: null, // 注意变量名：zhuanghaoStatus + dashouzhuangtai: null, + uid: null, + huiyuanList: [], // clumber 列表 + yajin: 0, + jifen: 0, + + // 4. 刷新控制字段 + scrollViewRefreshing: false, + lastRefreshTime: 0, + refreshCooldown: 2000, + isLoadingMore: false, + + // 5. 切换类型冷却时间控制 + lastSwitchTime: 0, + switchCooldown: 1500, + isSwitching: false, + + // 6. 全局OSS地址 + ossImageUrl: app.globalData.ossImageUrl || '', + + // 7. 授权状态控制 + showUnauthorized: false, + unauthorizedMsg: '您尚未开启此功能', + }, + + async onLoad(options) { + this.loadGlobalStatus(); + this.checkAuthorization(); + + }, + // 🆕 页面隐藏时清理弹窗视图 + onHide: function () { + const popupComp = this.selectComponent('#popupNotice'); + if (popupComp && popupComp.cleanup) { + popupComp.cleanup(); + } +}, + + onShow() { + this.registerNotificationComponent(); + this.loadGlobalStatus(); + this.checkAuthorization(); + }, + + registerNotificationComponent() { + const notificationComp = this.selectComponent('#global-notification'); + if (notificationComp && notificationComp.showNotification) { + app.globalData.globalNotification = { + show: (data) => notificationComp.showNotification(data), + hide: () => notificationComp.hideNotification() + }; + } + }, + + loadGlobalStatus() { + const globalData = app.globalData; + // 从缓存读取，确保与抢单时使用的数据源一致 + const dashoustatusCache = wx.getStorageSync('dashoustatus'); + const dashoustatus = dashoustatusCache !== '' ? dashoustatusCache : null; + + // 从 globalData 或缓存获取 zhuanghaoStatus（注意字段名可能有差异） + let zhuanghaoStatus = globalData.zhanghaoStatus; + if (zhuanghaoStatus === undefined || zhuanghaoStatus === null) { + zhuanghaoStatus = wx.getStorageSync('zhanghaoStatus'); + } + + this.setData({ + dashoustatus: dashoustatus, + zhuanghaoStatus: zhuanghaoStatus, + dashouzhuangtai: globalData.dashouzhuangtai, + uid: wx.getStorageSync('uid'), + huiyuanList: globalData.clumber || [], + yajin: globalData.yajin || 0, + jifen: globalData.jinfen || 0 + }); + + // 打印当前值，方便调试 + //console.log('loadGlobalStatus -> dashoustatus:', dashoustatus, 'zhuanghaoStatus:', zhuanghaoStatus); + }, + + checkAuthorization() { + const { dashoustatus, zhuanghaoStatus } = this.data; + //console.log('checkAuthorization -> dashoustatus:', dashoustatus, 'zhuanghaoStatus:', zhuanghaoStatus); + + // 完全复制抢单时的判断逻辑 + const isDashouValid = (dashoustatus && dashoustatus == 1) || false; // 存在且等于1 + const isZhuanghaoValid = (zhuanghaoStatus == 1); // 宽松比较，null/undefined/0 均视为 false + + const isAuthorized = isDashouValid && isZhuanghaoValid; + + if (!isAuthorized) { + this.setData({ showUnauthorized: true }); + let msg = ''; + if (!isDashouValid) msg = '您尚未开启身份'; + //else if (!isZhuanghaoValid) msg = '您的账号状态异常'; + this.setData({ unauthorizedMsg: msg || '无法使用抢单功能' }); + } else { + this.setData({ showUnauthorized: false }); + if (!this.data.shangpinleixing.length) { + this.loadShangpinLeixing(); + } else if (this.data.xuanzhongLeixingId) { + this.loadDingdanList(true); + } + PopupService.checkAndShow(this, 'jiedanchi'); + } + }, + + async loadShangpinLeixing() { + wx.showLoading({ title: '加载商品类型...' }); + try { + const res = await request({ + url: '/dingdan/dsqdhqddlx', + method: 'POST', + header: { 'content-type': 'application/json' } + }); + + if (res.statusCode === 200 && res.data) { + const data = res.data; + let list = []; + if (data.code === 200 || data.code === 0) { + if (data.data && Array.isArray(data.data.list)) { + list = data.data.list; + } else if (data.data && Array.isArray(data.data)) { + list = data.data; + } else if (Array.isArray(data.list)) { + list = data.list; + } else if (Array.isArray(data)) { + list = data; + } + } + const processedList = this.processTupianUrl(list); + this.setData({ + shangpinleixing: processedList, + xuanzhongLeixingId: processedList[0]?.id || null + }); + if (this.data.xuanzhongLeixingId) { + this.loadDingdanList(true); + } + } else { + wx.showToast({ title: res.data?.msg || '加载商品类型失败', icon: 'none', duration: 2000 }); + } + } catch (error) { + console.error('加载商品类型失败:', error); + wx.showToast({ title: '网络错误，加载失败', icon: 'none', duration: 2000 }); + } finally { + wx.hideLoading(); + } + }, + + processTupianUrl(list) { + const ossUrl = app.globalData.ossImageUrl || ''; + return list.map(item => ({ + ...item, + full_tupian_url: item.tupian_url && !item.tupian_url.startsWith('http') ? ossUrl + item.tupian_url : (item.tupian_url || '/images/default-type.png') + })); + }, + + async selectLeixing(e) { + const now = Date.now(); + if (now - this.data.lastSwitchTime < this.data.switchCooldown) { + wx.showToast({ + title: `操作太快，请${Math.ceil((this.data.switchCooldown - (now - this.data.lastSwitchTime)) / 1000)}秒后再试`, + icon: 'none', + duration: 1500 + }); + return; + } + if (this.data.isSwitching) return; + const leixingId = e.currentTarget.dataset.id; + if (leixingId === this.data.xuanzhongLeixingId) return; + this.setData({ isSwitching: true, lastSwitchTime: now }); + wx.showLoading({ title: '切换中...' }); + try { + this.setData({ + xuanzhongLeixingId: leixingId, + dingdanList: [], + page: 1, + hasMore: true + }); + await this.loadDingdanList(true); + } catch (error) { + console.error('切换类型失败:', error); + } finally { + this.setData({ isSwitching: false }); + wx.hideLoading(); + } + }, + + async loadDingdanList(isRefresh = false) { + if (this.data.isLoading || !this.data.xuanzhongLeixingId) return; + + const loadPage = isRefresh ? 1 : this.data.page; + if (!isRefresh && !this.data.hasMore) return; + + this.setData({ + isLoading: true, + isLoadingMore: !isRefresh + }); + + try { + const res = await request({ + url: '/dingdan/ddhq', + method: 'POST', + data: { + leixing_id: this.data.xuanzhongLeixingId, + page: loadPage, + page_size: this.data.pageSize + } + }); + + this.setData({ + isLoading: false, + isLoadingMore: false, + scrollViewRefreshing: false + }); + + if (res.data.code === 200 || res.data.code === 0) { + const newList = res.data.data.list || []; + const hasMore = res.data.data.has_more || false; + + const processedList = newList.map(item => this.processDingdanItem(item)); + + const updatedList = isRefresh ? processedList : [...this.data.dingdanList, ...processedList]; + + updatedList.sort((a, b) => (b.creat_time || '').localeCompare(a.creat_time || '')); + + this.setData({ + dingdanList: updatedList, + page: loadPage, + hasMore: hasMore + }); + + if (isRefresh) { + this.setData({ lastRefreshTime: Date.now() }); + } + } else { + wx.showToast({ title: res.data.msg || '加载失败', icon: 'none' }); + } + } catch (error) { + console.error('加载订单失败:', error); + this.setData({ + isLoading: false, + isLoadingMore: false, + scrollViewRefreshing: false + }); + wx.showToast({ title: '网络请求失败', icon: 'none' }); + } + }, + + processDingdanItem(item) { + const ossUrl = app.globalData.ossImageUrl || ''; + let fullTupianUrl = ''; + if (item.tupian) { + fullTupianUrl = !item.tupian.startsWith('http') ? ossUrl + item.tupian : item.tupian; + } else { + const leixing = this.data.shangpinleixing.find(l => l.id === item.leixing_id); + fullTupianUrl = leixing ? leixing.full_tupian_url : '/images/default-order.png'; + } + + const isZhiding = item.zhuangtai === 7; + + let zhidingAvatar = ''; + if (item.zhiding_avatar) { + zhidingAvatar = !item.zhiding_avatar.startsWith('http') ? ossUrl + item.zhiding_avatar : item.zhiding_avatar; + } + const zhidingNicheng = item.zhiding_nicheng || ''; + + return { + ...item, + full_tupian_url: fullTupianUrl, + isZhiding: isZhiding, + isPingtai: item.pingtai == 1, + isShangjia: item.pingtai == 2, + zhiding_avatar_full: zhidingAvatar, + zhiding_nicheng: zhidingNicheng + }; + }, + + goToChongzhiPage(failureType, huiyuanId = null, requiredYajin = 0) { + let url = '/pages/dashouchongzhi/dashouchongzhi'; + let params = {}; + switch (failureType) { + case 'huiyuan': + params = { needScroll: '0', scrollTo: 'member' }; + break; + case 'yajin': + params = { needScroll: '1', scrollTo: 'bottom', requiredYajin: requiredYajin }; + break; + case 'jifen': + params = { needScroll: '1', scrollTo: 'bottom' }; + break; + } + if (huiyuanId) params.huiyuanId = huiyuanId; + const queryString = Object.keys(params).map(key => `${key}=${encodeURIComponent(params[key])}`).join('&'); + const fullUrl = `${url}?${queryString}`; + wx.navigateTo({ + url: fullUrl, + fail: (err) => { + console.error('跳转失败:', err); + wx.showToast({ title: '跳转失败，请稍后重试', icon: 'none' }); + } + }); + }, + + async onQiangdanTap(e) { + const dingdanItem = e.currentTarget.dataset.item; + if (!dingdanItem) return; + + if (!this.data.dashoustatus || this.data.dashoustatus != 1) { + wx.showToast({ title: '请先开启打手身份', icon: 'none' }); + return; + } + if (this.data.zhuanghaoStatus != 1) { + wx.showToast({ title: '账号异常，无法接单', icon: 'none' }); + return; + } + if (this.data.dashouzhuangtai != 1) { + wx.showToast({ title: '您有订单正在接待中', icon: 'none' }); + return; + } + if (dingdanItem.isZhiding) { + if (!this.data.uid || this.data.uid != dingdanItem.zhiding_uid) { + wx.showToast({ title: '此订单为指定单', icon: 'none' }); + return; + } + } + if (dingdanItem.yaoqiuleixing == 1) { + const hasHuiyuan = this.data.huiyuanList.some(h => h.huiyuanid == dingdanItem.huiyuan_id); + if (!hasHuiyuan) { + wx.showToast({ title: '未开通对应会员，无法抢单', icon: 'none', duration: 2000 }); + setTimeout(() => this.goToChongzhiPage('huiyuan', dingdanItem.huiyuan_id), 500); + return; + } + } + if (dingdanItem.yaoqiuleixing == 2) { + if (this.data.yajin < dingdanItem.yajin) { + wx.showToast({ title: `押金不足，需${dingdanItem.yajin}`, icon: 'none', duration: 2000 }); + setTimeout(() => this.goToChongzhiPage('yajin', null, dingdanItem.yajin), 500); + return; + } + } + if (this.data.jifen < 5) { + wx.showToast({ title: '积分不足，至少需要5积分', icon: 'none', duration: 2000 }); + setTimeout(() => this.goToChongzhiPage('jifen'), 500); + return; + } + + const that = this; + wx.showModal({ + title: '确认抢单', + content: `确定要抢此订单吗？${dingdanItem.isZhiding ? '(指定订单)' : ''}`, + success: async function (res) { + if (res.confirm) { + wx.showLoading({ title: '抢单中...', mask: true }); + try { + const qiangdanRes = await request({ + url: '/dingdan/qiangdan', + method: 'POST', + data: { dingdan_id: dingdanItem.dingdan_id } + }); + wx.hideLoading(); + if (qiangdanRes.data.code === 200 || qiangdanRes.data.code === 0) { + that.showQiangdanSuccessEffect(); + if (app.globalData) { + app.globalData.dashouzhuangtai = 0; + that.setData({ dashouzhuangtai: 0 }); + } + const newList = that.data.dingdanList.filter(item => item.dingdan_id !== dingdanItem.dingdan_id); + that.setData({ dingdanList: newList }); + } else { + wx.showToast({ title: qiangdanRes.data.msg || '抢单失败', icon: 'none' }); + } + } catch (error) { + wx.hideLoading(); + console.error('抢单请求失败:', error); + wx.showToast({ title: '网络错误，抢单失败', icon: 'none' }); + } + } + } + }); + }, + + showQiangdanSuccessEffect() { + wx.showToast({ title: '抢单成功！', icon: 'success', duration: 2000 }); + }, + + onViewDetail(e) { + const { type, content } = e.currentTarget.dataset; + wx.showModal({ + title: type === 'jieshao' ? '订单介绍' : '订单备注', + content: content, + showCancel: false, + confirmText: '知道了' + }); + }, + + onReachBottom() { + const now = Date.now(); + if (now - this.data.lastRefreshTime < this.data.refreshCooldown) { + wx.showToast({ + title: `操作太快，请${Math.ceil((this.data.refreshCooldown - (now - this.data.lastRefreshTime)) / 1000)}秒后再试`, + icon: 'none', + duration: 1500 + }); + return; + } + if (this.data.isLoading || this.data.isLoadingMore) return; + if (this.data.hasMore && !this.data.isLoading && this.data.xuanzhongLeixingId) { + this.setData({ page: this.data.page + 1 }); + this.loadDingdanList(false); + } + }, + + onPullDownRefresh() { + const now = Date.now(); + if (now - this.data.lastRefreshTime < this.data.refreshCooldown) { + this.setData({ scrollViewRefreshing: false }); + wx.showToast({ + title: `操作太快，请${Math.ceil((this.data.refreshCooldown - (now - this.data.lastRefreshTime)) / 1000)}秒后再试`, + icon: 'none', + duration: 1500 + }); + return; + } + if (this.data.isLoading) { + this.setData({ scrollViewRefreshing: false }); + return; + } + this.setData({ + scrollViewRefreshing: true, + lastRefreshTime: now + }); + if (this.data.xuanzhongLeixingId) { + this.setData({ page: 1, hasMore: true }); + this.loadDingdanList(true); + } else { + this.setData({ scrollViewRefreshing: false }); + } + }, + + goToDashouRegister() { + wx.navigateTo({ + url: '/pages/dashouduan/dashouduan' + }); + } +}); \ No newline at end of file diff --git a/pages/jiedanchi/jiedanchi.json b/pages/jiedanchi/jiedanchi.json new file mode 100644 index 0000000..ea51a5d --- /dev/null +++ b/pages/jiedanchi/jiedanchi.json @@ -0,0 +1,9 @@ +{ + "navigationBarTitleText": "接单池", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark", + "backgroundColor": "#f5f7fa", + "usingComponents": { + "global-notification": "/components/global-notification/global-notification" + } + } \ No newline at end of file diff --git a/pages/jiedanchi/jiedanchi.wxml b/pages/jiedanchi/jiedanchi.wxml new file mode 100644 index 0000000..027df01 --- /dev/null +++ b/pages/jiedanchi/jiedanchi.wxml @@ -0,0 +1,263 @@ + + + + + + + + 🔒 + 功能未开启 + {{unauthorizedMsg}} + 请先注册为服务者，即可使用抢单功能 + + 立即注册 + + + + + + + + + + + + + + + + +

+ {{item.jieshao}} + + + + + + + + + + + + + + + 正在刷新... + 下拉刷新订单 + + + + + + +

+ 请先选择上方订单类型 + + + +

+ 当前类型暂无待抢订单 + + + + + + + + + {{item.creat_time}} + + 平台订单 + + + + + 指定 +

+ {{item.zhiding_nicheng || '指定打手'}} + UID: {{item.zhiding_uid || '未知'}} + + + + +

+ + 介绍： + {{item.jieshao || '暂无介绍'}} + [点击查看] + + + + + + 备注： + {{item.beizhu}} + [点击查看] + + + + + + 💰 + 分佣 + {{item.dashou_fencheng || 0}} + 元 + + + 立即抢单 + + + + + + + + + + {{item.creat_time}} + + 商家发单 + + + + + 指定 +

+ {{item.zhiding_nicheng || '指定打手'}} + UID: {{item.zhiding_uid || '未知'}} + + + + +

+ {{item.sjnicheng || '未知商家'}} + + + + + 订单介绍： + {{item.jieshao || '暂无介绍'}} + [点击查看] + + + + + 商家备注： + {{item.beizhu}} + [点击查看] + + + + + + 💰 + 分佣 + {{item.dashou_fencheng || 0}} + 元 + + + 立即抢单 + + + + + + + + + 加载更多订单中... + + + 没有更多订单了 + + + + + + + + 订单加载中... + + + + + + + \ No newline at end of file diff --git a/pages/jiedanchi/jiedanchi.wxss b/pages/jiedanchi/jiedanchi.wxss new file mode 100644 index 0000000..5784b03 --- /dev/null +++ b/pages/jiedanchi/jiedanchi.wxss @@ -0,0 +1,655 @@ +/* pages/qiangdan/qiangdan.wxss */ +.qiangdan-page { + height: 100vh; + display: flex; + flex-direction: column; + background-color: #f5f7fa; + overflow: hidden; + position: relative; + } + + /* ====== 授权提示页（机甲风格）====== */ + .unauthorized-container { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + background: radial-gradient(ellipse at top, #0b0f1a, #03050a); + z-index: 100; + } + + .unauthorized-card { + width: 600rpx; + padding: 60rpx 40rpx; + background: linear-gradient(145deg, #1a1f30, #0f1422); + border-radius: 60rpx; + position: relative; + overflow: hidden; + border: 2rpx solid rgba(0, 247, 255, 0.3); + box-shadow: 0 30rpx 60rpx rgba(0, 0, 0, 0.8), 0 0 30rpx rgba(0, 247, 255, 0.2); + } + + .card-glow { + position: absolute; + top: -20%; + left: -20%; + width: 140%; + height: 140%; + background: radial-gradient(circle at 30% 30%, rgba(0, 247, 255, 0.2), transparent 60%); + animation: rotateGlow 10s linear infinite; + z-index: 0; + } + + @keyframes rotateGlow { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } + } + + .card-content-unauth { + position: relative; + z-index: 2; + display: flex; + flex-direction: column; + align-items: center; + color: #ffffff; + } + + .icon-lock { + font-size: 100rpx; + margin-bottom: 30rpx; + background: rgba(255, 255, 255, 0.1); + width: 160rpx; + height: 160rpx; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + border: 4rpx solid #00f7ff; + box-shadow: 0 0 50rpx #00f7ff; + text-shadow: 0 0 20rpx #00f7ff; + } + + .title { + font-size: 48rpx; + font-weight: 700; + letter-spacing: 4rpx; + margin-bottom: 20rpx; + text-shadow: 0 0 15rpx #00f7ff; + background: linear-gradient(135deg, #ffffff, #aaddff); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } + + .message { + font-size: 32rpx; + color: #ffaa00; + margin-bottom: 16rpx; + font-weight: 600; + text-shadow: 0 0 10rpx #ffaa00; + } + + .description { + font-size: 28rpx; + color: #a0b0d0; + margin-bottom: 50rpx; + text-align: center; + } + + .btn-register { + position: relative; + padding: 24rpx 80rpx; + background: linear-gradient(145deg, #2a3050, #181e38); + border-radius: 60rpx; + overflow: hidden; + border: 2rpx solid #00f7ff; + box-shadow: 0 10rpx 30rpx rgba(0, 247, 255, 0.4); + transition: transform 0.2s; + } + + .btn-register:active { + transform: scale(0.96); + } + + .btn-text { + font-size: 32rpx; + color: #fff; + font-weight: 700; + letter-spacing: 4rpx; + position: relative; + z-index: 2; + text-shadow: 0 0 10rpx #00f7ff; + } + + .btn-shine { + position: absolute; + top: -50%; + left: -50%; + width: 200%; + height: 200%; + background: linear-gradient( + to right, + rgba(255, 255, 255, 0) 0%, + rgba(255, 255, 255, 0.2) 50%, + rgba(255, 255, 255, 0) 100% + ); + transform: rotate(30deg); + animation: btn-shimmer 2.8s infinite linear; + z-index: 1; + } + + @keyframes btn-shimmer { + 0% { transform: translateX(-100%) rotate(30deg); } + 100% { transform: translateX(100%) rotate(30deg); } + } + + /* ====== 原有样式（保持不变，仅略作调整以兼容提示页）====== */ + .leixing-quyu { + padding: 30rpx 0 20rpx; + background: linear-gradient(135deg, #ffffff 0%, #f8fafc 100%); + border-bottom: 1rpx solid #eaeaea; + position: relative; + z-index: 10; + flex-shrink: 0; + } + + .leixing-scroll { + width: 100%; + white-space: nowrap; + height: 180rpx; + } + + .leixing-container { + display: inline-flex; + padding: 0 30rpx; + } + + .leixing-item { + display: inline-flex; + flex-direction: column; + align-items: center; + width: 160rpx; + margin-right: 24rpx; + position: relative; + transition: all 0.4s cubic-bezier(0.175, 0.885, 0.32, 1.275); + } + + .leixing-active { + transform: translateY(-6rpx); + } + + .guangyun-effect { + position: absolute; + top: -12rpx; + left: -12rpx; + right: -12rpx; + bottom: -12rpx; + background: radial-gradient(circle at center, rgba(82, 196, 26, 0.15) 0%, transparent 70%); + border-radius: 40rpx; + z-index: 0; + animation: guangyun-pulse 2s infinite ease-in-out; + } + + @keyframes guangyun-pulse { + 0%, 100% { opacity: 0.6; transform: scale(1); } + 50% { opacity: 0.9; transform: scale(1.05); } + } + + .leixing-tupian { + width: 120rpx; + height: 120rpx; + border-radius: 28rpx; + z-index: 1; + box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.08); + transition: all 0.3s ease; + } + + .leixing-active .leixing-tupian { + box-shadow: 0 16rpx 40rpx rgba(82, 196, 26, 0.3); + border: 4rpx solid #52c41a; + } + + .leixing-jieshao { + margin-top: 16rpx; + font-size: 24rpx; + color: #666; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + text-align: center; + z-index: 1; + } + + .leixing-active .leixing-jieshao { + color: #52c41a; + font-weight: 600; + } + + .fenge-xian { + height: 16rpx; + background: linear-gradient(to bottom, #f0f2f5, #f8f9fa); + flex-shrink: 0; + } + + .dingdan-container { + flex: 1; + overflow: hidden; + } + + .dingdan-scroll-view { + height: 100%; + -webkit-overflow-scrolling: touch; + } + + .refresher-container { + height: 100rpx; + display: flex; + align-items: center; + justify-content: center; + } + + .refreshing-text, + .pull-down-text { + font-size: 26rpx; + color: #999; + } + + .empty-tip { + padding: 120rpx 0; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + } + + .tip-icon { + width: 160rpx; + height: 160rpx; + opacity: 0.4; + margin-bottom: 30rpx; + } + + .tip-text { + font-size: 28rpx; + color: #aaa; + } + + .dingdan-card { + margin: 20rpx 24rpx; + border-radius: 20rpx; + padding: 28rpx; + position: relative; + overflow: hidden; + box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.06); + transition: all 0.2s ease; + border: 1rpx solid rgba(0, 0, 0, 0.08); + } + + .dingdan-card:active { + transform: scale(0.995); + } + + .pingtai-card { + background: linear-gradient(145deg, #f8fff8 0%, #f0f9f0 100%); + } + + .shangjia-card { + background: linear-gradient(145deg, #f9f0ff 0%, #f3e8ff 100%); + } + + .card-top { + display: flex; + align-items: center; + margin-bottom: 20rpx; + padding-bottom: 16rpx; + border-bottom: 1rpx dashed #e0e0e0; + } + + .creat-time { + font-size: 26rpx; + color: #555; + font-weight: 500; + } + + .top-line { + flex: 1; + height: 1rpx; + background: linear-gradient(to right, transparent, #ddd, transparent); + margin: 0 20rpx; + } + + .pingtai-tag { + font-size: 24rpx; + color: #666; + padding: 6rpx 16rpx; + background: rgba(0, 0, 0, 0.04); + border-radius: 20rpx; + } + + .zhiding-row { + display: flex; + align-items: center; + margin-bottom: 20rpx; + padding: 10rpx 16rpx; + background: rgba(255, 77, 79, 0.08); + border-radius: 12rpx; + border-left: 4rpx solid #ff4d4f; + gap: 10rpx; + } + + .zhiding-icon { + font-size: 26rpx; + margin-right: 4rpx; + } + + .zhiding-avatar { + width: 48rpx; + height: 48rpx; + border-radius: 50%; + border: 2rpx solid #ff4d4f; + object-fit: cover; + } + + .zhiding-nicheng { + font-size: 24rpx; + color: #ff4d4f; + font-weight: 500; + max-width: 120rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .zhiding-uid { + font-size: 24rpx; + color: #ff4d4f; + font-weight: 400; + flex: 1; + text-align: right; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .card-content { + display: flex; + margin-bottom: 20rpx; + } + + .neirong-tupian { + width: 140rpx; + height: 140rpx; + border-radius: 50%; + margin-right: 24rpx; + flex-shrink: 0; + box-shadow: 0 6rpx 20rpx rgba(0, 0, 0, 0.08); + object-fit: cover; + } + + .jieshao-box { + flex: 1; + display: flex; + flex-direction: column; + justify-content: center; + min-height: 140rpx; + padding: 16rpx 0; + } + + .jieshao-label { + font-size: 26rpx; + color: #333; + font-weight: 600; + margin-bottom: 8rpx; + } + + .jieshao-text { + font-size: 26rpx; + color: #666; + line-height: 1.4; + } + + .jieshao-ellipsis .jieshao-text { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; + overflow: hidden; + text-overflow: ellipsis; + } + + .shangjia-info { + display: flex; + align-items: center; + margin-bottom: 20rpx; + } + + .shangjia-touxiang { + width: 90rpx; + height: 90rpx; + border-radius: 50%; + margin-right: 20rpx; + border: 2rpx solid rgba(114, 46, 209, 0.15); + box-shadow: 0 6rpx 18rpx rgba(114, 46, 209, 0.12); + object-fit: cover; + } + + .shangjia-nicheng { + font-size: 28rpx; + color: #333; + font-weight: 600; + } + + .shangjia-jieshao, + .shangjia-beizhu { + margin-bottom: 16rpx; + padding: 14rpx 18rpx; + background: rgba(255, 255, 255, 0.6); + border-radius: 12rpx; + } + + .shangjia-jieshao .jieshao-label, + .shangjia-beizhu .beizhu-label { + display: block; + margin-bottom: 6rpx; + font-size: 24rpx; + } + + .shangjia-jieshao .jieshao-text, + .shangjia-beizhu .beizhu-text { + font-size: 24rpx; + color: #555; + line-height: 1.4; + } + + .shangjia-jieshao.jieshao-ellipsis .jieshao-text { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + text-overflow: ellipsis; + } + + .shangjia-beizhu.beizhu-ellipsis .beizhu-text { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + text-overflow: ellipsis; + } + + .beizhu-box { + margin-bottom: 20rpx; + padding: 14rpx 18rpx; + background: rgba(255, 255, 255, 0.6); + border-radius: 12rpx; + } + + .beizhu-label { + font-size: 24rpx; + color: #333; + font-weight: 600; + margin-bottom: 6rpx; + display: block; + } + + .beizhu-text { + font-size: 24rpx; + color: #666; + line-height: 1.4; + } + + .beizhu-ellipsis .beizhu-text { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + text-overflow: ellipsis; + } + + .view-more { + display: block; + font-size: 22rpx; + color: #1890ff; + margin-top: 6rpx; + text-align: right; + } + + .card-bottom { + display: flex; + align-items: center; + justify-content: space-between; + padding-top: 20rpx; + border-top: 1rpx solid rgba(0, 0, 0, 0.06); + } + + .fenyong-box { + display: flex; + align-items: baseline; + } + + .fenyong-icon { + font-size: 30rpx; + margin-right: 10rpx; + } + + .fenyong-text { + font-size: 24rpx; + color: #999; + margin-right: 6rpx; + } + + .fenyong-price { + font-size: 40rpx; + color: #ff4d4f; + font-weight: 700; + margin-right: 4rpx; + } + + .fenyong-unit { + font-size: 24rpx; + color: #999; + } + + .qiangdan-btn { + position: relative; + padding: 18rpx 40rpx; + border-radius: 50rpx; + overflow: hidden; + box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.12); + } + + .pingtai-btn { + background: linear-gradient(135deg, #52c41a 0%, #73d13d 100%); + } + + .shangjia-btn { + background: linear-gradient(135deg, #722ed1 0%, #9254de 100%); + } + + .btn-text { + font-size: 28rpx; + color: white; + font-weight: 600; + letter-spacing: 1rpx; + position: relative; + z-index: 2; + } + + .btn-shine { + position: absolute; + top: -50%; + left: -50%; + width: 200%; + height: 200%; + background: linear-gradient( + to right, + rgba(255, 255, 255, 0) 0%, + rgba(255, 255, 255, 0.3) 50%, + rgba(255, 255, 255, 0) 100% + ); + transform: rotate(30deg); + animation: btn-shimmer 3s infinite linear; + z-index: 1; + } + + @keyframes btn-shimmer { + 0% { transform: translateX(-100%) rotate(30deg); } + 100% { transform: translateX(100%) rotate(30deg); } + } + + .qiangdan-btn:active { + transform: scale(0.96); + } + + .loading-more, + .no-more { + padding: 30rpx 0; + text-align: center; + } + + .loading-text { + font-size: 26rpx; + color: #999; + } + + .no-more-text { + font-size: 26rpx; + color: #ccc; + } + + .loading-mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(255, 255, 255, 0.9); + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + z-index: 9999; + } + + .loading-spinner { + width: 70rpx; + height: 70rpx; + border: 6rpx solid #f0f0f0; + border-top: 6rpx solid #52c41a; + border-radius: 50%; + animation: spin 1s linear infinite; + margin-bottom: 24rpx; + } + + @keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } + } + + .loading-mask-text { + font-size: 28rpx; + color: #666; + } \ No newline at end of file diff --git a/pages/jiedanchi2/jiedanchi2.js b/pages/jiedanchi2/jiedanchi2.js new file mode 100644 index 0000000..0e33db9 --- /dev/null +++ b/pages/jiedanchi2/jiedanchi2.js @@ -0,0 +1,66 @@ +// pages/jiedanchi2/jiedanchi2.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/jiedanchi2/jiedanchi2.json b/pages/jiedanchi2/jiedanchi2.json new file mode 100644 index 0000000..3928faa --- /dev/null +++ b/pages/jiedanchi2/jiedanchi2.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/jiedanchi2/jiedanchi2.wxml b/pages/jiedanchi2/jiedanchi2.wxml new file mode 100644 index 0000000..fdd9cd8 --- /dev/null +++ b/pages/jiedanchi2/jiedanchi2.wxml @@ -0,0 +1,2 @@ + +pages/jiedanchi2/jiedanchi2.wxml \ No newline at end of file diff --git a/pages/jiedanchi2/jiedanchi2.wxss b/pages/jiedanchi2/jiedanchi2.wxss new file mode 100644 index 0000000..fae36a0 --- /dev/null +++ b/pages/jiedanchi2/jiedanchi2.wxss @@ -0,0 +1 @@ +/* pages/jiedanchi2/jiedanchi2.wxss */ \ No newline at end of file diff --git a/pages/jinpaids/jinpaids.js b/pages/jinpaids/jinpaids.js new file mode 100644 index 0000000..aef8cef --- /dev/null +++ b/pages/jinpaids/jinpaids.js @@ -0,0 +1,346 @@ +// pages/jinpaids/jinpaids.js +import request from '../../utils/request.js' +import popupService from '../../services/popupService.js' + +const app = getApp() + +Page({ + data: { + // OSS地址 + ossImageUrl: '', + + // 图标路径 + icons: { + jinpai: '', + refresh: '', + copy: '', + qiangdan: '', + chongzhi: '', + dingdan: '', + chufa: '', + paihang: '', + xiugai: '', + tixian: '', + rightArrow: '' + }, + + // 用户基本信息 + uid: '', + touxiang: '', + avatarUrl: '', + dashouNicheng: '', + + // 打手核心数据 + chenghao: '', + yongjin: '0.00', + zonge: '0.00', + yajin: '0.00', + jinfen: '0', + chengjiaoliang: '0', + zaixianZhuangtai: 0, + dashouzhuangtai: '', + clumber: [], + + // 金牌专属数据 + jiedanZongliang: '0', + jinriJiedan: '0.00', + zuijinTixian: '0.00', + + // 页面状态 + isLoading: false, + lastRefreshTime: 0, + canRefresh: true, + + // 计算数据 + chengjiaoRate: '0%', + chengjiaoAngle: 0, + tixianProgress: 0, + + // 邀请人缓存（管事） + inviterCache: null, + chenghaoList: [] // 新增 + }, + + onLoad() { + const ossUrl = app.globalData.ossImageUrl || '' + const iconBase = 'beijing/tubiao/' + + this.setData({ + ossImageUrl: ossUrl, + 'icons.jinpai': ossUrl + iconBase + 'jinpai.png', + 'icons.refresh': ossUrl + iconBase + 'shuaxin.png', + 'icons.copy': ossUrl + iconBase + 'fuzhi.png', + 'icons.qiangdan': ossUrl + iconBase + 'qiangdan.png', + 'icons.chongzhi': ossUrl + iconBase + 'chongzhi.png', + 'icons.dingdan': ossUrl + iconBase + 'dingdan.png', + 'icons.chufa': ossUrl + iconBase + 'chufa.png', + 'icons.paihang': ossUrl + iconBase + 'paihang.png', + 'icons.xiugai': ossUrl + iconBase + 'xiugai.png', + 'icons.tixian': ossUrl + iconBase + 'tixian.png', + 'icons.rightArrow': ossUrl + iconBase + 'jiantou.png', + 'icons.guize': ossUrl + iconBase + 'guize.png', + 'icons.kaohe': ossUrl + iconBase + 'kaohe.png', + }) + + this.loadUserInfo() + this.getJinpaiInfo() + + if (!app.globalData.hasShownPopupOnColdStart) { + app.globalData.hasShownPopupOnColdStart = true; + setTimeout(() => { + popupService.checkAndShow(this, 'jinpaids'); + }, 300); + } + }, + + onHide() { + const popupComp = this.selectComponent('#popupNotice'); + if (popupComp && popupComp.cleanup) { + popupComp.cleanup(); + } + }, + + onShow() { + this.registerNotificationComponent() + this.refreshJinpaiInfo() + this.fetchChenghaoList() // 新增 + const inviterCache = wx.getStorageSync('inviterCache') || null + this.setData({ inviterCache }) + }, + + registerNotificationComponent() { + const notificationComp = this.selectComponent('#global-notification') + if (notificationComp && notificationComp.showNotification) { + app.globalData.globalNotification = { + show: (data) => notificationComp.showNotification(data), + hide: () => notificationComp.hideNotification() + } + } + }, + + loadUserInfo() { + const uid = wx.getStorageSync('uid') || '' + const touxiang = wx.getStorageSync('touxiang') || '' + const ossUrl = app.globalData.ossImageUrl || '' + const defaultAvatar = ossUrl + (app.globalData.morentouxiang || 'avatar/default.jpg') + + let avatarUrl = defaultAvatar + if (touxiang) { + avatarUrl = ossUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang) + } + + const dashouNicheng = app.globalData.dashouNicheng || wx.getStorageSync('nicheng') || '金牌选手' + + this.setData({ uid, touxiang, avatarUrl, dashouNicheng }) + }, + + async getJinpaiInfo() { + this.setData({ isLoading: true }) + + try { + const res = await request({ + url: '/yonghu/dashouxinxi', + method: 'POST' + }) + + if (res && res.data.code === 200) { + const data = res.data.data + + const updateData = { + dashouNicheng: data.dashounicheng || '', + zhanghaoStatus: data.zhanghaostatus || '', + yongjin: data.yongjin || '0.00', + zonge: data.zonge || '0.00', + yajin: data.yajin || '0.00', + chenghao: data.chenghao || '', + jinfen: data.jifen || '0', + chengjiaoliang: data.chengjiaoliang || '0', + zaixianZhuangtai: data.zaixianzhuangtai || 0, + dashouzhuangtai: data.dashouzhuangtai || '', + clumber: data.clumber || [], + jiedanZongliang: data.jiedanZongliang || '0', + jinriJiedan: data.jinriJiedan || '0.00', + zuijinTixian: data.zuijinTixian || '0.00', + } + + const jiedanTotal = parseFloat(updateData.jiedanZongliang) || 0 + const chengjiaoTotal = parseFloat(updateData.chengjiaoliang) || 0 + const rateNumber = jiedanTotal > 0 ? (chengjiaoTotal / jiedanTotal) * 100 : 0 + const chengjiaoRate = rateNumber.toFixed(1) + '%' + const chengjiaoAngle = rateNumber * 3.6 + + const zuijin = parseFloat(updateData.zuijinTixian) || 0 + const zong = parseFloat(updateData.jinriJiedan) || 0 + const tixianProgress = zong > 0 ? Math.min((zuijin / zong) * 100, 100) : 0 + + const globalUpdate = { + dashouNicheng: updateData.dashouNicheng, + zhanghaoStatus: updateData.zhanghaoStatus, + yongjin: updateData.yongjin, + zonge: updateData.zonge, + yajin: updateData.yajin, + chenghao: updateData.chenghao, + jinfen: updateData.jinfen, + chengjiaoliang: updateData.chengjiaoliang, + zaixianZhuangtai: updateData.zaixianZhuangtai, + dashouzhuangtai: updateData.dashouzhuangtai, + clumber: updateData.clumber, + } + Object.assign(app.globalData, globalUpdate) + + wx.setStorageSync('nicheng', updateData.dashouNicheng) + if (data.touxiang) { + wx.setStorageSync('touxiang', data.touxiang) + } + + this.setData({ + ...updateData, + chengjiaoRate, + chengjiaoAngle, + tixianProgress: Math.round(tixianProgress), + isLoading: false + }) + + this.checkJinpaiAndRedirect(updateData.chenghao) + + } else { + wx.showToast({ title: res?.data?.msg || '获取信息失败', icon: 'none' }) + this.setData({ isLoading: false }) + } + } catch (error) { + console.error('获取金牌信息失败:', error) + wx.showToast({ title: '网络错误', icon: 'none' }) + this.setData({ isLoading: false }) + } + }, + + refreshJinpaiInfo() { + const now = Date.now() + const lastTime = this.data.lastRefreshTime + const canRefresh = this.data.canRefresh + if (!canRefresh || (now - lastTime < 3000)) return + + + this.setData({ lastRefreshTime: now, canRefresh: false }) + this.getJinpaiInfo() + this.fetchChenghaoList() // 新增 + setTimeout(() => this.setData({ canRefresh: true }), 3000) + }, + + checkJinpaiAndRedirect(chenghao) { + if (chenghao !== '金牌选手') { + wx.setStorageSync('isJinpai', 0) + wx.redirectTo({ url: '/pages/dashouduan/dashouduan' }) + } else { + wx.setStorageSync('isJinpai', 1) + } + }, + + // 联系管事（与打手端完全一致，增加容错） + async contactInviter() { + wx.showLoading({ title: '获取管事信息...', mask: true }) + try { + const res = await request({ url: '/yonghu/hqwdyqr', method: 'POST' }) + if (res && res.data.code === 200) { + const inviter = res.data.data + const ossImageUrl = getApp().globalData.ossImageUrl || '' + const fullAvatar = inviter.touxiang + ? (inviter.touxiang.startsWith('http') ? inviter.touxiang : ossImageUrl + inviter.touxiang) + : '' + + // 缓存邀请人信息 + const cacheData = { + uid: inviter.uid, + nicheng: inviter.nicheng || '', + avatar: fullAvatar + } + wx.setStorageSync('inviterCache', cacheData) + this.setData({ inviterCache: cacheData }) + + // 确保打手身份并连接 + const app = getApp() + const myUid = wx.getStorageSync('uid') + + // 如果当前不是打手身份，则切换并重连 + if (app.globalData.currentRole !== 'dashou') { + app.globalData.currentRole = 'dashou' + wx.setStorageSync('currentRole', 'dashou') + if (app.switchRoleAndReconnect) { + await app.switchRoleAndReconnect('dashou') + } else if (app.connectWithIdentity) { + // 降级方案：直接用打手身份连接 + await app.connectWithIdentity('dashou', 'Ds' + myUid, false) + } + } else { + // 已为打手，确保连接存活 + if (app.connectForCurrentRole) { + app.connectForCurrentRole() + } else if (app.ensureConnection) { + app.ensureConnection() + } + } + + // 构造私聊参数 + const param = { + toUserId: 'Gs' + inviter.uid, + toName: inviter.nicheng || '管事', + toAvatar: fullAvatar + } + wx.navigateTo({ + url: '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param)), + fail: (err) => { + console.error('跳转私聊失败', err) + wx.showToast({ title: '打开聊天失败', icon: 'none' }) + } + }) + } else { + wx.showToast({ title: res?.data?.msg || '获取失败', icon: 'none' }) + } + } catch (e) { + console.error('联系管事出错:', e) + wx.showToast({ title: '网络错误', icon: 'none' }) + } finally { + wx.hideLoading() + } + }, + + copyUid() { + const { uid } = this.data + if (!uid) return wx.showToast({ title: 'UID不存在', icon: 'none' }) + wx.setClipboardData({ + data: uid, + success: () => wx.showToast({ title: '已复制UID', icon: 'success' }) + }) + }, + + previewAvatar() { + if (this.data.avatarUrl) wx.previewImage({ urls: [this.data.avatarUrl] }) + }, + + goToWithdraw() { wx.navigateTo({ url: '/pages/tixian/tixian' }) }, + goToReceiveOrder() { wx.navigateTo({ url: '/pages/jiedan/jiedan' }) }, + goToRecharge() { wx.navigateTo({ url: '/pages/dashouchongzhi/dashouchongzhi' }) }, + goToMyOrders() { wx.navigateTo({ url: '/pages/dashoudingdan/dashoudingdan' }) }, + goToMyPunishment() { wx.navigateTo({ url: '/pages/cfss/cfss/cfss' }) }, + goToRanking() { wx.navigateTo({ url: '/pages/dashoupaihang/dashoupaihang' }) }, + goToModifyInfo() { wx.navigateTo({ url: '/pages/dashouxiugai/dashouxiugai' }) }, + goToRules() { wx.navigateTo({ url: '/pages/dashouguize/dashouguize' }) }, + // 跳转到考核金牌 +goToKaohe() { + wx.navigateTo({ url: '/pages/kaohe_jinpai/kaohe_jinpai' }); + }, + + async fetchChenghaoList() { + try { + const res = await request({ + url: '/dengji/dsbqhq', + method: 'POST' + }); + if (res && res.data.code === 0 && res.data.data) { + this.setData({ chenghaoList: res.data.data.chenghao_list || [] }); + } + } catch (e) { + console.error('获取称号标签失败', e); + } +}, +}) \ No newline at end of file diff --git a/pages/jinpaids/jinpaids.json b/pages/jinpaids/jinpaids.json new file mode 100644 index 0000000..f3d656c --- /dev/null +++ b/pages/jinpaids/jinpaids.json @@ -0,0 +1,9 @@ +{ + "usingComponents": { + "global-notification": "/components/global-notification/global-notification", + "chenghao-tag": "/components/chenghao-tag/chenghao-tag" + }, + "navigationBarTitleText": "金牌用户", + "navigationBarBackgroundColor": "#0B2A4A", + "navigationBarTextStyle": "white" + } \ No newline at end of file diff --git a/pages/jinpaids/jinpaids.wxml b/pages/jinpaids/jinpaids.wxml new file mode 100644 index 0000000..5912b19 --- /dev/null +++ b/pages/jinpaids/jinpaids.wxml @@ -0,0 +1,193 @@ + + + + + + + + +

+ 金牌选手 + + +

+ 刷新 + + + + + + +

+ + + + + {{dashouNicheng}} + + {{zaixianZhuangtai == 1 ? '在线' : '离线'}} + + + + UID + {{uid}} +

+ + + 接单状态： + + {{dashouzhuangtai == '1' ? '可接单' : '暂停接单'}} + + + + + + + + + + + + + + + + + + + + + 可提现金额 + + {{yongjin}} + 元 + + + +

+ 立即提现 + + + + + + + + 总赚取 + {{zonge}}元 + + + 保证金 + {{yajin}}元 + + + 积分 + {{jinfen}} + + + 接单总量 + {{jiedanZongliang}} + + + 成交总量 + {{chengjiaoliang}} + + + 今日接单 + {{jinriJiedan}}元 + + + + + + + 成交率 + + + {{chengjiaoRate}} + + + + 最近提现占比 + + + {{tixianProgress}}% + + + 最近提现：{{zuijinTixian}}元 + 今日赚取：{{jinriJiedan}}元 + + + + + + + +

+ + {{inviterCache.nicheng || '我的管事'}} + ID: {{inviterCache.uid}} + + + 联系我的邀请人 + + + +

+ + 我的管事 + 点击联系 + + + 联系我的邀请人 + + + + + + +

+ 抢单大厅 + + +

+ 充值会员保证金 + + +

+ 我的订单 + + +

+ 我的处罚 + + +

+ 排行榜 + + +

+ 修改资料 + + +

+ 用户规则 + + +

+ 考核金牌 + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/jinpaids/jinpaids.wxss b/pages/jinpaids/jinpaids.wxss new file mode 100644 index 0000000..162eae6 --- /dev/null +++ b/pages/jinpaids/jinpaids.wxss @@ -0,0 +1,610 @@ +/* pages/jinpaids/jinpaids.wxss - 金牌打手机甲风格（CSS变量版） */ + +/* ========== 全局 ========== */ +page { + background: #0B1A2F; + min-height: 100vh; + font-family: 'Avenir', 'PingFang SC', 'Helvetica Neue', sans-serif; + color: #fff; + } + + .bg-grid { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-image: + linear-gradient(rgba(0, 160, 255, 0.1) 1px, transparent 1px), + linear-gradient(90deg, rgba(0, 160, 255, 0.1) 1px, transparent 1px); + background-size: 50rpx 50rpx; + pointer-events: none; + z-index: 0; + } + + .bg-energy { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: radial-gradient(circle at 20% 30%, rgba(0,200,255,0.1) 0%, transparent 40%), + radial-gradient(circle at 80% 70%, rgba(0,100,255,0.1) 0%, transparent 40%); + animation: energyFlow 20s linear infinite; + pointer-events: none; + z-index: 0; + } + + @keyframes energyFlow { + 0% { opacity: 0.3; } + 50% { opacity: 0.6; } + 100% { opacity: 0.3; } + } + + .page-container { + position: relative; + z-index: 2; + min-height: 100vh; + padding: 30rpx 25rpx; + box-sizing: border-box; + } + + /* ========== 顶部栏 ========== */ + .top-bar { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 30rpx; + margin-top: 20rpx; + } + .jinpai-badge { + display: flex; + align-items: center; + } + .jinpai-icon { + width: 60rpx; + height: 60rpx; + margin-right: 15rpx; + } + /* 火苗图标燃烧动画 */ + .fire-icon { + animation: fireBurn 0.8s infinite alternate ease-in-out; + filter: drop-shadow(0 0 10rpx #ffaa00); + } + @keyframes fireBurn { + 0% { transform: scale(1) rotate(-3deg); filter: drop-shadow(0 0 10rpx #ffaa00); } + 25% { transform: scale(1.1) rotate(2deg); filter: drop-shadow(0 0 20rpx #ff5500); } + 50% { transform: scale(1.05) rotate(-2deg); filter: drop-shadow(0 0 30rpx #ffaa00); } + 75% { transform: scale(1.15) rotate(3deg); filter: drop-shadow(0 0 40rpx #ffaa00); } + 100% { transform: scale(1) rotate(-3deg); filter: drop-shadow(0 0 10rpx #ffaa00); } + } + .jinpai-title { + font-size: 40rpx; + font-weight: bold; + color: #ffaa00; + text-shadow: 0 0 30rpx #ffaa00, 0 0 60rpx #ffaa00; + letter-spacing: 2rpx; + } + .refresh-btn { + display: flex; + align-items: center; + background: rgba(0,40,70,0.8); + border: 2rpx solid #00a6ff; + clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%); + padding: 8rpx 25rpx; + } + .refresh-icon { + width: 40rpx; + height: 40rpx; + margin-right: 10rpx; + } + .refresh-text { + font-size: 26rpx; + color: #00a6ff; + } + .refresh-btn:active { + opacity: 0.8; + } + + /* ========== 用户信息 ========== */ + .user-section { + display: flex; + background: rgba(0,30,50,0.5); + backdrop-filter: blur(20px); + border: 2rpx solid #00a6ff; + clip-path: polygon(0 0, 100% 0, 95% 100%, 0 100%); + padding: 30rpx; + margin-bottom: 40rpx; + } + .avatar-wrap { + position: relative; + width: 120rpx; + height: 120rpx; + margin-right: 30rpx; + } + .avatar { + width: 100%; + height: 100%; + border-radius: 50%; + border: 4rpx solid #00a6ff; + box-shadow: 0 0 50rpx #00a6ff; + object-fit: cover; + } + .avatar-ring { + position: absolute; + top: -10rpx; + left: -10rpx; + right: -10rpx; + bottom: -10rpx; + border-radius: 50%; + border: 2rpx solid #00a6ff; + border-top-color: transparent; + border-bottom-color: transparent; + animation: ringRotate 6s linear infinite; + } + @keyframes ringRotate { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } + } + .user-info { + flex: 1; + } + .name-row { + display: flex; + align-items: center; + margin-bottom: 10rpx; + } + .nickname { + font-size: 40rpx; + font-weight: bold; + color: #fff; + margin-right: 15rpx; + max-width: 250rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .status-tag { + font-size: 22rpx; + padding: 4rpx 16rpx; + border-radius: 30rpx; + background: rgba(255,255,255,0.1); + border: 1rpx solid currentColor; + } + .status-tag.online { color: #00ff80; border-color: #00ff80; } + .status-tag.offline { color: #aaa; border-color: #aaa; } + .uid-row { + display: flex; + align-items: center; + background: rgba(0,50,80,0.6); + border-left: 4rpx solid #00a6ff; + padding: 8rpx 20rpx; + margin-bottom: 10rpx; + width: fit-content; + } + .uid-label { + font-size: 24rpx; + color: #9cf; + margin-right: 10rpx; + } + .uid-value { + font-size: 24rpx; + color: #fff; + font-family: monospace; + margin-right: 15rpx; + } + .copy-icon { + width: 30rpx; + height: 30rpx; + } + .order-status { + display: flex; + align-items: center; + } + .status-label { + font-size: 24rpx; + color: #9cf; + margin-right: 8rpx; + } + .status-value { + font-size: 24rpx; + color: #aaa; + } + .status-value.active { + color: #00ff80; + text-shadow: 0 0 10rpx #00ff80; + } + + /* ========== 核心资产卡 ========== */ + .asset-card { + display: flex; + justify-content: space-between; + align-items: center; + background: linear-gradient(135deg, #0A1F3A, #0B2A4A); + border: 2rpx solid #00a6ff; + clip-path: polygon(0 0, 100% 0, 95% 100%, 0 100%); + padding: 30rpx 30rpx; + margin-bottom: 30rpx; + box-shadow: 0 0 40rpx #00a6ff; + } + .asset-left { + flex: 1; + } + .asset-label { + font-size: 28rpx; + color: #9cf; + display: block; + margin-bottom: 10rpx; + } + .asset-value-group { + display: flex; + align-items: baseline; + } + .asset-number { + font-size: 68rpx; + font-weight: bold; + color: #fff; + text-shadow: 0 0 30rpx #00a6ff, 0 0 60rpx #00a6ff; + } + .asset-unit { + font-size: 32rpx; + color: #00a6ff; + margin-left: 10rpx; + } + .asset-right { + display: flex; + align-items: center; + background: rgba(255,255,255,0.1); + border: 2rpx solid #ffaa00; + clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%); + padding: 15rpx 30rpx; + position: relative; + overflow: hidden; + } + .withdraw-icon { + width: 50rpx; + height: 50rpx; + margin-right: 10rpx; + } + .withdraw-text { + font-size: 32rpx; + font-weight: bold; + color: #ffaa00; + } + .withdraw-glow { + position: absolute; + top: 0; + left: -100%; + width: 100%; + height: 100%; + background: linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent); + animation: scan 2s infinite; + } + @keyframes scan { + 0% { left: -100%; } + 100% { left: 100%; } + } + .asset-right:active { + transform: scale(0.96); + } + + /* ========== 统计网格 ========== */ + .stats-grid { + display: grid; + grid-template-columns: repeat(3, 1fr); + gap: 20rpx; + margin-bottom: 40rpx; + } + .stat-item { + background: rgba(0,30,50,0.7); + border: 1rpx solid #00a6ff; + clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%); + padding: 20rpx 10rpx; + text-align: center; + } + .stat-label { + font-size: 24rpx; + color: #9cf; + display: block; + margin-bottom: 10rpx; + } + .stat-value { + font-size: 32rpx; + font-weight: bold; + color: #fff; + } + + /* ========== 图形化数据（使用CSS变量） ========== */ + .graphic-panel { + background: rgba(0,30,50,0.6); + backdrop-filter: blur(15px); + border: 2rpx solid #00a6ff; + clip-path: polygon(0 0, 100% 0, 98% 100%, 0 100%); + padding: 30rpx; + margin-bottom: 40rpx; + display: flex; + justify-content: space-around; + flex-wrap: wrap; + } + .chart-item { + width: 45%; + text-align: center; + } + .chart-title { + font-size: 28rpx; + color: #9cf; + margin-bottom: 15rpx; + text-transform: uppercase; + border-left: 4rpx solid #00a6ff; + padding-left: 15rpx; + text-align: left; + } + + /* 环形进度条（使用CSS变量 --progress-angle） */ + .ring-chart { + position: relative; + width: 200rpx; + height: 200rpx; + margin: 0 auto; + border-radius: 50%; + overflow: hidden; + box-shadow: 0 0 40rpx #00a6ff; + } + .ring-progress { + width: 100%; + height: 100%; + background: conic-gradient(#00a6ff 0deg, #00a6ff var(--progress-angle), #1a3a5a var(--progress-angle), #1a3a5a 360deg); + border-radius: 50%; + } + .ring-inner { + position: absolute; + top: 15rpx; + left: 15rpx; + right: 15rpx; + bottom: 15rpx; + background: #0a1a2a; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + font-size: 40rpx; + font-weight: bold; + color: #00a6ff; + box-shadow: inset 0 0 20rpx rgba(0,0,0,0.5); + } + + /* 提现进度条（使用CSS变量 --progress-width） */ + .progress-container { + height: 30rpx; + background: #1a3a5a; + border-radius: 15rpx; + position: relative; + overflow: hidden; + width: 100%; + margin-top: 20rpx; + } + .progress-bar { + height: 100%; + background: linear-gradient(90deg, #00a6ff, #80d4ff); + border-radius: 15rpx; + width: var(--progress-width); + position: relative; + } + .flow-bar::after { + content: ''; + position: absolute; + top: 0; + left: -100%; + width: 100%; + height: 100%; + background: linear-gradient(90deg, transparent, rgba(255,255,255,0.6), transparent); + animation: flow 1.5s infinite; + } + @keyframes flow { + 0% { left: -100%; } + 100% { left: 100%; } + } + .progress-label { + position: absolute; + right: 20rpx; + top: -30rpx; + font-size: 24rpx; + color: #00a6ff; + } + .progress-stats { + display: flex; + justify-content: space-between; + font-size: 24rpx; + color: #9cf; + margin-top: 15rpx; + } + + /* ========== 功能按钮（图标强光效果） ========== */ + .function-panel { + margin-bottom: 40rpx; + } + .function-grid { + display: grid; + grid-template-columns: repeat(3, 1fr); + gap: 20rpx; + } + .func-item { + background: rgba(0,20,40,0.8); + border: 1rpx solid #00a6ff; + clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%); + padding: 25rpx 0; + display: flex; + flex-direction: column; + align-items: center; + transition: 0.2s; + position: relative; + overflow: hidden; + } + .func-item:active { + transform: scale(0.96); + box-shadow: 0 0 40rpx #00a6ff; + } + /* 图标超强发光 */ + .super-glow { + width: 60rpx; + height: 60rpx; + margin-bottom: 15rpx; + filter: drop-shadow(0 0 25rpx #00a6ff) drop-shadow(0 0 50rpx #00a6ff) drop-shadow(0 0 80rpx #00a6ff); + animation: superGlow 1s infinite alternate; + } + @keyframes superGlow { + 0% { filter: drop-shadow(0 0 20rpx #00a6ff) drop-shadow(0 0 40rpx #00a6ff) drop-shadow(0 0 60rpx #00a6ff); } + 100% { filter: drop-shadow(0 0 30rpx #00a6ff) drop-shadow(0 0 60rpx #00a6ff) drop-shadow(0 0 100rpx #00a6ff); } + } + .func-label { + font-size: 26rpx; + color: #fff; + z-index: 1; + } + + /* ========== 加载遮罩 ========== */ + .loading-mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(2,6,12,0.9); + backdrop-filter: blur(20px); + display: flex; + align-items: center; + justify-content: center; + z-index: 9999; + } + .loading-core { + width: 200rpx; + height: 200rpx; + border: 4rpx solid #00a6ff; + border-radius: 50%; + border-top-color: transparent; + animation: spin 1s linear infinite; + display: flex; + align-items: center; + justify-content: center; + } + .loading-core::after { + content: ''; + width: 100rpx; + height: 100rpx; + border: 4rpx solid #ffaa00; + border-radius: 50%; + border-bottom-color: transparent; + animation: spin 1.5s reverse infinite; + } + @keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } + } + + + + + + /* ========== 原有样式（完全不变） ========== */ +/* ... 此处省略，切勿修改 ... */ + +/* ========== 联系管事胶囊（新增，适配机甲风格） ========== */ +.inviter-capsule { + margin: 30rpx 25rpx 30rpx; + background: rgba(0, 20, 40, 0.85); + backdrop-filter: blur(20px); + border: 2rpx solid #00a6ff; + clip-path: polygon(5% 0, 100% 0, 95% 100%, 0 100%); + padding: 20rpx 30rpx; + display: flex; + align-items: center; + justify-content: space-between; + box-shadow: 0 0 30rpx rgba(0, 166, 255, 0.4); + position: relative; + z-index: 1; + } + + .capsule-body { + display: flex; + align-items: center; + flex: 1; + } + + .capsule-avatar { + width: 80rpx; + height: 80rpx; + border-radius: 50%; + border: 3rpx solid #00a6ff; + box-shadow: 0 0 20rpx #00a6ff; + margin-right: 20rpx; + background: #0a1a2a; + } + + .capsule-info { + display: flex; + flex-direction: column; + } + + .capsule-name { + font-size: 30rpx; + font-weight: bold; + color: #fff; + text-shadow: 0 0 15rpx #00a6ff; + margin-bottom: 6rpx; + } + + .capsule-uid { + font-size: 24rpx; + color: #9cf; + } + + .capsule-contact { + background: linear-gradient(135deg, #00a6ff, #0080ff); + border-radius: 30rpx; + padding: 12rpx 30rpx; + font-size: 26rpx; + font-weight: bold; + color: #fff; + box-shadow: 0 0 20rpx #00a6ff; + letter-spacing: 2rpx; + transition: all 0.3s; + } + + .capsule-contact:active { + transform: scale(0.95); + box-shadow: 0 0 40rpx #00a6ff; + } + + + + + + + + /* ========== 🆕 称号标签展示区 ========== */ +.badge-area { + width: 100%; + margin: 20rpx 0 30rpx 0; + padding: 0 20rpx; + box-sizing: border-box; + } + + .badge-scroll { + width: 100%; + max-height: 140rpx; + overflow-y: auto; + background: transparent; + } + + .badge-grid { + display: flex; + flex-wrap: wrap; + gap: 8rpx; + padding: 6rpx 0; + align-items: center; + justify-content: flex-start; + } + + .badge-item { + flex-shrink: 0; + } \ No newline at end of file diff --git a/pages/jisufd/jisufd.js b/pages/jisufd/jisufd.js new file mode 100644 index 0000000..49ae9cb --- /dev/null +++ b/pages/jisufd/jisufd.js @@ -0,0 +1,618 @@ +// pages/jisufd/jisufd.js +import request from '../../utils/request.js' + +const PAGE_SIZE = 50 +const LINK_PAGE_SIZE = 5 + +Page({ + data: { + sjyue: '0.00', + shangpinList: [], // 最终展示的商品类型列表（已倒序） + selectedTypeId: null, + selectedHuiyuanId: null, + selectedYaoqiuleixing: null, + currentTypeChenghaoList: [], + + searchParams: { keyword: '', minPrice: '', labelId: '' }, + searchLabelName: '', + isSearchMode: false, + + templateList: [], + currentPage: 1, + hasMoreData: true, + isLoadingMore: false, + + linkMap: {}, + + showDetailModal: false, + showAddModal: false, + showDeleteConfirm: false, + showNewLinkConfirm: false, + + currentTemplate: null, + currentTemplateIndex: -1, + + isEditing: false, + editJieshao: '', + editJiage: '', + editLabelId: '', + editLabelName: '', + editCommissionEnabled: false, + editCommissionValue: '', + + addJieshao: '', + addJiage: '', + addLabelId: '', + addLabelName: '', + addCommissionEnabled: false, + addCommissionValue: '', + + detailLinkFilter: 0, + detailLinkList: [], + detailLinkPage: 1, + detailLinkHasMore: true, + isLoadingLinks: false, + + isLoading: false + }, + + onLoad() { + this.loadShangjiaYue() + this.loadShangpinTypes() + }, + + onShow() { + this.registerNotificationComponent() + this.loadShangjiaYue() + }, + + registerNotificationComponent() { + const app = getApp() + const comp = this.selectComponent('#global-notification') + if (comp && comp.showNotification) { + app.globalData.globalNotification = { + show: data => comp.showNotification(data), + hide: () => comp.hideNotification() + } + } + }, + + loadShangjiaYue() { + const app = getApp() + const data = app.globalData.shangjia || {} + this.setData({ sjyue: data.sjyue || '0.00' }) + }, + + async loadShangpinTypes() { + this.setData({ isLoading: true }) + try { + const res = await request({ url: '/dingdan/sjspleixing', method: 'POST' }) + if (res && res.data.code === 200) { + let list = res.data.data || [] + // 强制倒序排列 + list.reverse() + this.setData({ shangpinList: list, isLoading: false }) + if (list.length > 0) { + this.setSelectedType(list[0]) + } + } + } catch (e) { + console.error(e) + this.setData({ isLoading: false }) + wx.showToast({ title: '加载类型失败', icon: 'error' }) + } + }, + + setSelectedType(item) { + this.setData({ + selectedTypeId: item.id, + selectedHuiyuanId: item.huiyuan_id, + selectedYaoqiuleixing: item.yaoqiuleixing, + currentTypeChenghaoList: item.chenghaoList || [] + }, () => { + this.resetAndLoadTemplates() + }) + }, + + resetAndLoadTemplates() { + this.setData({ + templateList: [], + currentPage: 1, + hasMoreData: true, + isSearchMode: false, + searchParams: { keyword: '', minPrice: '', labelId: '' }, + searchLabelName: '' + }) + this.loadTemplates() + }, + + async loadTemplates() { + const { selectedTypeId, currentPage, isSearchMode, searchParams, linkMap } = this.data + if (!selectedTypeId) { + wx.showToast({ title: '请先选择订单类型', icon: 'none' }) + return + } + if (currentPage === 1) this.setData({ isLoading: true }) + else this.setData({ isLoadingMore: true }) + + try { + const postData = { + shangpinTypeId: selectedTypeId, + page: currentPage, + pageSize: PAGE_SIZE, + getType: isSearchMode ? 1 : 2 + } + if (isSearchMode) { + if (searchParams.keyword) postData.keyword = searchParams.keyword.trim() + if (searchParams.minPrice) postData.minPrice = searchParams.minPrice + if (searchParams.labelId) postData.labelId = searchParams.labelId + } + + const res = await request({ url: '/peizhi/sjddmblb', method: 'POST', data: postData }) + if (res && res.data.code === 200) { + const data = res.data.data || {} + const newTemplates = data.list || [] + const existingIds = new Set(this.data.templateList.map(item => item.mobanId)) + const uniqueNew = newTemplates.filter(item => !existingIds.has(item.mobanId)) + + const processed = uniqueNew.map(item => { + const mobanId = item.mobanId || item.id + const cached = linkMap[mobanId] || {} + return { + ...item, + hasGenerated: cached.hasGenerated || !!item.linkUrl, + isCopied: cached.isCopied || false, + linkUrl: cached.linkUrl || item.linkUrl || '', + mobanId: mobanId, + jieshao: item.jieshao || item.moban_jieshao, + jiage: item.jiage || item.price, + fabushuliang: item.fabushuliang || item.fabu_shuliang || 0, + labelId: item.labelId, + labelName: item.labelName || '', + commissionEnabled: item.commissionEnabled, + commissionValue: item.commissionValue + } + }) + + this.setData({ + templateList: currentPage === 1 ? processed : [...this.data.templateList, ...processed], + hasMoreData: data.hasMore !== false && processed.length === PAGE_SIZE, + isLoading: false, + isLoadingMore: false + }) + } else { + this.setData({ isLoading: false, isLoadingMore: false, hasMoreData: false }) + } + } catch (e) { + console.error(e) + this.setData({ isLoading: false, isLoadingMore: false }) + wx.showToast({ title: '加载模板失败', icon: 'error' }) + } + }, + + // ---------- 搜索相关 ---------- + onSearchKeywordInput(e) { this.setData({ 'searchParams.keyword': e.detail.value }) }, + onSearchMinPriceInput(e) { this.setData({ 'searchParams.minPrice': e.detail.value }) }, + onSearchLabelChange(e) { + const idx = e.detail.value + const label = this.data.currentTypeChenghaoList[idx] + this.setData({ + 'searchParams.labelId': label ? label.id : '', + searchLabelName: label ? label.mingcheng : '' + }) + }, + onSearchConfirm() { + const { searchParams } = this.data + if (!searchParams.keyword && !searchParams.minPrice && !searchParams.labelId) { + this.resetAndLoadTemplates() + return + } + this.setData({ + isSearchMode: true, + currentPage: 1, + templateList: [], + hasMoreData: true + }, () => this.loadTemplates()) + }, + onClearSearch() { this.resetAndLoadTemplates() }, + + // ---------- 卡片生成链接 ---------- + async onGenerateLink(e) { + const { id } = e.currentTarget.dataset + const idx = this.data.templateList.findIndex(item => item.mobanId === id) + if (idx === -1) return + await this.generateLinkForTemplate(this.data.templateList[idx], idx) + }, + + onCopyLink(e) { + const { id } = e.currentTarget.dataset + const idx = this.data.templateList.findIndex(item => item.mobanId === id) + if (idx === -1) return + const template = this.data.templateList[idx] + if (!template.linkUrl) { + wx.showToast({ title: '请先生成链接', icon: 'none' }) + return + } + wx.setClipboardData({ + data: template.linkUrl, + success: () => { + const { linkMap } = this.data + const mobanId = template.mobanId + const updatedLinkMap = { ...linkMap } + if (updatedLinkMap[mobanId]) updatedLinkMap[mobanId].isCopied = true + const updatedList = [...this.data.templateList] + updatedList[idx].isCopied = true + this.setData({ linkMap: updatedLinkMap, templateList: updatedList }) + wx.showToast({ title: '链接已复制', icon: 'success' }) + } + }) + }, + + async generateLinkForTemplate(template, templateIndex) { + const { selectedTypeId, linkMap } = this.data + if (!selectedTypeId) { + wx.showToast({ title: '请选择订单类型', icon: 'none' }) + return + } + wx.showLoading({ title: '生成中...', mask: true }) + try { + const res = await request({ + url: '/peizhi/sjljhq', + method: 'POST', + data: { mobanId: template.mobanId, shangpinTypeId: selectedTypeId } + }) + if (res && res.data.code === 200) { + const data = res.data.data || {} + const mobanId = template.mobanId + const updatedLinkMap = { ...linkMap } + updatedLinkMap[mobanId] = { + hasGenerated: true, + linkUrl: data.linkUrl || '', + isCopied: false, + newBalance: data.newBalance + } + const updatedList = [...this.data.templateList] + updatedList[templateIndex] = { + ...updatedList[templateIndex], + hasGenerated: true, + linkUrl: data.linkUrl || '', + isCopied: false, + newBalance: data.newBalance + } + if (data.newBalance) { + const app = getApp() + if (app.globalData.shangjia) app.globalData.shangjia.sjyue = data.newBalance + this.setData({ sjyue: data.newBalance }) + } + this.setData({ linkMap: updatedLinkMap, templateList: updatedList }) + wx.showToast({ title: '链接生成成功', icon: 'success' }) + } else { + wx.showToast({ title: res.data.msg || '生成失败', icon: 'error' }) + } + } catch (e) { + wx.showToast({ title: '生成失败', icon: 'error' }) + } finally { + wx.hideLoading() + } + }, + + onCardTap(e) { + const { target } = e + if (target.className && (target.className.includes('btn') || target.className.includes('action'))) return + const { item } = e.currentTarget.dataset + if (!item) return + const idx = this.data.templateList.findIndex(t => t.mobanId === item.mobanId) + this.setData({ + currentTemplate: item, + currentTemplateIndex: idx, + showDetailModal: true, + isEditing: false, + editJieshao: item.jieshao || '', + editJiage: item.jiage || '', + editLabelId: item.labelId || '', + editLabelName: item.labelName || '', + editCommissionEnabled: item.commissionEnabled || false, + editCommissionValue: item.commissionValue || '', + detailLinkFilter: 0, + detailLinkList: [], + detailLinkPage: 1, + detailLinkHasMore: true + }) + this.loadDetailLinks() + }, + + hideDetailModal() { this.setData({ showDetailModal: false, isEditing: false }) }, + showAddModal() { + this.setData({ + showAddModal: true, + addJieshao: '', addJiage: '', addLabelId: '', addLabelName: '', + addCommissionEnabled: false, addCommissionValue: '' + }) + }, + hideAddModal() { this.setData({ showAddModal: false }) }, + hideDeleteConfirm() { this.setData({ showDeleteConfirm: false }) }, + hideNewLinkConfirm() { this.setData({ showNewLinkConfirm: false }) }, + + // ---------- 链接筛选与加载 ---------- + onToggleLinkFilter() { + const newFilter = this.data.detailLinkFilter === 0 ? 1 : 0 + this.setData({ + detailLinkFilter: newFilter, + detailLinkList: [], + detailLinkPage: 1, + detailLinkHasMore: true + }, () => this.loadDetailLinks()) + }, + + async loadDetailLinks() { + const { currentTemplate, detailLinkFilter, detailLinkPage, isLoadingLinks } = this.data + if (!currentTemplate || isLoadingLinks) return + this.setData({ isLoadingLinks: true }) + try { + const res = await request({ + url: '/peizhi/hqsjlslj', + method: 'POST', + data: { + mobanId: currentTemplate.mobanId, + used: detailLinkFilter, + page: detailLinkPage, + pageSize: LINK_PAGE_SIZE + } + }) + if (res && res.data.code === 200) { + const data = res.data.data || {} + const newLinks = data.list || [] + const merged = detailLinkPage === 1 ? newLinks : [...this.data.detailLinkList, ...newLinks] + this.setData({ + detailLinkList: merged, + detailLinkHasMore: newLinks.length === LINK_PAGE_SIZE, + isLoadingLinks: false + }) + } else { + this.setData({ isLoadingLinks: false }) + } + } catch (e) { + this.setData({ isLoadingLinks: false }) + wx.showToast({ title: '加载链接失败', icon: 'error' }) + } + }, + + onLoadMoreLinks() { + if (!this.data.detailLinkHasMore || this.data.isLoadingLinks) return + this.setData({ detailLinkPage: this.data.detailLinkPage + 1 }, () => this.loadDetailLinks()) + }, + + onCopyLinkItem(e) { + const url = e.currentTarget.dataset.url + if (!url) return + wx.setClipboardData({ data: url, success: () => wx.showToast({ title: '已复制', icon: 'success' }) }) + }, + + // ---------- 弹窗内操作 ---------- + onGenerateLinkModal() { + const { currentTemplate, currentTemplateIndex } = this.data + if (!currentTemplate) return + if (currentTemplate.hasGenerated && !currentTemplate.isCopied) { + this.setData({ showNewLinkConfirm: true }) + return + } + this.generateLinkForTemplate(currentTemplate, currentTemplateIndex) + }, + + onCopyLinkModal() { + const { currentTemplate, linkMap } = this.data + if (!currentTemplate || !currentTemplate.linkUrl) { + wx.showToast({ title: '请先生成链接', icon: 'none' }) + return + } + wx.setClipboardData({ + data: currentTemplate.linkUrl, + success: () => { + const mobanId = currentTemplate.mobanId + const updatedLinkMap = { ...linkMap } + if (updatedLinkMap[mobanId]) updatedLinkMap[mobanId].isCopied = true + const updatedList = [...this.data.templateList] + if (this.data.currentTemplateIndex !== -1) { + updatedList[this.data.currentTemplateIndex].isCopied = true + } + const updatedCurrent = { ...currentTemplate, isCopied: true } + this.setData({ linkMap: updatedLinkMap, templateList: updatedList, currentTemplate: updatedCurrent }) + wx.showToast({ title: '链接已复制', icon: 'success' }) + } + }) + }, + + // ---------- 编辑 ---------- + onEditTemplate() { + if (!this.data.isEditing) this.setData({ isEditing: true }) + else this.saveTemplateEdit() + }, + onEditJieshaoInput(e) { this.setData({ editJieshao: e.detail.value }) }, + onEditJiageInput(e) { this.setData({ editJiage: e.detail.value }) }, + onEditLabelChange(e) { + const idx = e.detail.value + const label = this.data.currentTypeChenghaoList[idx] + this.setData({ editLabelId: label ? label.id : '', editLabelName: label ? label.mingcheng : '' }) + }, + onEditCommissionToggle() { this.setData({ editCommissionEnabled: !this.data.editCommissionEnabled }) }, + onEditCommissionValueInput(e) { this.setData({ editCommissionValue: e.detail.value }) }, + + async saveTemplateEdit() { + const { currentTemplate, selectedTypeId, editJieshao, editJiage, editLabelId, editCommissionEnabled, editCommissionValue } = this.data + if (!currentTemplate || !selectedTypeId) return + if (editCommissionEnabled && (!editCommissionValue || isNaN(parseFloat(editCommissionValue)))) { + wx.showToast({ title: '请输入有效佣金金额', icon: 'none' }) + return + } + wx.showLoading({ title: '保存中...', mask: true }) + try { + const res = await request({ + url: '/peizhi/sjddmbgx', + method: 'POST', + data: { + mobanId: currentTemplate.mobanId, + shangpinTypeId: selectedTypeId, + jieshao: editJieshao, + jiage: editJiage, + labelId: editLabelId || '', + commissionEnabled: editCommissionEnabled, + commissionValue: editCommissionValue + } + }) + if (res && res.data.code === 200) { + const updatedList = [...this.data.templateList] + const idx = this.data.currentTemplateIndex + if (idx !== -1) { + updatedList[idx] = { + ...updatedList[idx], + jieshao: editJieshao, + jiage: editJiage, + labelId: editLabelId, + labelName: this.getLabelNameById(editLabelId), + commissionEnabled: editCommissionEnabled, + commissionValue: editCommissionValue + } + this.setData({ templateList: updatedList, currentTemplate: updatedList[idx], isEditing: false }) + } + wx.showToast({ title: '修改成功', icon: 'success' }) + } else { + wx.showToast({ title: res.data.msg || '修改失败', icon: 'error' }) + } + } catch (e) { + wx.showToast({ title: '修改失败', icon: 'error' }) + } finally { wx.hideLoading() } + }, + + onDeleteTemplate() { this.setData({ showDeleteConfirm: true }) }, + + async confirmDeleteTemplate() { + const { currentTemplate, selectedTypeId, linkMap } = this.data + if (!currentTemplate || !selectedTypeId) return + wx.showLoading({ title: '删除中...', mask: true }) + try { + const res = await request({ + url: '/peizhi/sjddmbsc', + method: 'POST', + data: { mobanId: currentTemplate.mobanId, shangpinTypeId: selectedTypeId } + }) + if (res && res.data.code === 200) { + const updatedLinkMap = { ...linkMap } + delete updatedLinkMap[currentTemplate.mobanId] + const updatedList = [...this.data.templateList] + updatedList.splice(this.data.currentTemplateIndex, 1) + this.setData({ + linkMap: updatedLinkMap, + templateList: updatedList, + showDetailModal: false, + showDeleteConfirm: false, + currentTemplate: null, + currentTemplateIndex: -1 + }) + wx.showToast({ title: '删除成功', icon: 'success' }) + } else { + wx.showToast({ title: res.data.msg || '删除失败', icon: 'error' }) + } + } catch (e) { + wx.showToast({ title: '删除失败', icon: 'error' }) + } finally { wx.hideLoading() } + }, + + async confirmNewLink() { + const { currentTemplate, currentTemplateIndex } = this.data + if (!currentTemplate) return + this.setData({ showNewLinkConfirm: false }) + await this.generateLinkForTemplate(currentTemplate, currentTemplateIndex) + }, + + // ---------- 添加模板 ---------- + onAddJieshaoInput(e) { this.setData({ addJieshao: e.detail.value }) }, + onAddJiageInput(e) { this.setData({ addJiage: e.detail.value }) }, + onAddLabelChange(e) { + const idx = e.detail.value + const label = this.data.currentTypeChenghaoList[idx] + this.setData({ addLabelId: label ? label.id : '', addLabelName: label ? label.mingcheng : '' }) + }, + onAddCommissionToggle() { this.setData({ addCommissionEnabled: !this.data.addCommissionEnabled }) }, + onAddCommissionValueInput(e) { this.setData({ addCommissionValue: e.detail.value }) }, + + async onAddTemplate() { + const { selectedTypeId, addJieshao, addJiage, addLabelId, addCommissionEnabled, addCommissionValue } = this.data + if (!selectedTypeId) { + wx.showToast({ title: '请选择订单类型', icon: 'none' }) + return + } + if (!addJieshao.trim()) { + wx.showToast({ title: '请输入订单介绍', icon: 'none' }) + return + } + if (!addJiage || isNaN(parseFloat(addJiage)) || parseFloat(addJiage) <= 0) { + wx.showToast({ title: '请输入有效的价格', icon: 'none' }) + return + } + if (addCommissionEnabled && (!addCommissionValue || isNaN(parseFloat(addCommissionValue)))) { + wx.showToast({ title: '请输入有效的佣金金额', icon: 'none' }) + return + } + + wx.showLoading({ title: '添加中...', mask: true }) + try { + const res = await request({ + url: '/peizhi/sjtjddmb', + method: 'POST', + data: { + shangpinTypeId: selectedTypeId, + jieshao: addJieshao.trim(), + jiage: addJiage, + labelId: addLabelId || '', + commissionEnabled: addCommissionEnabled, + commissionValue: addCommissionValue + } + }) + if (res && res.data.code === 200) { + const data = res.data.data || {} + const newTemplate = { + mobanId: data.mobanId, + jieshao: addJieshao, + jiage: addJiage, + fabushuliang: 0, + hasGenerated: false, + isCopied: false, + linkUrl: '', + labelId: addLabelId, + labelName: this.getLabelNameById(addLabelId), + commissionEnabled: addCommissionEnabled, + commissionValue: addCommissionValue + } + this.setData({ + templateList: [newTemplate, ...this.data.templateList], + showAddModal: false, + addJieshao: '', addJiage: '', addLabelId: '', addLabelName: '', + addCommissionEnabled: false, addCommissionValue: '' + }) + wx.showToast({ title: '添加成功', icon: 'success' }) + } else { + wx.showToast({ title: res.data.msg || '添加失败', icon: 'error' }) + } + } catch (e) { + wx.showToast({ title: '添加失败', icon: 'error' }) + } finally { wx.hideLoading() } + }, + + getLabelNameById(labelId) { + if (!labelId) return '' + const list = this.data.currentTypeChenghaoList + const found = list.find(item => item.id == labelId) + return found ? found.mingcheng : '' + }, + + onScrollToLower() { + const { hasMoreData, isLoadingMore, isSearchMode } = this.data + if (!hasMoreData || isLoadingMore || isSearchMode) return + this.setData({ currentPage: this.data.currentPage + 1 }, () => this.loadTemplates()) + }, + + onSelectType(e) { + const { id, item } = e.currentTarget.dataset + this.setSelectedType(item) + } +}) \ No newline at end of file diff --git a/pages/jisufd/jisufd.json b/pages/jisufd/jisufd.json new file mode 100644 index 0000000..e0c0695 --- /dev/null +++ b/pages/jisufd/jisufd.json @@ -0,0 +1,12 @@ +{ + "usingComponents": { + "global-notification": "/components/global-notification/global-notification", + "chenghao-tag": "/components/chenghao-tag/chenghao-tag" + }, + "backgroundTextStyle": "dark", + "navigationBarBackgroundColor": "#0a0a0f", + "navigationBarTitleText": "极速派单", + "navigationBarTextStyle": "white", + "backgroundColor": "#0a0a0f", + "enablePullDownRefresh": false +} \ No newline at end of file diff --git a/pages/jisufd/jisufd.wxml b/pages/jisufd/jisufd.wxml new file mode 100644 index 0000000..5d0fc2a --- /dev/null +++ b/pages/jisufd/jisufd.wxml @@ -0,0 +1,230 @@ + + + + + 可用余额 + + {{sjyue}} + 元 + + 生成链接将从此余额扣除 + + + + + 选择订单类型 + + + + {{item.jieshao}} + + + + + + + + + + + + 清空 + + + + + + + + + + + {{item.jieshao || '无介绍'}} + + + + + + 价格: + {{item.jiage || '0.00'}}元 + + + + {{item.hasGenerated ? '获取新链接' : '生成链接'}} + + + {{item.isCopied ? '已复制' : '一键复制'}} + + + + + + ➕ + 添加模板 + 点击创建新模板 + + + ... + 没有更多模板了 + 暂无模板 + + + + + + + + + + + + 订单介绍 + {{currentTemplate.jieshao || '无介绍'}} + + + 关联标签 + + + + 价格{{currentTemplate.jiage || '0.00'}}元 + | + 发布数量{{currentTemplate.fabushuliang || 0}}次 + | + 模板ID{{currentTemplate.mobanId || 'N/A'}} + + + 佣金要求 + {{currentTemplate.commissionValue}}元（建议≤50） + + + + + 未使用 + 已使用 + + + + + {{item.lianjie}} + {{item.is_used ? '已使用' : '未使用'}} + 复制 + + + + 获取更多链接 + + 加载中... + 暂无链接 + + + + + + + 订单介绍 +

+        <text class="word-count">{{editJieshao.length}}/100</text>
+      </view>
+      <view class="edit-item">
+        <text class="edit-label">价格（元）</text>
+        <input class="edit-input price-edit" type="digit" value="{{editJiage}}" placeholder="0.1 - 10000" bindinput="onEditJiageInput"/>
+      </view>
+      <view class="edit-item">
+        <text class="edit-label">标签</text>
+        <picker mode="selector" range="{{currentTypeChenghaoList}}" range-key="mingcheng" bindchange="onEditLabelChange">
+          <view class="picker-view"><text>{{editLabelName || '无'}}</text></view>
+        </picker>
+      </view>
+      <view class="edit-item commission-item">
+        <text class="edit-label">佣金要求（建议≤50）</text>
+        <switch checked="{{editCommissionEnabled}}" bindchange="onEditCommissionToggle"/>
+        <input wx:if="{{editCommissionEnabled}}" class="commission-input" type="digit" placeholder="佣金金额" value="{{editCommissionValue}}" bindinput="onEditCommissionValueInput"/>
+      </view>
+    </view>
+  </view>
+</view>
+
+
+<view class="modal-overlay" wx:if="{{showAddModal}}" bindtap="hideAddModal">
+  <view class="modal-content add-modal" catchtap="stopPropagation">
+    <view class="modal-close" bindtap="hideAddModal">×</view>
+    <view class="modal-header"><text class="modal-title">添加模板</text></view>
+    <view class="add-form">
+      <view class="form-item">
+        <text class="form-label">订单介绍</text>
+        <textarea class="form-input intro-input" value="{{addJieshao}}" maxlength="100" placeholder="请输入订单介绍（必填）" bindinput="onAddJieshaoInput" auto-height/>
+        <text class="word-count">{{addJieshao.length}}/100</text>
+      </view>
+      <view class="form-item">
+        <text class="form-label">价格（元）</text>
+        <input class="form-input price-input" type="digit" value="{{addJiage}}" placeholder="0.1 - 10000" bindinput="onAddJiageInput"/>
+      </view>
+      <view class="form-item">
+        <text class="form-label">标签</text>
+        <picker mode="selector" range="{{currentTypeChenghaoList}}" range-key="mingcheng" bindchange="onAddLabelChange">
+          <view class="picker-view"><text>{{addLabelName || '可选'}}</text></view>
+        </picker>
+      </view>
+      <view class="form-item commission-item">
+        <text class="form-label">佣金要求（建议≤50）</text>
+        <switch checked="{{addCommissionEnabled}}" bindchange="onAddCommissionToggle"/>
+        <input wx:if="{{addCommissionEnabled}}" class="commission-input" type="digit" placeholder="佣金金额" value="{{addCommissionValue}}" bindinput="onAddCommissionValueInput"/>
+      </view>
+    </view>
+    <view class="modal-actions-grid add-actions-grid">
+      <view class="modal-grid-btn cancel-grid-btn" bindtap="hideAddModal">取消</view>
+      <view class="modal-grid-btn confirm-add-grid-btn" bindtap="onAddTemplate">确认添加</view>
+    </view>
+  </view>
+</view>
+
+
+<view class="modal-overlay confirm-overlay" wx:if="{{showDeleteConfirm}}" bindtap="hideDeleteConfirm">
+  <view class="confirm-content" catchtap="stopPropagation">
+    <text class="confirm-title">确认删除</text>
+    <text class="confirm-text">确定要删除这个模板吗？此操作不可恢复。</text>
+    <view class="confirm-actions-grid">
+      <view class="confirm-grid-btn cancel-confirm-grid-btn" bindtap="hideDeleteConfirm">取消</view>
+      <view class="confirm-grid-btn delete-confirm-grid-btn" bindtap="confirmDeleteTemplate">确定删除</view>
+    </view>
+  </view>
+</view>
+
+
+<view class="modal-overlay confirm-overlay" wx:if="{{showNewLinkConfirm}}" bindtap="hideNewLinkConfirm">
+  <view class="confirm-content" catchtap="stopPropagation">
+    <text class="confirm-title">获取新链接</text>
+    <text class="confirm-text">{{currentTemplate.isCopied ? '确定要获取新链接吗？旧链接将失效。' : '您还没有复制当前链接，确定要获取新链接吗？'}}</text>
+    <view class="confirm-actions-grid">
+      <view class="confirm-grid-btn cancel-confirm-grid-btn" bindtap="hideNewLinkConfirm">取消</view>
+      <view class="confirm-grid-btn confirm-new-link-grid-btn" bindtap="confirmNewLink">确定</view>
+    </view>
+  </view>
+</view>
+
+<global-notification id="global-notification" />
\ No newline at end of file
diff --git a/pages/jisufd/jisufd.wxss b/pages/jisufd/jisufd.wxss
new file mode 100644
index 0000000..dc4d7e6
--- /dev/null
+++ b/pages/jisufd/jisufd.wxss
@@ -0,0 +1,222 @@
+/* pages/jisufd/jisufd.wxss - 增强版，包含标签展示 */
+.page-container {
+    min-height: 100vh;
+    background: linear-gradient(135deg, #0a0a0f 0%, #1a1a2e 50%, #16213e 100%);
+    padding: 30rpx;
+    box-sizing: border-box;
+    padding-bottom: 40rpx;
+    font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', sans-serif;
+  }
+  .balance-card {
+    background: linear-gradient(135deg, rgba(20,20,30,0.9), rgba(30,30,50,0.9));
+    border-radius: 24rpx;
+    padding: 36rpx;
+    margin-bottom: 40rpx;
+    color: #fff;
+    box-shadow: 0 15rpx 35rpx rgba(0,0,0,0.4), 0 0 40rpx rgba(0,150,255,0.15);
+    text-align: center;
+    border: 1.5rpx solid rgba(0,180,255,0.2);
+    backdrop-filter: blur(10rpx);
+    position: relative;
+    overflow: hidden;
+  }
+  .balance-card::before {
+    content: '';
+    position: absolute;
+    top: -50%; left: -50%;
+    width: 200%; height: 200%;
+    background: linear-gradient(45deg, transparent 30%, rgba(0,180,255,0.1) 50%, transparent 70%);
+    animation: cardShine 6s infinite linear;
+    z-index: 1;
+  }
+  @keyframes cardShine {
+    0% { transform: translateX(-100%) translateY(-100%) rotate(45deg); }
+    100% { transform: translateX(100%) translateY(100%) rotate(45deg); }
+  }
+  .balance-label { font-size: 28rpx; color: rgba(255,255,255,0.8); margin-bottom: 18rpx; font-weight: 500; position: relative; z-index: 2; }
+  .balance-amount { display: flex; align-items: baseline; justify-content: center; margin-bottom: 15rpx; position: relative; z-index: 2; }
+  .amount-value { font-size: 64rpx; font-weight: bold; color: #00B4FF; text-shadow: 0 0 20rpx rgba(0,180,255,0.7), 0 0 40rpx rgba(0,180,255,0.4); animation: amountGlow 3s infinite alternate; }
+  @keyframes amountGlow {
+    0% { color: #00B4FF; text-shadow: 0 0 15rpx rgba(0,180,255,0.6); }
+    100% { color: #00E0FF; text-shadow: 0 0 25rpx rgba(0,180,255,0.8), 0 0 50rpx rgba(0,180,255,0.5); }
+  }
+  .amount-unit { font-size: 36rpx; color: #00B4FF; margin-left: 12rpx; font-weight: 500; z-index: 2; }
+  .balance-tip { font-size: 24rpx; color: rgba(255,255,255,0.6); z-index: 2; }
+  
+  .section { margin-bottom: 35rpx; }
+  .section-title { font-size: 32rpx; font-weight: 700; color: #FFFFFF; margin-bottom: 25rpx; padding-left: 12rpx; border-left: 6rpx solid #9C27B0; text-shadow: 0 2rpx 4rpx rgba(0,0,0,0.3); }
+  
+  .type-scroll { white-space: nowrap; display: flex; height: 90rpx; }
+  .type-item {
+    display: inline-flex; flex-shrink: 0; align-items: center; justify-content: center;
+    height: 85rpx; padding: 0 40rpx; margin-right: 20rpx;
+    background: rgba(255,255,255,0.08); border-radius: 45rpx; border: 2rpx solid rgba(255,255,255,0.15);
+    font-size: 28rpx; color: rgba(255,255,255,0.8);
+    transition: all 0.3s cubic-bezier(0.175,0.885,0.32,1.275);
+    backdrop-filter: blur(10rpx);
+  }
+  .type-active {
+    background: linear-gradient(135deg, #9C27B0 0%, #673AB7 100%);
+    border-color: #9C27B0; color: white; transform: scale(1.05);
+    box-shadow: 0 10rpx 25rpx rgba(156,39,176,0.4), 0 0 30rpx rgba(156,39,176,0.3);
+  }
+  .type-text { max-width: 220rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-weight: 500; }
+  
+  /* 搜索区域 */
+  .search-section { margin-bottom: 35rpx; }
+  .search-box {
+    display: flex; align-items: center;
+    background: rgba(255,255,255,0.1); border-radius: 50rpx;
+    padding: 20rpx 30rpx; border: 2rpx solid rgba(255,255,255,0.2);
+    backdrop-filter: blur(10rpx); transition: all 0.3s ease;
+  }
+  .search-box:focus-within { border-color: #9C27B0; background: rgba(255,255,255,0.15); box-shadow: 0 0 25rpx rgba(156,39,176,0.3); }
+  .search-icon { font-size: 32rpx; color: rgba(255,255,255,0.7); margin-right: 20rpx; flex-shrink: 0; }
+  .search-input { flex: 1; font-size: 28rpx; color: #FFFFFF; background: transparent; border: none; outline: none; min-height: 40rpx; }
+  .search-input::placeholder { color: rgba(255,255,255,0.4); }
+  .search-btn { background: linear-gradient(135deg, #9C27B0 0%, #673AB7 100%); border-radius: 40rpx; padding: 15rpx 30rpx; margin-left: 20rpx; flex-shrink: 0; box-shadow: 0 8rpx 20rpx rgba(156,39,176,0.3); }
+  .search-btn:active { transform: scale(0.95); }
+  .search-btn-text { font-size: 26rpx; color: white; font-weight: 600; }
+  
+  .filter-row { display: flex; align-items: center; margin-top: 20rpx; gap: 15rpx; }
+  .filter-item { display: flex; align-items: center; background: rgba(255,255,255,0.08); border-radius: 30rpx; padding: 10rpx 20rpx; border: 1rpx solid rgba(255,255,255,0.15); }
+  .filter-label { font-size: 24rpx; color: rgba(255,255,255,0.7); margin-right: 10rpx; }
+  .filter-input { width: 120rpx; height: 50rpx; background: transparent; color: #fff; font-size: 26rpx; }
+  .picker-view { padding: 10rpx 0; color: rgba(255,255,255,0.9); font-size: 26rpx; max-width: 160rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+  .clear-search { margin-left: auto; padding: 10rpx 20rpx; background: rgba(255,255,255,0.1); border-radius: 20rpx; color: rgba(255,255,255,0.7); font-size: 24rpx; }
+  
+  /* 模板区域 */
+  .template-section { height: calc(100vh - 600rpx); position: relative; }
+  .template-scroll { height: 100%; }
+  .template-grid { display: grid; grid-template-columns: repeat(3, 1fr); gap: 25rpx; padding-bottom: 30rpx; }
+  .template-card {
+    background: linear-gradient(145deg, rgba(30,30,45,0.9), rgba(40,40,60,0.9));
+    border-radius: 20rpx; padding: 25rpx;
+    border: 1.5rpx solid rgba(255,255,255,0.1);
+    box-shadow: 0 10rpx 30rpx rgba(0,0,0,0.3), 0 0 25rpx rgba(0,180,255,0.1);
+    transition: all 0.3s ease; backdrop-filter: blur(10rpx);
+    display: flex; flex-direction: column; min-height: 280rpx; position: relative; overflow: hidden;
+  }
+  .template-card::before { content: ''; position: absolute; top:0; left:0; right:0; height:4rpx; background: linear-gradient(90deg, #9C27B0, #00B4FF, #9C27B0); opacity:0.6; }
+  .template-intro { flex:1; margin-bottom:10rpx; min-height:70rpx; overflow:hidden; }
+  .intro-text { font-size:24rpx; line-height:1.4; color:rgba(255,255,255,0.9); display:-webkit-box; -webkit-box-orient:vertical; -webkit-line-clamp:3; overflow:hidden; font-weight:500; }
+  .template-label { margin-bottom: 10rpx; }
+  .template-price-row { display:flex; align-items:center; margin-bottom:20rpx; padding:10rpx 0; border-bottom:1rpx solid rgba(255,255,255,0.1); }
+  .template-price-label { font-size:22rpx; color:rgba(255,255,255,0.7); margin-right:10rpx; }
+  .template-price-value { font-size:26rpx; font-weight:bold; color:#FFD700; text-shadow:0 0 10rpx rgba(255,215,0,0.3); flex:1; }
+  .template-actions-grid { display:flex; flex-direction:column; gap:12rpx; margin-top:10rpx; }
+  .action-grid-btn {
+    height:65rpx; border-radius:32rpx; font-size:24rpx; font-weight:600; transition:all 0.3s ease;
+    border:none; padding:0 20rpx; box-shadow:0 4rpx 12rpx rgba(0,0,0,0.2), inset 0 1rpx 0 rgba(255,255,255,0.1);
+    display:flex !important; align-items:center !important; justify-content:center !important; text-align:center !important;
+  }
+  .generate-grid-btn { background:linear-gradient(135deg, #00B4FF, #0091EA); color:white; }
+  .generate-grid-btn.generated { background:linear-gradient(135deg, #4CAF50, #2E7D32); }
+  .copy-grid-btn { background:linear-gradient(135deg, #9C27B0, #673AB7); color:white; }
+  .copy-grid-btn.copied { background:linear-gradient(135deg, #FF9800, #F57C00); }
+  .add-card { background: linear-gradient(145deg, rgba(40,40,60,0.7), rgba(60,60,80,0.7)); border:2rpx dashed rgba(255,255,255,0.3); display:flex; flex-direction:column; align-items:center; justify-content:center; min-height:280rpx; }
+  .add-icon { font-size:60rpx; color:rgba(255,255,255,0.6); margin-bottom:20rpx; }
+  .add-text { font-size:30rpx; color:rgba(255,255,255,0.8); font-weight:600; margin-bottom:8rpx; }
+  .add-subtext { font-size:24rpx; color:rgba(255,255,255,0.5); }
+  
+  /* 弹窗通用 */
+  .modal-overlay { position:fixed; top:0; left:0; right:0; bottom:0; background:rgba(0,0,0,0.75); display:flex; align-items:center; justify-content:center; z-index:9999; padding:30rpx; backdrop-filter:blur(10rpx); animation:fadeIn 0.3s ease; }
+  @keyframes fadeIn { from{opacity:0;} to{opacity:1;} }
+  .modal-content {
+    background:linear-gradient(145deg, rgba(30,30,45,0.95), rgba(40,40,60,0.95));
+    border-radius:30rpx; width:100%; max-width:700rpx; max-height:85vh; overflow-y:auto;
+    border:1.5rpx solid rgba(255,255,255,0.15);
+    box-shadow:0 25rpx 80rpx rgba(0,0,0,0.6), 0 0 60rpx rgba(0,180,255,0.2);
+    animation:slideUp 0.4s cubic-bezier(0.175,0.885,0.32,1.275);
+    position:relative;
+  }
+  @keyframes slideUp { from{transform:translateY(100rpx) scale(0.9); opacity:0;} to{transform:translateY(0) scale(1); opacity:1;} }
+  .modal-close { position:absolute; top:25rpx; right:25rpx; width:60rpx; height:60rpx; border-radius:50%; background:rgba(255,255,255,0.1); display:flex; align-items:center; justify-content:center; font-size:40rpx; color:rgba(255,255,255,0.7); z-index:10; }
+  .modal-header { padding:40rpx 40rpx 20rpx; text-align:center; }
+  .modal-title { font-size:36rpx; font-weight:bold; color:#FFFFFF; }
+  
+  .detail-info { padding:30rpx 40rpx; }
+  .detail-item { margin-bottom:30rpx; }
+  .detail-label { font-size:26rpx; color:rgba(255,255,255,0.7); margin-bottom:10rpx; font-weight:500; }
+  .detail-value { font-size:28rpx; color:#FFFFFF; word-break:break-word; }
+  .intro-value { background:rgba(255,255,255,0.05); border-radius:15rpx; padding:20rpx; border:1rpx solid rgba(255,255,255,0.1); max-height:200rpx; overflow-y:auto; }
+  .detail-meta-row { display:flex; align-items:center; justify-content:space-between; padding:25rpx 0; margin:20rpx 0; border-top:1rpx solid rgba(255,255,255,0.1); border-bottom:1rpx solid rgba(255,255,255,0.1); }
+  .meta-item { display:flex; flex-direction:column; align-items:center; flex:1; }
+  .meta-label { font-size:22rpx; color:rgba(255,255,255,0.6); margin-bottom:8rpx; }
+  .meta-value { font-size:26rpx; font-weight:600; }
+  .price-meta { color:#FFD700; text-shadow:0 0 10rpx rgba(255,215,0,0.3); }
+  .count-meta { color:#00B4FF; }
+  .id-meta { color:#4CAF50; font-family:'Courier New',monospace; font-size:24rpx; }
+  .meta-divider { color:rgba(255,255,255,0.2); font-size:24rpx; margin:0 15rpx; }
+  
+  .link-filter-bar { display:flex; align-items:center; margin-top:30rpx; margin-bottom:20rpx; }
+  .filter-switch {
+    padding:10rpx 25rpx; margin-left:10rpx; border-radius:20rpx; background:rgba(255,255,255,0.1);
+    font-size:24rpx; color:rgba(255,255,255,0.7); transition:all 0.3s;
+  }
+  .filter-switch.active { background:linear-gradient(135deg, #00B4FF, #0091EA); color:white; }
+  .link-list { background:rgba(0,0,0,0.2); border-radius:15rpx; padding:15rpx; }
+  .link-item { display:flex; align-items:center; justify-content:space-between; padding:15rpx 0; border-bottom:1rpx solid rgba(255,255,255,0.1); }
+  .link-url { flex:1; font-size:22rpx; color:rgba(255,255,255,0.8); word-break:break-all; margin-right:15rpx; }
+  .link-status { font-size:20rpx; color:rgba(255,255,255,0.5); margin-right:15rpx; }
+  .copy-link-btn { padding:8rpx 20rpx; background:#00B4FF; color:white; border-radius:15rpx; font-size:22rpx; }
+  .load-more-links { text-align:center; padding:20rpx 0; }
+  .load-more-btn { display:inline-block; padding:15rpx 40rpx; background:linear-gradient(135deg, #9C27B0, #673AB7); border-radius:30rpx; color:white; font-size:26rpx; }
+  .link-loading, .link-empty { text-align:center; padding:30rpx; color:rgba(255,255,255,0.5); font-size:24rpx; }
+  
+  /* 弹窗按钮 */
+  .modal-actions-grid { display:grid; grid-template-columns:repeat(2,1fr); gap:18rpx; padding:30rpx 40rpx 40rpx; border-top:1rpx solid rgba(255,255,255,0.1); }
+  .modal-grid-btn {
+    height:85rpx; border-radius:42rpx; font-size:28rpx; font-weight:600; transition:all 0.3s;
+    border:none; padding:0 20rpx; box-shadow:0 8rpx 25rpx rgba(0,0,0,0.3), inset 0 1rpx 0 rgba(255,255,255,0.2);
+    display:flex !important; align-items:center !important; justify-content:center !important;
+  }
+  .generate-modal-grid-btn { background:linear-gradient(145deg, #00B4FF, #0091EA); color:white; }
+  .copy-modal-grid-btn { background:linear-gradient(145deg, #9C27B0, #673AB7); color:white; }
+  .copy-modal-grid-btn.copied { background:linear-gradient(145deg, #FF9800, #F57C00); }
+  .edit-modal-grid-btn { background:linear-gradient(145deg, #4CAF50, #2E7D32); color:white; }
+  .delete-modal-grid-btn { background:linear-gradient(145deg, #FF4444, #CC0000); color:white; }
+  
+  /* 编辑区 */
+  .edit-section { padding:30rpx 40rpx 20rpx; border-top:1rpx solid rgba(255,255,255,0.1); margin-top:20rpx; }
+  .edit-item { margin-bottom:30rpx; }
+  .edit-label { font-size:26rpx; color:rgba(255,255,255,0.8); margin-bottom:15rpx; font-weight:600; }
+  .edit-input { width:100%; background:rgba(255,255,255,0.08); border:1.5rpx solid rgba(255,255,255,0.2); border-radius:15rpx; padding:25rpx; font-size:28rpx; color:#FFFFFF; }
+  .intro-edit { min-height:150rpx; }
+  .price-edit { text-align:center; font-size:32rpx; font-weight:600; height:90rpx; line-height:90rpx; }
+  .picker-view { padding:25rpx; background:rgba(255,255,255,0.08); border-radius:15rpx; border:1.5rpx solid rgba(255,255,255,0.2); color:#fff; }
+  .commission-item { display:flex; align-items:center; gap:20rpx; }
+  .commission-input { flex:1; background:rgba(255,255,255,0.08); border-radius:15rpx; padding:20rpx; color:#fff; }
+  
+  /* 添加表单 */
+  .add-form { padding:30rpx 40rpx 20rpx; }
+  .form-item { margin-bottom:35rpx; }
+  .form-label { font-size:28rpx; color:rgba(255,255,255,0.8); margin-bottom:18rpx; font-weight:600; }
+  .intro-input, .price-input { width:100%; background:rgba(255,255,255,0.08); border:1.5rpx solid rgba(255,255,255,0.2); border-radius:15rpx; padding:25rpx; font-size:28rpx; color:#FFFFFF; }
+  .intro-input { min-height:180rpx; }
+  .price-input { height:90rpx; line-height:90rpx; text-align:center; font-weight:600; }
+  .add-actions-grid { display:grid; grid-template-columns:repeat(2,1fr); gap:25rpx; padding:30rpx 40rpx 40rpx; border-top:1rpx solid rgba(255,255,255,0.1); }
+  .cancel-grid-btn { background:rgba(255,255,255,0.1); color:rgba(255,255,255,0.8); border:1.5rpx solid rgba(255,255,255,0.2); }
+  .confirm-add-grid-btn { background:linear-gradient(145deg, #9C27B0, #673AB7); color:white; }
+  
+  /* 确认弹窗 */
+  .confirm-content {
+    background:linear-gradient(145deg, rgba(40,40,60,0.95), rgba(50,50,70,0.95));
+    border-radius:25rpx; padding:50rpx 40rpx 40rpx; width:85%; max-width:550rpx;
+    border:1.5rpx solid rgba(255,255,255,0.15); box-shadow:0 30rpx 90rpx rgba(0,0,0,0.7); text-align:center;
+    animation:scaleIn 0.3s ease;
+  }
+  @keyframes scaleIn { from{transform:scale(0.8); opacity:0;} to{transform:scale(1); opacity:1;} }
+  .confirm-title { font-size:34rpx; font-weight:bold; color:#FFFFFF; margin-bottom:25rpx; }
+  .confirm-text { font-size:28rpx; color:rgba(255,255,255,0.8); margin-bottom:40rpx; }
+  .confirm-actions-grid { display:grid; grid-template-columns:repeat(2,1fr); gap:25rpx; }
+  .confirm-grid-btn { height:85rpx; border-radius:42rpx; font-size:28rpx; font-weight:600; display:flex; align-items:center; justify-content:center; }
+  .cancel-confirm-grid-btn { background:rgba(255,255,255,0.1); color:rgba(255,255,255,0.8); border:1.5rpx solid rgba(255,255,255,0.2); }
+  .delete-confirm-grid-btn { background:linear-gradient(145deg, #FF4444, #CC0000); color:white; }
+  .confirm-new-link-grid-btn { background:linear-gradient(145deg, #00B4FF, #0091EA); color:white; }
+  
+  .loading-mask { position:fixed; top:0; left:0; right:0; bottom:0; background:rgba(18,18,24,0.95); display:flex; align-items:center; justify-content:center; z-index:10000; }
+  .loading-content { background:rgba(40,40,60,0.95); padding:60rpx 80rpx; border-radius:30rpx; display:flex; flex-direction:column; align-items:center; box-shadow:0 25rpx 70rpx rgba(0,0,0,0.6); }
+  .loading-spinner { width:90rpx; height:90rpx; border:8rpx solid rgba(0,180,255,0.2); border-top:8rpx solid #00B4FF; border-radius:50%; animation:spin 1.2s linear infinite; margin-bottom:35rpx; }
+  .loading-text { font-size:30rpx; color:#00B4FF; font-weight:600; }
+  @keyframes spin { 0%{transform:rotate(0deg);} 100%{transform:rotate(360deg);} }
\ No newline at end of file
diff --git a/pages/kaohe_dafen/kaohe_dafen.js b/pages/kaohe_dafen/kaohe_dafen.js
new file mode 100644
index 0000000..c70b1eb
--- /dev/null
+++ b/pages/kaohe_dafen/kaohe_dafen.js
@@ -0,0 +1,237 @@
+// pages/kaohe_dafen/kaohe_dafen.js
+const app = getApp();
+import request from '../../utils/request.js';
+
+Page({
+  data: {
+    recordList: [],
+    page: 1,
+    pageSize: 10,
+    hasMore: false,
+    isLoading: false,
+    ossImageUrl: app.globalData.ossImageUrl || '',
+
+    // 操作弹窗
+    showAgreeModal: false,
+    showRejectModal: false,
+    showTransferModal: false,
+    currentItem: null,
+    rejectReason: '',
+
+    // 倒计时
+    countdown: 2,
+    counting: false,
+    countdownTimer: null,
+  },
+
+  onLoad() {
+    this.loadRecords(true);
+  },
+
+  // 加载考核记录
+  async loadRecords(isRefresh = false) {
+    if (this.data.isLoading) return;
+    const page = isRefresh ? 1 : this.data.page;
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({
+        url: '/dengji/hqkhxq',
+        method: 'POST',
+        data: { page, page_size: this.data.pageSize }
+      });
+      if (res && res.data.code === 0) {
+        const list = res.data.data.list || [];
+        const hasMore = res.data.data.has_more;
+        const oss = this.data.ossImageUrl;
+        const processed = list.map(item => ({
+          ...item,
+          shenqingren_avatar: item.shenqingren_avatar && !item.shenqingren_avatar.startsWith('http')
+            ? oss + item.shenqingren_avatar
+            : item.shenqingren_avatar || '/images/default-avatar.png'
+        }));
+        const newList = isRefresh ? processed : [...this.data.recordList, ...processed];
+        this.setData({ recordList: newList, page: page + 1, hasMore, isLoading: false });
+      } else {
+        wx.showToast({ title: '加载失败', icon: 'none' });
+        this.setData({ isLoading: false });
+      }
+    } catch (e) {
+      wx.showToast({ title: '网络错误', icon: 'none' });
+      this.setData({ isLoading: false });
+    }
+  },
+
+  onReachBottom() {
+    if (this.data.hasMore && !this.data.isLoading) {
+      this.loadRecords(false);
+    }
+  },
+
+  // 联系打手（私聊）—— 照搬金牌页面逻辑
+  contactDashou(e) {
+    const item = e.currentTarget.dataset.item;
+    if (!item) return;
+    if (!item.shenqingren_id) {
+      wx.showToast({ title: '无法获取打手ID', icon: 'none' });
+      return;
+    }
+
+    const uid = wx.getStorageSync('uid');
+    if (!uid) {
+      wx.showToast({ title: '用户信息缺失', icon: 'none' });
+      return;
+    }
+
+    // 1. 设置当前角色为考核官
+    if (app.globalData.currentRole !== 'kaoheguan') {
+      app.globalData.currentRole = 'kaoheguan';
+      wx.setStorageSync('currentRole', 'kaoheguan');
+    }
+
+    // 2. 确保 IM 连接存活
+    if (app.connectForCurrentRole) {
+      app.connectForCurrentRole();
+    } else if (app.ensureConnection) {
+      app.ensureConnection();
+    }
+
+    // 3. 构造私聊参数
+    const param = {
+      toUserId: 'Ds' + item.shenqingren_id,
+      toName: '打手' + item.shenqingren_id,
+      toAvatar: item.shenqingren_avatar || ''
+    };
+
+    // 4. 直接跳转聊天页面
+    wx.navigateTo({
+      url: '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param)),
+      fail: (err) => {
+        console.error('跳转私聊失败', err);
+        wx.showToast({ title: '打开聊天失败', icon: 'none' });
+      }
+    });
+  },
+
+  // 修改游戏昵称
+  async modifyNick(e) {
+    const { id } = e.currentTarget.dataset;
+    const item = this.data.recordList.find(r => r.jilu_id === id);
+    if (!item) return;
+    const newNick = item.shenheguan_youxi_id || '';
+    try {
+      const res = await request({
+        url: '/dengji/khgxgkh',
+        method: 'POST',
+        data: { jilu_id: id, caozuo: 'modify_nick', youxi_id: newNick }
+      });
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '修改成功', icon: 'success' });
+      } else {
+        wx.showToast({ title: res.data?.msg || '修改失败', icon: 'none' });
+      }
+    } catch (e) {
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  onNickInput(e) {
+    const id = e.currentTarget.dataset.id;
+    const value = e.detail.value;
+    const list = this.data.recordList.map(item => {
+      if (item.jilu_id === id) {
+        return { ...item, shenheguan_youxi_id: value };
+      }
+      return item;
+    });
+    this.setData({ recordList: list });
+  },
+
+  // 🆕 实时更新拒绝原因
+  onRejectInput(e) {
+    this.setData({ rejectReason: e.detail.value });
+  },
+
+  openAgreeModal(e) {
+    const item = e.currentTarget.dataset.item;
+    this.setData({ showAgreeModal: true, currentItem: item });
+    this.startCountdown();
+  },
+  openRejectModal(e) {
+    const item = e.currentTarget.dataset.item;
+    this.setData({ showRejectModal: true, currentItem: item, rejectReason: '' });
+    this.startCountdown();
+  },
+  openTransferModal(e) {
+    const item = e.currentTarget.dataset.item;
+    this.setData({ showTransferModal: true, currentItem: item });
+    this.startCountdown();
+  },
+
+  closeAllModals() {
+    this.stopCountdown();
+    this.setData({
+      showAgreeModal: false,
+      showRejectModal: false,
+      showTransferModal: false,
+      currentItem: null,
+      rejectReason: ''
+    });
+  },
+
+  startCountdown() {
+    this.stopCountdown();
+    this.setData({ counting: true, countdown: 2 });
+    this.data.countdownTimer = setInterval(() => {
+      if (this.data.countdown > 1) {
+        this.setData({ countdown: this.data.countdown - 1 });
+      } else {
+        this.stopCountdown();
+        this.setData({ counting: false, countdown: 0 });
+      }
+    }, 1000);
+  },
+  stopCountdown() {
+    if (this.data.countdownTimer) {
+      clearInterval(this.data.countdownTimer);
+      this.data.countdownTimer = null;
+    }
+  },
+
+  // 执行操作（从事件对象中获取操作类型）
+  async executeAction(e) {
+    const actionType = e.currentTarget.dataset.action;
+    if (!actionType) {
+      wx.showToast({ title: '操作类型异常', icon: 'none' });
+      return;
+    }
+
+    const item = this.data.currentItem;
+    if (!item) return;
+
+    const params = { jilu_id: item.jilu_id, caozuo: actionType };
+
+    if (actionType === 'reject') {
+      if (!this.data.rejectReason.trim()) {
+        wx.showToast({ title: '请填写拒绝原因', icon: 'none' });
+        return;
+      }
+      params.yuanyin = this.data.rejectReason;
+    }
+
+    try {
+      const res = await request({ url: '/dengji/khgxgkh', method: 'POST', data: params });
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '操作成功', icon: 'success' });
+        this.closeAllModals();
+        const newList = this.data.recordList.filter(r => r.jilu_id !== item.jilu_id);
+        this.setData({ recordList: newList });
+      } else {
+        wx.showToast({ title: res.data?.msg || '操作失败', icon: 'none' });
+        this.closeAllModals();
+      }
+    } catch (e) {
+      wx.showToast({ title: '网络错误', icon: 'none' });
+      this.closeAllModals();
+    }
+  },
+});
\ No newline at end of file
diff --git a/pages/kaohe_dafen/kaohe_dafen.json b/pages/kaohe_dafen/kaohe_dafen.json
new file mode 100644
index 0000000..f315be3
--- /dev/null
+++ b/pages/kaohe_dafen/kaohe_dafen.json
@@ -0,0 +1,10 @@
+{
+    "usingComponents": {
+      "chenghao-tag": "/components/chenghao-tag/chenghao-tag",
+      "global-notification": "/components/global-notification/global-notification",
+      "popup-notice": "/components/popup-notice/popup-notice"
+    },
+    "navigationBarTitleText": "考核打分",
+    "navigationBarBackgroundColor": "#0b0c12",
+    "navigationBarTextStyle": "white"
+  }
\ No newline at end of file
diff --git a/pages/kaohe_dafen/kaohe_dafen.wxml b/pages/kaohe_dafen/kaohe_dafen.wxml
new file mode 100644
index 0000000..3094b15
--- /dev/null
+++ b/pages/kaohe_dafen/kaohe_dafen.wxml
@@ -0,0 +1,118 @@
+
+<view class="root-page">
+  <view class="scroll-container" scroll-y="true" bindscrolltolower="onReachBottom">
+    <view class="list">
+      <block wx:for="{{recordList}}" wx:key="jilu_id">
+        <view class="card">
+          
+          <view class="user-row">
+            <image class="avatar" src="{{item.shenqingren_avatar}}" mode="aspectFill" />
+            <view class="info">
+              <text class="uid">UID {{item.shenqingren_id}}</text>
+              <text class="time">{{item.create_time}}</text>
+            </view>
+            <view class="contact-btn" bindtap="contactDashou" data-item="{{item}}">联系</view>
+          </view>
+
+          
+          <view class="detail-grid">
+            <view class="detail-item">
+              <text class="label">板块</text>
+              <text class="value">{{item.bankuai_mingcheng}}</text>
+            </view>
+            <view class="detail-item">
+              <text class="label">标签</text>
+              <chenghao-tag mingcheng="{{item.chenghao_mingcheng}}" texiaoJson="{{item.chenghao_texiao_json}}" />
+              <text wx:if="{{item.is_jinpai}}" class="jinpai-note">(开启金牌)</text>
+            </view>
+            <view class="detail-item">
+              <text class="label">规则</text>
+              <text class="value rule-content">{{item.guize_neirong}}</text>
+            </view>
+             
+            <view class="detail-item" wx:if="{{item.dashou_youxi_id}}">
+                <text class="label">打手游戏昵称</text>
+                <text class="value">{{item.dashou_youxi_id}}</text>
+            </view>
+            <view class="detail-item" wx:if="{{item.dashou_beizhu}}">
+              <text class="label">备注</text>
+              <text class="value">{{item.dashou_beizhu}}</text>
+            </view>
+            <view class="detail-item">
+              <text class="label">次数</text>
+              <text class="value">{{item.cishu}}</text>
+            </view>
+            <view class="detail-item">
+              <text class="label">待收考核费</text>
+              <text class="value amount">¥{{item.daishou_fei}}</text>
+            </view>
+          </view>
+
+          
+          <view wx:if="{{item.last_fail_reason}}" class="fail-box">
+            <text class="fail-label">上次拒绝原因：</text>
+            <text class="fail-text">{{item.last_fail_reason}}</text>
+          </view>
+
+          
+          <view class="nick-row">
+            <text class="label">我的游戏昵称</text>
+            <input class="nick-input" data-id="{{item.jilu_id}}" value="{{item.shenheguan_youxi_id}}" bindinput="onNickInput" placeholder="输入昵称" />
+            <view class="save-nick-btn" data-id="{{item.jilu_id}}" bindtap="modifyNick">保存</view>
+          </view>
+
+          
+          <view class="action-row">
+            <view class="action-btn agree" data-item="{{item}}" bindtap="openAgreeModal">合格</view>
+            <view class="action-btn reject" data-item="{{item}}" bindtap="openRejectModal">不合格</view>
+            <view class="action-btn transfer" data-item="{{item}}" bindtap="openTransferModal">转移</view>
+          </view>
+        </view>
+      </block>
+      <view wx:if="{{isLoading}}" class="loading">加载中...</view>
+      <view wx:if="{{!hasMore && recordList.length > 0}}" class="no-more">—— 已加载全部 ——</view>
+      <view wx:if="{{!isLoading && recordList.length === 0}}" class="empty">暂无待考核记录</view>
+    </view>
+  </view>
+</view>
+
+
+<view wx:if="{{showAgreeModal}}" class="modal-mask" bindtap="closeAllModals">
+  <view class="modal-box" catchtap="noop">
+    <view class="modal-header">确认通过考核</view>
+    <view class="modal-body">通过后，该用户将获得对应标签，请认真审核后操作。</view>
+    <view class="countdown-text" wx:if="{{counting}}">{{countdown}}秒后可确认</view>
+    <view class="modal-footer">
+      <view class="btn cancel" bindtap="closeAllModals">取消</view>
+      <view class="btn confirm {{counting ? 'disabled' : ''}}" bindtap="{{counting ? '' : 'executeAction'}}" data-action="agree">确认通过</view>
+    </view>
+  </view>
+</view>
+
+
+<view wx:if="{{showRejectModal}}" class="modal-mask" bindtap="closeAllModals">
+  <view class="modal-box" catchtap="noop">
+    <view class="modal-header">拒绝通过</view>
+    <textarea class="reason-input" value="{{rejectReason}}" bindinput="onRejectInput" placeholder="请填写拒绝原因" maxlength="200">

+ {{countdown}}秒后可确认 + + + + + + + + \ No newline at end of file diff --git a/pages/kaohe_dafen/kaohe_dafen.wxss b/pages/kaohe_dafen/kaohe_dafen.wxss new file mode 100644 index 0000000..f736716 --- /dev/null +++ b/pages/kaohe_dafen/kaohe_dafen.wxss @@ -0,0 +1,170 @@ +/* 根容器，全屏且底部固定 */ +.root-page { + width: 100vw; + height: 100vh; + background: radial-gradient(ellipse at 20% 20%, #1a1e2b 0%, #0b0c12 100%); + display: flex; + flex-direction: column; + } + + /* 滚动区域 */ + .scroll-container { + flex: 1; + overflow-y: auto; + padding: 30rpx 30rpx 0; + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + } + + /* 卡片 */ + .card { + background: rgba(25, 27, 36, 0.8); + backdrop-filter: blur(20px); + border: 1rpx solid rgba(201, 169, 88, 0.15); + border-radius: 24rpx; + padding: 30rpx; + margin-bottom: 30rpx; + box-shadow: 0 8rpx 30rpx rgba(0,0,0,0.5); + } + + /* 用户信息 */ + .user-row { + display: flex; + align-items: center; + margin-bottom: 30rpx; + } + .avatar { + width: 80rpx; height: 80rpx; + border-radius: 50%; + border: 2rpx solid rgba(201,169,88,0.4); + margin-right: 20rpx; + } + .info { flex: 1; } + .uid { font-size: 30rpx; color: #f0f2ff; font-weight: 600; } + .time { font-size: 22rpx; color: #6a7090; margin-top: 4rpx; } + .contact-btn { + background: rgba(201,169,88,0.15); + border: 1rpx solid rgba(201,169,88,0.3); + border-radius: 20rpx; + padding: 8rpx 24rpx; + font-size: 24rpx; + color: #c9a558; + } + + /* 详情网格 */ + .detail-grid { + border-bottom: 1rpx solid rgba(255,255,255,0.06); + margin-bottom: 20rpx; + } + .detail-item { + display: flex; + align-items: center; + padding: 16rpx 0; + border-bottom: 1rpx solid rgba(255,255,255,0.04); + } + .detail-item:last-child { border-bottom: none; } + .label { font-size: 26rpx; color: #8a90b0; width: 160rpx; flex-shrink: 0; } + .value { font-size: 26rpx; color: #d0d4ff; font-weight: 500; } + .rule-content { white-space: pre-wrap; line-height: 1.5; } + .jinpai-note { font-size: 24rpx; color: #c9a558; font-weight: 600; margin-left: 10rpx; } + + /* 失败原因 */ + .fail-box { + background: rgba(255, 70, 70, 0.1); + border-left: 4rpx solid #ff5e5e; + padding: 16rpx; + border-radius: 8rpx; + margin-bottom: 20rpx; + } + .fail-label { font-size: 24rpx; color: #ff8a8a; } + .fail-text { font-size: 24rpx; color: #ffd0d0; } + + /* 昵称修改 */ + .nick-row { + display: flex; + align-items: center; + margin-bottom: 30rpx; + } + .nick-input { + flex: 1; + background: rgba(255,255,255,0.06); + border: 1rpx solid rgba(255,255,255,0.1); + border-radius: 12rpx; + padding: 12rpx 20rpx; + color: #fff; + font-size: 26rpx; + margin-right: 20rpx; + } + .save-nick-btn { + background: #c9a558; + color: #0b0c12; + padding: 12rpx 30rpx; + border-radius: 30rpx; + font-size: 26rpx; + font-weight: 600; + } + + /* 操作按钮 */ + .action-row { + display: flex; + gap: 20rpx; + margin-top: 20rpx; + } + .action-btn { + flex: 1; + height: 80rpx; + display: flex; + align-items: center; + justify-content: center; + border-radius: 40rpx; + font-size: 28rpx; + font-weight: 600; + color: #fff; + } + .agree { background: linear-gradient(135deg, #c9a558, #9e7d2e); } + .reject { background: linear-gradient(135deg, #a85050, #802a2a); } + .transfer { background: linear-gradient(135deg, #4a6090, #2a3a60); } + + /* 加载/空状态 */ + .loading, .no-more, .empty { text-align: center; padding: 30rpx; color: #6a7090; font-size: 28rpx; } + + /* 弹窗 */ + .modal-mask { + position: fixed; + top: 0; left: 0; right: 0; bottom: 0; + background: rgba(0,0,0,0.7); + display: flex; + align-items: center; + justify-content: center; + z-index: 1000; + } + .modal-box { + width: 80%; + background: #1e2030; + border-radius: 24rpx; + padding: 30rpx; + border: 1rpx solid rgba(201,169,88,0.2); + } + .modal-header { font-size: 32rpx; color: #f0f2ff; font-weight: 600; margin-bottom: 20rpx; } + .modal-body { font-size: 26rpx; color: #b0b8d0; margin-bottom: 20rpx; } + .reason-input { + width: 100%; + height: 200rpx; + background: rgba(255,255,255,0.05); + border-radius: 12rpx; + padding: 15rpx; + color: #fff; + font-size: 26rpx; + box-sizing: border-box; + margin-bottom: 20rpx; + } + .countdown-text { text-align: center; font-size: 28rpx; color: #c9a558; margin-bottom: 20rpx; } + .modal-footer { display: flex; gap: 20rpx; } + .btn { + flex: 1; height: 80rpx; border-radius: 40rpx; + display: flex; align-items: center; justify-content: center; + font-size: 28rpx; font-weight: 600; + } + .cancel { background: #2a2f3e; color: #fff; } + .confirm { background: linear-gradient(135deg, #c9a558, #9e7d2e); color: #0b0c12; } + .confirm.disabled { opacity: 0.4; pointer-events: none; } \ No newline at end of file diff --git a/pages/kaohe_jilu/kaohe_jilu.js b/pages/kaohe_jilu/kaohe_jilu.js new file mode 100644 index 0000000..545e567 --- /dev/null +++ b/pages/kaohe_jilu/kaohe_jilu.js @@ -0,0 +1,149 @@ +// pages/kaohe_jilu/kaohe_jilu.js +const app = getApp(); +import request from '../../utils/request.js'; + +Page({ + data: { + // 板块筛选 + moduleList: [], + xuanzhongBankuaiId: 0, // 0代表全部 + // 状态筛选：0-全部 1-审核中 2-已通过 3-未通过 + statusFilter: 0, + // 记录列表 + recordList: [], + page: 1, + pageSize: 5, + hasMore: true, + isLoading: false, + isLoadingMore: false, + // 展开的记录ID集合（字符串数组） + expandedIds: [], + // OSS地址 + ossImageUrl: app.globalData.ossImageUrl || '', + }, + + onLoad() { + this.loadModules(); + }, + + // 加载板块（复用审核大厅接口） + async loadModules() { + try { + const res = await request({ url: '/dengji/shdthqmk', method: 'POST' }); + if (res && res.data.code === 0) { + const modules = res.data.data.modules || []; + this.setData({ moduleList: modules, xuanzhongBankuaiId: 0 }); + this.loadRecords(true); + } else { + wx.showToast({ title: '加载模块失败', icon: 'none' }); + } + } catch (e) { + wx.showToast({ title: '网络错误', icon: 'none' }); + } + }, + + // 选择板块 + selectModule(e) { + const bankuaiId = e.currentTarget.dataset.id; + if (bankuaiId === this.data.xuanzhongBankuaiId) return; + this.setData({ + xuanzhongBankuaiId: bankuaiId, + recordList: [], + page: 1, + hasMore: true, + expandedIds: [] + }); + this.loadRecords(true); + }, + + // 选择状态 + selectStatus(e) { + const status = e.currentTarget.dataset.status; + if (status === this.data.statusFilter) return; + this.setData({ + statusFilter: status, + recordList: [], + page: 1, + hasMore: true, + expandedIds: [] + }); + this.loadRecords(true); + }, + + // 加载历史记录 + async loadRecords(isRefresh = false) { + if (this.data.isLoading) return; + const page = isRefresh ? 1 : this.data.page; + if (!isRefresh && !this.data.hasMore) return; + + this.setData({ isLoading: true, isLoadingMore: !isRefresh }); + + try { + const res = await request({ + url: '/dengji/khghqkhjl', + method: 'POST', + data: { + bankuai_id: this.data.xuanzhongBankuaiId || undefined, + status: this.data.statusFilter || undefined, + page: page, + page_size: this.data.pageSize + } + }); + + this.setData({ isLoading: false, isLoadingMore: false }); + + if (res && res.data.code === 0) { + const list = res.data.data.list || []; + const hasMore = res.data.data.has_more; + // 拼接头像 + const oss = this.data.ossImageUrl; + const processedList = list.map(item => { + let avatar = item.shenqingren_avatar || ''; + if (avatar && !avatar.startsWith('http')) { + avatar = oss + avatar; + } + return { ...item, shenqingren_avatar: avatar }; + }); + const newList = isRefresh ? processedList : [...this.data.recordList, ...processedList]; + this.setData({ recordList: newList, page: page + 1, hasMore: hasMore }); + } else { + wx.showToast({ title: '加载记录失败', icon: 'none' }); + } + } catch (e) { + this.setData({ isLoading: false, isLoadingMore: false }); + wx.showToast({ title: '网络错误', icon: 'none' }); + } + }, + + // 上拉加载更多 + onReachBottom() { + if (this.data.hasMore && !this.data.isLoading && !this.data.isLoadingMore) { + this.loadRecords(false); + } + }, + + // 展开/收起详情 + toggleExpand(e) { + const jiluId = e.currentTarget.dataset.id; + // 确保 jiluId 是字符串 + const id = String(jiluId); + const expandedIds = this.data.expandedIds.slice(); // 拷贝 + const index = expandedIds.indexOf(id); + if (index > -1) { + expandedIds.splice(index, 1); + } else { + expandedIds.push(id); + } + this.setData({ expandedIds }); + }, + + // 去评判（跳转考核打分页） + goJudge(e) { + const item = e.currentTarget.dataset.item; + if (!item) return; + wx.navigateTo({ url: '/pages/kaohe_dafen/kaohe_dafen?jilu_id=' + item.jilu_id }); + }, + + // 阻止冒泡 + noop() {} +}); \ No newline at end of file diff --git a/pages/kaohe_jilu/kaohe_jilu.json b/pages/kaohe_jilu/kaohe_jilu.json new file mode 100644 index 0000000..f6a68c8 --- /dev/null +++ b/pages/kaohe_jilu/kaohe_jilu.json @@ -0,0 +1,9 @@ +{ + "usingComponents": { + "chenghao-tag": "/components/chenghao-tag/chenghao-tag", + "global-notification": "/components/global-notification/global-notification" + }, + "navigationBarTitleText": "考核记录", + "navigationBarBackgroundColor": "#FDFBF7", + "navigationBarTextStyle": "black" + } \ No newline at end of file diff --git a/pages/kaohe_jilu/kaohe_jilu.wxml b/pages/kaohe_jilu/kaohe_jilu.wxml new file mode 100644 index 0000000..b8ac9ff --- /dev/null +++ b/pages/kaohe_jilu/kaohe_jilu.wxml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + 全部 + 审核中 + 已通过 + 未通过 + + + + + + + + 暂无考核记录 + + + + + +

+ + {{item.shenqingren_nicheng || '用户'}} + UID {{item.shenqingren_id}} + + + {{item.zhuangtai == 0 ? '审核中' : (item.zhuangtai == 1 ? '已通过' : (item.zhuangtai == 2 ? '未通过' : '待审核'))}} + + + + + + + 板块 + {{item.bankuai_mingcheng}} + + + 标签 + + + + 次数 + {{item.cishu}}次 + + + 总费用 + ¥{{item.total_fee}} + + + + + + + {{expandedIds.indexOf(item.jilu_id) > -1 ? '收起详情' : '展开详情'}} + + + 去评判 + + + + + + + 考核规则 + {{item.guize_neirong}} + + + 缴纳记录 + + 第{{item.cishu}}次：¥{{item.jine}} + + 暂无缴纳记录 + + + 拒绝记录 + + + {{item.create_time}} + 第{{item.cishu}}次拒绝：{{item.yuanyin}} + + + 暂无拒绝记录 + + + 其他信息 + + 打手游戏ID：{{item.dashou_youxi_id || '无'}} + 打手备注：{{item.dashou_beizhu || '无'}} + 审核官游戏ID：{{item.shenheguan_youxi_id || '无'}} + 创建时间：{{item.create_time}} + 更新时间：{{item.update_time}} + + + + + + + 加载更多... + —— 没有更多了 —— + + + + + + + + 加载中... + + + + \ No newline at end of file diff --git a/pages/kaohe_jilu/kaohe_jilu.wxss b/pages/kaohe_jilu/kaohe_jilu.wxss new file mode 100644 index 0000000..bf37003 --- /dev/null +++ b/pages/kaohe_jilu/kaohe_jilu.wxss @@ -0,0 +1,263 @@ +/* pages/kaohe_jilu/kaohe_jilu.wxss - 晨露微光风格（左右均等边距） */ +page { + background: linear-gradient(135deg, #FDFBF7 0%, #F2EFE9 100%); + color: #4A4A4A; + font-family: 'SF Pro Display', 'PingFang SC', system-ui; + height: 100vh; + overflow: hidden; + } + + .page-root { + height: 100vh; + display: flex; + flex-direction: column; + overflow: hidden; + } + + /* 筛选栏 */ + .filter-bar { + background: rgba(255, 255, 255, 0.8); + backdrop-filter: blur(20px); + border-bottom: 1rpx solid rgba(0,0,0,0.04); + flex-shrink: 0; + padding: 20rpx 0 0; + } + + .module-scroll { + white-space: nowrap; + height: 70rpx; + padding: 0 30rpx; + } + .module-container { + display: inline-flex; + gap: 20rpx; + align-items: center; + height: 70rpx; + } + + .filter-item { + display: inline-flex; + align-items: center; + justify-content: center; + padding: 0 30rpx; + height: 56rpx; + border-radius: 28rpx; + background: #F0EFEC; + font-size: 26rpx; + color: #6B6B6B; + transition: all 0.2s; + } + .filter-item.active { + background: #C8A27A; + color: #FFFFFF; + font-weight: 600; + box-shadow: 0 4rpx 12rpx rgba(200, 162, 122, 0.3); + } + + .status-row { + display: flex; + padding: 15rpx 30rpx 20rpx; + gap: 30rpx; + } + .status-item { + font-size: 26rpx; + color: #8B8B8B; + padding-bottom: 8rpx; + border-bottom: 4rpx solid transparent; + transition: all 0.2s; + } + .status-item.active { + color: #C8A27A; + border-bottom-color: #C8A27A; + font-weight: 600; + } + + /* 列表容器 */ + .list-container { + flex: 1; + overflow: hidden; + } + .list-scroll { + height: 100%; + padding: 20rpx 0; /* 上下内边距 */ + } + + .empty-tip { + text-align: center; + color: #A0A0A0; + font-size: 28rpx; + padding-top: 200rpx; + } + + /* 卡片：统一左右边距 30rpx */ + .card { + background: #FFFFFF; + border-radius: 28rpx; + padding: 30rpx; + margin: 0 30rpx 24rpx 30rpx; /* 左右严格相等 */ + box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.04); + transition: all 0.3s; + } + + .card-header { + display: flex; + align-items: center; + margin-bottom: 24rpx; + } + .avatar { + width: 72rpx; + height: 72rpx; + border-radius: 50%; + margin-right: 18rpx; + border: 2rpx solid #F0EDE8; + background: #F7F5F2; + } + .user-info { + flex: 1; + } + .nickname { + font-size: 30rpx; + font-weight: 600; + color: #3A3A3A; + display: block; + } + .uid { + font-size: 24rpx; + color: #9A9A9A; + margin-top: 4rpx; + } + .status-tag { + font-size: 24rpx; + padding: 6rpx 18rpx; + border-radius: 20rpx; + font-weight: 500; + } + .status-0 { background: #FFF3E0; color: #EF6C00; } + .status-1 { background: #E8F5E9; color: #2E7D32; } + .status-2 { background: #FFEBEE; color: #C62828; } + .status-3 { background: #E3F2FD; color: #1565C0; } + + .card-summary { + display: flex; + flex-wrap: wrap; + gap: 16rpx 24rpx; + margin-bottom: 20rpx; + } + .summary-item { + display: flex; + align-items: center; + font-size: 26rpx; + } + .summary-item .label { + color: #8B8B8B; + margin-right: 12rpx; + } + .summary-item .value { + color: #3A3A3A; + font-weight: 500; + } + + .card-actions { + display: flex; + justify-content: space-between; + align-items: center; + padding-top: 20rpx; + border-top: 1rpx solid #F5F2ED; + } + .expand-btn { + font-size: 26rpx; + color: #C8A27A; + font-weight: 500; + } + .judge-btn { + font-size: 26rpx; + background: #C8A27A; + color: #FFFFFF; + padding: 8rpx 24rpx; + border-radius: 24rpx; + font-weight: 500; + } + + /* 展开详情（左右边距继承卡片，无需额外设置） */ + .card-detail { + margin-top: 20rpx; + padding-top: 20rpx; + border-top: 1rpx solid #F5F2ED; + } + .detail-section { + margin-bottom: 20rpx; + } + .detail-title { + font-size: 26rpx; + font-weight: 600; + color: #5A5A5A; + margin-bottom: 10rpx; + display: block; + } + .detail-text { + font-size: 24rpx; + color: #6B6B6B; + line-height: 1.6; + } + .fee-row, .reject-row { + font-size: 24rpx; + color: #6B6B6B; + padding: 6rpx 0; + } + .reject-item { + display: flex; + flex-direction: column; + background: #FFF9F5; + padding: 12rpx 16rpx; + border-radius: 12rpx; + margin-bottom: 12rpx; + } + .reject-time { + font-size: 22rpx; + color: #B0A090; + margin-bottom: 4rpx; + } + .reject-reason { + font-size: 24rpx; + color: #7A5A4A; + } + .detail-empty { + font-size: 24rpx; + color: #A0A0A0; + padding: 8rpx 0; + } + .info-grid { + display: flex; + flex-direction: column; + gap: 8rpx; + font-size: 24rpx; + color: #6B6B6B; + } + + /* 加载 */ + .loading-more, .no-more { + text-align: center; + padding: 30rpx; + font-size: 24rpx; + color: #A0A0A0; + } + .loading-mask { + position: fixed; + top: 0; left: 0; right: 0; bottom: 0; + background: rgba(253, 251, 247, 0.8); + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + z-index: 999; + } + .loading-spinner { + width: 60rpx; + height: 60rpx; + border: 4rpx solid #E0DDD5; + border-top-color: #C8A27A; + border-radius: 50%; + animation: spin 0.8s linear infinite; + margin-bottom: 20rpx; + } + @keyframes spin { to { transform: rotate(360deg); } } \ No newline at end of file diff --git a/pages/kaohe_jinpai/kaohe_jinpai.js b/pages/kaohe_jinpai/kaohe_jinpai.js new file mode 100644 index 0000000..ed6fcb4 --- /dev/null +++ b/pages/kaohe_jinpai/kaohe_jinpai.js @@ -0,0 +1,461 @@ +// pages/kaohe_jinpai/kaohe_jinpai.js +const app = getApp(); +import request from '../../utils/request.js'; + +Page({ + data: { + activeTab: 'all_tags', + plateList: [], // 第一个接口返回的所有板块及标签（含 fee_list） + myTags: [], + recordList: [], + recordPage: 1, + recordHasMore: true, + recordLoading: false, + recordFilter: 'pending', + showApplyModal: false, + selectedTag: null, + applyGameNick: '', + applyRemark: '', + applyFee: 0, + applyJiluId: '', + isReapply: false, + payLoading: false, + ossImageUrl: app.globalData.ossImageUrl || '', + + // 新增：考核官相关 + kaoheguanList: [], // 所有可选的考核官 + showKaoheguanModal: false, // 考核官选择弹窗 + selectedKaoheguanId: '', // 已选择的考核官ID + selectedKaoheguanInfo: null, // 已选择的考核官信息（用于展示） + searchKeyword: '', // 搜索关键词 + filteredKaoheguanList: [], // 搜索过滤后的列表 + }, + + onLoad() { + this.fetchAllTags(); + this.fetchMyRecords(true); + }, + + switchTab(e) { + const tab = e.currentTarget.dataset.tab; + if (tab === this.data.activeTab) return; + this.setData({ activeTab: tab }); + if (tab === 'my_records') this.fetchMyRecords(true); + }, + + // 获取所有板块及标签（含费用列表），缓存到 plateList，同时获取考核官列表 + async fetchAllTags() { + try { + const res = await request({ url: '/dengji/dskhhq', method: 'POST' }); + if (res.data.code === 0) { + const { plate_list, my_tags, kaoheguan_list } = res.data.data; + // 拼接考核官头像为完整URL + const ossUrl = this.data.ossImageUrl; + const processedKgList = (kaoheguan_list || []).map(kg => ({ + ...kg, + avatar: kg.avatar && !kg.avatar.startsWith('http') ? ossUrl + kg.avatar : kg.avatar, + })); + this.setData({ + plateList: plate_list || [], + myTags: my_tags || [], + kaoheguanList: processedKgList // 使用拼接后的列表 + }); + } + } catch (e) {} + }, + + // 获取我的考核记录，并根据 plateList 计算本次/预计下次费用 + async fetchMyRecords(isRefresh = false) { + if (this.data.recordLoading) return; + const page = isRefresh ? 1 : this.data.recordPage; + this.setData({ recordLoading: true }); + try { + const res = await request({ + url: '/dengji/dskhjl', + method: 'POST', + data: { status: this.data.recordFilter, page, page_size: 5 } + }); + if (res.data.code === 0) { + const { list, has_more } = res.data.data; + + // 从 plateList 构建标签ID -> 完整标签对象的映射（用于精确匹配费用） + const tagMap = {}; + this.data.plateList.forEach(plate => { + (plate.tags || []).forEach(tag => { + tagMap[tag.id] = tag; // tag 包含 fee_list + }); + }); + + // 处理每条记录：优先使用 tag_obj.id 匹配，其次 chenghao_id + const processed = list.map(item => { + // 尝试多种方式获取标签ID + const tagId = (item.tag_obj && item.tag_obj.id) || item.chenghao_id; + const tag = tagMap[tagId] || item.tag_obj || {}; + const feeList = tag.fee_list || []; + let currentFee = 0; + let nextFee = 0; + if (feeList.length > 0) { + const cishu = item.cishu; + const cur = feeList.find(f => f.cishu === cishu); + currentFee = cur ? cur.feiyong : feeList[feeList.length - 1].feiyong; + const nextCishu = cishu + 1; + const nxt = feeList.find(f => f.cishu === nextCishu); + nextFee = nxt ? nxt.feiyong : feeList[feeList.length - 1].feiyong; + } + return { + ...item, + current_fee: currentFee, + next_fee: nextFee, + tag_obj: tag // 使用匹配到的完整标签对象，保证后续“再次考核”能拿到费用 + }; + }); + + const newList = isRefresh ? processed : [...this.data.recordList, ...processed]; + this.setData({ + recordList: newList, + recordPage: page + 1, + recordHasMore: has_more, + recordLoading: false + }); + } else { + this.setData({ recordLoading: false }); + } + } catch (e) { + this.setData({ recordLoading: false }); + } + }, + + filterRecord(e) { + const filter = e.currentTarget.dataset.filter; + if (filter === this.data.recordFilter) return; + this.setData({ recordFilter: filter, recordList: [], recordPage: 1, recordHasMore: true }); + this.fetchMyRecords(true); + }, + + onReachBottom() { + if (this.data.activeTab === 'my_records' && this.data.recordHasMore) { + this.fetchMyRecords(false); + } + }, + + // 打开申请考核弹窗，费用完全基于 plateList 中的标签数据 + openApplyModal(e) { + const { tag, jiluid, reapply } = e.currentTarget.dataset; + // 查找完整标签对象，保证 fee_list 存在 + let fullTag = tag; + if (fullTag && fullTag.fee_list === undefined) { + const found = this.findTagInPlateList(fullTag.id); + if (found) fullTag = found; + } + if (!fullTag) { + const found = this.findTagInPlateList(tag); + if (found) fullTag = found; + } + + let fee = 0; + if (fullTag) { + let nextCishu = 0; + // 再次申请时，基于原记录次数计算下一次考核次数 + if (reapply && jiluid) { + const record = this.data.recordList.find(r => r.jilu_id === jiluid); + if (record) { + nextCishu = record.cishu + 1; + } else { + nextCishu = (fullTag.my_cishu || 0) + 1; + } + } else { + nextCishu = (fullTag.my_cishu || 0) + 1; + } + const feeList = fullTag.fee_list || []; + const exact = feeList.find(f => f.cishu === nextCishu); + if (exact) { + fee = exact.feiyong; + } else if (feeList.length > 0) { + fee = feeList[feeList.length - 1].feiyong; + } + } + // 检查再次申请时原记录是否有考核官，若有则不允许指定 + let canSpecify = true; + let originalShenheguanId = ''; + if (reapply && jiluid) { + const record = this.data.recordList.find(r => r.jilu_id === jiluid); + if (record && record.shenheguan_id) { + canSpecify = false; // 已有考核官，不能指定新的 + originalShenheguanId = record.shenheguan_id; + } + } + this.setData({ + showApplyModal: true, + selectedTag: fullTag || null, + applyGameNick: '', + applyRemark: '', + applyFee: fee, + applyJiluId: jiluid || '', + isReapply: reapply || false, + selectedKaoheguanId: '', // 重置 + selectedKaoheguanInfo: null, + canSpecify: canSpecify, // 新增 + originalShenheguanId: originalShenheguanId, // 新增 + }); + }, + + // 辅助方法：从 plateList 查找指定 id 的标签 + findTagInPlateList(tagId) { + if (!tagId) return null; + for (const plate of this.data.plateList) { + for (const t of (plate.tags || [])) { + if (t.id === tagId) return t; + } + } + return null; + }, + + closeApplyModal() { + this.setData({ showApplyModal: false }); + }, + + // 实时更新游戏昵称 + onNickInput(e) { + this.setData({ applyGameNick: e.detail.value }); + }, + + // 实时更新备注 + onRemarkInput(e) { + this.setData({ applyRemark: e.detail.value }); + }, + + // 新增：打开考核官选择弹窗 + openKaoheguanModal() { + if (!this.data.canSpecify) { + wx.showToast({ title: '已有考核官，无法重新指定', icon: 'none' }); + return; + } + // 根据费用筛选可选考核官 + let all = [...this.data.kaoheguanList]; + if (this.data.applyFee > 0) { + all = all.filter(kg => kg.is_renzheng); + } + this.setData({ + showKaoheguanModal: true, + filteredKaoheguanList: all, + searchKeyword: '', + }); + }, + + // 关闭考核官选择弹窗 + closeKaoheguanModal() { + this.setData({ showKaoheguanModal: false }); + }, + + // 搜索输入 + onSearchInput(e) { + const value = e.detail.value.trim(); + this.setData({ searchKeyword: value }); + this.filterKaoheguanList(value); + }, + + // 过滤考核官列表 + filterKaoheguanList(keyword) { + let all = [...this.data.kaoheguanList]; + if (this.data.applyFee > 0) { + all = all.filter(kg => kg.is_renzheng); + } + if (keyword) { + all = all.filter(kg => + kg.yonghuid.includes(keyword) || + (kg.dashou_nick && kg.dashou_nick.includes(keyword)) + ); + } + this.setData({ filteredKaoheguanList: all }); + }, + + // 选择一个考核官 + selectKaoheguan(e) { + const kg = e.currentTarget.dataset.kg; + if (kg.shenhe_zhuangtai !== 0) { + wx.showToast({ title: '该考核官正忙，无法指定', icon: 'none' }); + return; + } + this.setData({ + selectedKaoheguanId: kg.yonghuid, + selectedKaoheguanInfo: kg, + showKaoheguanModal: false, + }); + }, + + // 取消已选择的考核官 + clearSelectedKaoheguan() { + this.setData({ + selectedKaoheguanId: '', + selectedKaoheguanInfo: null, + }); + }, + + // 提交申请 + async submitApply() { + const { applyGameNick, applyRemark, applyFee, selectedTag, isReapply, applyJiluId, selectedKaoheguanId } = this.data; + if (!applyGameNick || !applyGameNick.trim()) { + wx.showToast({ title: '请输入游戏昵称', icon: 'none' }); + return; + } + if (!applyRemark || !applyRemark.trim()) { + wx.showToast({ title: '请填写备注', icon: 'none' }); + return; + } + if (applyFee > 0) { + await this.startPayProcess(); + } else { + await this.doFreeApply(); + } + }, + + // 支付流程 + async startPayProcess() { + this.setData({ payLoading: true }); + try { + const res = await request({ + url: '/yonghu/khzf', + method: 'POST', + data: { + tag_id: this.data.selectedTag.id, + game_nick: this.data.applyGameNick, + remark: this.data.applyRemark, + reapply: this.data.isReapply, + jilu_id: this.data.applyJiluId, + shenheguan_id: this.data.selectedKaoheguanId, // 新增 + } + }); + if (res.data.code !== 200) throw new Error(res.data.message || '下单失败'); + const payParams = res.data.payParams; + const dingdanid = res.data.dingdanid; + wx.requestPayment({ + timeStamp: payParams.timeStamp, + nonceStr: payParams.nonceStr, + package: payParams.package, + signType: payParams.signType || 'MD5', + paySign: payParams.paySign, + success: async () => { + await this.pollPayStatus(dingdanid); + }, + fail: () => { + wx.showToast({ title: '支付取消或失败', icon: 'none' }); + request({ url: '/yonghu/khzfsb', method: 'POST', data: { dingdanid } }).catch(()=>{}); + } + }); + } catch (e) { + wx.showToast({ title: e.message || '支付异常', icon: 'none' }); + } finally { + this.setData({ payLoading: false }); + } + }, + + // 轮询支付结果 + async pollPayStatus(dingdanid) { + for (let i = 0; i < 10; i++) { + try { + const res = await request({ url: '/yonghu/khzffc', method: 'POST', data: { dingdanid } }); + if (res.data.code === 200) { + wx.showToast({ title: '申请成功', icon: 'success' }); + this.closeApplyModal(); + this.fetchAllTags(); + this.setData({ recordList: [], recordPage: 1 }); + this.fetchMyRecords(true); + return; + } + } catch (e) {} + await new Promise(r => setTimeout(r, 2000)); + } + wx.showToast({ title: '支付确认超时', icon: 'none' }); + }, + + // 免费申请 + async doFreeApply() { + try { + const res = await request({ + url: '/dengji/dssqkh', + method: 'POST', + data: { + tag_id: this.data.selectedTag.id, + game_nick: this.data.applyGameNick, + remark: this.data.applyRemark, + reapply: this.data.isReapply, + jilu_id: this.data.applyJiluId, + shenheguan_id: this.data.selectedKaoheguanId, // 新增 + } + }); + if (res.data.code === 0) { + wx.showToast({ title: '申请成功', icon: 'success' }); + this.closeApplyModal(); + this.fetchAllTags(); + this.setData({ recordList: [], recordPage: 1 }); + this.fetchMyRecords(true); + } else { + wx.showToast({ title: res.data.msg || '申请失败', icon: 'none' }); + } + } catch (e) { + wx.showToast({ title: '网络错误', icon: 'none' }); + } + }, + + // 联系考核官（私聊） + contactKaoheguan(e) { + const item = e.currentTarget.dataset.item; + if (!item) return; + if (!item.shenheguan_id) { + wx.showToast({ title: '暂无考核官信息', icon: 'none' }); + return; + } + const uid = wx.getStorageSync('uid'); + if (!uid) { + wx.showToast({ title: '用户信息缺失', icon: 'none' }); + return; + } + if (app.globalData.currentRole !== 'dashou') { + app.globalData.currentRole = 'dashou'; + wx.setStorageSync('currentRole', 'dashou'); + } + if (app.connectForCurrentRole) { + app.connectForCurrentRole(); + } else if (app.ensureConnection) { + app.ensureConnection(); + } + const ossImageUrl = this.data.ossImageUrl || app.globalData.ossImageUrl || ''; + let fullAvatar = item.shenheguan_avatar || ''; + if (fullAvatar && !fullAvatar.startsWith('http')) { + fullAvatar = ossImageUrl + fullAvatar; + } + if (!fullAvatar) { + fullAvatar = ossImageUrl + (app.globalData.morentouxiang || 'avatar/default.jpg'); + } + const param = { + toUserId: 'Kh' + item.shenheguan_id, + toName: '考核官' + item.shenheguan_id, + toAvatar: fullAvatar + }; + wx.navigateTo({ + url: '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param)), + fail: (err) => { + wx.showToast({ title: '打开聊天失败', icon: 'none' }); + } + }); + }, + + showTagDetail(e) { + const tag = e.currentTarget.dataset.tag; + const feeStr = this.formatFeeList(tag.fee_list); + wx.showModal({ + title: tag.name, + content: `规则：${tag.rule || '暂无'}\n${tag.jinpai ? '【可同时开启金牌】' : ''}\n费用：${feeStr}`, + showCancel: false, + confirmText: '知道了' + }); + }, + + formatFeeList(feeList) { + if (!feeList || feeList.length === 0) return '暂无'; + let str = feeList.map(f => `第${f.cishu}次：¥${f.feiyong}`).join('；'); + const last = feeList[feeList.length - 1]; + str += `；第${last.cishu}次及以上：¥${last.feiyong}`; + return str; + }, +}); \ No newline at end of file diff --git a/pages/kaohe_jinpai/kaohe_jinpai.json b/pages/kaohe_jinpai/kaohe_jinpai.json new file mode 100644 index 0000000..fa331e5 --- /dev/null +++ b/pages/kaohe_jinpai/kaohe_jinpai.json @@ -0,0 +1,9 @@ +{ + "usingComponents": { + "chenghao-tag": "/components/chenghao-tag/chenghao-tag", + "global-notification": "/components/global-notification/global-notification" + }, + "navigationBarTitleText": "考核金牌", + "navigationBarBackgroundColor": "#0F0A1E", + "navigationBarTextStyle": "white" + } \ No newline at end of file diff --git a/pages/kaohe_jinpai/kaohe_jinpai.wxml b/pages/kaohe_jinpai/kaohe_jinpai.wxml new file mode 100644 index 0000000..6d89494 --- /dev/null +++ b/pages/kaohe_jinpai/kaohe_jinpai.wxml @@ -0,0 +1,135 @@ + + + + + 考核标签 + 我的考核 + + + + + + + {{item.mingcheng}} + + + + 金牌 + + + {{item.cishu}}次 ¥{{item.feiyong}} + ≥{{item.fee_list.length}}次 ¥{{item.fee_list[item.fee_list.length-1].feiyong}} + + 申请考核 + 已拥有 + + + + + + + + + 进行中/未通过 + 已通过 + + + + + {{item.chenghao_name}} + {{item.statusText}} + + + 板块：{{item.bankuai_name}} + 考核官：{{item.shenheguan_id || '待分配'}} + + 联系考核官 + + 游戏ID：{{item.dashou_youxi_id}} + 备注：{{item.dashou_beizhu}} + 第{{item.cishu}}次考核 · 共缴 ¥{{item.total_fee}} + + + + 本次考核费用：¥{{item.current_fee}} + 预计下次费用：¥{{item.next_fee}} + + + 上次拒绝原因：{{item.last_fail_reason}} + + + 再次考核 + + 加载中... + —— 没有更多了 —— + + + + + + + + + 游戏昵称 + + + + 备注 +

+      </view>
+
+      
+      <view class="form-group">
+        <text class="form-label">指定考核官（可选）</text>
+        <view wx:if="{{!canSpecify}}" class="kg-disabled-tip">
+          <text>已有考核官：{{originalShenheguanId}}，不可重新指定</text>
+        </view>
+        <view wx:else>
+          <view wx:if="{{!selectedKaoheguanInfo}}" class="select-kg-btn" bindtap="openKaoheguanModal">选择考核官</view>
+          <view wx:else class="selected-kg-card">
+            <image class="kg-avatar" src="{{selectedKaoheguanInfo.avatar}}" mode="aspectFill" />
+            <view class="kg-info">
+              <text class="kg-uid">UID {{selectedKaoheguanInfo.yonghuid}}</text>
+              <text class="kg-nick" wx:if="{{selectedKaoheguanInfo.dashou_nick}}">{{selectedKaoheguanInfo.dashou_nick}}</text>
+              <text class="kg-status {{selectedKaoheguanInfo.is_renzheng ? 'renzheng' : 'not-renzheng'}}">{{selectedKaoheguanInfo.is_renzheng ? '已认证' : '未认证'}}</text>
+            </view>
+            <view class="clear-kg-btn" bindtap="clearSelectedKaoheguan">取消</view>
+          </view>
+        </view>
+      </view>
+
+      <view wx:if="{{applyFee > 0}}" class="fee-info">本次需缴纳：<text class="fee-amount">¥{{applyFee}}</text></view>
+      <view class="modal-actions">
+        <view class="btn-cancel" bindtap="closeApplyModal">取消</view>
+        <view class="btn-confirm" bindtap="submitApply">确认申请{{applyFee > 0 ? '并支付' : ''}}</view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view wx:if="{{showKaoheguanModal}}" class="modal-mask" bindtap="closeKaoheguanModal">
+    <view class="modal-dialog" catchtap="noop">
+      <view class="modal-header">选择考核官</view>
+      <view class="search-box">
+        <input class="search-input" value="{{searchKeyword}}" bindinput="onSearchInput" placeholder="搜索用户ID或昵称" />
+      </view>
+      <scroll-view scroll-y="true" class="kg-scroll">
+        <view wx:for="{{filteredKaoheguanList}}" wx:key="yonghuid" class="kg-item" data-kg="{{item}}" bindtap="selectKaoheguan">
+          <image class="kg-avatar" src="{{item.avatar}}" mode="aspectFill" />
+          <view class="kg-info">
+            <text class="kg-uid">UID {{item.yonghuid}}</text>
+            <text wx:if="{{item.dashou_nick}}" class="kg-nick">{{item.dashou_nick}}</text>
+            <text class="kg-status {{item.is_renzheng ? 'renzheng' : 'not-renzheng'}}">{{item.is_renzheng ? '已认证' : '未认证'}}</text>
+            <text class="kg-state {{item.shenhe_zhuangtai === 0 ? 'free' : 'busy'}}">{{item.shenhe_zhuangtai === 0 ? '空闲' : '忙碌'}}</text>
+          </view>
+        </view>
+        <view wx:if="{{filteredKaoheguanList.length === 0}}" class="empty-tip">暂无符合条件的考核官</view>
+      </scroll-view>
+      <view class="modal-actions">
+        <view class="btn-cancel" bindtap="closeKaoheguanModal">取消</view>
+      </view>
+    </view>
+  </view>
+
+  <global-notification id="global-notification" />
+</view>
\ No newline at end of file
diff --git a/pages/kaohe_jinpai/kaohe_jinpai.wxss b/pages/kaohe_jinpai/kaohe_jinpai.wxss
new file mode 100644
index 0000000..854c33b
--- /dev/null
+++ b/pages/kaohe_jinpai/kaohe_jinpai.wxss
@@ -0,0 +1,385 @@
+/* pages/kaohe_jinpai/kaohe_jinpai.wxss - 晨雾微光风格 */
+.page-root {
+    min-height: 100vh;
+    background: linear-gradient(135deg, #F5F7FA 0%, #E4E8F0 100%);
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+  }
+  
+  .tab-bar {
+    display: flex;
+    padding: 30rpx 50rpx;
+    gap: 60rpx;
+    background: rgba(255, 255, 255, 0.65);
+    backdrop-filter: blur(15px);
+    border-bottom: 1rpx solid rgba(0, 0, 0, 0.04);
+  }
+  .tab-item {
+    font-size: 32rpx;
+    color: #6B7280;
+    padding-bottom: 10rpx;
+    border-bottom: 4rpx solid transparent;
+    transition: all 0.3s;
+  }
+  .tab-item.active {
+    color: #4C5BF0;
+    border-bottom-color: #4C5BF0;
+    font-weight: 600;
+  }
+  
+  .content-area {
+    flex: 1;
+    overflow: hidden;
+  }
+  .scroll-view {
+    height: 100%;
+    padding: 30rpx 0;
+  }
+  
+  .plate-group {
+    margin-bottom: 50rpx;
+  }
+  .plate-title {
+    font-size: 34rpx;
+    font-weight: 700;
+    color: #1F2937;
+    margin-bottom: 20rpx;
+    padding-left: 30rpx;
+    border-left: 6rpx solid #4C5BF0;
+    margin-left: 30rpx;
+    margin-right: 30rpx;
+  }
+  
+  .tag-card {
+    background: #FFFFFF;
+    border-radius: 28rpx;
+    padding: 30rpx;
+    margin: 0 30rpx 20rpx 30rpx;
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.03);
+    border: 1rpx solid rgba(0, 0, 0, 0.04);
+  }
+  .tag-header {
+    display: flex;
+    align-items: center;
+    gap: 16rpx;
+    margin-bottom: 18rpx;
+  }
+  .jinpai-badge {
+    font-size: 22rpx;
+    color: #F59E0B;
+    background: rgba(245, 158, 11, 0.1);
+    padding: 4rpx 14rpx;
+    border-radius: 20rpx;
+    font-weight: 600;
+  }
+  .fee-line {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16rpx;
+    margin-bottom: 20rpx;
+  }
+  .fee-item {
+    font-size: 24rpx;
+    color: #4B5563;
+    background: #F3F4F6;
+    padding: 6rpx 16rpx;
+    border-radius: 20rpx;
+  }
+  
+  .apply-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 80rpx;
+    background: linear-gradient(135deg, #4C5BF0, #6D7AF5);
+    color: #FFFFFF;
+    border-radius: 34rpx;
+    font-size: 28rpx;
+    font-weight: 600;
+    letter-spacing: 2rpx;
+    transition: all 0.2s;
+  }
+  .apply-btn:active {
+    opacity: 0.85;
+    transform: scale(0.98);
+  }
+  .owned-tip {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 80rpx;
+    color: #10B981;
+    font-size: 28rpx;
+    font-weight: 600;
+  }
+  
+  /* 记录卡片 */
+  .record-card {
+    background: #FFFFFF;
+    border-radius: 28rpx;
+    padding: 30rpx;
+    margin: 0 30rpx 20rpx 30rpx;
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.03);
+    border: 1rpx solid rgba(0, 0, 0, 0.04);
+  }
+  .card-top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 16rpx;
+  }
+  .tag-name { font-size: 32rpx; font-weight: 600; color: #1F2937; }
+  .status-text { font-size: 26rpx; }
+  .card-info {
+    display: flex;
+    flex-direction: column;
+    gap: 10rpx;
+    font-size: 26rpx;
+    color: #4B5563;
+  }
+  
+  /* 联系考核官：蓝色下划线 */
+  .contact-text-link {
+    color: #4C5BF0;
+    text-decoration: underline;
+    font-size: 26rpx;
+  }
+  
+  .fee-predict {
+    background: #F3F4F6;
+    padding: 12rpx 16rpx;
+    border-radius: 12rpx;
+    margin-top: 10rpx;
+    display: flex;
+    flex-direction: column;
+    gap: 6rpx;
+    font-size: 24rpx;
+    color: #4B5563;
+  }
+  
+  .reapply-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 80rpx;
+    margin-top: 20rpx;
+    background: #F59E0B;
+    color: #FFFFFF;
+    border-radius: 34rpx;
+    font-size: 28rpx;
+    font-weight: 600;
+  }
+  .reapply-btn:active {
+    opacity: 0.85;
+    transform: scale(0.98);
+  }
+  
+  .filter-row {
+    display: flex;
+    padding: 20rpx 30rpx;
+    gap: 40rpx;
+  }
+  .filter-tag {
+    font-size: 28rpx;
+    color: #6B7280;
+    padding-bottom: 8rpx;
+    border-bottom: 3rpx solid transparent;
+  }
+  .filter-tag.active {
+    color: #4C5BF0;
+    border-bottom-color: #4C5BF0;
+  }
+  
+  /* 弹窗 */
+  .modal-mask {
+    position: fixed; top:0; left:0; width:100%; height:100%;
+    background: rgba(0, 0, 0, 0.4);
+    display: flex; align-items: center; justify-content: center;
+    z-index: 1000;
+  }
+  .modal-dialog {
+    width: 85%;
+    background: #FFFFFF;
+    border-radius: 36rpx;
+    padding: 40rpx;
+    box-shadow: 0 20rpx 40rpx rgba(0, 0, 0, 0.15);
+  }
+  .modal-header { font-size: 34rpx; font-weight: 700; color: #1F2937; margin-bottom: 30rpx; }
+  .form-group { margin-bottom: 25rpx; }
+  .form-label { font-size: 28rpx; color: #4B5563; margin-bottom: 10rpx; display: block; }
+  .form-input, .form-textarea {
+    width: 100%;
+    background: #F9FAFB;
+    border-radius: 14rpx;
+    padding: 16rpx;
+    font-size: 28rpx;
+    color: #1F2937;
+    border: 1rpx solid #E5E7EB;
+  }
+  .form-textarea { height: 150rpx; }
+  .fee-info { text-align: center; font-size: 30rpx; margin: 20rpx 0; color: #F59E0B; }
+  .fee-amount { font-weight: 700; }
+  .modal-actions { display: flex; gap: 20rpx; margin-top: 30rpx; }
+  .btn-cancel, .btn-confirm {
+    flex: 1;
+    height: 80rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 40rpx;
+    font-size: 30rpx;
+    font-weight: 600;
+    transition: all 0.2s;
+  }
+  .btn-cancel { background: #F3F4F6; color: #4B5563; }
+  .btn-cancel:active { background: #E5E7EB; }
+  .btn-confirm { background: linear-gradient(135deg, #4C5BF0, #6D7AF5); color: #FFFFFF; }
+  .btn-confirm:active { opacity: 0.85; transform: scale(0.98); }
+  
+  .loading-more, .no-more { text-align: center; padding: 30rpx; color: #9CA3AF; font-size: 26rpx; }
+  
+  .kg-avatar {
+    width: 40rpx;
+    height: 40rpx;
+    border-radius: 50%;
+    margin-right: 8rpx;
+    vertical-align: middle;
+  }
+
+
+
+
+
+  /* 原有样式保留，以下是新增样式 */
+
+/* 指定考核官选择按钮 */
+.select-kg-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 80rpx;
+    background: #F3F4F6;
+    color: #4B5563;
+    border-radius: 34rpx;
+    font-size: 28rpx;
+    margin-top: 10rpx;
+  }
+  .select-kg-btn:active {
+    background: #E5E7EB;
+  }
+  
+  /* 已选择的考核官卡片 */
+  .selected-kg-card {
+    display: flex;
+    align-items: center;
+    background: #F9FAFB;
+    border-radius: 20rpx;
+    padding: 20rpx;
+    margin-top: 10rpx;
+    border: 1rpx solid #E5E7EB;
+  }
+  .kg-avatar {
+    width: 64rpx;
+    height: 64rpx;
+    border-radius: 50%;
+    margin-right: 16rpx;
+  }
+  .kg-info {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 4rpx;
+  }
+  .kg-uid {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #1F2937;
+  }
+  .kg-nick {
+    font-size: 24rpx;
+    color: #6B7280;
+  }
+  .kg-status {
+    font-size: 22rpx;
+    padding: 2rpx 12rpx;
+    border-radius: 20rpx;
+    display: inline-block;
+    width: fit-content;
+  }
+  .kg-status.renzheng {
+    background: rgba(16, 185, 129, 0.1);
+    color: #10B981;
+  }
+  .kg-status.not-renzheng {
+    background: rgba(245, 158, 11, 0.1);
+    color: #F59E0B;
+  }
+  .clear-kg-btn {
+    color: #EF4444;
+    font-size: 26rpx;
+    padding: 0 10rpx;
+  }
+  .clear-kg-btn:active {
+    opacity: 0.7;
+  }
+  
+  /* 禁用指定提示 */
+  .kg-disabled-tip {
+    background: #FEF3C7;
+    padding: 16rpx;
+    border-radius: 12rpx;
+    font-size: 24rpx;
+    color: #92400E;
+    margin-top: 10rpx;
+  }
+  
+  /* 考核官选择弹窗内搜索 */
+  .search-box {
+    margin-bottom: 20rpx;
+  }
+  .search-input {
+    width: 100%;
+    background: #F9FAFB;
+    border-radius: 14rpx;
+    padding: 16rpx;
+    font-size: 28rpx;
+    border: 1rpx solid #E5E7EB;
+  }
+  
+  /* 考核官滚动列表 */
+  .kg-scroll {
+    max-height: 500rpx;
+    margin-bottom: 20rpx;
+  }
+  
+  /* 单个考核官项 */
+  .kg-item {
+    display: flex;
+    align-items: center;
+    padding: 20rpx;
+    background: #FFFFFF;
+    border-radius: 16rpx;
+    margin-bottom: 12rpx;
+    border: 1rpx solid #F3F4F6;
+  }
+  .kg-item:active {
+    background: #F9FAFB;
+  }
+  .kg-item .kg-state {
+    font-size: 22rpx;
+    margin-top: 4rpx;
+  }
+  .kg-state.free {
+    color: #10B981;
+  }
+  .kg-state.busy {
+    color: #EF4444;
+  }
+  
+  .empty-tip {
+    text-align: center;
+    padding: 30rpx;
+    color: #9CA3AF;
+    font-size: 26rpx;
+  }
\ No newline at end of file
diff --git a/pages/kaohe_zhongxin/kaohe_zhongxin.js b/pages/kaohe_zhongxin/kaohe_zhongxin.js
new file mode 100644
index 0000000..9f45455
--- /dev/null
+++ b/pages/kaohe_zhongxin/kaohe_zhongxin.js
@@ -0,0 +1,240 @@
+// pages/shenhedating/shenhedating.js
+const app = getApp();
+import request from '../../utils/request.js';
+
+Page({
+  data: {
+    // 模块列表 [{bankuai_id, mingcheng, count, is_related}]
+    moduleList: [],
+    xuanzhongBankuaiId: 0,        // 0代表全部
+    // 审核记录列表
+    recordList: [],
+    page: 1,
+    pageSize: 5,
+    hasMore: true,
+    isLoading: false,
+    isLoadingMore: false,
+    scrollViewRefreshing: false,
+    lastRefreshTime: 0,
+    refreshCooldown: 2000,
+    // 弹窗控制
+    showRuleModal: false,
+    currentRuleContent: '',
+    showBeizhuModal: false,
+    currentBeizhuContent: '',
+    // 加载状态
+    loadingModules: false
+  },
+
+  onLoad() {
+    this.loadModules();
+  },
+
+  onShow() {
+    this.registerNotificationComponent();
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  // 加载板块模块
+  async loadModules() {
+    this.setData({ loadingModules: true });
+    try {
+      const res = await request({ url: '/dengji/shdthqmk', method: 'POST' });
+      if (res && res.data.code === 0) {
+        const modules = res.data.data.modules || [];
+        this.setData({ moduleList: modules, xuanzhongBankuaiId: 0 });
+        this.loadRecords(true);
+      } else {
+        wx.showToast({ title: '加载模块失败', icon: 'none' });
+      }
+    } catch (e) {
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    } finally {
+      this.setData({ loadingModules: false });
+    }
+  },
+
+  // 选择模块（含全部）
+  selectModule(e) {
+    const bankuaiId = e.currentTarget.dataset.id;
+    if (bankuaiId === this.data.xuanzhongBankuaiId) return;
+    this.setData({
+      xuanzhongBankuaiId: bankuaiId,
+      recordList: [],
+      page: 1,
+      hasMore: true
+    });
+    this.loadRecords(true);
+  },
+
+  // 加载审核记录
+  async loadRecords(isRefresh = false) {
+    if (this.data.isLoading) return;
+    const page = isRefresh ? 1 : this.data.page;
+    if (!isRefresh && !this.data.hasMore) return;
+
+    this.setData({ isLoading: true, isLoadingMore: !isRefresh });
+
+    try {
+      const res = await request({
+        url: '/dengji/hqshsj',
+        method: 'POST',
+        data: {
+          bankuai_id: this.data.xuanzhongBankuaiId || undefined,
+          page: page,
+          page_size: this.data.pageSize
+        }
+      });
+
+      this.setData({ isLoading: false, isLoadingMore: false, scrollViewRefreshing: false });
+
+      if (res && res.data.code === 0) {
+        const list = res.data.data.list || [];
+        const hasMore = res.data.data.has_more;
+        const ossUrl = app.globalData.ossImageUrl || '';
+        const processedList = list.map(item => {
+          let avatar = item.shenqingren_avatar || '';
+          if (avatar && !avatar.startsWith('http')) {
+            avatar = ossUrl + avatar;
+          }
+          return { ...item, shenqingren_avatar: avatar };
+        });
+        const newList = isRefresh ? processedList : [...this.data.recordList, ...processedList];
+        this.setData({ recordList: newList, page: page + 1, hasMore: hasMore });
+        if (isRefresh) this.setData({ lastRefreshTime: Date.now() });
+      } else {
+        wx.showToast({ title: '加载记录失败', icon: 'none' });
+      }
+    } catch (e) {
+      this.setData({ isLoading: false, isLoadingMore: false, scrollViewRefreshing: false });
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  // 上拉加载更多
+  onReachBottom() {
+    const now = Date.now();
+    if (now - this.data.lastRefreshTime < this.data.refreshCooldown ||
+        this.data.isLoading || this.data.isLoadingMore) return;
+    if (this.data.hasMore) {
+      this.loadRecords(false);
+    }
+  },
+
+  // 下拉刷新
+  onPullDownRefresh() {
+    const now = Date.now();
+    if (now - this.data.lastRefreshTime < this.data.refreshCooldown || this.data.isLoading) {
+      this.setData({ scrollViewRefreshing: false });
+      return;
+    }
+    this.setData({ scrollViewRefreshing: true, lastRefreshTime: now, page: 1, hasMore: true });
+    this.loadRecords(true);
+  },
+
+  // 查看规则详情
+  showRuleDetail(e) {
+    const content = e.currentTarget.dataset.content;
+    this.setData({ showRuleModal: true, currentRuleContent: content });
+  },
+  hideRuleDetail() {
+    this.setData({ showRuleModal: false, currentRuleContent: '' });
+  },
+
+  // 查看备注详情
+  showBeizhuDetail(e) {
+    const content = e.currentTarget.dataset.content;
+    this.setData({ showBeizhuModal: true, currentBeizhuContent: content || '无' });
+  },
+  hideBeizhuDetail() {
+    this.setData({ showBeizhuModal: false, currentBeizhuContent: '' });
+  },
+
+  // 抢单
+  async onShouShen(e) {
+    const jiluId = e.currentTarget.dataset.jiluid;
+    const bankuaiId = e.currentTarget.dataset.bankuaiid;
+    if (!jiluId) {
+      wx.showToast({ title: '记录ID异常，无法接单', icon: 'none' });
+      return;
+    }
+
+    const that = this;
+    wx.showModal({
+      title: '确认审核',
+      content: '确定要审核此用户吗？审核后请前往游戏进行审核，并严格评分。',
+      confirmColor: '#c9a558',
+      success: async (res) => {
+        if (res.confirm) {
+          wx.showLoading({ title: '接单中...', mask: true });
+          try {
+            const qdRes = await request({
+              url: '/dengji/shqd',
+              method: 'POST',
+              data: { jilu_id: jiluId }
+            });
+            if (qdRes && qdRes.data.code === 0) {
+              // 抢单成功，弹出联系打手弹窗
+              wx.showModal({
+                title: '接待成功',
+                content: '请认真考核，点击联系他查看打手信息并打分。',
+                showCancel: false,
+                confirmText: '联系他',
+                confirmColor: '#c9a558',
+                success: (modalRes) => {
+                  if (modalRes.confirm) {
+                    wx.navigateTo({
+                      url: '/pages/kaohe_dafen/kaohe_dafen?jilu_id=' + jiluId
+                    });
+                  }
+                }
+              });
+              const newList = that.data.recordList.filter(r => r.jilu_id !== jiluId);
+              that.setData({ recordList: newList });
+              // 对应板块待审核数减1
+              const bkId = qdRes.data.data ? qdRes.data.data.bankuai_id : bankuaiId;
+              if (bkId) {
+                const newModules = that.data.moduleList.map(m => {
+                  if (m.bankuai_id === bkId && m.count > 0) {
+                    return { ...m, count: m.count - 1 };
+                  }
+                  return m;
+                });
+                that.setData({ moduleList: newModules });
+              }
+            } else {
+              const errMsg = qdRes?.data?.msg || '接单失败，请重试';
+              wx.showModal({
+                title: '接单失败',
+                content: errMsg,
+                showCancel: false,
+                confirmText: '知道了',
+                confirmColor: '#c9a558'
+              });
+            }
+          } catch (e) {
+            wx.showModal({
+              title: '提示',
+              content: '网络错误，请重试',
+              showCancel: false,
+              confirmText: '知道了'
+            });
+          } finally {
+            wx.hideLoading();
+          }
+        }
+      }
+    });
+  },
+
+  noop() {}
+});
\ No newline at end of file
diff --git a/pages/kaohe_zhongxin/kaohe_zhongxin.json b/pages/kaohe_zhongxin/kaohe_zhongxin.json
new file mode 100644
index 0000000..37a74a1
--- /dev/null
+++ b/pages/kaohe_zhongxin/kaohe_zhongxin.json
@@ -0,0 +1,10 @@
+{
+    "usingComponents": {
+      "chenghao-tag": "/components/chenghao-tag/chenghao-tag",
+      "global-notification": "/components/global-notification/global-notification",
+      "popup-notice": "/components/popup-notice/popup-notice"
+    },
+    "navigationBarTitleText": "审核大厅",
+    "navigationBarBackgroundColor": "#0b0c12",
+    "navigationBarTextStyle": "white"
+  }
\ No newline at end of file
diff --git a/pages/kaohe_zhongxin/kaohe_zhongxin.wxml b/pages/kaohe_zhongxin/kaohe_zhongxin.wxml
new file mode 100644
index 0000000..08e7ebb
--- /dev/null
+++ b/pages/kaohe_zhongxin/kaohe_zhongxin.wxml
@@ -0,0 +1,144 @@
+
+<view class="shenhe-page">
+  
+  <view class="module-quyu">
+    <scroll-view class="module-scroll" scroll-x enhanced show-scrollbar="{{false}}" scroll-y="{{false}}">
+      <view class="module-container">
+        <view
+          class="module-item {{xuanzhongBankuaiId === 0 ? 'module-active' : ''}}"
+          data-id="{{0}}"
+          bindtap="selectModule"
+        >
+          <text class="module-name">全部</text>
+        </view>
+        <block wx:for="{{moduleList}}" wx:key="bankuai_id">
+          <view
+            class="module-item {{xuanzhongBankuaiId === item.bankuai_id ? 'module-active' : ''}}"
+            data-id="{{item.bankuai_id}}"
+            bindtap="selectModule"
+          >
+            <text class="module-name">{{item.mingcheng}}</text>
+            <text wx:if="{{item.count > 0}}" class="module-count">{{item.count}}</text>
+          </view>
+        </block>
+      </view>
+    </scroll-view>
+  </view>
+
+  
+  <view class="record-container">
+    <scroll-view
+      class="record-scroll"
+      scroll-y enhanced show-scrollbar="{{false}}"
+      refresher-enabled="{{true}}"
+      refresher-threshold="80"
+      refresher-default-style="white"
+      refresher-background="#0b0c12"
+      refresher-triggered="{{scrollViewRefreshing}}"
+      bindrefresherrefresh="onPullDownRefresh"
+      bindscrolltolower="onReachBottom"
+    >
+      <view class="refresher-container" slot="refresher">
+        <text wx:if="{{scrollViewRefreshing}}" class="refreshing-text">⚡️ 正在刷新...</text>
+        <text wx:else class="pull-down-text">▼ 下拉刷新</text>
+      </view>
+
+      <view class="record-list">
+        <view wx:if="{{!moduleList.length}}" class="empty-tip">模块加载中...</view>
+        <view wx:elif="{{recordList.length === 0 && !isLoading}}" class="empty-tip">当前暂无待审核记录</view>
+
+        <block wx:for="{{recordList}}" wx:key="jilu_id">
+          <view class="record-card">
+            
+            <view class="user-row">
+              <image class="user-avatar" src="{{item.shenqingren_avatar}}" mode="aspectFill" />
+              <view class="user-info">
+                <text class="user-uid">UID {{item.shenqingren_id}}</text>
+                <text class="user-time">{{item.create_time}}</text>
+              </view>
+            </view>
+
+            
+            <view class="detail-row">
+              <text class="detail-label">所属板块</text>
+              <text class="detail-value">{{item.bankuai_mingcheng}}</text>
+            </view>
+
+            
+            <view class="detail-row" wx:if="{{item.chenghao_mingcheng}}">
+              <text class="detail-label">考核标签</text>
+              <chenghao-tag
+                mingcheng="{{item.chenghao_mingcheng}}"
+                texiaoJson="{{item.chenghao_texiao_json}}"
+              />
+            </view>
+
+            
+            <view class="rule-row" wx:if="{{item.guize_neirong}}">
+              <view class="rule-header">
+                <text class="rule-label">审核规则</text>
+                <text wx:if="{{item.guize_neirong.length > 50}}" class="rule-more" data-content="{{item.guize_neirong}}" bindtap="showRuleDetail">详情</text>
+              </view>
+              <view class="rule-content" data-content="{{item.guize_neirong}}" bindtap="showRuleDetail">
+                <text class="rule-text">{{item.guize_neirong.length > 50 ? item.guize_neirong.substring(0, 50) + '...' : item.guize_neirong}}</text>
+              </view>
+            </view>
+
+            
+            <view class="beizhu-row" wx:if="{{item.dashou_beizhu}}">
+              <view class="beizhu-header">
+                <text class="beizhu-label">备注</text>
+                <text wx:if="{{item.dashou_beizhu.length > 40}}" class="beizhu-more" data-content="{{item.dashou_beizhu}}" bindtap="showBeizhuDetail">详情</text>
+              </view>
+              <view class="beizhu-content" data-content="{{item.dashou_beizhu}}" bindtap="showBeizhuDetail">
+                <text class="beizhu-text">{{item.dashou_beizhu.length > 40 ? item.dashou_beizhu.substring(0, 40) + '...' : item.dashou_beizhu}}</text>
+              </view>
+            </view>
+
+            
+            <view class="fee-row">
+              <text class="fee-label">本次考核费用：</text>
+              <text wx:if="{{item.kaohe_feiyong === 0}}" class="fee-value free">免费</text>
+              <text wx:else class="fee-value">{{item.kaohe_feiyong}}元</text>
+              <text wx:if="{{item.kaohe_feiyong === 0}}" class="fee-require">（任何考核官可接）</text>
+              <text wx:else class="fee-require">（需认证考核官）</text>
+            </view>
+
+            
+            <view class="card-footer">
+                <view class="shoushen-btn" data-jiluid="{{item.jilu_id}}" data-bankuaiid="{{item.bankuai_id}}" bindtap="onShouShen">
+                <text class="btn-text">审核</text>
+              </view>
+            </view>
+          </view>
+        </block>
+
+        <view wx:if="{{isLoadingMore}}" class="loading-more">加载更多...</view>
+        <view wx:if="{{!hasMore && recordList.length > 0}}" class="no-more">—— 没有更多了 ——</view>
+      </view>
+    </scroll-view>
+
+    <view wx:if="{{isLoading && recordList.length === 0}}" class="loading-mask">
+      <view class="loading-spinner"></view>
+      <text>加载中...</text>
+    </view>
+  </view>
+
+  
+  <view wx:if="{{showRuleModal}}" class="modal-mask" bindtap="hideRuleDetail">
+    <view class="modal-content" catchtap="noop">
+      <view class="modal-header"><text>审核规则</text><view class="modal-close" bindtap="hideRuleDetail">×</view></view>
+      <scroll-view class="modal-body" scroll-y><text class="rule-full">{{currentRuleContent}}</text></scroll-view>
+    </view>
+  </view>
+  
+  <view wx:if="{{showBeizhuModal}}" class="modal-mask" bindtap="hideBeizhuDetail">
+    <view class="modal-content" catchtap="noop">
+      <view class="modal-header"><text>备注</text><view class="modal-close" bindtap="hideBeizhuDetail">×</view></view>
+      <scroll-view class="modal-body" scroll-y><text class="rule-full">{{currentBeizhuContent}}</text></scroll-view>
+    </view>
+  </view>
+
+  <global-notification id="global-notification" />
+  <popup-notice id="popupNotice" />
+</view>
\ No newline at end of file
diff --git a/pages/kaohe_zhongxin/kaohe_zhongxin.wxss b/pages/kaohe_zhongxin/kaohe_zhongxin.wxss
new file mode 100644
index 0000000..586c429
--- /dev/null
+++ b/pages/kaohe_zhongxin/kaohe_zhongxin.wxss
@@ -0,0 +1,288 @@
+/* pages/shenhedating/shenhedating.wxss - 暗夜鎏金主题 */
+
+/* 根容器：深邃渐变背景 */
+.shenhe-page {
+    width: 100vw;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background: radial-gradient(ellipse at 20% 20%, #1a1e2b 0%, #0b0c12 100%);
+    overflow: hidden;
+  }
+  
+  /* ========== 顶部固定模块区 ========== */
+  .module-quyu {
+    width: 100%;
+    background: rgba(20, 22, 30, 0.8);
+    backdrop-filter: blur(25px);
+    padding: 20rpx 0;
+    border-bottom: 1rpx solid rgba(201, 169, 88, 0.15);
+    flex-shrink: 0;
+    position: sticky;
+    top: 0;
+    z-index: 10;
+  }
+  .module-scroll {
+    white-space: nowrap;
+    height: 80rpx;
+    width: 100%;
+  }
+  .module-container {
+    display: inline-flex;
+    padding: 0 24rpx;
+    gap: 20rpx;
+    height: 80rpx;
+    align-items: center;
+  }
+  .module-item {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 36rpx;
+    height: 64rpx;
+    border-radius: 32rpx;
+    background: rgba(255, 255, 255, 0.06);
+    transition: all 0.25s ease;
+    min-width: 100rpx;
+    position: relative;
+    flex-shrink: 0;
+    border: 1rpx solid rgba(255, 255, 255, 0.04);
+  }
+  .module-active {
+    background: linear-gradient(135deg, #c9a558, #b28b3a);
+    border-color: transparent;
+    box-shadow: 0 4rpx 20rpx rgba(201, 169, 88, 0.35);
+  }
+  .module-active .module-name {
+    color: #0b0c12;
+    font-weight: 700;
+  }
+  .module-name {
+    font-size: 26rpx;
+    color: #a2a8ba;
+    font-weight: 500;
+  }
+  .module-count {
+    position: absolute;
+    top: -10rpx;
+    right: -6rpx;
+    background: #d43b3b;
+    color: #ffffff;
+    border-radius: 14rpx;
+    padding: 2rpx 12rpx;
+    font-size: 20rpx;
+    font-weight: 600;
+  }
+  
+  /* ========== 列表容器 ========== */
+  .record-container {
+    flex: 1;
+    overflow: hidden;
+    width: 100%;
+  }
+  .record-scroll {
+    height: 100%;
+    width: 100%;
+  }
+  .refresher-container {
+    height: 80rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .refreshing-text, .pull-down-text {
+    font-size: 24rpx;
+    color: #6a7090;
+  }
+  
+  .empty-tip {
+    padding: 200rpx 0;
+    text-align: center;
+    color: #6a7090;
+    font-size: 28rpx;
+  }
+  
+  /* ========== 审核卡片：玻璃态 ========== */
+  .record-card {
+    background: rgba(25, 27, 36, 0.7);
+    backdrop-filter: blur(15px);
+    margin: 20rpx 24rpx;
+    border-radius: 24rpx;
+    padding: 28rpx;
+    border: 1rpx solid rgba(201, 169, 88, 0.1);
+    box-shadow: 0 8rpx 30rpx rgba(0, 0, 0, 0.5);
+    transition: transform 0.15s;
+  }
+  .record-card:active {
+    transform: scale(0.995);
+  }
+  .user-row {
+    display: flex;
+    align-items: center;
+    margin-bottom: 24rpx;
+  }
+  .user-avatar {
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 50%;
+    margin-right: 20rpx;
+    background: #2a2d3a;
+    border: 2rpx solid rgba(201, 169, 88, 0.3);
+    box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.4);
+  }
+  .user-info {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  }
+  .user-uid {
+    font-size: 30rpx;
+    color: #f0f2ff;
+    font-weight: 600;
+    margin-bottom: 6rpx;
+  }
+  .user-time {
+    font-size: 22rpx;
+    color: #6a7090;
+  }
+  
+  .detail-row {
+    display: flex;
+    align-items: center;
+    padding: 16rpx 0;
+    border-bottom: 1rpx solid rgba(255, 255, 255, 0.05);
+    gap: 20rpx;
+  }
+  .detail-row:last-of-type {
+    border-bottom: none;
+  }
+  .detail-label {
+    font-size: 26rpx;
+    color: #8a90b0;
+    flex-shrink: 0;
+    width: 120rpx;
+  }
+  .detail-value {
+    font-size: 26rpx;
+    color: #d0d4ff;
+    font-weight: 500;
+  }
+  
+  .rule-row, .beizhu-row {
+    padding: 16rpx 0;
+    border-bottom: 1rpx solid rgba(255, 255, 255, 0.05);
+  }
+  .rule-header, .beizhu-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 12rpx;
+  }
+  .rule-label, .beizhu-label {
+    font-size: 26rpx;
+    color: #8a90b0;
+  }
+  .rule-more, .beizhu-more {
+    font-size: 24rpx;
+    color: #c9a558;
+    font-weight: 500;
+  }
+  .rule-content, .beizhu-content {
+    background: rgba(255, 255, 255, 0.05);
+    padding: 18rpx;
+    border-radius: 14rpx;
+    border: 1rpx solid rgba(255, 255, 255, 0.06);
+  }
+  .rule-text, .beizhu-text {
+    font-size: 24rpx;
+    color: #b0b8d0;
+    line-height: 1.6;
+  }
+  
+  /* 底部按钮 */
+  .card-footer {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 24rpx;
+  }
+  .shoushen-btn {
+    background: linear-gradient(135deg, #c9a558, #9e7d2e);
+    color: #0b0c12;
+    padding: 14rpx 48rpx;
+    border-radius: 40rpx;
+    font-size: 28rpx;
+    font-weight: 700;
+    box-shadow: 0 6rpx 18rpx rgba(201, 169, 88, 0.3);
+    transition: all 0.2s;
+  }
+  .shoushen-btn:active {
+    transform: scale(0.97);
+    opacity: 0.9;
+  }
+  
+  /* 加载 */
+  .loading-more, .no-more {
+    text-align: center;
+    padding: 30rpx;
+    font-size: 24rpx;
+    color: #6a7090;
+  }
+  .loading-mask {
+    position: fixed;
+    top: 0; left: 0; right: 0; bottom: 0;
+    background: rgba(11, 12, 18, 0.85);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+  .loading-spinner {
+    width: 60rpx;
+    height: 60rpx;
+    border: 4rpx solid rgba(255,255,255,0.1);
+    border-top-color: #c9a558;
+    border-radius: 50%;
+    animation: spin 0.8s linear infinite;
+    margin-bottom: 20rpx;
+  }
+  @keyframes spin { to { transform: rotate(360deg); } }
+  
+  /* 弹窗 */
+  .modal-mask {
+    position: fixed;
+    top: 0; left: 0; right: 0; bottom: 0;
+    background: rgba(0, 0, 0, 0.7);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 1000;
+  }
+  .modal-content {
+    width: 85%;
+    max-height: 70vh;
+    background: #1e2030;
+    border-radius: 24rpx;
+    padding: 30rpx;
+    border: 1rpx solid rgba(201, 169, 88, 0.2);
+    box-shadow: 0 20rpx 40rpx rgba(0,0,0,0.8);
+  }
+  .modal-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #f0f2ff;
+    margin-bottom: 20rpx;
+  }
+  .modal-close {
+    font-size: 40rpx;
+    color: #8a90b0;
+    padding: 0 10rpx;
+  }
+  .modal-body {
+    max-height: 50vh;
+    font-size: 28rpx;
+    line-height: 1.6;
+    color: #c0c8e0;
+  }
\ No newline at end of file
diff --git a/pages/kaoheguan/kaoheguan.js b/pages/kaoheguan/kaoheguan.js
new file mode 100644
index 0000000..5f5715a
--- /dev/null
+++ b/pages/kaoheguan/kaoheguan.js
@@ -0,0 +1,195 @@
+// pages/kaoheguan/kaoheguan.js
+// 只新增了两个字段的接收，其余所有代码未变
+import request from '../../utils/request.js';
+const app = getApp();
+
+Page({
+  data: {
+    isKaoheguan: false,
+    isLoading: false,
+    inviteCode: '',
+    statusText: '用户尚未注册或账号已被封禁',
+    uid: '',
+    avatarUrl: '',
+    icons: {
+      refresh: '',
+      tixian: '',
+      daofen: '',
+      jilu: '',
+      zhongxin: '',
+      bgImage: ''
+    },
+    kaoheData: {
+      shenheZongshu: 0,
+      tongguoZongshu: 0,
+      yue: '0.00',
+      zonge: '0.00',
+      shenheZhuangtai: 0,
+      bankuaiList: [],
+      isRenzheng: false,           // 🆕 是否认证
+      pendingShenheCount: 0        // 🆕 审核中数量
+    },
+    lastRefreshTime: 0,
+    canRefresh: true,
+    planetPaused: {
+      top: false,
+      bottom: false,
+      left: false,
+      right: false
+    }
+  },
+
+  _planetTimers: {},
+
+  onLoad() {
+    const ossUrl = app.globalData.ossImageUrl || '';
+    const iconBase = 'beijing/kaohe/';
+    this.setData({
+      'icons.refresh': ossUrl + iconBase + 'shuaxin.png',
+      'icons.tixian': ossUrl + iconBase + 'tixian.png',
+      'icons.daofen': ossUrl + iconBase + 'daofen.png',
+      'icons.jilu': ossUrl + iconBase + 'jilu.png',
+      'icons.zhongxin': ossUrl + iconBase + 'zhongxin.png',
+      'icons.bgImage': ossUrl + iconBase + 'top_bg.jpg'
+    });
+
+    const kaoheguanstatus = wx.getStorageSync('kaoheguanstatus');
+    if (kaoheguanstatus === 1 || kaoheguanstatus === '1') {
+      this.loadUserInfo();
+      this.setData({ isKaoheguan: true });
+      this.getKaoheguanInfo();
+    } else {
+      this.setData({ isKaoheguan: false });
+    }
+  },
+
+  onShow() {
+    if (this.data.isKaoheguan) {
+      this.refreshKaoheInfo();
+    }
+  },
+
+  loadUserInfo() {
+    const uid = wx.getStorageSync('uid') || '';
+    const touxiang = wx.getStorageSync('touxiang') || '';
+    const ossUrl = app.globalData.ossImageUrl || '';
+    const defaultAvatar = ossUrl + (app.globalData.morentouxiang || 'avatar/default.jpg');
+    let avatarUrl = defaultAvatar;
+    if (touxiang) {
+      avatarUrl = ossUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang);
+    }
+    this.setData({ uid, avatarUrl });
+  },
+
+  async getKaoheguanInfo() {
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({ url: '/dengji/khgsx', method: 'POST' });
+      if (res && res.data.code === 200) {
+        const data = res.data.data;
+        if (data.zhuangtai === 0 || data.zhuangtai === 2) {
+          wx.setStorageSync('kaoheguanstatus', 0);
+          this.setData({ isKaoheguan: false, isLoading: false, statusText: '用户尚未注册或账号已被封禁' });
+          return;
+        }
+        wx.setStorageSync('kaoheguanstatus', 1);
+        this.setData({
+          isKaoheguan: true,
+          isLoading: false,
+          kaoheData: {
+            shenheZongshu: data.shenhe_zongshu || 0,
+            tongguoZongshu: data.tongguo_zongshu || 0,
+            yue: data.yue || '0.00',
+            zonge: data.zonge || '0.00',
+            shenheZhuangtai: data.shenhe_zhuangtai || 0,
+            bankuaiList: data.bankuai_list || [],
+            isRenzheng: data.is_renzheng || false,              // 🆕
+            pendingShenheCount: data.pending_shenhe_count || 0  // 🆕
+          }
+        });
+      } else {
+        wx.showToast({ title: res?.data?.msg || '获取信息失败', icon: 'none' });
+        this.setData({ isLoading: false });
+      }
+    } catch (error) {
+      console.error('获取考核官信息失败:', error);
+      wx.showToast({ title: '网络错误', icon: 'none' });
+      this.setData({ isLoading: false });
+    }
+  },
+
+  onInviteCodeInput(e) {
+    this.setData({ inviteCode: e.detail.value.trim() });
+  },
+
+  async onRegister() {
+    const { inviteCode } = this.data;
+    if (!inviteCode) {
+      wx.showToast({ title: '请输入邀请码', icon: 'none', duration: 2000 });
+      return;
+    }
+    if (inviteCode.length > 100) {
+      wx.showToast({ title: '邀请码不能超过100位', icon: 'none', duration: 2000 });
+      return;
+    }
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({
+        url: '/dengji/khgzc',
+        method: 'POST',
+        data: { inviteCode: inviteCode }
+      });
+      if (res && res.data.code === 200) {
+        wx.setStorageSync('kaoheguanstatus', 1);
+        wx.showToast({ title: '注册成功', icon: 'success', duration: 2000 });
+        this.loadUserInfo();
+        await this.getKaoheguanInfo();
+      } else {
+        wx.showToast({ title: res?.data?.msg || '注册失败', icon: 'none', duration: 2000 });
+        this.setData({ isLoading: false });
+      }
+    } catch (error) {
+      console.error('注册失败:', error);
+      wx.showToast({ title: '网络错误', icon: 'none' });
+      this.setData({ isLoading: false });
+    }
+  },
+
+  refreshKaoheInfo() {
+    const now = Date.now();
+    const lastTime = this.data.lastRefreshTime;
+    const canRefresh = this.data.canRefresh;
+    if (!canRefresh || (now - lastTime < 3000)) return;
+    this.setData({ lastRefreshTime: now, canRefresh: false });
+    this.getKaoheguanInfo();
+    setTimeout(() => this.setData({ canRefresh: true }), 3000);
+  },
+
+  goToWithdraw() {
+    const yue = this.data.kaoheData.yue || 0;
+    wx.navigateTo({
+      url: `/pages/tixian/tixian?amount=${yue}&from=kaoheguan`
+    });
+  },
+  goToDafen() { wx.navigateTo({ url: '/pages/kaohe_dafen/kaohe_dafen' }); },
+  goToJilu() { wx.navigateTo({ url: '/pages/kaohe_jilu/kaohe_jilu' }); },
+  goToZhongxin() { wx.navigateTo({ url: '/pages/kaohe_zhongxin/kaohe_zhongxin' }); },
+
+  onPlanetTouch(e) {
+    const id = e.currentTarget.dataset.id;
+    if (this._planetTimers[id]) {
+      clearTimeout(this._planetTimers[id]);
+      this._planetTimers[id] = null;
+    }
+    const paused = `planetPaused.${id}`;
+    this.setData({ [paused]: true });
+  },
+
+  onPlanetLeave(e) {
+    const id = e.currentTarget.dataset.id;
+    this._planetTimers[id] = setTimeout(() => {
+      const paused = `planetPaused.${id}`;
+      this.setData({ [paused]: false });
+    }, 5000);
+  }
+});
\ No newline at end of file
diff --git a/pages/kaoheguan/kaoheguan.json b/pages/kaoheguan/kaoheguan.json
new file mode 100644
index 0000000..78582c0
--- /dev/null
+++ b/pages/kaoheguan/kaoheguan.json
@@ -0,0 +1,11 @@
+{
+    "usingComponents": {
+      "global-notification": "/components/global-notification/global-notification",
+      "custom-tab-bar": "/custom-tab-bar/index",
+      "popup-notice": "/components/popup-notice/popup-notice"
+    },
+    "navigationBarTitleText": "考核官",
+    "navigationBarBackgroundColor": "#0a0c14",
+    "navigationBarTextStyle": "white",
+    "navigationStyle": "custom"
+  }
\ No newline at end of file
diff --git a/pages/kaoheguan/kaoheguan.wxml b/pages/kaoheguan/kaoheguan.wxml
new file mode 100644
index 0000000..0c1d239
--- /dev/null
+++ b/pages/kaoheguan/kaoheguan.wxml
@@ -0,0 +1,128 @@
+
+<view class="universe-root">
+  
+  <image class="full-bg" src="{{icons.bgImage}}" mode="aspectFill" />
+
+  
+  <canvas type="2d" id="starfield" class="starfield-canvas"></canvas>
+  <view class="aurora-ribbon"></view>
+
+  
+  <view class="unreg-floating" wx:if="{{!isKaoheguan}}">
+    <view class="unreg-core">
+      <image class="unreg-icon" src="/images/kaoheguan.png" mode="aspectFit" />
+      <text class="unreg-title">考核官</text>
+      <text class="unreg-desc">{{statusText}}</text>
+      <input class="unreg-input" type="text" placeholder="输入邀请码" value="{{inviteCode}}" bindinput="onInviteCodeInput" placeholder-class="unreg-placeholder" maxlength="100" />
+      <view class="unreg-btn" bindtap="onRegister">
+        <text class="unreg-btn-text">即刻入驻</text>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="orbit-zone" wx:else>
+    
+    <view class="top-identity">
+      <image class="identity-avatar" src="{{avatarUrl}}" mode="aspectFill" />
+      <view class="identity-info">
+        <text class="identity-name">考核官</text>
+        <view class="identity-uid">
+          <text class="uid-txt">{{uid}}</text>
+          <view class="status-indicator {{kaoheData.shenheZhuangtai == 1 ? 'active' : ''}}"></view>
+        </view>
+        
+        <text class="renzheng-tag {{kaoheData.isRenzheng ? 'authed' : 'unauth'}}">
+          {{kaoheData.isRenzheng ? '已认证' : '未认证'}}
+        </text>
+      </view>
+      <view class="refresh-touch" bindtap="refreshKaoheInfo">
+        <image class="refresh-icon" src="{{icons.refresh}}" mode="aspectFit" />
+      </view>
+    </view>
+
+    
+    <view class="plate-cloud" wx:if="{{kaoheData.bankuaiList.length > 0}}">
+      <scroll-view class="plate-cloud-scroll" scroll-x="true" enhanced show-scrollbar="{{false}}">
+        <view class="plate-chip" wx:for="{{kaoheData.bankuaiList}}" wx:key="bankuai_id">{{item.mingcheng}}</view>
+      </scroll-view>
+    </view>
+
+    
+    <view class="balance-planet">
+      <view class="planet-ring"></view>
+      <view class="planet-body">
+        <text class="planet-num">{{kaoheData.yue}}元</text>
+        <text class="planet-label">可提现余额</text>
+      </view>
+      <view class="planet-glow"></view>
+    </view>
+
+    
+    <view class="meteor-stats">
+      <view class="meteor-item">
+        <text class="meteor-num">{{kaoheData.shenheZongshu}}</text>
+        <text class="meteor-label">审核总数</text>
+      </view>
+      <view class="meteor-divider"></view>
+      <view class="meteor-item">
+        <text class="meteor-num">{{kaoheData.tongguoZongshu}}</text>
+        <text class="meteor-label">通过总数</text>
+      </view>
+      <view class="meteor-divider"></view>
+      <view class="meteor-item">
+        <text class="meteor-num">{{kaoheData.zonge}}元</text>
+        <text class="meteor-label">累计赚取</text>
+      </view>
+    </view>
+
+    
+    <view class="star-cross">
+      
+      <view class="cross-item cross-top {{planetPaused.top ? 'pause-spin' : ''}}" 
+            bindtap="goToZhongxin" 
+            bindtouchstart="onPlanetTouch" bindtouchend="onPlanetLeave" data-id="top">
+        <view class="orbit-ring"></view>
+        <image class="cross-icon" src="{{icons.zhongxin}}" mode="aspectFit" />
+        <text class="cross-text">考核中心</text>
+      </view>
+      
+      <view class="cross-item cross-bottom {{planetPaused.bottom ? 'pause-spin' : ''}}" 
+            bindtap="goToDafen"
+            bindtouchstart="onPlanetTouch" bindtouchend="onPlanetLeave" data-id="bottom">
+        <view class="orbit-ring"></view>
+        <image class="cross-icon" src="{{icons.daofen}}" mode="aspectFit" />
+        <text class="cross-text">考核打分</text>
+        
+        <view class="badge" wx:if="{{kaoheData.pendingShenheCount > 0}}">{{kaoheData.pendingShenheCount}}</view>
+      </view>
+      
+      <view class="cross-item cross-left {{planetPaused.left ? 'pause-spin' : ''}}" 
+            bindtap="goToJilu"
+            bindtouchstart="onPlanetTouch" bindtouchend="onPlanetLeave" data-id="left">
+        <view class="orbit-ring"></view>
+        <image class="cross-icon" src="{{icons.jilu}}" mode="aspectFit" />
+        <text class="cross-text">考核记录</text>
+      </view>
+      
+      <view class="cross-item cross-right {{planetPaused.right ? 'pause-spin' : ''}}" 
+            bindtap="goToWithdraw"
+            bindtouchstart="onPlanetTouch" bindtouchend="onPlanetLeave" data-id="right">
+        <view class="orbit-ring"></view>
+        <image class="cross-icon" src="{{icons.tixian}}" mode="aspectFit" />
+        <text class="cross-text">立即提现</text>
+      </view>
+      
+      <view class="pentagram"></view>
+    </view>
+  </view>
+
+  
+  <view class="loading-portal" wx:if="{{isLoading}}">
+    <view class="portal-ring"></view>
+    <text class="portal-text">加载中...</text>
+  </view>
+</view>
+
+<global-notification id="global-notification" />
+<custom-tab-bar />
\ No newline at end of file
diff --git a/pages/kaoheguan/kaoheguan.wxss b/pages/kaoheguan/kaoheguan.wxss
new file mode 100644
index 0000000..b1f152c
--- /dev/null
+++ b/pages/kaoheguan/kaoheguan.wxss
@@ -0,0 +1,512 @@
+/* pages/kaoheguan/kaoheguan.wxss — 完整版：适度背景 + 整体下移 */
+
+page {
+    background: #0a0c14;
+    color: #e0e6f0;
+    font-family: 'SF Pro Display', 'PingFang SC', system-ui;
+    height: 100vh;
+    overflow: hidden;
+  }
+  
+  /* 根容器：让出自定义导航栏与底部 TabBar 空间 */
+  .universe-root {
+    position: relative;
+    width: 100%;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding-top: calc(88rpx + env(safe-area-inset-top));
+    padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
+    box-sizing: border-box;
+    z-index: 1;
+  }
+  
+  /* ========== 全屏背景图（适度弱化） ========== */
+  .full-bg {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100vw;
+    height: 100vh;
+    z-index: 0;
+    opacity: 1;          /* 从0.15调整到0.3，若隐若现但不抢夺内容 */
+    pointer-events: none;
+    object-fit: cover;
+    filter: blur(1px);      /* 轻微模糊，增加梦幻感 */
+  }
+  
+  /* ========== 动态星空（Canvas） ========== */
+  .starfield-canvas {
+    position: fixed;
+    top: 0; left: 0;
+    width: 100vw; height: 100vh;
+    pointer-events: none;
+    z-index: 0;
+    opacity: 0.35;
+  }
+  
+  /* ========== 极光飘带 ========== */
+  .aurora-ribbon {
+    position: fixed;
+    top: -10%;
+    left: -30%;
+    width: 160%;
+    height: 60%;
+    background: radial-gradient(ellipse at 50% 50%, rgba(100, 140, 255, 0.12) 0%, transparent 70%);
+    pointer-events: none;
+    z-index: 0;
+    animation: drift 20s ease-in-out infinite alternate;
+  }
+  
+  @keyframes drift {
+    0% { transform: translate(0, 0) rotate(0deg); }
+    100% { transform: translate(10%, 5%) rotate(3deg); }
+  }
+  
+  /* ========== 舒缓流星 ========== */
+  /* 流星1：右上 → 左下，缓慢，间隔10秒 */
+  .universe-root::before {
+    content: "";
+    position: fixed;
+    top: 5%;
+    right: -2%;
+    width: 2rpx;
+    height: 85rpx;
+    background: linear-gradient(to bottom, rgba(255, 255, 255, 0.6), transparent);
+    transform: rotate(-35deg);
+    animation: meteor1 10s 0s linear infinite;
+    pointer-events: none;
+    z-index: 1;
+    opacity: 0;
+  }
+  
+  /* 流星2：稍有不同的角度与延迟 */
+  .universe-root::after {
+    content: "";
+    position: fixed;
+    top: 10%;
+    right: -5%;
+    width: 2rpx;
+    height: 70rpx;
+    background: linear-gradient(to bottom, rgba(200, 210, 255, 0.55), transparent);
+    transform: rotate(-28deg);
+    animation: meteor2 11s 4s linear infinite;
+    pointer-events: none;
+    z-index: 1;
+    opacity: 0;
+  }
+  
+  @keyframes meteor1 {
+    0% {
+      opacity: 0;
+      transform: translate(0, 0) rotate(-35deg);
+    }
+    10% {
+      opacity: 0.5;
+    }
+    28% {
+      opacity: 0;
+      transform: translate(-500rpx, 450rpx) rotate(-35deg);
+    }
+    100% {
+      opacity: 0;
+      transform: translate(-500rpx, 450rpx) rotate(-35deg);
+    }
+  }
+  
+  @keyframes meteor2 {
+    0% {
+      opacity: 0;
+      transform: translate(0, 0) rotate(-28deg);
+    }
+    8% {
+      opacity: 0.45;
+    }
+    25% {
+      opacity: 0;
+      transform: translate(-480rpx, 420rpx) rotate(-28deg);
+    }
+    100% {
+      opacity: 0;
+      transform: translate(-480rpx, 420rpx) rotate(-28deg);
+    }
+  }
+  
+  /* ========== 未注册状态 ========== */
+  .unreg-floating {
+    position: relative;
+    z-index: 10;
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .unreg-core {
+    width: 80%;
+    max-width: 640rpx;
+    background: rgba(255,255,255,0.04);
+    backdrop-filter: blur(30px);
+    border-radius: 50rpx;
+    padding: 80rpx 50rpx 60rpx;
+    border: 1rpx solid rgba(255,255,255,0.1);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  .unreg-icon { width: 100rpx; height: 100rpx; margin-bottom: 20rpx; }
+  .unreg-title { font-size: 42rpx; font-weight: 700; color: #fff; margin-bottom: 12rpx; }
+  .unreg-desc { font-size: 28rpx; color: #8590b0; margin-bottom: 50rpx; text-align: center; }
+  .unreg-input { width: 100%; height: 90rpx; background: rgba(255,255,255,0.08); border-radius: 30rpx; padding: 0 30rpx; color: #fff; font-size: 30rpx; box-sizing: border-box; margin-bottom: 30rpx; }
+  .unreg-placeholder { color: rgba(255,255,255,0.3); }
+  .unreg-btn { width: 100%; height: 90rpx; background: linear-gradient(135deg, #4f6ef6, #8b5cf6); border-radius: 45rpx; display: flex; align-items: center; justify-content: center; transition: transform 0.2s; }
+  .unreg-btn:active { transform: scale(0.98); }
+  .unreg-btn-text { font-size: 34rpx; font-weight: 600; color: #fff; }
+  
+  /* ========== 已注册状态（整体下移） ========== */
+  .orbit-zone {
+    position: relative;
+    z-index: 10;
+    flex: 1;
+    padding: 80rpx 30rpx 0;   /* 顶部从40rpx增加到60rpx，整体下移 */
+    display: flex;
+    flex-direction: column;
+  }
+  
+  /* 身份条 */
+  .top-identity {
+    display: flex;
+    align-items: center;
+    margin-bottom: 40rpx;
+    position: relative;
+    z-index: 2;
+  }
+  .identity-avatar {
+    width: 90rpx; height: 90rpx; border-radius: 50%;
+    border: 2rpx solid rgba(255,255,255,0.2);
+    margin-right: 20rpx;
+  }
+  .identity-info { flex: 1; }
+  .identity-name { font-size: 36rpx; font-weight: 700; color: #fff; }
+  .identity-uid {
+    display: flex; align-items: center; margin-top: 8rpx;
+  }
+  .uid-txt { font-size: 24rpx; color: #9098b0; font-family: monospace; }
+  .status-indicator {
+    width: 12rpx; height: 12rpx; border-radius: 50%;
+    background: #4ade80; margin-left: 12rpx;
+    transition: background 0.3s;
+  }
+  .status-indicator.active { background: #fbbf24; }
+  .refresh-touch {
+    width: 60rpx; height: 60rpx;
+    background: rgba(255,255,255,0.06);
+    border-radius: 20rpx;
+    display: flex; align-items: center; justify-content: center;
+    transition: background 0.2s;
+  }
+  .refresh-touch:active { background: rgba(255,255,255,0.15); }
+  .refresh-icon { width: 36rpx; height: 36rpx; }
+  
+  /* 板块标签云 */
+  .plate-cloud { margin-bottom: 30rpx; }
+  .plate-cloud-scroll { white-space: nowrap; }
+  .plate-chip {
+    display: inline-block;
+    padding: 8rpx 24rpx;
+    border-radius: 30rpx;
+    background: rgba(79,110,246,0.1);
+    color: #a5b4fc;
+    font-size: 26rpx;
+    margin-right: 16rpx;
+    border: 1rpx solid rgba(79,110,246,0.3);
+    box-shadow: 0 0 12rpx rgba(79,110,246,0.1);
+    transition: all 0.3s;
+  }
+  .plate-chip:active { transform: scale(0.95); background: rgba(79,110,246,0.2); }
+  
+  /* 中央余额星球 */
+  .balance-planet {
+    position: relative;
+    width: 280rpx;
+    height: 280rpx;
+    margin: 20rpx auto 30rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .planet-ring {
+    position: absolute;
+    width: 280rpx;
+    height: 280rpx;
+    border-radius: 50%;
+    border: 2rpx solid rgba(79,110,246,0.4);
+    animation: ringRotate 12s linear infinite;
+  }
+  @keyframes ringRotate { to { transform: rotate(360deg); } }
+  .planet-body {
+    width: 210rpx;
+    height: 210rpx;
+    border-radius: 50%;
+    background: radial-gradient(circle at 30% 30%, rgba(79,110,246,0.3), rgba(15,15,30,0.8));
+    backdrop-filter: blur(10px);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border: 1rpx solid rgba(255,255,255,0.1);
+    transition: transform 0.3s;
+  }
+  .balance-planet:active .planet-body { transform: scale(0.95); }
+  .planet-num {
+    font-size: 52rpx;
+    font-weight: 900;
+    color: #fff;
+    text-shadow: 0 0 30rpx rgba(79,110,246,0.8);
+    animation: numGlow 2s ease-in-out infinite alternate;
+  }
+  @keyframes numGlow {
+    from { text-shadow: 0 0 20rpx rgba(79,110,246,0.6); }
+    to { text-shadow: 0 0 40rpx rgba(79,110,246,1); }
+  }
+  .planet-label {
+    font-size: 24rpx;
+    color: #a5b4fc;
+    margin-top: 8rpx;
+  }
+  .planet-glow {
+    position: absolute;
+    width: 300rpx;
+    height: 300rpx;
+    border-radius: 50%;
+    background: radial-gradient(circle, rgba(79,110,246,0.2), transparent 70%);
+    animation: planetPulse 4s ease-in-out infinite;
+    pointer-events: none;
+  }
+  @keyframes planetPulse {
+    0%, 100% { opacity: 0.3; transform: scale(1); }
+    50% { opacity: 0.8; transform: scale(1.08); }
+  }
+  
+  /* 流星数据条 */
+  .meteor-stats {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    margin-bottom: 30rpx;
+    padding: 20rpx 0;
+    position: relative;
+  }
+  .meteor-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    flex: 1;
+  }
+  .meteor-num {
+    font-size: 36rpx;
+    font-weight: 800;
+    background: linear-gradient(135deg, #a5b4fc, #4f6ef6);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    transition: all 0.3s;
+  }
+  .meteor-item:active .meteor-num { transform: scale(1.1); }
+  .meteor-label {
+    font-size: 22rpx;
+    color: #64748b;
+    margin-top: 10rpx;
+  }
+  .meteor-divider {
+    width: 2rpx;
+    height: 40rpx;
+    background: linear-gradient(to bottom, transparent, rgba(255,255,255,0.15), transparent);
+  }
+  
+  /* ========== 十字星阵功能区 ========== */
+  .star-cross {
+    position: relative;
+    width: 520rpx;
+    height: 520rpx;
+    margin: 40rpx auto 50rpx;
+  }
+  
+  /* 按钮公共样式 */
+  .cross-item {
+    position: absolute;
+    width: 150rpx;
+    height: 150rpx;
+    background: radial-gradient(circle at 30% 30%, rgba(79,110,246,0.25), rgba(0,0,0,0.25));
+    border-radius: 50%;
+    border: 1rpx solid rgba(255,255,255,0.12);
+    backdrop-filter: blur(10px);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    transition: transform 0.2s, box-shadow 0.2s;
+    z-index: 5;
+    overflow: visible;
+  }
+  
+  /* 行星光环 */
+  .orbit-ring {
+    position: absolute;
+    top: -8rpx;
+    left: -8rpx;
+    right: -8rpx;
+    bottom: -8rpx;
+    border-radius: 50%;
+    border: 2rpx solid rgba(79,110,246,0.5);
+    border-top-color: transparent;
+    border-bottom-color: transparent;
+    animation: spinRing 4s linear infinite;
+    pointer-events: none;
+  }
+  .pause-spin .orbit-ring {
+    animation-play-state: paused;
+  }
+  
+  @keyframes spinRing {
+    to { transform: rotate(360deg); }
+  }
+  
+  .cross-item:active {
+    transform: scale(0.95);
+    box-shadow: 0 0 30rpx rgba(79,110,246,0.6);
+  }
+  
+  /* 图标强化 */
+  .cross-icon {
+    width: 58rpx;
+    height: 58rpx;
+    margin-bottom: 8rpx;
+    filter: drop-shadow(0 0 14rpx rgba(79,110,246,0.9)) 
+            drop-shadow(0 0 28rpx rgba(99,102,241,0.7));
+    animation: iconFloat 3s ease-in-out infinite;
+    z-index: 2;
+  }
+  
+  @keyframes iconFloat {
+    0%, 100% { transform: translateY(0); }
+    50% { transform: translateY(-3rpx); }
+  }
+  
+  .cross-text {
+    font-size: 24rpx;
+    color: #e0e6f0;
+    font-weight: 600;
+    z-index: 2;
+  }
+  
+  /* 上 */
+  .cross-top { top: 0; left: 50%; transform: translateX(-50%); }
+  /* 下 */
+  .cross-bottom { bottom: 0; left: 50%; transform: translateX(-50%); }
+  /* 左 */
+  .cross-left { left: 0; top: 50%; transform: translateY(-50%); }
+  /* 右 */
+  .cross-right { right: 0; top: 50%; transform: translateY(-50%); }
+  
+  /* 中央五角星（固定，仅呼吸） */
+  .pentagram {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 0; height: 0;
+    transform: translate(-50%, -50%);
+    border-left: 36rpx solid transparent;
+    border-right: 36rpx solid transparent;
+    border-bottom: 84rpx solid rgba(79,110,246,0.85);
+    filter: drop-shadow(0 0 18rpx rgba(79,110,246,0.7));
+    animation: star-pulse 2s ease-in-out infinite;
+  }
+  .pentagram::before {
+    content: "";
+    position: absolute;
+    top: 36rpx;
+    left: -36rpx;
+    width: 0; height: 0;
+    border-left: 36rpx solid transparent;
+    border-right: 36rpx solid transparent;
+    border-bottom: 84rpx solid rgba(79,110,246,0.85);
+    transform: rotate(72deg);
+  }
+  .pentagram::after {
+    content: "";
+    position: absolute;
+    top: 36rpx;
+    left: -36rpx;
+    width: 0; height: 0;
+    border-left: 36rpx solid transparent;
+    border-right: 36rpx solid transparent;
+    border-bottom: 84rpx solid rgba(79,110,246,0.85);
+    transform: rotate(-72deg);
+  }
+  
+  @keyframes star-pulse {
+    0%, 100% { opacity: 0.8; }
+    50% { opacity: 1; }
+  }
+  
+  /* ========== 加载星门 ========== */
+  .loading-portal {
+    position: fixed; top: 0; left: 0; right: 0; bottom: 0;
+    background: rgba(10,12,20,0.95);
+    backdrop-filter: blur(15px);
+    display: flex; flex-direction: column;
+    align-items: center; justify-content: center;
+    z-index: 999;
+  }
+  .portal-ring {
+    width: 100rpx; height: 100rpx;
+    border-radius: 50%;
+    border: 3rpx solid rgba(79,110,246,0.2);
+    border-top-color: #4f6ef6;
+    animation: portalSpin 1s linear infinite;
+    margin-bottom: 30rpx;
+  }
+  @keyframes portalSpin { to { transform: rotate(360deg); } }
+  .portal-text { font-size: 28rpx; color: #64748b; }
+
+/* ========== 🆕 以下为新增样式，绝无任何修改 ========== */
+
+/* 认证状态标签 */
+.renzheng-tag {
+  font-size: 22rpx;
+  padding: 4rpx 12rpx;
+  border-radius: 20rpx;
+  margin-top: 8rpx;
+  display: inline-block;
+}
+.renzheng-tag.authed {
+  background: rgba(76, 175, 80, 0.15);
+  color: #4caf50;
+  border: 1rpx solid rgba(76, 175, 80, 0.4);
+}
+.renzheng-tag.unauth {
+  background: rgba(244, 67, 54, 0.1);
+  color: #f44336;
+  border: 1rpx solid rgba(244, 67, 54, 0.4);
+}
+
+/* 红色角标 */
+.badge {
+  position: absolute;
+  top: -4rpx;
+  right: -8rpx;
+  min-width: 36rpx;
+  height: 36rpx;
+  background: #f44336;
+  color: #fff;
+  font-size: 22rpx;
+  font-weight: 600;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 8rpx;
+  box-shadow: 0 2rpx 8rpx rgba(244, 67, 54, 0.4);
+  z-index: 10;
+}
\ No newline at end of file
diff --git a/pages/kefuliaotian/kefuliaotian.js b/pages/kefuliaotian/kefuliaotian.js
new file mode 100644
index 0000000..e4edb6e
--- /dev/null
+++ b/pages/kefuliaotian/kefuliaotian.js
@@ -0,0 +1,468 @@
+const app = getApp();
+import { formatDate } from '../../static/lib/utils';
+
+Page({
+  data: {
+    teamId: '',
+    teamName: '客服',
+    teamAvatar: '',
+    currentUser: null,
+    messages: [],
+    inputText: '',
+    showEmojiPanel: false,
+    showPlusPanel: false,
+    showOrderSender: false,
+    loadingHistory: false,
+    isRefreshing: false,
+    lastTimestamp: null,
+    hasMore: true,
+    scrollToView: '',
+    detailText: '',
+    showDetailModal: false,
+    lastTapTime: 0,
+    lastTapMsgId: '',
+    showOrderDetail: false,
+    detailOrder: null,
+    emojiList: ['😀','😁','😂','🤣','😃','😄','😅','😆','😉','😊','😋','😎','😍','😘','😗','😙','😚','🙂','🤗','🤩','🤔','🤨','😐','😑','😶','🙄','😏','😣','😥','😮','🤐','😯','😪','😫','😴','😌','😛','😜','😝','🤤','😒','😓','😔','😕','🙃','🤑','😲','☹','🙁','😖','😞','😟','😤','😢','😭','😦','😧','😨','😩','🤯','😬','😰','😱','🥵','🥶','😳','🤪','😵','😡','😠','🤬','😷','🤒','🤕','🤢','🤮','🤧','😇','🤠','🤡','🤥','🤫','🤭','🧐','🤓','😈','👿','👹','👺','💀','👻','👽','🤖','💩','😺','😸','😹','😻','😼','😽','🙀','😿','😾'],
+    pendingImage: '',
+    keyboardHeight: 0,
+    bottomSafeHeight: 10
+  },
+
+  onLoad(options) {
+    let teamId = '', teamName = '客服', teamAvatar = '';
+    if (options.data) {
+      try {
+        const p = JSON.parse(decodeURIComponent(options.data));
+        teamId = p.teamId || '';
+        teamName = p.teamName || '客服';
+        teamAvatar = p.teamAvatar || '';
+      } catch (e) {
+        console.error('解析客服页面参数失败', e);
+      }
+    }
+    // 默认头像使用全局配置
+    if (!teamAvatar) {
+      teamAvatar = app.globalData.ossImageUrl + app.globalData.morentouxiang;
+    }
+    this.setData({ teamId, teamName, teamAvatar });
+    wx.setNavigationBarTitle({ title: teamName });
+    this.initCurrentUser();
+  },
+
+  onShow() {
+    this.autoConnect();
+  },
+
+  onHide() {
+    this.clearAllListeners();
+  },
+
+  autoConnect() {
+    const role = app.globalData.currentRole || 'normal';
+    const uid = wx.getStorageSync('uid');
+    const prefixMap = { normal:'Boss', dashou:'Ds', shangjia:'Sj', guanshi:'Gs', zuzhang:'Zz' };
+    const prefix = prefixMap[role] || 'Boss';
+    const targetUserId = prefix + uid;
+
+    const status = wx.goEasy.getConnectionStatus ? wx.goEasy.getConnectionStatus() : 'disconnected';
+    if (status === 'connected' || status === 'reconnected') {
+      const currentUserId = wx.goEasy.im ? wx.goEasy.im.userId : null;
+      if (currentUserId === targetUserId) {
+        this.setupAllListeners();
+        this.loadHistory(true);
+        return;
+      } else {
+        wx.goEasy.disconnect();
+      }
+    }
+    this.connectGoEasy(targetUserId);
+  },
+
+  connectGoEasy(userId) {
+    const { currentUser } = this.data;
+    if (!currentUser) return;
+    wx.goEasy.connect({
+      id: userId,
+      data: {
+        name: currentUser.name,
+        avatar: currentUser.avatar
+      },
+      onSuccess: () => {
+        this.setupAllListeners();
+        this.loadHistory(true);
+      },
+      onFailed: (error) => {
+        if (error.code === 408) {
+          this.setupAllListeners();
+          this.loadHistory(true);
+        } else {
+          wx.showToast({ title: '连接失败，请重试', icon: 'none' });
+        }
+      }
+    });
+  },
+
+  setupAllListeners() {
+    this.clearAllListeners();
+    this.listenNewMsg();
+    this.listenRecall();
+    this.listenDelete();
+    this.listenRead();
+  },
+
+  clearAllListeners() {
+    if (this._msgHandler) { wx.goEasy.im.off(wx.GoEasy.IM_EVENT.CS_MESSAGE_RECEIVED, this._msgHandler); this._msgHandler = null; }
+    if (this._recallHandler) { wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_RECALLED, this._recallHandler); this._recallHandler = null; }
+    if (this._deleteHandler) { wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_DELETED, this._deleteHandler); this._deleteHandler = null; }
+    if (this._readHandler) { wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_READ, this._readHandler); this._readHandler = null; }
+  },
+
+  initCurrentUser() {
+    const uid = wx.getStorageSync('uid');
+    const role = app.globalData.currentRole || 'normal';
+    const prefix = { normal:'Boss', dashou:'Ds', shangjia:'Sj', guanshi:'Gs', zuzhang:'Zz' }[role] || 'Boss';
+    const avatar = this.fixAvatar(wx.getStorageSync('touxiang'));
+    this.setData({
+      currentUser: {
+        id: prefix + uid,
+        name: app.globalData.currentUser?.name || `用户${uid}`,
+        avatar: avatar
+      }
+    });
+  },
+
+  fixAvatar(url) {
+    if (!url) return app.globalData.ossImageUrl + app.globalData.morentouxiang;
+    if (url.startsWith('http')) return url;
+    return app.globalData.ossImageUrl + url;
+  },
+
+  // ---------- 历史消息 + 永久欢迎语 ----------
+  loadHistory(refresh) {
+    if (!refresh && !this.data.hasMore) return Promise.resolve();
+    return new Promise((resolve) => {
+      this.setData({ loadingHistory: true });
+      const { teamId, lastTimestamp } = this.data;
+      const ts = refresh ? null : lastTimestamp;
+      wx.goEasy.im.history({
+        type: wx.GoEasy.IM_SCENE.CS,
+        id: teamId,
+        lastTimestamp: ts,
+        limit: 20,
+        onSuccess: (res) => {
+          let list = res.content || [];
+          list.sort((a, b) => a.timestamp - b.timestamp);
+          list.forEach((m, idx) => {
+            m.formattedTime = formatDate(m.timestamp);
+            if (idx === 0) m.showTime = true;
+            else m.showTime = (m.timestamp - list[idx-1].timestamp) / 60000 > 5;
+            if (m.senderId === this.data.currentUser.id) {
+              m.senderData = { name: this.data.currentUser.name, avatar: this.data.currentUser.avatar };
+            } else {
+              m.senderData = { name: this.data.teamName, avatar: this.data.teamAvatar };
+            }
+          });
+          let final = refresh ? list : [...list, ...this.data.messages];
+          if (!refresh) {
+            for (let i=0; i<final.length; i++) {
+              if (i===0) final[i].showTime = true;
+              else final[i].showTime = (final[i].timestamp - final[i-1].timestamp) / 60000 > 5;
+            }
+          }
+          const ids = new Set();
+          const unique = [];
+          for (const m of final) { if (!ids.has(m.messageId)) { ids.add(m.messageId); unique.push(m); } }
+
+          // 强制在第一行插入欢迎语（如果不存在）
+          const welcomeId = 'welcome-cs';
+          if (!unique.some(m => m.messageId === welcomeId)) {
+            const welcome = this.createWelcomeMessage();
+            welcome.messageId = welcomeId;
+            welcome.showTime = true;
+            unique.unshift(welcome);
+          }
+
+          const update = {
+            messages: unique,
+            hasMore: list.length >= 20,
+            lastTimestamp: unique.length ? unique[0].timestamp : lastTimestamp,
+            loadingHistory: false
+          };
+          if (refresh) update.scrollToView = 'msg-bottom';
+          this.setData(update);
+          resolve();
+        },
+        onFailed: () => { this.setData({ loadingHistory: false }); resolve(); }
+      });
+    });
+  },
+
+  createWelcomeMessage() {
+    return {
+      messageId: 'welcome-cs',
+      type: 'text',
+      timestamp: Date.now(),
+      senderId: 'system',
+      receiverId: this.data.currentUser?.id,
+      senderData: { name: '系统消息', avatar: '' },
+      payload: { text: '你好，请问有什么可以帮到您的？' },
+      status: 'success',
+      read: false,
+      formattedTime: formatDate(Date.now()),
+      showTime: true
+    };
+  },
+
+  // ---------- 接收新客服消息 ----------
+  listenNewMsg() {
+    if (this._msgHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.CS_MESSAGE_RECEIVED, this._msgHandler);
+    this._msgHandler = (msg) => {
+      if (msg.teamId !== this.data.teamId && msg.to !== this.data.teamId) return;
+      if (msg.senderId === this.data.currentUser.id) return;
+      msg.formattedTime = formatDate(msg.timestamp);
+      msg.senderData = { name: this.data.teamName, avatar: this.data.teamAvatar };
+      const msgs = this.data.messages;
+      const last = msgs.length ? msgs[msgs.length-1] : null;
+      msg.showTime = last ? (msg.timestamp - last.timestamp) / 60000 > 5 : true;
+      if (msgs.some(m => m.messageId === msg.messageId)) return;
+      this.setData({ messages: [...msgs, msg], scrollToView: 'msg-bottom' });
+      this.markCsMessageAsRead();
+    };
+    wx.goEasy.im.on(wx.GoEasy.IM_EVENT.CS_MESSAGE_RECEIVED, this._msgHandler);
+  },
+
+  markCsMessageAsRead() {
+    if (!this.data.teamId) return;
+    wx.goEasy.im.markMessageAsRead({
+      type: wx.GoEasy.IM_SCENE.CS,
+      id: this.data.teamId
+    });
+  },
+
+  // 已读回执监听
+  listenRead() {
+    if (this._readHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_READ, this._readHandler);
+    this._readHandler = (msgs) => {
+      if (!msgs || !msgs.length) return;
+      const ids = new Set(msgs.map(m => m.messageId));
+      const newMsgs = this.data.messages.map(m => ids.has(m.messageId) ? { ...m, read: true } : m);
+      this.setData({ messages: newMsgs });
+    };
+    wx.goEasy.im.on(wx.GoEasy.IM_EVENT.MESSAGE_READ, this._readHandler);
+  },
+
+  // 撤回监听
+  listenRecall() {
+    if (this._recallHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_RECALLED, this._recallHandler);
+    this._recallHandler = (msgs) => {
+      if (!msgs || !msgs.length) return;
+      const ids = new Set(msgs.map(m => m.messageId));
+      this.setData({ messages: this.data.messages.filter(m => !ids.has(m.messageId)) });
+    };
+    wx.goEasy.im.on(wx.GoEasy.IM_EVENT.MESSAGE_RECALLED, this._recallHandler);
+  },
+
+  // 删除监听
+  listenDelete() {
+    if (this._deleteHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_DELETED, this._deleteHandler);
+    this._deleteHandler = (msgs) => {
+      if (!msgs || !msgs.length) return;
+      const ids = new Set(msgs.map(m => m.messageId));
+      this.setData({ messages: this.data.messages.filter(m => !ids.has(m.messageId)) });
+    };
+    wx.goEasy.im.on(wx.GoEasy.IM_EVENT.MESSAGE_DELETED, this._deleteHandler);
+  },
+
+  // ---------- 面板控制 ----------
+  togglePlusPanel() { this.setData({ showPlusPanel: !this.data.showPlusPanel, showEmojiPanel: false }); },
+  closePlusPanel() { this.setData({ showPlusPanel: false }); },
+  openEmojiFromPlus() { this.setData({ showPlusPanel: false, showEmojiPanel: true }); },
+  toggleEmoji() { this.setData({ showEmojiPanel: !this.data.showEmojiPanel }); },
+  insertEmoji(e) { this.setData({ inputText: this.data.inputText + e.currentTarget.dataset.emoji }); },
+  closeEmojiPanel() { this.setData({ showEmojiPanel: false }); },
+
+  // ---------- 发送消息 ----------
+  onInput(e) { this.setData({ inputText: e.detail.value }); },
+  chooseImage() {
+    const that = this;
+    wx.chooseImage({
+      count: 1, sizeType: ['compressed'], sourceType: ['album', 'camera'],
+      success(res) { that.setData({ pendingImage: res.tempFilePaths[0] }); }
+    });
+  },
+  clearPendingImage() { this.setData({ pendingImage: '' }); },
+
+  sendMessage() {
+    if (this.data.pendingImage) {
+      this.sendImageMsg(this.data.pendingImage);
+      this.setData({ pendingImage: '' });
+      return;
+    }
+    const text = this.data.inputText.trim();
+    if (!text) return;
+    this.sendText(text);
+    this.setData({ inputText: '' });
+  },
+
+  sendText(text) {
+    const { currentUser, teamId, teamName, teamAvatar } = this.data;
+    if (!teamId || !currentUser) return;
+    const id = 'local-'+Date.now();
+    const local = {
+      messageId:id, type:'text', timestamp:Date.now(),
+      senderId:currentUser.id, receiverId:teamId,
+      senderData: { name: currentUser.name, avatar: currentUser.avatar },
+      payload:{text}, status:'sending', read:false,
+      formattedTime:formatDate(Date.now()), showTime:this.needShow(Date.now())
+    };
+    this.setData({ messages: [...this.data.messages, local], scrollToView: 'msg-bottom' });
+    const msg = wx.goEasy.im.createTextMessage({
+      text,
+      to:{ type:wx.GoEasy.IM_SCENE.CS, id:teamId, data:{ name:teamName, avatar:teamAvatar } }
+    });
+    wx.goEasy.im.sendMessage({
+      message:msg,
+      onSuccess:() => this.updateMsg(id, 'success'),
+      onFailed:() => this.updateMsg(id, 'failed')
+    });
+  },
+
+  sendImageMsg(file) {
+    const { currentUser, teamId, teamName, teamAvatar } = this.data;
+    if (!teamId || !currentUser) return;
+    const id = 'img-'+Date.now();
+    const local = {
+      messageId:id, type:'image', timestamp:Date.now(),
+      senderId:currentUser.id, receiverId:teamId,
+      payload:{url:file}, status:'sending', read:false,
+      formattedTime:formatDate(Date.now()), showTime:this.needShow(Date.now())
+    };
+    this.setData({ messages: [...this.data.messages, local], scrollToView: 'msg-bottom' });
+    const imgMsg = wx.goEasy.im.createImageMessage({
+      file,
+      to:{ type:wx.GoEasy.IM_SCENE.CS, id:teamId, data:{ name:teamName, avatar:teamAvatar } }
+    });
+    wx.goEasy.im.sendMessage({ message:imgMsg, onSuccess:()=>this.updateMsg(id,'success'), onFailed:()=>{ this.updateMsg(id,'failed'); } });
+  },
+
+  // ---------- 订单发送 ----------
+  openOrderSender() { this.setData({ showOrderSender: true, showPlusPanel: false }); },
+  closeOrderSender() { this.setData({ showOrderSender: false }); },
+  onSendOrder(e) {
+    const order = e.detail.order;
+    if (!order) return;
+    this.sendOrderMessage(order);
+  },
+
+  sendOrderMessage(order) {
+    const { currentUser, teamId, teamName, teamAvatar } = this.data;
+    if (!teamId || !currentUser) return;
+    const id = 'order-'+Date.now();
+    const local = {
+      messageId:id, type:'order', timestamp:Date.now(),
+      senderId:currentUser.id, receiverId:teamId,
+      senderData: { name: currentUser.name, avatar: currentUser.avatar },
+      payload: order, status:'sending', read:false,
+      formattedTime:formatDate(Date.now()), showTime:this.needShow(Date.now())
+    };
+    this.setData({ messages: [...this.data.messages, local], scrollToView: 'msg-bottom' });
+    const customMsg = wx.goEasy.im.createCustomMessage({
+      type:'order',
+      payload: order,
+      to:{ type:wx.GoEasy.IM_SCENE.CS, id:teamId, data:{ name:teamName, avatar:teamAvatar } }
+    });
+    wx.goEasy.im.sendMessage({
+      message:customMsg,
+      onSuccess:() => this.updateMsg(id, 'success'),
+      onFailed:() => this.updateMsg(id, 'failed')
+    });
+  },
+
+  updateMsg(id, status) { this.setData({ messages: this.data.messages.map(m => m.messageId === id ? { ...m, status } : m) }); },
+  needShow(ts) { const ms = this.data.messages; if (!ms.length) return true; const last = ms[ms.length-1]; return (ts - last.timestamp) / 60000 > 5; },
+
+  // ---------- 消息操作 ----------
+  onBubbleTap(e) {
+    const msgId = e.currentTarget.dataset.messageid;
+    const text = e.currentTarget.dataset.text;
+    const now = Date.now();
+    if (msgId === this.data.lastTapMsgId && now - this.data.lastTapTime < 350) {
+      this.setData({ detailText: text, showDetailModal: true, lastTapTime:0, lastTapMsgId:'' });
+    } else {
+      this.data.lastTapTime = now;
+      this.data.lastTapMsgId = msgId;
+    }
+  },
+  hideDetail() { this.setData({ showDetailModal: false }); },
+  copyDetail() { wx.setClipboardData({ data: this.data.detailText }); },
+
+  showAction(e) {
+    const msgId = e.currentTarget.dataset.messageid;
+    if (!msgId) return;
+    const msg = this.data.messages.find(m => m.messageId === msgId);
+    if (!msg || msg.messageId.startsWith('local-')) return;
+    const itemList = ['复制', '删除'];
+    if (msg.senderId === this.data.currentUser.id && (Date.now() - msg.timestamp < 120000)) {
+      itemList.push('撤回');
+    }
+    wx.showActionSheet({
+      itemList,
+      success: (res) => {
+        if (itemList[res.tapIndex] === '复制') { if (msg.type === 'text') wx.setClipboardData({ data: msg.payload.text }); }
+        else if (itemList[res.tapIndex] === '删除') { this.deleteMsg(msg); }
+        else if (itemList[res.tapIndex] === '撤回') { this.recallMsg(msg); }
+      }
+    });
+  },
+
+  deleteMsg(msg) {
+    wx.showModal({
+      title: '提示', content: '仅自己看不到',
+      success: (res) => {
+        if (res.confirm) {
+          wx.goEasy.im.deleteMessage({ messages: [msg] });
+          this.setData({ messages: this.data.messages.filter(m => m.messageId !== msg.messageId) });
+        }
+      }
+    });
+  },
+
+  recallMsg(msg) {
+    wx.showModal({
+      title: '提示', content: '撤回后对方也看不到',
+      success: (res) => {
+        if (res.confirm) {
+          wx.goEasy.im.recallMessage({ messages: [msg] });
+          const newMsgs = this.data.messages.map(m => {
+            if (m.messageId === msg.messageId) return { ...m, type:'text', payload:{text:'你撤回了一条消息'}, recalled:true };
+            return m;
+          });
+          this.setData({ messages: newMsgs });
+        }
+      }
+    });
+  },
+
+  previewImage(e) {
+    const url = e.currentTarget.dataset.url;
+    if (url) wx.previewImage({ urls: [url], current: url });
+  },
+
+  // 订单详情弹窗
+  showOrderDetailPopup(e) {
+    const order = e.currentTarget.dataset.order;
+    this.setData({ showOrderDetail: true, detailOrder: order });
+  },
+  hideOrderDetail() {
+    this.setData({ showOrderDetail: false, detailOrder: null });
+  },
+
+  onKeyboardHeightChange(e) { this.setData({ keyboardHeight: e.detail.height }); },
+
+  onPullDownRefresh() {
+    if (this.data.loadingHistory) return;
+    this.setData({ isRefreshing: true });
+    this.loadHistory(false).finally(() => { this.setData({ isRefreshing: false }); wx.stopPullDownRefresh(); });
+  }
+});
\ No newline at end of file
diff --git a/pages/kefuliaotian/kefuliaotian.json b/pages/kefuliaotian/kefuliaotian.json
new file mode 100644
index 0000000..23f400e
--- /dev/null
+++ b/pages/kefuliaotian/kefuliaotian.json
@@ -0,0 +1,7 @@
+{
+    "navigationBarTitleText": "聊天",
+    "usingComponents": {
+      "order-card": "/components/order-card/order-card",
+      "order-sender": "/components/order-sender/order-sender"
+    }
+  }
\ No newline at end of file
diff --git a/pages/kefuliaotian/kefuliaotian.wxml b/pages/kefuliaotian/kefuliaotian.wxml
new file mode 100644
index 0000000..0b64b0c
--- /dev/null
+++ b/pages/kefuliaotian/kefuliaotian.wxml
@@ -0,0 +1,109 @@
+<view class="chat-page">
+  <scroll-view class="msg-list" scroll-y="true"
+               scroll-into-view="{{scrollToView}}"
+               refresher-enabled="{{true}}"
+               refresher-triggered="{{isRefreshing}}"
+               bindrefresherrefresh="onPullDownRefresh"
+               style="top: 20rpx; bottom: calc({{bottomSafeHeight}}rpx + {{keyboardHeight}}px + env(safe-area-inset-bottom) + 20rpx);">
+    <view class="loading-more" wx:if="{{loadingHistory}}">加载更早消息...</view>
+    <block wx:for="{{messages}}" wx:key="messageId">
+      <view class="msg-wrapper" data-messageid="{{item.messageId}}" bindlongpress="showAction">
+        <view class="time-tag" wx:if="{{item.showTime}}">{{item.formattedTime}}</view>
+        <view class="msg-row {{item.senderId === currentUser.id ? 'right' : 'left'}}">
+          
+          <image wx:if="{{item.senderId !== currentUser.id}}" class="avatar" src="{{teamAvatar}}" mode="aspectFill" />
+          <view class="bubble {{item.senderId === currentUser.id ? 'bubble-right' : 'bubble-left'}}"
+                data-messageid="{{item.messageId}}"
+                data-text="{{item.type==='text' ? item.payload.text : ''}}"
+                bindtap="{{item.type==='text' ? 'onBubbleTap' : (item.type==='image' ? 'previewImage' : '')}}"
+                data-url="{{item.type==='image' ? item.payload.url : ''}}">
+            <text wx:if="{{item.type === 'text'}}" class="msg-text">{{item.payload.text}}</text>
+            <image wx:elif="{{item.type === 'image'}}" class="msg-image" src="{{item.payload.url}}" mode="widthFix" data-url="{{item.payload.url}}" bindtap="previewImage"/>
+            <view wx:elif="{{item.type === 'order'}}" class="order-bubble">
+              <text class="order-label">📋 订单消息</text>
+              <view class="order-brief">
+                <text>订单号：{{item.payload.dingdan_id || '无'}}</text>
+                <text>服务：{{item.payload.jieshao || ''}}</text>
+                <text class="order-price">¥{{item.payload.jine}}</text>
+              </view>
+              <button class="order-detail-btn" catchtap="showOrderDetailPopup" data-order="{{item.payload}}" size="mini">查看详情</button>
+            </view>
+            <text wx:else class="msg-text">{{item.payload.text || '[未知消息]'}}</text>
+          </view>
+          
+          <image wx:if="{{item.senderId === currentUser.id}}" class="avatar" src="{{currentUser.avatar}}" mode="aspectFill" />
+        </view>
+        
+      </view>
+    </block>
+    <view id="msg-bottom" style="height:20rpx;"></view>
+  </scroll-view>
+
+  
+  <view class="input-area" style="bottom: {{keyboardHeight}}px; padding-bottom: calc(10rpx + env(safe-area-inset-bottom));">
+    <view class="plus-panel {{showPlusPanel ? 'show' : ''}}" catchtap="closePlusPanel">
+      <view class="plus-grid">
+        <view class="plus-item" catchtap="openEmojiFromPlus">
+          <text class="plus-icon">😀</text>
+          <text class="plus-label">表情</text>
+        </view>
+        <view class="plus-item" catchtap="chooseImage">
+          <text class="plus-icon">📷</text>
+          <text class="plus-label">图片</text>
+        </view>
+        <view class="plus-item" catchtap="openOrderSender">
+          <text class="plus-icon">📋</text>
+          <text class="plus-label">订单</text>
+        </view>
+      </view>
+    </view>
+
+    <view class="emoji-mask" wx:if="{{showEmojiPanel}}" catchtap="closeEmojiPanel"></view>
+    <view class="emoji-panel {{showEmojiPanel ? 'show' : ''}}">
+      <scroll-view scroll-y="true" class="emoji-scroll">
+        <view class="emoji-grid">
+          <block wx:for="{{emojiList}}" wx:key="*this">
+            <view class="emoji-item" data-emoji="{{item}}" catchtap="insertEmoji">{{item}}</view>
+          </block>
+        </view>
+      </scroll-view>
+    </view>
+
+    <view class="pending-image" wx:if="{{pendingImage}}">
+      <image class="pending-thumb" src="{{pendingImage}}" mode="aspectFill" />
+      <view class="pending-remove" catchtap="clearPendingImage">✕</view>
+    </view>
+
+    <view class="write-row">
+      <input class="text-input" placeholder="消息" value="{{inputText}}" bindinput="onInput" adjust-position="{{false}}" bindkeyboardheightchange="onKeyboardHeightChange" cursor-spacing="10"/>
+      <view class="send-btn" bindtap="sendMessage">发送</view>
+      <view class="plus-btn" bindtap="togglePlusPanel">
+        <text class="plus-icon-single">➕</text>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="detail-modal" wx:if="{{showDetailModal}}" catchtap="hideDetail">
+    <view class="detail-content" catchtap="noop">
+      <text class="detail-text" user-select="true">{{detailText}}</text>
+      <button class="copy-btn" bindtap="copyDetail">复制</button>
+    </view>
+  </view>
+
+  
+  <view class="order-detail-mask" wx:if="{{showOrderDetail}}" catchtap="hideOrderDetail">
+    <view class="order-detail-panel" catchtap="noop">
+      <view class="order-detail-title">订单详情</view>
+      <view class="order-detail-item">订单号：{{detailOrder.dingdan_id}}</view>
+      <view class="order-detail-item">服务描述：{{detailOrder.jieshao}}</view>
+      <view class="order-detail-item">金额：¥{{detailOrder.jine}}</view>
+      <view class="order-detail-item">类型：{{detailOrder.leixing || '无'}}</view>
+      <view class="order-detail-item">时间：{{detailOrder.shijian || '无'}}</view>
+      <button class="order-detail-close-btn" catchtap="hideOrderDetail">关闭</button>
+    </view>
+  </view>
+
+  
+  <order-sender visible="{{showOrderSender}}" bind:send="onSendOrder" bind:close="closeOrderSender" />
+</view>
\ No newline at end of file
diff --git a/pages/kefuliaotian/kefuliaotian.wxss b/pages/kefuliaotian/kefuliaotian.wxss
new file mode 100644
index 0000000..00e37b0
--- /dev/null
+++ b/pages/kefuliaotian/kefuliaotian.wxss
@@ -0,0 +1,67 @@
+.chat-page { width:100%; height:100vh; background:#f5f5f5; }
+.msg-list { position:absolute; left:0; right:0; padding:0 20rpx; box-sizing:border-box; overflow-y:auto; }
+.loading-more { text-align:center; font-size:24rpx; color:#999; padding:20rpx 0; }
+.time-tag { text-align:center; margin:28rpx 0; font-size:24rpx; color:#b0b0b0; }
+.msg-wrapper { margin-bottom:12rpx; }
+.msg-row { display:flex; align-items:flex-start; margin-bottom:4rpx; }
+.right { justify-content:flex-end; }
+.left { justify-content:flex-start; }
+.avatar { width:76rpx; height:76rpx; border-radius:50%; background:#e0e0e0; margin:0 12rpx; flex-shrink:0; }
+.bubble { max-width:70%; padding:16rpx 20rpx; border-radius:16rpx; position:relative; word-break:break-all; font-size:30rpx; line-height:1.5; }
+.bubble-left { background:#fff; border-top-left-radius:4rpx; }
+.bubble-right { background:#00aaff; color:#fff; border-top-right-radius:4rpx; }
+.msg-text { color:inherit; }
+.msg-image { max-width:240rpx; border-radius:10rpx; }
+
+/* 已读/未读标签：靠右显示 */
+.read-tag {
+  display: flex;
+  justify-content: flex-end;
+  font-size: 20rpx;
+  color: #888;
+  padding: 4rpx 12rpx 0 0;
+  margin-top: 2rpx;
+}
+
+/* 订单气泡 */
+.order-bubble { background:#fff7e0; padding:12rpx; border-radius:8rpx; }
+.order-label { font-size:24rpx; color:#e6a23c; font-weight:600; margin-bottom:8rpx; }
+.order-brief { font-size:24rpx; color:#333; line-height:1.6; }
+.order-price { color:#e6a23c; font-weight:bold; }
+.order-detail-btn { margin-top:10rpx; background:#e6a23c; color:#fff; border-radius:8rpx; }
+
+/* 订单详情弹窗 */
+.order-detail-mask { position:fixed; top:0; left:0; right:0; bottom:0; background:rgba(0,0,0,0.6); z-index:999; display:flex; justify-content:center; align-items:center; }
+.order-detail-panel { width:80%; background:#fff; border-radius:20rpx; padding:30rpx; }
+.order-detail-title { font-size:34rpx; font-weight:bold; margin-bottom:20rpx; color:#333; }
+.order-detail-item { font-size:28rpx; margin:16rpx 0; color:#555; }
+.order-detail-close-btn { width:100%; height:80rpx; background:#00aaff; color:#fff; border-radius:12rpx; margin-top:30rpx; font-size:30rpx; }
+
+/* 底部输入区域 */
+.input-area { position:fixed; left:0; right:0; background:#f7f7f7; border-top:1rpx solid #ddd; z-index:10; }
+.plus-panel { position:absolute; bottom:100%; left:0; right:0; background:#fff; border-top:1rpx solid #e0e0e0; padding:20rpx; transform:translateY(100%); opacity:0; transition:0.3s; pointer-events:none; z-index:9; }
+.plus-panel.show { transform:translateY(0); opacity:1; pointer-events:auto; }
+.plus-grid { display:flex; justify-content:space-around; }
+.plus-item { display:flex; flex-direction:column; align-items:center; width:120rpx; }
+.plus-icon { font-size:60rpx; }
+.plus-label { font-size:24rpx; color:#666; margin-top:8rpx; }
+.emoji-mask { position:fixed; top:0; left:0; right:0; bottom:0; background:transparent; z-index:8; }
+.emoji-panel { position:absolute; bottom:100%; left:0; right:0; background:#fff; border-top:1rpx solid #e0e0e0; height:380rpx; transform:translateY(100%); opacity:0; transition:0.3s; pointer-events:none; z-index:9; }
+.emoji-panel.show { transform:translateY(0); opacity:1; pointer-events:auto; }
+.emoji-scroll { height:100%; }
+.emoji-grid { display:flex; flex-wrap:wrap; padding:20rpx 10rpx; }
+.emoji-item { width:14.28%; text-align:center; padding:16rpx 0; font-size:44rpx; }
+.pending-image { display:flex; align-items:center; padding:10rpx 20rpx; background:#fff; }
+.pending-thumb { width:80rpx; height:80rpx; border-radius:8rpx; }
+.pending-remove { font-size:30rpx; color:#999; margin-left:10rpx; }
+.write-row { display:flex; padding:0 20rpx 10rpx; align-items:center; }
+.text-input { flex:1; height:76rpx; background:#fff; border-radius:12rpx; padding:0 20rpx; font-size:30rpx; margin-right:12rpx; }
+.send-btn { width:120rpx; height:76rpx; background:#00aaff; color:#fff; font-size:28rpx; font-weight:500; border-radius:12rpx; display:flex; align-items:center; justify-content:center; }
+.plus-btn { width:56rpx; height:56rpx; display:flex; align-items:center; justify-content:center; margin-left:10rpx; }
+.plus-icon-single { font-size:46rpx; color:#00aaff; }
+
+/* 双击放大文本弹窗 */
+.detail-modal { position:fixed; top:0; left:0; right:0; bottom:0; background:rgba(0,0,0,0.7); z-index:999; display:flex; align-items:center; justify-content:center; }
+.detail-content { width:80%; max-height:80%; background:#fff; border-radius:16rpx; padding:40rpx; }
+.detail-text { font-size:32rpx; line-height:1.6; word-break:break-all; overflow-y:auto; }
+.copy-btn { width:100%; height:80rpx; background:#00aaff; color:#fff; border-radius:12rpx; margin-top:20rpx; font-size:30rpx; }
\ No newline at end of file
diff --git a/pages/liaotian/liaotian.js b/pages/liaotian/liaotian.js
new file mode 100644
index 0000000..2ee0095
--- /dev/null
+++ b/pages/liaotian/liaotian.js
@@ -0,0 +1,385 @@
+const app = getApp();
+import { formatDate } from '../../static/lib/utils';
+
+Page({
+  data: {
+    toUserId: '', toName: '', toAvatar: '',
+    currentUser: null,
+    messages: [],
+    inputText: '',
+    showEmojiPanel: false,
+    showPlusPanel: false,
+    showOrderSender: false,
+    loadingHistory: false,
+    isRefreshing: false,
+    lastTimestamp: null,
+    hasMore: true,
+    scrollToView: '',
+    detailText: '',
+    showDetailModal: false,
+    lastTapTime: 0,
+    lastTapMsgId: '',
+    emojiList: ['😀','😁','😂','🤣','😃','😄','😅','😆','😉','😊','😋','😎','😍','😘','😗','😙','😚','🙂','🤗','🤩','🤔','🤨','😐','😑','😶','🙄','😏','😣','😥','😮','🤐','😯','😪','😫','😴','😌','😛','😜','😝','🤤','😒','😓','😔','😕','🙃','🤑','😲','☹','🙁','😖','😞','😟','😤','😢','😭','😦','😧','😨','😩','🤯','😬','😰','😱','🥵','🥶','😳','🤪','😵','😡','😠','🤬','😷','🤒','🤕','🤢','🤮','🤧','😇','🤠','🤡','🤥','🤫','🤭','🧐','🤓','😈','👿','👹','👺','💀','👻','👽','🤖','💩','😺','😸','😹','😻','😼','😽','🙀','😿','😾'],
+    pendingImage: '',
+    keyboardHeight: 0,
+    bottomSafeHeight: 10
+  },
+
+  onLoad(options) {
+    if (options.data) {
+      try {
+        const p = JSON.parse(decodeURIComponent(options.data));
+        this.setData({ toUserId: p.toUserId || '', toName: p.toName || '聊天', toAvatar: p.toAvatar || '' });
+      } catch (e) {}
+    }
+    wx.setNavigationBarTitle({ title: this.data.toName });
+    this.initCurrentUser();
+  },
+
+  onShow() {
+    this.autoConnect();
+  },
+
+  onHide() {
+    this.clearAllListeners();
+  },
+
+  autoConnect() {
+    const role = app.globalData.currentRole || 'normal';
+    const uid = wx.getStorageSync('uid');
+    const prefixMap = { normal:'Boss', dashou:'Ds', shangjia:'Sj', guanshi:'Gs', zuzhang:'Zz',kaoheguan:'Kh' };
+    const prefix = prefixMap[role] || 'Boss';
+    const targetUserId = prefix + uid;
+
+    const status = wx.goEasy.getConnectionStatus ? wx.goEasy.getConnectionStatus() : 'disconnected';
+    if (status === 'connected' || status === 'reconnected') {
+      const currentUserId = wx.goEasy.im ? wx.goEasy.im.userId : null;
+      if (currentUserId === targetUserId) {
+        this.setupAllListeners();
+        this.loadHistory(true);
+        return;
+      } else {
+        wx.goEasy.disconnect();
+      }
+    }
+    this.connectGoEasy(targetUserId);
+  },
+
+  connectGoEasy(userId) {
+    const { currentUser } = this.data;
+    if (!currentUser) return;
+    wx.goEasy.connect({
+      id: userId,
+      data: {
+        name: currentUser.name,
+        avatar: currentUser.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
+      },
+      onSuccess: () => {
+        this.setupAllListeners();
+        this.loadHistory(true);
+      },
+      onFailed: (error) => {
+        if (error.code === 408) {
+          this.setupAllListeners();
+          this.loadHistory(true);
+        } else {
+          wx.showToast({ title: '连接失败，请重试', icon: 'none' });
+        }
+      }
+    });
+  },
+
+  setupAllListeners() {
+    this.clearAllListeners();
+    this.listenNewMsg();
+    this.listenRecall();
+    this.listenDelete();
+    this.listenRead();
+  },
+
+  clearAllListeners() {
+    if (this._msgHandler) { wx.goEasy.im.off(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, this._msgHandler); this._msgHandler = null; }
+    if (this._recallHandler) { wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_RECALLED, this._recallHandler); this._recallHandler = null; }
+    if (this._deleteHandler) { wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_DELETED, this._deleteHandler); this._deleteHandler = null; }
+    if (this._readHandler) { wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_READ, this._readHandler); this._readHandler = null; }
+  },
+
+  initCurrentUser() {
+    const uid = wx.getStorageSync('uid');
+    const role = app.globalData.currentRole || 'normal';
+    const prefix = { normal:'Boss', dashou:'Ds', shangjia:'Sj', guanshi:'Gs', zuzhang:'Zz',kaoheguan:'Kh' }[role] || 'Boss';
+    this.setData({ currentUser: {
+      id: prefix + uid,
+      name: app.globalData.currentUser?.name || `用户${uid}`,
+      avatar: this.fixAvatar(wx.getStorageSync('touxiang'))
+    }});
+  },
+  fixAvatar(url) {
+    if (!url) return app.globalData.ossImageUrl + app.globalData.morentouxiang;
+    if (url.startsWith('http')) return url;
+    return app.globalData.ossImageUrl + url;
+  },
+  isConnected() {
+    const s = wx.goEasy.getConnectionStatus ? wx.goEasy.getConnectionStatus() : 'disconnected';
+    return s === 'connected' || s === 'reconnected';
+  },
+
+  onPullDownRefresh() {
+    if (this.data.loadingHistory) return;
+    this.setData({ isRefreshing: true });
+    this.loadHistory(false).finally(() => { this.setData({ isRefreshing: false }); wx.stopPullDownRefresh(); });
+  },
+
+  loadHistory(refresh) {
+    if (!refresh && !this.data.hasMore) return Promise.resolve();
+    return new Promise((resolve) => {
+      this.setData({ loadingHistory: true });
+      const { toUserId, lastTimestamp } = this.data;
+      const ts = refresh ? null : lastTimestamp;
+      wx.goEasy.im.history({
+        type: wx.GoEasy.IM_SCENE.PRIVATE, id: toUserId, lastTimestamp: ts, limit: 20,
+        onSuccess: (res) => {
+          let list = res.content || [];
+          list.sort((a, b) => a.timestamp - b.timestamp);
+          list.forEach((m, idx) => {
+            m.formattedTime = formatDate(m.timestamp);
+            if (idx === 0) m.showTime = true;
+            else m.showTime = (m.timestamp - list[idx-1].timestamp) / 60000 > 5;
+            if (m.senderId === this.data.currentUser.id) {
+              m.senderData = { name: this.data.currentUser.name, avatar: this.data.currentUser.avatar };
+            } else {
+              m.senderData = { name: this.data.toName, avatar: this.data.toAvatar };
+            }
+          });
+          let final = refresh ? list : [...list, ...this.data.messages];
+          if (!refresh) {
+            for (let i=0; i<final.length; i++) {
+              if (i===0) final[i].showTime = true;
+              else final[i].showTime = (final[i].timestamp - final[i-1].timestamp) / 60000 > 5;
+            }
+          }
+          const ids = new Set();
+          const unique = [];
+          for (const m of final) { if (!ids.has(m.messageId)) { ids.add(m.messageId); unique.push(m); } }
+          const update = {
+            messages: unique,
+            hasMore: list.length >= 20,
+            lastTimestamp: unique.length ? unique[0].timestamp : lastTimestamp,
+            loadingHistory: false
+          };
+          if (refresh) update.scrollToView = 'msg-bottom';
+          this.setData(update);
+          resolve();
+        },
+        onFailed: () => { this.setData({ loadingHistory: false }); resolve(); }
+      });
+    });
+  },
+
+  listenNewMsg() {
+    if (this._msgHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, this._msgHandler);
+    this._msgHandler = (msg) => {
+      if (msg.receiverId !== this.data.currentUser.id && msg.senderId !== this.data.toUserId) return;
+      msg.formattedTime = formatDate(msg.timestamp);
+      if (msg.senderId === this.data.currentUser.id) {
+        msg.senderData = { name: this.data.currentUser.name, avatar: this.data.currentUser.avatar };
+      } else {
+        msg.senderData = { name: this.data.toName, avatar: this.data.toAvatar };
+      }
+      const msgs = this.data.messages;
+      const last = msgs.length ? msgs[msgs.length-1] : null;
+      msg.showTime = last ? (msg.timestamp - last.timestamp) / 60000 > 5 : true;
+      this.setData({ messages: [...msgs, msg], scrollToView: 'msg-bottom' });
+      this.markPrivateMessageAsRead();
+    };
+    wx.goEasy.im.on(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, this._msgHandler);
+  },
+
+  markPrivateMessageAsRead() {
+    if (!this.data.toUserId) return;
+    wx.goEasy.im.markMessageAsRead({
+      type: wx.GoEasy.IM_SCENE.PRIVATE,
+      id: this.data.toUserId
+    });
+  },
+
+  listenRead() {
+    if (this._readHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_READ, this._readHandler);
+    this._readHandler = (msgs) => {
+      if (!msgs || !msgs.length) return;
+      const ids = new Set(msgs.map(m => m.messageId));
+      const newMsgs = this.data.messages.map(m => ids.has(m.messageId) ? { ...m, read: true } : m);
+      this.setData({ messages: newMsgs });
+    };
+    wx.goEasy.im.on(wx.GoEasy.IM_EVENT.MESSAGE_READ, this._readHandler);
+  },
+
+  listenRecall() {
+    if (this._recallHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_RECALLED, this._recallHandler);
+    this._recallHandler = (msgs) => {
+      if (!msgs || !msgs.length) return;
+      const ids = new Set(msgs.map(m => m.messageId));
+      this.setData({ messages: this.data.messages.filter(m => !ids.has(m.messageId)) });
+    };
+    wx.goEasy.im.on(wx.GoEasy.IM_EVENT.MESSAGE_RECALLED, this._recallHandler);
+  },
+
+  listenDelete() {
+    if (this._deleteHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_DELETED, this._deleteHandler);
+    this._deleteHandler = (msgs) => {
+      if (!msgs || !msgs.length) return;
+      const ids = new Set(msgs.map(m => m.messageId));
+      this.setData({ messages: this.data.messages.filter(m => !ids.has(m.messageId)) });
+    };
+    wx.goEasy.im.on(wx.GoEasy.IM_EVENT.MESSAGE_DELETED, this._deleteHandler);
+  },
+
+  onInput(e) { this.setData({ inputText: e.detail.value }); },
+  chooseImage() {
+    const that = this;
+    wx.chooseImage({
+      count: 1, sizeType: ['compressed'], sourceType: ['album', 'camera'],
+      success(res) { that.setData({ pendingImage: res.tempFilePaths[0] }); }
+    });
+  },
+  clearPendingImage() { this.setData({ pendingImage: '' }); },
+  sendMessage() {
+    if (this.data.pendingImage) {
+      this.sendImageMsg(this.data.pendingImage);
+      this.setData({ pendingImage: '' });
+      return;
+    }
+    const text = this.data.inputText.trim();
+    if (!text) return;
+    this.sendText(text);
+    this.setData({ inputText: '' });
+  },
+
+  sendText(text) {
+    const { currentUser, toUserId } = this.data;
+    if (!toUserId || !currentUser) return;
+    const id = 'local-'+Date.now();
+    const local = {
+      messageId:id, type:'text', timestamp:Date.now(),
+      senderId:currentUser.id, receiverId:toUserId,
+      senderData: { name: currentUser.name, avatar: currentUser.avatar },
+      payload:{text}, status:'sending', read:false,
+      formattedTime:formatDate(Date.now()), showTime:this.needShow(Date.now())
+    };
+    this.setData({ messages: [...this.data.messages, local], scrollToView: 'msg-bottom' });
+    const msg = wx.goEasy.im.createTextMessage({
+      text,
+      to:{ type:wx.GoEasy.IM_SCENE.PRIVATE, id:toUserId, data:{ avatar:currentUser.avatar, name:currentUser.name } }
+    });
+    wx.goEasy.im.sendMessage({
+      message:msg,
+      onSuccess:() => this.updateMsg(id, 'success'),
+      onFailed:() => this.updateMsg(id, 'failed')
+    });
+  },
+  sendImageMsg(file) {
+    const { currentUser, toUserId } = this.data;
+    if (!toUserId || !currentUser) return;
+    const id = 'img-'+Date.now();
+    const local = {
+      messageId:id, type:'image', timestamp:Date.now(),
+      senderId:currentUser.id, receiverId:toUserId,
+      payload:{url:file}, status:'sending', read:false,
+      formattedTime:formatDate(Date.now()), showTime:this.needShow(Date.now())
+    };
+    this.setData({ messages: [...this.data.messages, local], scrollToView: 'msg-bottom' });
+    const imgMsg = wx.goEasy.im.createImageMessage({
+      file,
+      to:{ type:wx.GoEasy.IM_SCENE.PRIVATE, id:toUserId, data:{ avatar:currentUser.avatar, name:currentUser.name } }
+    });
+    wx.goEasy.im.sendMessage({ message:imgMsg, onSuccess:()=>this.updateMsg(id,'success'), onFailed:()=>{ this.updateMsg(id,'failed'); } });
+  },
+  updateMsg(id, status) { this.setData({ messages: this.data.messages.map(m => m.messageId === id ? { ...m, status } : m) }); },
+  needShow(ts) { const ms = this.data.messages; if (!ms.length) return true; const last = ms[ms.length-1]; return (ts - last.timestamp) / 60000 > 5; },
+
+  onBubbleTap(e) {
+    const msgId = e.currentTarget.dataset.messageid;
+    const text = e.currentTarget.dataset.text;
+    const now = Date.now();
+    if (msgId === this.data.lastTapMsgId && now - this.data.lastTapTime < 350) {
+      this.setData({ detailText: text, showDetailModal: true, lastTapTime:0, lastTapMsgId:'' });
+    } else {
+      this.data.lastTapTime = now;
+      this.data.lastTapMsgId = msgId;
+    }
+  },
+  hideDetail() { this.setData({ showDetailModal: false }); },
+  copyDetail() { wx.setClipboardData({ data: this.data.detailText }); },
+
+  showAction(e) {
+    const msgId = e.currentTarget.dataset.messageid;
+    if (!msgId) return;
+    const msg = this.data.messages.find(m => m.messageId === msgId);
+    if (!msg || msg.messageId.startsWith('local-')) return;
+    const itemList = ['复制', '删除'];
+    if (msg.senderId === this.data.currentUser.id && (Date.now() - msg.timestamp < 120000)) {
+      itemList.push('撤回');
+    }
+    wx.showActionSheet({
+      itemList,
+      success: (res) => {
+        if (itemList[res.tapIndex] === '复制') { if (msg.type === 'text') wx.setClipboardData({ data: msg.payload.text }); }
+        else if (itemList[res.tapIndex] === '删除') { this.deleteMsg(msg); }
+        else if (itemList[res.tapIndex] === '撤回') { this.recallMsg(msg); }
+      }
+    });
+  },
+
+  deleteMsg(msg) {
+    wx.showModal({
+      title: '提示', content: '仅自己看不到',
+      success: (res) => {
+        if (res.confirm) {
+          wx.goEasy.im.deleteMessage({
+            messages: [msg],
+            onSuccess: () => { this.setData({ messages: this.data.messages.filter(m => m.messageId !== msg.messageId) }); },
+            onFailed: () => { this.setData({ messages: this.data.messages.filter(m => m.messageId !== msg.messageId) }); }
+          });
+        }
+      }
+    });
+  },
+
+  recallMsg(msg) {
+    wx.showModal({
+      title: '提示', content: '撤回后对方也看不到',
+      success: (res) => {
+        if (res.confirm) {
+          const newMsgs = this.data.messages.map(m => {
+            if (m.messageId === msg.messageId) return { ...m, type:'text', payload:{text:'你撤回了一条消息'}, recalled:true };
+            return m;
+          });
+          this.setData({ messages: newMsgs });
+          wx.goEasy.im.recallMessage({ messages: [msg], onFailed:()=>{} });
+        }
+      }
+    });
+  },
+
+  previewImage(e) { wx.previewImage({ urls: [e.currentTarget.dataset.url], current: e.currentTarget.dataset.url }); },
+
+  togglePlusPanel() { this.setData({ showPlusPanel: !this.data.showPlusPanel, showEmojiPanel: false }); },
+  closePlusPanel() { this.setData({ showPlusPanel: false }); },
+
+  openEmojiFromPlus() { this.setData({ showPlusPanel: false, showEmojiPanel: true }); },
+  toggleEmoji() { this.setData({ showEmojiPanel: !this.data.showEmojiPanel }); },
+  insertEmoji(e) { this.setData({ inputText: this.data.inputText + e.currentTarget.dataset.emoji }); },
+  closeEmojiPanel() { this.setData({ showEmojiPanel: false }); },
+
+  openOrderSender() { this.setData({ showOrderSender: true, showPlusPanel: false }); },
+  closeOrderSender() { this.setData({ showOrderSender: false }); },
+  onSendOrder(e) {
+    const order = e.detail.order;
+    if (!order) return;
+    const text = `[订单]${order.dingdan_id}\n${order.jieshao}\n¥${order.jine}`;
+    this.setData({ inputText: text });
+    this.sendMessage();
+  },
+
+  onKeyboardHeightChange(e) { this.setData({ keyboardHeight: e.detail.height }); }
+});
\ No newline at end of file
diff --git a/pages/liaotian/liaotian.json b/pages/liaotian/liaotian.json
new file mode 100644
index 0000000..23f400e
--- /dev/null
+++ b/pages/liaotian/liaotian.json
@@ -0,0 +1,7 @@
+{
+    "navigationBarTitleText": "聊天",
+    "usingComponents": {
+      "order-card": "/components/order-card/order-card",
+      "order-sender": "/components/order-sender/order-sender"
+    }
+  }
\ No newline at end of file
diff --git a/pages/liaotian/liaotian.wxml b/pages/liaotian/liaotian.wxml
new file mode 100644
index 0000000..db692d2
--- /dev/null
+++ b/pages/liaotian/liaotian.wxml
@@ -0,0 +1,87 @@
+<view class="chat-page">
+  <scroll-view class="msg-list" scroll-y="true"
+               scroll-into-view="{{scrollToView}}"
+               refresher-enabled="{{true}}"
+               refresher-triggered="{{isRefreshing}}"
+               bindrefresherrefresh="onPullDownRefresh"
+               style="top: 20rpx; bottom: calc({{bottomSafeHeight}}rpx + {{keyboardHeight}}px + env(safe-area-inset-bottom) + 20rpx);">
+    <view class="loading-more" wx:if="{{loadingHistory}}">加载更早消息...</view>
+    <block wx:for="{{messages}}" wx:key="messageId">
+      <view class="msg-wrapper" data-messageid="{{item.messageId}}" bindlongpress="showAction">
+        <view class="time-tag" wx:if="{{item.showTime}}">{{item.formattedTime}}</view>
+        <view class="msg-row {{item.senderId === currentUser.id ? 'right' : 'left'}}">
+          <image wx:if="{{item.senderId !== currentUser.id}}" class="avatar" src="{{toAvatar || '/images/default-avatar.png'}}" mode="aspectFill" />
+          <view class="bubble {{item.senderId === currentUser.id ? 'bubble-right' : 'bubble-left'}}"
+                data-messageid="{{item.messageId}}"
+                data-text="{{item.type==='text' ? item.payload.text : ''}}"
+                bindtap="{{item.type==='text' ? 'onBubbleTap' : (item.type==='image' ? 'previewImage' : '')}}"
+                data-url="{{item.type==='image' ? item.payload.url : ''}}">
+            <text wx:if="{{item.type === 'text'}}" class="msg-text">{{item.payload.text}}</text>
+            <image wx:elif="{{item.type === 'image'}}" class="msg-image" src="{{item.payload.url}}" mode="widthFix" />
+            <view wx:elif="{{item.type === 'order'}}" class="order-bubble">
+              <text class="order-label">[订单]</text>
+              <text class="order-info">ID: {{item.payload.orderId}}</text>
+            </view>
+          </view>
+          <image wx:if="{{item.senderId === currentUser.id}}" class="avatar" src="{{currentUser.avatar}}" mode="aspectFill" />
+        </view>
+        <view wx:if="{{item.senderId === currentUser.id && item.status === 'success'}}" class="read-tag">
+          {{item.read ? '已读' : '未读'}}
+        </view>
+      </view>
+    </block>
+    <view id="msg-bottom" style="height:20rpx;"></view>
+  </scroll-view>
+
+  <view class="input-area" style="bottom: {{keyboardHeight}}px; padding-bottom: calc(10rpx + env(safe-area-inset-bottom));">
+    <view class="plus-panel {{showPlusPanel ? 'show' : ''}}" catchtap="closePlusPanel">
+      <view class="plus-grid">
+        <view class="plus-item" catchtap="openEmojiFromPlus">
+          <text class="plus-icon">😀</text>
+          <text class="plus-label">表情</text>
+        </view>
+        <view class="plus-item" catchtap="chooseImage">
+          <text class="plus-icon">📷</text>
+          <text class="plus-label">图片</text>
+        </view>
+        <view class="plus-item" catchtap="openOrderSender">
+          <text class="plus-icon">📋</text>
+          <text class="plus-label">订单</text>
+        </view>
+      </view>
+    </view>
+
+    <view class="emoji-mask" wx:if="{{showEmojiPanel}}" catchtap="closeEmojiPanel"></view>
+    <view class="emoji-panel {{showEmojiPanel ? 'show' : ''}}">
+      <scroll-view scroll-y="true" class="emoji-scroll">
+        <view class="emoji-grid">
+          <block wx:for="{{emojiList}}" wx:key="*this">
+            <view class="emoji-item" data-emoji="{{item}}" catchtap="insertEmoji">{{item}}</view>
+          </block>
+        </view>
+      </scroll-view>
+    </view>
+
+    <view class="pending-image" wx:if="{{pendingImage}}">
+      <image class="pending-thumb" src="{{pendingImage}}" mode="aspectFill" />
+      <view class="pending-remove" catchtap="clearPendingImage">✕</view>
+    </view>
+
+    <view class="write-row">
+      <input class="text-input" placeholder="消息" value="{{inputText}}" bindinput="onInput" adjust-position="{{false}}" bindkeyboardheightchange="onKeyboardHeightChange" cursor-spacing="10"/>
+      <view class="send-btn" bindtap="sendMessage">发送</view>
+      <view class="plus-btn" bindtap="togglePlusPanel">
+        <text class="plus-icon-single">➕</text>
+      </view>
+    </view>
+  </view>
+
+  <view class="detail-modal" wx:if="{{showDetailModal}}" catchtap="hideDetail">
+    <view class="detail-content" catchtap="noop">
+      <text class="detail-text" user-select="true">{{detailText}}</text>
+      <button class="copy-btn" bindtap="copyDetail">复制</button>
+    </view>
+  </view>
+
+  <order-sender visible="{{showOrderSender}}" bind:send="onSendOrder" bind:close="closeOrderSender" />
+</view>
\ No newline at end of file
diff --git a/pages/liaotian/liaotian.wxss b/pages/liaotian/liaotian.wxss
new file mode 100644
index 0000000..21a4b4e
--- /dev/null
+++ b/pages/liaotian/liaotian.wxss
@@ -0,0 +1,98 @@
+.chat-page { width:100%; height:100vh; background:#f5f5f5; }
+
+.msg-list {
+  position: absolute;
+  left:0; right:0;
+  padding: 0 20rpx;
+  box-sizing: border-box;
+  overflow-y: auto;
+}
+
+.loading-more { text-align:center; font-size:24rpx; color:#999; padding:20rpx 0; }
+.time-tag { text-align:center; margin:28rpx 0; font-size:24rpx; color:#b0b0b0; }
+.msg-wrapper { margin-bottom:12rpx; }
+.msg-row { display:flex; align-items:flex-start; margin-bottom:4rpx; }
+.right { justify-content:flex-end; }
+.left { justify-content:flex-start; }
+.avatar { width:76rpx; height:76rpx; border-radius:50%; background:#e0e0e0; margin:0 12rpx; flex-shrink:0; }
+.bubble { max-width:70%; padding:16rpx 20rpx; border-radius:16rpx; position:relative; word-break:break-all; font-size:30rpx; line-height:1.5; }
+.bubble-left { background:#fff; border-top-left-radius:4rpx; }
+.bubble-right { background:#00aaff; color:#fff; border-top-right-radius:4rpx; }
+.msg-text { color:inherit; }
+.msg-image { max-width:240rpx; border-radius:10rpx; }
+.order-bubble { background:#fff7e0; padding:12rpx; border-radius:8rpx; }
+.order-label { font-size:24rpx; color:#e6a23c; font-weight:600; }
+.order-info { font-size:24rpx; color:#333; margin:6rpx 0; }
+
+.read-tag {
+  font-size:20rpx;
+  color:#888;
+  text-align:right;
+  padding:4rpx 12rpx 0 0;
+  margin-top: -4rpx;
+}
+
+.input-area {
+  position: fixed;
+  left:0; right:0;
+  background:#f7f7f7;
+  border-top:1rpx solid #ddd;
+  z-index:10;
+}
+
+.plus-panel {
+  position: absolute;
+  bottom:100%; left:0; right:0;
+  background:#fff;
+  border-top:1rpx solid #e0e0e0;
+  padding: 20rpx;
+  transform: translateY(100%);
+  opacity:0;
+  transition: transform 0.3s, opacity 0.3s;
+  pointer-events:none;
+  z-index:9;
+}
+.plus-panel.show { transform: translateY(0); opacity:1; pointer-events:auto; }
+.plus-grid { display: flex; justify-content: space-around; }
+.plus-item { display: flex; flex-direction: column; align-items: center; width: 120rpx; }
+.plus-icon { font-size: 60rpx; }
+.plus-label { font-size: 24rpx; color: #666; margin-top: 8rpx; }
+
+.emoji-mask { position:fixed; top:0; left:0; right:0; bottom:0; background:transparent; z-index:8; }
+.emoji-panel {
+  position: absolute; bottom:100%; left:0; right:0;
+  background:#fff; border-top:1rpx solid #e0e0e0;
+  height:380rpx;
+  transform: translateY(100%); opacity:0; transition:0.3s;
+  pointer-events:none; z-index:9;
+}
+.emoji-panel.show { transform:translateY(0); opacity:1; pointer-events:auto; }
+.emoji-scroll { height:100%; }
+.emoji-grid { display:flex; flex-wrap:wrap; padding:20rpx 10rpx; }
+.emoji-item { width:14.28%; text-align:center; padding:16rpx 0; font-size:44rpx; }
+
+.pending-image { display:flex; align-items:center; padding:10rpx 20rpx; background:#fff; }
+.pending-thumb { width:80rpx; height:80rpx; border-radius:8rpx; }
+.pending-remove { font-size:30rpx; color:#999; margin-left:10rpx; }
+
+.write-row { display:flex; padding:0 20rpx 10rpx; align-items:center; }
+.text-input {
+  flex:1; height:76rpx; background:#fff; border-radius:12rpx;
+  padding:0 20rpx; font-size:30rpx; margin-right:12rpx;
+}
+.send-btn {
+  width:120rpx; height:76rpx; background:#00aaff; color:#fff;
+  font-size:28rpx; font-weight:500; border-radius:12rpx;
+  display:flex; align-items:center; justify-content:center;
+}
+.plus-btn {
+  width:56rpx; height:56rpx;
+  display:flex; align-items:center; justify-content:center;
+  margin-left: 10rpx;
+}
+.plus-icon-single { font-size:46rpx; color:#00aaff; }
+
+.detail-modal { position:fixed; top:0; left:0; right:0; bottom:0; background:rgba(0,0,0,0.7); z-index:999; display:flex; align-items:center; justify-content:center; }
+.detail-content { width:80%; max-height:80%; background:#fff; border-radius:16rpx; padding:40rpx; }
+.detail-text { font-size:32rpx; line-height:1.6; word-break:break-all; overflow-y:auto; }
+.copy-btn { width:100%; height:80rpx; background:#00aaff; color:#fff; border-radius:12rpx; margin-top:20rpx; font-size:30rpx; }
\ No newline at end of file
diff --git a/pages/phone-auth/phone-auth.js b/pages/phone-auth/phone-auth.js
new file mode 100644
index 0000000..d61714f
--- /dev/null
+++ b/pages/phone-auth/phone-auth.js
@@ -0,0 +1,40 @@
+import { submit } from '../../utils/phone-auth';
+
+Page({
+  data: {
+    show: false,
+    avatar: '',
+    avatarFile: null,
+    phoneCode: '',
+    phoneGot: false
+  },
+  onLoad() {
+    setTimeout(() => this.setData({ show: true }), 100);
+  },
+  onAvatar(e) {
+    const p = e.detail.avatarUrl;
+    this.setData({ avatar: p, avatarFile: p });
+  },
+  onPhone(e) {
+    if (e.detail.code) {
+      this.setData({ phoneCode: e.detail.code, phoneGot: true });
+    }
+  },
+  async submit() {
+    const { phoneCode, avatarFile } = this.data;
+    if (!avatarFile || !phoneCode) return;
+    try {
+      wx.showLoading({ title: '认证中...', mask: true });
+      await submit(phoneCode, avatarFile);
+      wx.hideLoading();
+      // 成功，重启小程序，此时check返回false，用户无感进入
+      wx.reLaunch({ url: '/pages/index/index' });
+    } catch (e) {
+      wx.hideLoading();
+      wx.showToast({ title: e.message, icon: 'none' });
+    }
+  },
+  exit() {
+    wx.exitMiniProgram();
+  }
+});
\ No newline at end of file
diff --git a/pages/phone-auth/phone-auth.json b/pages/phone-auth/phone-auth.json
new file mode 100644
index 0000000..34bbf75
--- /dev/null
+++ b/pages/phone-auth/phone-auth.json
@@ -0,0 +1,3 @@
+{
+    "navigationStyle": "custom"
+  }
\ No newline at end of file
diff --git a/pages/phone-auth/phone-auth.wxml b/pages/phone-auth/phone-auth.wxml
new file mode 100644
index 0000000..512af56
--- /dev/null
+++ b/pages/phone-auth/phone-auth.wxml
@@ -0,0 +1,41 @@
+
+<view class="mask">
+  <view class="card">
+    
+    <view class="icon-box">
+      <image class="icon" src="/images/auth-shield.png" mode="aspectFit" />
+    </view>
+
+    
+    <view class="title">完善资料</view>
+    <view class="subtitle">仅需两步，即可开始</view>
+
+    
+    <view class="step">
+      <view class="step-number">1</view>
+      <view class="step-text">设置你的头像(一定要选哦)</view>
+    </view>
+    <button class="avatar-btn" open-type="chooseAvatar" bindchooseavatar="onAvatar">
+      <image class="avatar-img" src="{{avatar || '/images/default-avatar.png'}}" mode="aspectFill" />
+      <text class="avatar-tip">{{avatar ? '点击更换' : '点击选择(必选)'}}</text>
+    </button>
+
+    
+    <view class="step">
+      <view class="step-number">2</view>
+      <view class="step-text">绑定微信手机号</view>
+    </view>
+    <button class="phone-btn" open-type="getPhoneNumber" bindgetphonenumber="onPhone">
+      <text class="phone-icon"></text>
+      <text>{{phoneGot ? '已获取' : '一键获取'}}</text>
+    </button>
+
+    
+    <button class="submit-btn" bindtap="submit" disabled="{{!phoneGot || submitting}}">
+      {{submitting ? '认证中...' : '完成认证'}}
+    </button>
+
+    
+    <view class="exit" bindtap="exit">暂不认证，退出</view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/phone-auth/phone-auth.wxss b/pages/phone-auth/phone-auth.wxss
new file mode 100644
index 0000000..2f24905
--- /dev/null
+++ b/pages/phone-auth/phone-auth.wxss
@@ -0,0 +1,169 @@
+/* 极简居中卡片设计 - 世界级UI */
+
+/* 遮罩 */
+.mask {
+    position: fixed;
+    top: 0; left: 0; right: 0; bottom: 0;
+    background: rgba(0,0,0,0.45);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 9999;
+    backdrop-filter: blur(6rpx);
+  }
+  
+  /* 卡片 */
+  .card {
+    width: 640rpx;
+    background: #ffffff;
+    border-radius: 32rpx;
+    padding: 60rpx 48rpx 48rpx;
+    box-shadow: 0 20rpx 60rpx rgba(0,0,0,0.08);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    animation: fadeIn 0.3s ease;
+  }
+  
+  @keyframes fadeIn {
+    from { opacity: 0; transform: scale(0.95); }
+    to { opacity: 1; transform: scale(1); }
+  }
+  
+  /* 图标区域 */
+  .icon-box {
+    width: 96rpx;
+    height: 96rpx;
+    border-radius: 50%;
+    background: #f0f4ff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 24rpx;
+  }
+  
+  .icon {
+    width: 52rpx;
+    height: 52rpx;
+  }
+  
+  /* 标题 */
+  .title {
+    font-size: 40rpx;
+    font-weight: 600;
+    color: #1a1a1a;
+    margin-bottom: 8rpx;
+  }
+  
+  .subtitle {
+    font-size: 26rpx;
+    color: #999;
+    margin-bottom: 40rpx;
+  }
+  
+  /* 步骤 */
+  .step {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    margin-bottom: 16rpx;
+  }
+  
+  .step-number {
+    width: 40rpx;
+    height: 40rpx;
+    border-radius: 50%;
+    background: #f0f4ff;
+    color: #4a6cf7;
+    font-size: 24rpx;
+    font-weight: 600;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 16rpx;
+    flex-shrink: 0;
+  }
+  
+  .step-text {
+    font-size: 28rpx;
+    color: #444;
+  }
+  
+  /* 头像按钮 */
+  .avatar-btn {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    height: 100rpx;
+    background: #f8f9ff;
+    border: 2rpx solid #eef0f6;
+    border-radius: 20rpx;
+    padding: 0 24rpx;
+    margin-bottom: 32rpx;
+    box-sizing: border-box;
+    text-align: left;
+  }
+  
+  .avatar-img {
+    width: 68rpx;
+    height: 68rpx;
+    border-radius: 50%;
+    background: #eee;
+    flex-shrink: 0;
+  }
+  
+  .avatar-tip {
+    margin-left: 20rpx;
+    font-size: 26rpx;
+    color: #666;
+  }
+  
+  /* 手机号按钮 */
+  .phone-btn {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    height: 96rpx;
+    background: #4a6cf7;
+    border-radius: 48rpx;
+    justify-content: center;
+    margin-bottom: 40rpx;
+    padding: 0;
+    border: none;
+    color: #fff;
+    font-size: 30rpx;
+    font-weight: 500;
+  }
+  
+  .phone-icon {
+    margin-right: 12rpx;
+    font-size: 32rpx;
+  }
+  
+  /* 提交按钮 */
+  .submit-btn {
+    width: 100%;
+    height: 96rpx;
+    background: #1a1a1a;
+    border-radius: 48rpx;
+    color: #fff;
+    font-size: 32rpx;
+    font-weight: 600;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: none;
+    margin-bottom: 24rpx;
+  }
+  
+  .submit-btn[disabled] {
+    background: #ccc;
+    color: #fff;
+  }
+  
+  /* 退出 */
+  .exit {
+    font-size: 26rpx;
+    color: #aaa;
+    padding: 8rpx 0;
+  }
\ No newline at end of file
diff --git a/pages/qunliaotian/qunliaotian.js b/pages/qunliaotian/qunliaotian.js
new file mode 100644
index 0000000..0045f78
--- /dev/null
+++ b/pages/qunliaotian/qunliaotian.js
@@ -0,0 +1,505 @@
+const app = getApp();
+import { formatDate } from '../../static/lib/utils';
+import { sendGroupMessage } from '../../utils/message-sender';
+
+Page({
+  data: {
+    groupId: '',
+    groupName: '',
+    groupAvatar: '',
+    orderId: '',
+    isCross: 0,
+    currentUser: null,
+    messages: [],
+    inputText: '',
+    showEmojiPanel: false,
+    showPlusPanel: false,
+    showOrderSender: false,
+    loadingHistory: false,
+    isRefreshing: false,
+    lastTimestamp: null,
+    hasMore: true,
+    scrollToView: '',
+    detailText: '',
+    showDetailModal: false,
+    lastTapTime: 0,
+    lastTapMsgId: '',
+    emojiList: ['😀','😁','😂','🤣','😃','😄','😅','😆','😉','😊','😋','😎','😍','😘','😗','😙','😚','🙂','🤗','🤩','🤔','🤨','😐','😑','😶','🙄','😏','😣','😥','😮','🤐','😯','😪','😫','😴','😌','😛','😜','😝','🤤','😒','😓','😔','😕','🙃','🤑','😲','☹','🙁','😖','😞','😟','😤','😢','😭','😦','😧','😨','😩','🤯','😬','😰','😱','🥵','🥶','😳','🤪','😵','😡','😠','🤬','😷','🤒','🤕','🤢','🤮','🤧','😇','🤠','🤡','🤥','🤫','🤭','🧐','🤓','😈','👿','👹','👺','💀','👻','👽','🤖','💩','😺','😸','😹','😻','😼','😽','🙀','😿','😾'],
+    pendingImage: '',
+    keyboardHeight: 0,
+    bottomSafeHeight: 10
+  },
+  onLoad(options) {
+    let p = { groupId: '', groupName: '订单群聊', groupAvatar: '', orderId: '', isCross: 0,
+              currentUserId: '', currentUserName: '', currentUserAvatar: '' };
+    if (options.data) {
+      try {
+        const d = JSON.parse(decodeURIComponent(options.data));
+        p = { ...p, ...d };
+      } catch (e) {}
+    }
+    this.setData({
+      groupId: p.groupId,
+      groupName: p.groupName,
+      groupAvatar: p.groupAvatar,
+      orderId: p.orderId,
+      isCross: p.isCross
+    });
+    wx.setNavigationBarTitle({ title: this.data.groupName });
+    // 如果有外部传入的 currentUser 信息，直接用，不再依赖全局状态
+    if (p.currentUserId) {
+      this.setData({
+        currentUser: {
+          id: p.currentUserId,
+          name: p.currentUserName || `用户${p.currentUserId.replace(/^[A-Za-z]+/,'')}`,
+          avatar: p.currentUserAvatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
+        }
+      });
+    } else {
+      this.initCurrentUser();
+    }
+  },
+  
+  // 原有的 initCurrentUser 保留，仅当没有外部参数时使用
+  initCurrentUser() {
+    const uid = wx.getStorageSync('uid');
+    const role = app.globalData.currentRole || 'normal';
+    const prefix = { normal:'Boss', dashou:'Ds', shangjia:'Sj', guanshi:'Gs', zuzhang:'Zz' }[role] || 'Boss';
+    this.setData({ currentUser: {
+      id: prefix + uid,
+      name: app.globalData.currentUser?.name || `用户${uid}`,
+      avatar: this.fixAvatar(wx.getStorageSync('touxiang'))
+    }});
+  },
+  /*onLoad(options) {
+    if (options.data) {
+      try {
+        const p = JSON.parse(decodeURIComponent(options.data));
+        this.setData({
+          groupId: p.groupId || '',
+          groupName: p.groupName || '订单群聊',
+          groupAvatar: p.groupAvatar || '',
+          orderId: p.orderId || '',
+          isCross: p.isCross || 0
+        });
+      } catch (e) {}
+    }
+    wx.setNavigationBarTitle({ title: this.data.groupName });
+    this.initCurrentUser();
+  },*/
+
+  onShow() {
+    this.autoConnect();
+  },
+
+  onHide() {
+    this.clearAllListeners();
+  },
+
+  autoConnect() {
+    const role = app.globalData.currentRole || 'normal';
+    const uid = wx.getStorageSync('uid');
+    const prefixMap = { normal:'Boss', dashou:'Ds', shangjia:'Sj', guanshi:'Gs', zuzhang:'Zz' };
+    const prefix = prefixMap[role] || 'Boss';
+    const targetUserId = prefix + uid;
+
+    const status = wx.goEasy.getConnectionStatus ? wx.goEasy.getConnectionStatus() : 'disconnected';
+    if (status === 'connected' || status === 'reconnected') {
+      const currentUserId = wx.goEasy.im ? wx.goEasy.im.userId : null;
+      if (currentUserId === targetUserId) {
+        this.subscribeGroupIfNeeded();
+        this.setupAllListeners();
+        this.loadHistory(true);
+        return;
+      } else {
+        wx.goEasy.disconnect();
+      }
+    }
+    this.connectGoEasy(targetUserId);
+  },
+
+  connectGoEasy(userId) {
+    const { currentUser } = this.data;
+    if (!currentUser) return;
+    wx.goEasy.connect({
+      id: userId,
+      data: {
+        name: currentUser.name,
+        avatar: currentUser.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
+      },
+      onSuccess: () => {
+        this.subscribeGroupIfNeeded();
+        this.setupAllListeners();
+        this.loadHistory(true).then(()=>{
+            this.markGroupMessageAsRead
+
+        });
+      },
+      onFailed: (error) => {
+        if (error.code === 408) {
+          this.subscribeGroupIfNeeded();
+          this.setupAllListeners();
+          this.loadHistory(true);
+        } else {
+          wx.showToast({ title: '连接失败，请重试', icon: 'none' });
+        }
+      }
+    });
+  },
+
+  subscribeGroupIfNeeded() {
+    const { groupId } = this.data;
+    if (!groupId) return;
+    wx.goEasy.im.subscribeGroup({
+      groupIds: [groupId],
+      onSuccess: () => console.log(`[群聊页] 订阅成功: ${groupId}`),
+      onFailed: (err) => console.error(`[群聊页] 订阅失败: ${groupId}`, err)
+    });
+  },
+
+  setupAllListeners() {
+    this.clearAllListeners();
+    this.listenNewMsg();
+    this.listenRecall();
+    this.listenDelete();
+  },
+
+  clearAllListeners() {
+    if (this._msgHandler) { wx.goEasy.im.off(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, this._msgHandler); this._msgHandler = null; }
+    if (this._recallHandler) { wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_RECALLED, this._recallHandler); this._recallHandler = null; }
+    if (this._deleteHandler) { wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_DELETED, this._deleteHandler); this._deleteHandler = null; }
+  },
+
+  initCurrentUser() {
+    const uid = wx.getStorageSync('uid');
+    const role = app.globalData.currentRole || 'normal';
+    const prefix = { normal:'Boss', dashou:'Ds', shangjia:'Sj', guanshi:'Gs', zuzhang:'Zz' }[role] || 'Boss';
+    this.setData({ currentUser: {
+      id: prefix + uid,
+      name: app.globalData.currentUser?.name || `用户${uid}`,
+      avatar: this.fixAvatar(wx.getStorageSync('touxiang'))
+    }});
+  },
+
+  fixAvatar(url) {
+    if (!url) return app.globalData.ossImageUrl + app.globalData.morentouxiang;
+    if (url.startsWith('http')) return url;
+    return app.globalData.ossImageUrl + url;
+  },
+
+  isConnected() {
+    const s = wx.goEasy.getConnectionStatus ? wx.goEasy.getConnectionStatus() : 'disconnected';
+    return s === 'connected' || s === 'reconnected';
+  },
+
+  onPullDownRefresh() {
+    if (this.data.loadingHistory) return;
+    this.setData({ isRefreshing: true });
+    this.loadHistory(false).finally(() => { this.setData({ isRefreshing: false }); wx.stopPullDownRefresh(); });
+  },
+
+  loadHistory(refresh) {
+    if (!refresh && !this.data.hasMore) return Promise.resolve();
+    return new Promise((resolve) => {
+      this.setData({ loadingHistory: true });
+      const { groupId, lastTimestamp } = this.data;
+      const ts = refresh ? null : lastTimestamp;
+      wx.goEasy.im.history({
+        type: wx.GoEasy.IM_SCENE.GROUP,
+        id: groupId,
+        lastTimestamp: ts,
+        limit: 20,
+        onSuccess: (res) => {
+          let list = res.content || [];
+          list.sort((a, b) => a.timestamp - b.timestamp);
+          list.forEach((m, idx) => {
+            m.formattedTime = formatDate(m.timestamp);
+            if (idx === 0) m.showTime = true;
+            else m.showTime = (m.timestamp - list[idx-1].timestamp) / 60000 > 5;
+            if (!m.senderData) m.senderData = { name: '未知用户', avatar: '' };
+          });
+          let final = refresh ? list : [...list, ...this.data.messages];
+          if (!refresh) {
+            for (let i = 0; i < final.length; i++) {
+              if (i === 0) final[i].showTime = true;
+              else final[i].showTime = (final[i].timestamp - final[i-1].timestamp) / 60000 > 5;
+            }
+          }
+          const ids = new Set();
+          const unique = [];
+          for (const m of final) { if (!ids.has(m.messageId)) { ids.add(m.messageId); unique.push(m); } }
+          const update = {
+            messages: unique,
+            hasMore: list.length >= 20,
+            lastTimestamp: unique.length ? unique[0].timestamp : lastTimestamp,
+            loadingHistory: false
+          };
+          if (refresh) update.scrollToView = 'msg-bottom';
+          this.setData(update);
+          resolve();
+        },
+        onFailed: () => { this.setData({ loadingHistory: false }); resolve(); }
+      });
+    });
+  },
+
+  listenNewMsg() {
+    if (this._msgHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, this._msgHandler);
+    this._msgHandler = (msg) => {
+      if (msg.groupId !== this.data.groupId) return;
+      if (msg.senderId === this.data.currentUser.id) return;
+      msg.formattedTime = formatDate(msg.timestamp);
+      const msgs = this.data.messages;
+      const last = msgs.length ? msgs[msgs.length-1] : null;
+      msg.showTime = last ? (msg.timestamp - last.timestamp) / 60000 > 5 : true;
+      this.setData({ messages: [...msgs, msg], scrollToView: 'msg-bottom' });
+      this.markGroupMessageAsRead();
+    };
+    wx.goEasy.im.on(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, this._msgHandler);
+    this.markGroupMessageAsRead(); // ← 收到新消息就标记已读
+  },
+
+  markGroupMessageAsRead() {
+    if (!this.data.groupId) return;
+    wx.goEasy.im.markMessageAsRead({
+      type: wx.GoEasy.IM_SCENE.GROUP,
+      id: this.data.groupId
+    });
+  },
+
+  listenRecall() {
+    if (this._recallHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_RECALLED, this._recallHandler);
+    this._recallHandler = (msgs) => {
+      if (!msgs || !msgs.length) return;
+      const ids = new Set(msgs.map(m => m.messageId));
+      this.setData({ messages: this.data.messages.filter(m => !ids.has(m.messageId)) });
+    };
+    wx.goEasy.im.on(wx.GoEasy.IM_EVENT.MESSAGE_RECALLED, this._recallHandler);
+  },
+
+  listenDelete() {
+    if (this._deleteHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.MESSAGE_DELETED, this._deleteHandler);
+    this._deleteHandler = (msgs) => {
+      if (!msgs || !msgs.length) return;
+      const ids = new Set(msgs.map(m => m.messageId));
+      this.setData({ messages: this.data.messages.filter(m => !ids.has(m.messageId)) });
+    };
+    wx.goEasy.im.on(wx.GoEasy.IM_EVENT.MESSAGE_DELETED, this._deleteHandler);
+  },
+
+  onInput(e) { this.setData({ inputText: e.detail.value }); },
+
+  chooseImage() {
+    const that = this;
+    wx.chooseImage({
+      count: 1, sizeType: ['compressed'], sourceType: ['album', 'camera'],
+      success(res) { that.setData({ pendingImage: res.tempFilePaths[0] }); }
+    });
+  },
+
+  clearPendingImage() { this.setData({ pendingImage: '' }); },
+
+  sendMessage() {
+    if (this.data.pendingImage) {
+      this.sendImageMsg(this.data.pendingImage);
+      this.setData({ pendingImage: '' });
+      return;
+    }
+    const text = this.data.inputText.trim();
+    if (!text) return;
+    this.sendText(text);
+    this.setData({ inputText: '' });
+  },
+
+  sendText(text) {
+    const that = this;
+    sendGroupMessage({
+      msgData: {
+        type: 'text',
+        text,
+        currentUser: that.data.currentUser,
+        groupId: that.data.groupId,
+        orderId: that.data.orderId,
+        isCross: that.data.isCross,
+        groupName: that.data.groupName,
+        groupAvatar: that.data.groupAvatar
+      },
+      onSendStart: (localMsg) => {
+        const msgs = that.data.messages;
+        if (msgs.length) {
+          localMsg.showTime = (localMsg.timestamp - msgs[msgs.length-1].timestamp) / 60000 > 5;
+        } else {
+          localMsg.showTime = true;
+        }
+        that.setData({ messages: [...msgs, localMsg], scrollToView: 'msg-bottom' });
+      },
+      onSuccess: (messageId, status) => {
+        that.updateMsg(messageId, status);
+      }
+    });
+  },
+
+  sendImageMsg(file) {
+    const that = this;
+    sendGroupMessage({
+      msgData: {
+        type: 'image',
+        filePath: file,
+        currentUser: that.data.currentUser,
+        groupId: that.data.groupId,
+        orderId: that.data.orderId,
+        isCross: that.data.isCross,
+        groupName: that.data.groupName,
+        groupAvatar: that.data.groupAvatar
+      },
+      onSendStart: (localMsg) => {
+        const msgs = that.data.messages;
+        if (msgs.length) {
+          localMsg.showTime = (localMsg.timestamp - msgs[msgs.length-1].timestamp) / 60000 > 5;
+        } else {
+          localMsg.showTime = true;
+        }
+        that.setData({ messages: [...msgs, localMsg], scrollToView: 'msg-bottom' });
+      },
+      onSuccess: (messageId, status) => {
+        that.updateMsg(messageId, status);
+      }
+    });
+  },
+
+  updateMsg(id, status) {
+    this.setData({ messages: this.data.messages.map(m => m.messageId === id ? { ...m, status } : m) });
+  },
+
+  needShow(ts) {
+    const ms = this.data.messages;
+    if (!ms.length) return true;
+    const last = ms[ms.length-1];
+    return (ts - last.timestamp) / 60000 > 5;
+  },
+
+  onBubbleTap(e) {
+    const msgId = e.currentTarget.dataset.messageid;
+    const text = e.currentTarget.dataset.text;
+    const now = Date.now();
+    if (msgId === this.data.lastTapMsgId && now - this.data.lastTapTime < 350) {
+      this.setData({ detailText: text, showDetailModal: true, lastTapTime:0, lastTapMsgId:'' });
+    } else {
+      this.data.lastTapTime = now;
+      this.data.lastTapMsgId = msgId;
+    }
+  },
+
+  hideDetail() { this.setData({ showDetailModal: false }); },
+  copyDetail() { wx.setClipboardData({ data: this.data.detailText }); },
+
+  showAction(e) {
+    const msgId = e.currentTarget.dataset.messageid;
+    if (!msgId) return;
+    const msg = this.data.messages.find(m => m.messageId === msgId);
+    if (!msg || msg.messageId.startsWith('local-')) return;
+    const itemList = ['复制'];
+    if (msg.senderId === this.data.currentUser.id && (Date.now() - msg.timestamp < 120000) && !msg.recalled) {
+      itemList.push('撤回');
+    }
+    itemList.push('删除');
+    wx.showActionSheet({
+      itemList,
+      success: (res) => {
+        if (itemList[res.tapIndex] === '复制') {
+          if (msg.type === 'text') wx.setClipboardData({ data: msg.payload.text });
+          else if (msg.type === 'order') wx.setClipboardData({ data: JSON.stringify(msg.payload) });
+        } else if (itemList[res.tapIndex] === '删除') {
+          this.deleteMsg(msg);
+        } else if (itemList[res.tapIndex] === '撤回') {
+          this.recallMsg(msg);
+        }
+      }
+    });
+  },
+
+  deleteMsg(msg) {
+    wx.showModal({
+      title: '提示', content: '仅自己看不到',
+      success: (res) => {
+        if (res.confirm) {
+          wx.goEasy.im.deleteMessage({
+            messages: [msg],
+            onSuccess: () => { this.setData({ messages: this.data.messages.filter(m => m.messageId !== msg.messageId) }); },
+            onFailed: () => { this.setData({ messages: this.data.messages.filter(m => m.messageId !== msg.messageId) }); }
+          });
+        }
+      }
+    });
+  },
+
+  recallMsg(msg) {
+    wx.showModal({
+      title: '提示', content: '撤回后群内所有人都看不到该消息',
+      success: (res) => {
+        if (res.confirm) {
+          this.setData({ messages: this.data.messages.filter(m => m.messageId !== msg.messageId) });
+          wx.goEasy.im.recallMessage({ messages: [msg], onFailed:()=>{} });
+        }
+      }
+    });
+  },
+
+  previewImage(e) { wx.previewImage({ urls: [e.currentTarget.dataset.url], current: e.currentTarget.dataset.url }); },
+
+  togglePlusPanel() { this.setData({ showPlusPanel: !this.data.showPlusPanel, showEmojiPanel: false }); },
+  closePlusPanel() { this.setData({ showPlusPanel: false }); },
+
+  openEmojiFromPlus() { this.setData({ showPlusPanel: false, showEmojiPanel: true }); },
+  toggleEmoji() { this.setData({ showEmojiPanel: !this.data.showEmojiPanel }); },
+  insertEmoji(e) { this.setData({ inputText: this.data.inputText + e.currentTarget.dataset.emoji }); },
+  closeEmojiPanel() { this.setData({ showEmojiPanel: false }); },
+
+  openOrderSender() { this.setData({ showOrderSender: true, showPlusPanel: false }); },
+  closeOrderSender() { this.setData({ showOrderSender: false }); },
+
+  onSendOrder(e) {
+    const order = e.detail.order;
+    if (!order) return;
+    const that = this;
+    const payload = {
+      orderId: order.dingdan_id,
+      jieshao: order.jieshao,
+      jine: order.jine,
+      beizhu: order.beizhu
+    };
+    sendGroupMessage({
+      msgData: {
+        type: 'order',
+        orderPayload: payload,
+        currentUser: that.data.currentUser,
+        groupId: that.data.groupId,
+        orderId: that.data.orderId,
+        isCross: that.data.isCross,
+        groupName: that.data.groupName,
+        groupAvatar: that.data.groupAvatar
+      },
+      onSendStart: (localMsg) => {
+        const msgs = that.data.messages;
+        if (msgs.length) {
+          localMsg.showTime = (localMsg.timestamp - msgs[msgs.length-1].timestamp) / 60000 > 5;
+        } else {
+          localMsg.showTime = true;
+        }
+        that.setData({ messages: [...msgs, localMsg], scrollToView: 'msg-bottom' });
+      },
+      onSuccess: (messageId, status) => {
+        that.updateMsg(messageId, status);
+      }
+    });
+  },
+
+  viewOrderDetail(e) {
+    const payload = e.currentTarget.dataset.payload;
+    if (!payload) return;
+    const text = `订单ID: ${payload.orderId}\n内容: ${payload.jieshao}\n金额: ¥${payload.jine}\n备注: ${payload.beizhu}`;
+    this.setData({ detailText: text, showDetailModal: true });
+  },
+
+  onKeyboardHeightChange(e) { this.setData({ keyboardHeight: e.detail.height }); }
+});
\ No newline at end of file
diff --git a/pages/qunliaotian/qunliaotian.json b/pages/qunliaotian/qunliaotian.json
new file mode 100644
index 0000000..d5bfa0e
--- /dev/null
+++ b/pages/qunliaotian/qunliaotian.json
@@ -0,0 +1,6 @@
+{
+    "navigationBarTitleText": "群聊",
+    "usingComponents": {
+        "order-card": "/components/order-card/order-card"
+    }
+}
\ No newline at end of file
diff --git a/pages/qunliaotian/qunliaotian.wxml b/pages/qunliaotian/qunliaotian.wxml
new file mode 100644
index 0000000..d22a391
--- /dev/null
+++ b/pages/qunliaotian/qunliaotian.wxml
@@ -0,0 +1,92 @@
+<view class="chat-page">
+  <scroll-view class="msg-list" scroll-y="true"
+               scroll-into-view="{{scrollToView}}"
+               refresher-enabled="{{true}}"
+               refresher-triggered="{{isRefreshing}}"
+               bindrefresherrefresh="onPullDownRefresh"
+               style="top: 20rpx; bottom: calc({{bottomSafeHeight}}rpx + {{keyboardHeight}}px + env(safe-area-inset-bottom) + 20rpx);">
+    <view class="loading-more" wx:if="{{loadingHistory}}">加载更早消息...</view>
+    <block wx:for="{{messages}}" wx:key="messageId">
+      <view class="msg-wrapper" data-messageid="{{item.messageId}}" bindlongpress="showAction">
+        <view class="time-tag" wx:if="{{item.showTime}}">{{item.formattedTime}}</view>
+        <view class="msg-row {{item.senderId === currentUser.id ? 'right' : 'left'}}">
+          
+          <view wx:if="{{item.senderId !== currentUser.id}}" class="sender-info">
+            <image class="avatar" src="{{item.senderData.avatar || '/images/default-avatar.png'}}" mode="aspectFill" />
+            <text class="sender-name">{{item.senderData.name || item.senderId}}</text>
+          </view>
+          <view class="bubble {{item.senderId === currentUser.id ? 'bubble-right' : 'bubble-left'}}"
+                data-messageid="{{item.messageId}}"
+                data-text="{{item.type==='text' ? item.payload.text : ''}}"
+                bindtap="{{item.type==='text' ? 'onBubbleTap' : (item.type==='image' ? 'previewImage' : '')}}"
+                data-url="{{item.type==='image' ? item.payload.url : ''}}">
+            <text wx:if="{{item.type === 'text'}}" class="msg-text">{{item.payload.text}}</text>
+            <image wx:elif="{{item.type === 'image'}}" class="msg-image" src="{{item.payload.url}}" mode="widthFix" />
+            <view wx:elif="{{item.type === 'order'}}" class="order-bubble" data-payload="{{item.payload}}" bindtap="viewOrderDetail">
+              <text class="order-label">[订单]</text>
+              <text class="order-info">ID: {{item.payload.orderId}}</text>
+              <text class="order-info">内容: {{item.payload.jieshao}}</text>
+              <text class="order-info">金额: ¥{{item.payload.jine}}</text>
+              <view class="order-detail-link">点击查看详情</view>
+            </view>
+          </view>
+          
+          <image wx:if="{{item.senderId === currentUser.id}}" class="avatar" src="{{currentUser.avatar}}" mode="aspectFill" />
+        </view>
+      </view>
+    </block>
+    <view id="msg-bottom" style="height:20rpx;"></view>
+  </scroll-view>
+
+  <view class="input-area" style="bottom: {{keyboardHeight}}px; padding-bottom: calc(10rpx + env(safe-area-inset-bottom));">
+    <view class="plus-panel {{showPlusPanel ? 'show' : ''}}" catchtap="closePlusPanel">
+      <view class="plus-grid">
+        <view class="plus-item" catchtap="openEmojiFromPlus">
+          <text class="plus-icon">😀</text>
+          <text class="plus-label">表情</text>
+        </view>
+        <view class="plus-item" catchtap="chooseImage">
+          <text class="plus-icon">📷</text>
+          <text class="plus-label">图片</text>
+        </view>
+        <view class="plus-item" catchtap="openOrderSender">
+          <text class="plus-icon">📋</text>
+          <text class="plus-label">订单</text>
+        </view>
+      </view>
+    </view>
+
+    <view class="emoji-mask" wx:if="{{showEmojiPanel}}" catchtap="closeEmojiPanel"></view>
+    <view class="emoji-panel {{showEmojiPanel ? 'show' : ''}}">
+      <scroll-view scroll-y="true" class="emoji-scroll">
+        <view class="emoji-grid">
+          <block wx:for="{{emojiList}}" wx:key="*this">
+            <view class="emoji-item" data-emoji="{{item}}" catchtap="insertEmoji">{{item}}</view>
+          </block>
+        </view>
+      </scroll-view>
+    </view>
+
+    <view class="pending-image" wx:if="{{pendingImage}}">
+      <image class="pending-thumb" src="{{pendingImage}}" mode="aspectFill" />
+      <view class="pending-remove" catchtap="clearPendingImage">✕</view>
+    </view>
+
+    <view class="write-row">
+      <input class="text-input" placeholder="发送消息" value="{{inputText}}" bindinput="onInput" adjust-position="{{false}}" bindkeyboardheightchange="onKeyboardHeightChange" cursor-spacing="10"/>
+      <view class="send-btn" bindtap="sendMessage">发送</view>
+      <view class="plus-btn" bindtap="togglePlusPanel">
+        <text class="plus-icon-single">➕</text>
+      </view>
+    </view>
+  </view>
+
+  <view class="detail-modal" wx:if="{{showDetailModal}}" catchtap="hideDetail">
+    <view class="detail-content" catchtap="noop">
+      <text class="detail-text" user-select="true">{{detailText}}</text>
+      <button class="copy-btn" bindtap="copyDetail">复制</button>
+    </view>
+  </view>
+
+  <order-sender visible="{{showOrderSender}}" bind:send="onSendOrder" bind:close="closeOrderSender" />
+</view>
\ No newline at end of file
diff --git a/pages/qunliaotian/qunliaotian.wxss b/pages/qunliaotian/qunliaotian.wxss
new file mode 100644
index 0000000..6496c30
--- /dev/null
+++ b/pages/qunliaotian/qunliaotian.wxss
@@ -0,0 +1,109 @@
+.chat-page { width:100%; height:100vh; background:#f5f5f5; }
+
+.msg-list {
+  position: absolute;
+  left:0; right:0;
+  padding: 0 20rpx;
+  box-sizing: border-box;
+  overflow-y: auto;
+}
+
+.loading-more { text-align:center; font-size:24rpx; color:#999; padding:20rpx 0; }
+.time-tag { text-align:center; margin:28rpx 0; font-size:24rpx; color:#b0b0b0; }
+.msg-wrapper { margin-bottom:12rpx; }
+.msg-row { display:flex; align-items:flex-start; margin-bottom:4rpx; }
+.right { justify-content:flex-end; }
+.left { justify-content:flex-start; }
+.avatar { width:76rpx; height:76rpx; border-radius:50%; background:#e0e0e0; margin:0 12rpx; flex-shrink:0; }
+.bubble { max-width:70%; padding:16rpx 20rpx; border-radius:16rpx; position:relative; word-break:break-all; font-size:30rpx; line-height:1.5; }
+.bubble-left { background:#fff; border-top-left-radius:4rpx; }
+.bubble-right { background:#00aaff; color:#fff; border-top-right-radius:4rpx; }
+.msg-text { color:inherit; }
+.msg-image { max-width:240rpx; border-radius:10rpx; }
+
+.order-bubble { background:#fff7e0; padding:12rpx; border-radius:8rpx; }
+.order-label { font-size:24rpx; color:#e6a23c; font-weight:600; }
+.order-info { font-size:24rpx; color:#333; margin:6rpx 0; }
+.order-detail-link { color:#007aff; font-size:24rpx; margin-top:8rpx; }
+
+.input-area {
+  position: fixed;
+  left:0; right:0;
+  background:#f7f7f7;
+  border-top:1rpx solid #ddd;
+  z-index:10;
+}
+
+.plus-panel {
+  position: absolute;
+  bottom:100%; left:0; right:0;
+  background:#fff;
+  border-top:1rpx solid #e0e0e0;
+  padding: 20rpx;
+  transform: translateY(100%);
+  opacity:0;
+  transition: transform 0.3s, opacity 0.3s;
+  pointer-events:none;
+  z-index:9;
+}
+.plus-panel.show { transform: translateY(0); opacity:1; pointer-events:auto; }
+.plus-grid { display: flex; justify-content: space-around; }
+.plus-item { display: flex; flex-direction: column; align-items: center; width: 120rpx; }
+.plus-icon { font-size: 60rpx; }
+.plus-label { font-size: 24rpx; color: #666; margin-top: 8rpx; }
+
+.emoji-mask { position:fixed; top:0; left:0; right:0; bottom:0; background:transparent; z-index:8; }
+.emoji-panel {
+  position: absolute; bottom:100%; left:0; right:0;
+  background:#fff; border-top:1rpx solid #e0e0e0;
+  height:380rpx;
+  transform: translateY(100%); opacity:0; transition:0.3s;
+  pointer-events:none; z-index:9;
+}
+.emoji-panel.show { transform:translateY(0); opacity:1; pointer-events:auto; }
+.emoji-scroll { height:100%; }
+.emoji-grid { display:flex; flex-wrap:wrap; padding:20rpx 10rpx; }
+.emoji-item { width:14.28%; text-align:center; padding:16rpx 0; font-size:44rpx; }
+
+.pending-image { display:flex; align-items:center; padding:10rpx 20rpx; background:#fff; }
+.pending-thumb { width:80rpx; height:80rpx; border-radius:8rpx; }
+.pending-remove { font-size:30rpx; color:#999; margin-left:10rpx; }
+
+.write-row { display:flex; padding:0 20rpx 10rpx; align-items:center; }
+.text-input {
+  flex:1; height:76rpx; background:#fff; border-radius:12rpx;
+  padding:0 20rpx; font-size:30rpx; margin-right:12rpx;
+}
+.send-btn {
+  width:120rpx; height:76rpx; background:#00aaff; color:#fff;
+  font-size:28rpx; font-weight:500; border-radius:12rpx;
+  display:flex; align-items:center; justify-content:center;
+}
+.plus-btn {
+  width:56rpx; height:56rpx;
+  display:flex; align-items:center; justify-content:center;
+  margin-left: 10rpx;
+}
+.plus-icon-single { font-size:46rpx; color:#00aaff; }
+
+.detail-modal { position:fixed; top:0; left:0; right:0; bottom:0; background:rgba(0,0,0,0.7); z-index:999; display:flex; align-items:center; justify-content:center; }
+.detail-content { width:80%; max-height:80%; background:#fff; border-radius:16rpx; padding:40rpx; }
+.detail-text { font-size:32rpx; line-height:1.6; word-break:break-all; overflow-y:auto; }
+.copy-btn { width:100%; height:80rpx; background:#00aaff; color:#fff; border-radius:12rpx; margin-top:20rpx; font-size:30rpx; }
+
+/* 发送者昵称样式 */
+.sender-info {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-right: 10rpx;
+}
+.sender-name {
+  font-size: 20rpx;
+  color: #888;
+  margin-top: 4rpx;
+  max-width: 100rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
\ No newline at end of file
diff --git a/pages/renzheng/renzheng.js b/pages/renzheng/renzheng.js
new file mode 100644
index 0000000..84420a9
--- /dev/null
+++ b/pages/renzheng/renzheng.js
@@ -0,0 +1,155 @@
+// pages/renzheng/renzheng.js
+import request from '../../utils/request.js'
+
+const API_MAP = {
+  dashou:    '/yonghu/dashouzhuce',
+  shangjia:  '/yonghu/shangjiahuce',
+  guanshi:   '/yonghu/guanshizhuce',
+  zuzhang:   '/yonghu/zuzhangzhuce',
+  kaoheguan: '/dengji/khgzc'                  // 🆕 考核官注册接口
+}
+
+const STATUS_KEY_MAP = {
+  dashou:    'dashoustatus',
+  shangjia:  'shangjiastatus',
+  guanshi:   'guanshistatus',
+  zuzhang:   'zuzhangstatus',
+  kaoheguan: 'kaoheguanstatus'                // 🆕 考核官缓存键
+}
+
+const NAME_MAP = {
+  dashou:    '接单员',
+  shangjia:  '商家',
+  guanshi:   '管事',
+  zuzhang:   '组长',
+  kaoheguan: '考核官'                         // 🆕 考核官中文名
+}
+
+Page({
+  data: {
+    authType: '',
+    authName: '',
+    pageState: 'need_register',
+    inviteCode: '',
+    isLoading: false,
+  },
+
+  onLoad(options) {
+    const type = options.type || ''
+    if (!API_MAP[type]) {
+      wx.showToast({ title: '认证类型错误', icon: 'none' })
+      setTimeout(() => wx.navigateBack(), 1500)
+      return
+    }
+    this.setData({ authType: type, authName: NAME_MAP[type] })
+    this.checkStatus()
+  },
+
+  onShow() {
+    if (this.data.authType) this.checkStatus()
+  },
+
+  checkStatus() {
+    const key = STATUS_KEY_MAP[this.data.authType]
+    const val = wx.getStorageSync(key)
+    if (val === 1) {
+      this.setData({ pageState: 'done' })
+    } else {
+      this.setData({ pageState: 'need_register' })
+    }
+  },
+
+  onInviteCodeInput(e) {
+    this.setData({ inviteCode: e.detail.value.trim() })
+  },
+
+  async onRegister() {
+    const { inviteCode, authType } = this.data
+    if (!inviteCode) {
+      wx.showToast({ title: '请输入邀请码', icon: 'none' })
+      return
+    }
+    if (inviteCode.length > 100) {
+      wx.showToast({ title: '邀请码不能超过100字符', icon: 'none' })
+      return
+    }
+
+    this.setData({ isLoading: true })
+    wx.showLoading({ title: '注册中...', mask: true })
+
+    try {
+      const res = await request({
+        url: API_MAP[authType],
+        method: 'POST',
+        data: { inviteCode }
+      })
+
+      if (res && res.data.code === 200) {
+        const data = res.data.data || res.data
+        const app = getApp()
+
+        // ----- 缓存身份状态（完全由后端决定） -----
+        const key = STATUS_KEY_MAP[authType]
+        if (data[key] !== undefined) {
+          wx.setStorageSync(key, data[key])
+          app.globalData[key] = data[key]
+        } else {
+          wx.setStorageSync(key, 1)
+          app.globalData[key] = 1
+        }
+
+        // 更新其他可能返回的身份状态字段
+        const allKeys = ['dashoustatus', 'shangjiastatus', 'guanshistatus', 'zuzhangstatus', 'kaoheguanstatus'] // 🆕 新增
+        allKeys.forEach(k => {
+          if (data[k] !== undefined && k !== key) {
+            wx.setStorageSync(k, data[k])
+            app.globalData[k] = data[k]
+          }
+        })
+
+        // 保存各身份详细信息（参照各注册页面的处理）
+        if (authType === 'dashou') {
+          const fields = ['dashounicheng','zhanghaostatus','yongjin','zonge','yajin','chenghao','jifen','clumber','chengjiaoliang','zaixianzhuangtai']
+          fields.forEach(f => { if (data[f] !== undefined) app.globalData[f] = data[f] })
+        } else if (authType === 'shangjia') {
+          app.globalData.shangjia = app.globalData.shangjia || {}
+          const sf = ['nicheng','sjyue','fabu','chengjiao','tuikuan','jinridingdan','jinriliushui','jinyuedingdan','jinyueliushui','zhuangtai']
+          sf.forEach(f => { if (data[f] !== undefined) app.globalData.shangjia[f] = data[f] })
+        } else if (authType === 'guanshi') {
+          app.globalData.guanshi = app.globalData.guanshi || {}
+          const gf = ['gszhstatus','yaoqingzongshu','fenyongzonge','fenyongtixian','yichongzhiDashou']
+          gf.forEach(f => { if (data[f] !== undefined) app.globalData.guanshi[f] = data[f] })
+        } else if (authType === 'zuzhang') {
+          const zf = ['ketixian','guanshiCount','fenhongZonge']
+          zf.forEach(f => { if (data[f] !== undefined) app.globalData[f] = data[f] })
+        } else if (authType === 'kaoheguan') {                        // 🆕 考核官数据更新
+          app.globalData.kaoheguan = app.globalData.kaoheguan || {}
+          const kf = ['shenhe_zongshu','tongguo_zongshu','yue','zonge','shenhe_zhuangtai','bankuai_list']
+          kf.forEach(f => { if (data[f] !== undefined) app.globalData.kaoheguan[f] = data[f] })
+        }
+
+        wx.hideLoading()
+        this.setData({ isLoading: false, pageState: 'done' })
+        wx.showToast({ title: '认证成功', icon: 'success' })
+      } else {
+        wx.hideLoading()
+        this.setData({ isLoading: false })
+        wx.showToast({ title: res?.data?.msg || '注册失败', icon: 'none' })
+      }
+    } catch (err) {
+      wx.hideLoading()
+      this.setData({ isLoading: false })
+      wx.showToast({ title: err.message || '注册失败', icon: 'none' })
+    }
+  },
+
+  goToKefu() {
+    const app = getApp()
+    const { link, enterpriseId } = app.globalData.kefuConfig || {}
+    if (!link || !enterpriseId) {
+      wx.showToast({ title: '客服配置未加载', icon: 'none' })
+      return
+    }
+    wx.openCustomerServiceChat({ extInfo: { url: link }, corpId: enterpriseId })
+  }
+})
\ No newline at end of file
diff --git a/pages/renzheng/renzheng.json b/pages/renzheng/renzheng.json
new file mode 100644
index 0000000..ba70bf8
--- /dev/null
+++ b/pages/renzheng/renzheng.json
@@ -0,0 +1,8 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "身份认证",
+    "navigationBarBackgroundColor": "#F7F3ED",
+    "navigationBarTextStyle": "black",
+    "backgroundColor": "#F7F3ED",
+    "enablePullDownRefresh": false
+  }
\ No newline at end of file
diff --git a/pages/renzheng/renzheng.wxml b/pages/renzheng/renzheng.wxml
new file mode 100644
index 0000000..5b4b678
--- /dev/null
+++ b/pages/renzheng/renzheng.wxml
@@ -0,0 +1,29 @@
+
+<view class="page-container">
+  
+  <view class="card" wx:if="{{pageState === 'need_register'}}">
+    <view class="card-title">{{authName}}认证</view>
+    <view class="card-desc">您尚未注册此角色或账号已被封禁，请输入邀请码注册或联系客服</view>
+    <view class="input-box">
+      <input class="invite-input" placeholder="请输入邀请码" value="{{inviteCode}}" bindinput="onInviteCodeInput" maxlength="100"/>
+    </view>
+    <view class="btn-primary" bindtap="onRegister">
+      {{isLoading ? '注册中…' : '立即注册'}}
+    </view>
+    <view class="kefu-link" bindtap="goToKefu">联系客服</view>
+  </view>
+
+  
+  <view class="card done-card" wx:if="{{pageState === 'done'}}">
+    <view class="done-icon">✓</view>
+    <view class="card-title">认证成功</view>
+    <view class="done-tip">
+      您已是<text class="highlight">{{authName}}</text>身份，
+      <text class="highlight">请退出此页面</text>点击底部导航栏左侧的
+      <text class="highlight">「切换」</text>
+      按钮，选择
+      <text class="highlight">「{{authName}}」</text>
+      即可开始使用。
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/renzheng/renzheng.wxss b/pages/renzheng/renzheng.wxss
new file mode 100644
index 0000000..1dbbb97
--- /dev/null
+++ b/pages/renzheng/renzheng.wxss
@@ -0,0 +1,95 @@
+page {
+    background: #F7F3ED;
+    height: 100vh;
+  }
+  
+  .page-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 100rpx 40rpx;
+  }
+  
+  .card {
+    width: 100%;
+    background: #fff;
+    border-radius: 36rpx;
+    padding: 60rpx 40rpx;
+    box-shadow: 0 20rpx 40rpx rgba(0,0,0,0.04);
+    text-align: center;
+  }
+  
+  .card-title {
+    font-size: 40rpx;
+    font-weight: 700;
+    color: #1A1A1A;
+    margin-bottom: 30rpx;
+  }
+  
+  .card-desc {
+    font-size: 28rpx;
+    color: #7A7A7A;
+    margin-bottom: 50rpx;
+    line-height: 1.6;
+  }
+  
+  .input-box {
+    background: #F7F3ED;
+    border-radius: 24rpx;
+    padding: 0 24rpx;
+    margin-bottom: 40rpx;
+  }
+  
+  .invite-input {
+    height: 90rpx;
+    font-size: 30rpx;
+    color: #1A1A1A;
+  }
+  
+  .btn-primary {
+    width: 100%;
+    height: 96rpx;
+    line-height: 96rpx;
+    background: linear-gradient(135deg, #C9A962, #D4B56A);
+    color: #fff;
+    font-size: 34rpx;
+    font-weight: 600;
+    border-radius: 48rpx;
+    text-align: center;
+  }
+  
+  .kefu-link {
+    margin-top: 30rpx;
+    font-size: 28rpx;
+    color: #C9A962;
+    text-decoration: underline;
+  }
+  
+  /* 已认证专用 */
+  .done-card {
+    padding: 80rpx 40rpx;
+  }
+  
+  .done-icon {
+    font-size: 80rpx;
+    color: #C9A962;
+    margin-bottom: 30rpx;
+    font-weight: bold;
+  }
+  
+  .done-tip {
+    font-size: 34rpx;
+    color: #1A1A1A;
+    line-height: 1.8;
+    font-weight: 500;
+    background: rgba(201,169,98,0.08);
+    border-radius: 20rpx;
+    padding: 30rpx 24rpx;
+    margin-top: 40rpx;
+  }
+  
+  .highlight {
+    color: #C9A962;
+    font-weight: 700;
+    font-size: 36rpx;
+  }
\ No newline at end of file
diff --git a/pages/shangjiaduan/shangjiaduan.js b/pages/shangjiaduan/shangjiaduan.js
new file mode 100644
index 0000000..f309ed6
--- /dev/null
+++ b/pages/shangjiaduan/shangjiaduan.js
@@ -0,0 +1,316 @@
+// pages/shangjiazhongxin/shangjiazhongxin.js
+// 🏪 商家中心 - 完全重构版 | 背景图全覆盖 | 称号从商家接口获取
+
+import request from '../../utils/request.js';
+import popupService from '../../services/popupService.js';
+
+const app = getApp();
+
+Page({
+  data: {
+    // ========== 图片资源 ==========
+    imgUrls: {
+      pageBg: '',
+      avatarCardBg: '',
+      assetCardBg: '',
+      statCardBg: '',
+      funcItemBg: '',
+      primaryFuncBg: '',
+      highlightFuncBg: '',
+      iconRelease: '',
+      iconFast: '',
+      iconOrders: '',
+      iconService: '',
+      iconPunish: '',
+      iconRank: '',
+      iconRecharge: '',
+      iconWithdraw: '',
+      iconRefresh: '',
+      iconCopy: '',
+      avatarFrame: '',
+    },
+
+    // ========== 商家状态 ==========
+    isShangjia: false,
+    isLoading: false,
+    isAutoRegistering: false,
+
+    // ========== 用户基础信息 ==========
+    uid: '',
+    avatarUrl: '',
+    nicheng: '',
+
+    // ========== 商家核心数据 ==========
+    sjyue: '0.00',
+    fabu: 0,
+    tuikuan: 0,
+    jinriliushui: '0.00',
+    jinyueliushui: '0.00',
+    jinridingdan: 0,
+    jinrituikuan: 0,
+    chenghaoList: [],      // 称号列表（从商家接口获取）
+
+    // ========== 交互控制 ==========
+    inviteCode: '',
+    lastRefreshTime: 0,
+    canRefresh: true,
+  },
+
+  onLoad(options) {
+    this.initImageUrls();
+    this.checkShangjiaStatus();
+
+    const { inviteCode } = options || {};
+    if (inviteCode) {
+      this.setData({ inviteCode });
+      setTimeout(() => this.handleInviteCodeWithLoginCheck(inviteCode), 500);
+    }
+
+    if (!app.globalData.hasShownPopupOnColdStart) {
+      app.globalData.hasShownPopupOnColdStart = true;
+      setTimeout(() => popupService.checkAndShow(this, 'shangjiaduan'), 300);
+    }
+  },
+
+  onShow() {
+    this.registerNotificationComponent();
+    if (this.data.isShangjia) {
+      this.refreshShangjiaInfo();   // 刷新时从商家接口获取所有数据（含称号）
+    }
+  },
+
+  onHide() {
+    const popupComp = this.selectComponent('#popupNotice');
+    popupComp?.cleanup?.();
+  },
+
+  // ========== 图片路径初始化 ==========
+  initImageUrls() {
+    const ossBase = app.globalData.ossImageUrl || '';
+    const imgDir = `${ossBase}beijing/shangjiaduan/`;
+    this.setData({
+      imgUrls: {
+        pageBg: `${imgDir}page_bg.png`,
+        avatarCardBg: `${imgDir}avatar_card_bg.png`,
+        assetCardBg: `${imgDir}asset_card_bg.png`,
+        statCardBg: `${imgDir}stat_card_bg.png`,
+        funcItemBg: `${imgDir}func_item_bg.png`,
+        primaryFuncBg: `${imgDir}primary_func_bg.png`,
+        highlightFuncBg: `${imgDir}highlight_func_bg.png`,
+        iconRelease: `${imgDir}icon_release.png`,
+        iconFast: `${imgDir}icon_fast.png`,
+        iconOrders: `${imgDir}icon_orders.png`,
+        iconService: `${imgDir}icon_service.png`,
+        iconPunish: `${imgDir}icon_punish.png`,
+        iconRank: `${imgDir}icon_rank.png`,
+        iconRecharge: `${imgDir}icon_recharge.png`,
+        iconWithdraw: `${imgDir}icon_withdraw.png`,
+        iconRefresh: `${imgDir}icon_refresh.png`,
+        iconCopy: `${imgDir}icon_copy.png`,
+        avatarFrame: `${imgDir}avatar_frame.png`,
+      }
+    });
+  },
+
+  // ========== 商家状态检查 ==========
+  checkShangjiaStatus() {
+    try {
+      const shangjiastatus = wx.getStorageSync('shangjiastatus');
+      const uid = wx.getStorageSync('uid');
+      if (shangjiastatus === 1) {
+        this.setData({ isShangjia: true, uid: uid || '' });
+        this.loadAvatar();
+        this.getShangjiaInfo();   // 获取完整商家数据（含称号）
+      } else {
+        this.setData({ isShangjia: false });
+      }
+    } catch (error) {
+      console.error('读取商家状态失败', error);
+      this.setData({ isShangjia: false });
+    }
+  },
+
+  loadAvatar() {
+    const { ossImageUrl = '', morentouxiang = 'avatar/default.jpg' } = app.globalData || {};
+    const touxiang = wx.getStorageSync('touxiang') || '';
+    let avatarUrl = '';
+    if (touxiang) {
+      avatarUrl = ossImageUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang);
+    } else {
+      avatarUrl = ossImageUrl + (morentouxiang.startsWith('/') ? morentouxiang : '/' + morentouxiang);
+    }
+    this.setData({ avatarUrl });
+  },
+
+  // ========== 获取商家信息（核心接口，包含称号列表）==========
+  async getShangjiaInfo() {
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({ url: '/yonghu/shangjiaxinxi', method: 'POST' });
+      if (res?.data?.code === 200) {
+        const data = res.data.data;
+        // 更新全局缓存
+        app.globalData.shangjia = data;
+        wx.setStorageSync('shangjiastatus', 1);
+        
+        // 称号列表：优先使用接口返回的 chenghao_list，若无则空数组
+        const chenghaoList = data.chenghao_list || [];
+        
+        // ✅ 字段映射：后端返回字段 → 前端 data 字段（只改这里，其他一律不变）
+        this.setData({
+          nicheng: data.nicheng || '',                      // 商家昵称（后端如有则显示）
+          sjyue: data.sjyue || '0.00',                      // 商家余额
+          fabu: data.fadanzong || 0,                        // 发单总量（后端 fadanzong）
+          tuikuan: data.tuikuanzong || 0,                   // 退款总量（后端 tuikuanzong）
+          jinriliushui: data.riliushui || '0.00',           // 今日流水（后端 riliushui）
+          jinyueliushui: data.yueliushui || '0.00',         // 今月流水（后端 yueliushui）
+          jinridingdan: data.jinripaidan || 0,              // 今日派单数（后端 jinripaidan）
+          jinrituikuan: data.jinrituikuan || 0,             // 今日退款数（后端 jinrituikuan）
+          chenghaoList: chenghaoList,
+          isLoading: false,
+        });
+        
+        if (this.data.isAutoRegistering) {
+          this.setData({ isAutoRegistering: false });
+          wx.showToast({ title: '商家注册成功', icon: 'success' });
+        }
+      } else {
+        throw new Error(res?.data?.msg || '获取商家信息失败');
+      }
+    } catch (error) {
+      console.error('获取商家信息失败', error);
+      this.setData({ isLoading: false });
+      wx.showToast({ title: error.message || '加载失败', icon: 'none' });
+    }
+  },
+
+  refreshShangjiaInfo() {
+    const now = Date.now();
+    if (!this.data.canRefresh || now - this.data.lastRefreshTime < 3000) {
+      wx.showToast({ title: '操作过快', icon: 'none' });
+      return;
+    }
+    this.setData({ lastRefreshTime: now, canRefresh: false });
+    this.getShangjiaInfo();   // 刷新时重新获取所有数据
+    setTimeout(() => this.setData({ canRefresh: true }), 3000);
+  },
+
+  // ========== 邀请码注册 ==========
+  handleInviteCodeWithLoginCheck(inviteCode) {
+    const token = wx.getStorageSync('token');
+    const uid = wx.getStorageSync('uid');
+    if (!token || !uid) {
+      wx.reLaunch({
+        url: `/pages/gerenzhongxin/gerenzhongxin?autoLogin=true&inviteCode=${inviteCode}&redirect=/pages/shangjiazhongxin/shangjiazhongxin&type=shangjia`
+      });
+    } else {
+      if (!this.data.isShangjia) {
+        wx.showLoading({ title: '商家注册中...', mask: true });
+        this.setData({ isAutoRegistering: true });
+        this.onRegister();
+      } else {
+        wx.showToast({ title: '您已是商家', icon: 'success' });
+      }
+    }
+  },
+
+  async onRegister() {
+    const { inviteCode } = this.data;
+    if (!inviteCode) {
+      wx.showToast({ title: '请输入邀请码', icon: 'none' });
+      return;
+    }
+    if (inviteCode.length > 100) {
+      wx.showToast({ title: '邀请码不能超过100字符', icon: 'none' });
+      return;
+    }
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({
+        url: '/yonghu/shangjiahuce',
+        method: 'POST',
+        data: { inviteCode }
+      });
+      if (res?.data?.code === 200) {
+        wx.setStorageSync('shangjiastatus', 1);
+        const data = res.data.data;
+        app.globalData.shangjia = data;
+        const chenghaoList = data.chenghao_list || [];
+        this.setData({
+          isShangjia: true,
+          nicheng: data.nicheng || '',
+          sjyue: data.sjyue || '0.00',
+          fabu: data.fabu || 0,
+          tuikuan: data.tuikuan || 0,
+          jinriliushui: data.jinriliushui || '0.00',
+          jinyueliushui: data.jinyueliushui || '0.00',
+          jinridingdan: data.jinridingdan || 0,
+          chenghaoList: chenghaoList,
+          isLoading: false,
+          isAutoRegistering: false,
+        });
+        this.loadAvatar();
+        wx.showToast({ title: '商家注册成功', icon: 'success' });
+      } else {
+        throw new Error(res?.data?.msg || '注册失败');
+      }
+    } catch (error) {
+      console.error('商家注册失败', error);
+      this.setData({ isLoading: false, isAutoRegistering: false });
+      wx.showToast({ title: error.message, icon: 'error' });
+    }
+  },
+
+  // ========== 辅助功能 ==========
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp?.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  copyUid() {
+    if (!this.data.uid) {
+      wx.showToast({ title: 'UID不存在', icon: 'none' });
+      return;
+    }
+    wx.setClipboardData({
+      data: this.data.uid,
+      success: () => wx.showToast({ title: 'UID已复制', icon: 'success' }),
+      fail: () => wx.showToast({ title: '复制失败', icon: 'error' })
+    });
+  },
+
+  previewAvatar() {
+    if (this.data.avatarUrl) {
+      wx.previewImage({ urls: [this.data.avatarUrl] });
+    }
+  },
+
+  // ========== 页面跳转 ==========
+  goToPaiDan() { wx.navigateTo({ url: '/pages/sjpaidan/sjpaidan' }); },
+  goToJiSuPaiDan() { 
+    wx.vibrateShort({ type: 'medium' });
+    wx.navigateTo({ url: '/pages/jisufd/jisufd' });
+  },
+  goToMyOrders() { wx.navigateTo({ url: '/pages/sjdingdan/sjdingdan' }); },
+  goToRecharge() { wx.navigateTo({ url: '/pages/sjchongzhi/sjchongzhi' }); },
+  goToWithdraw() { wx.navigateTo({ url: '/pages/tixian/tixian' }); },
+  goToRanking() { wx.navigateTo({ url: '/pages/sjpaihang/sjpaihang' }); },
+  goToMessages() { wx.navigateTo({ url: '/pages/sjxiaoxi/sjxiaoxi' }); },
+  goToKefu() {
+    const { kefuConfig } = app.globalData;
+    if (kefuConfig?.link && kefuConfig?.enterpriseId) {
+      wx.openCustomerServiceChat({
+        extInfo: { url: kefuConfig.link },
+        corpId: kefuConfig.enterpriseId,
+        fail: () => wx.showToast({ title: '客服暂不可用', icon: 'none' })
+      });
+    } else {
+      wx.showToast({ title: '客服配置未加载', icon: 'none' });
+    }
+  },
+});
\ No newline at end of file
diff --git a/pages/shangjiaduan/shangjiaduan.json b/pages/shangjiaduan/shangjiaduan.json
new file mode 100644
index 0000000..c00917d
--- /dev/null
+++ b/pages/shangjiaduan/shangjiaduan.json
@@ -0,0 +1,14 @@
+{
+    "usingComponents": {
+      "global-notification": "/components/global-notification/global-notification",
+      "popup-notice": "/components/popup-notice/popup-notice",
+      "custom-tab-bar": "/custom-tab-bar/index",
+      "chenghao-tag": "/components/chenghao-tag/chenghao-tag"
+    },
+    "navigationBarTitleText": "商家中心",
+    "navigationBarBackgroundColor": "#ffffff",
+    "navigationBarTextStyle": "black",
+    "backgroundColor": "#f8f9fc",
+    "backgroundTextStyle": "light",
+    "enablePullDownRefresh": false
+  }
\ No newline at end of file
diff --git a/pages/shangjiaduan/shangjiaduan.wxml b/pages/shangjiaduan/shangjiaduan.wxml
new file mode 100644
index 0000000..32c2292
--- /dev/null
+++ b/pages/shangjiaduan/shangjiaduan.wxml
@@ -0,0 +1,178 @@
+
+
+
+
+<image class="page-bg" src="{{imgUrls.pageBg}}" mode="aspectFill" />
+
+
+<view class="page-container unregistered" wx:if="{{!isShangjia}}">
+  <view class="unreg-card" style="background-image: url('{{imgUrls.assetCardBg}}'); background-size: cover; background-position: center;">
+    <view class="unreg-content">
+      <text class="status-title">商家入驻</text>
+      <text class="status-desc">输入邀请码，解锁专属商家权益</text>
+      <view class="input-group">
+        <input class="invite-input" type="text" placeholder="请输入邀请码" maxlength="100" value="{{inviteCode}}" bindinput="onInviteCodeInput" placeholder-class="input-placeholder"/>
+      </view>
+      <button class="register-btn" bindtap="onRegister">立即注册</button>
+      <view class="register-tip">已有邀请码？点击上方注册</view>
+    </view>
+  </view>
+</view>
+
+
+<view class="page-container registered" wx:else>
+  
+  <view class="refresh-btn" bindtap="refreshShangjiaInfo">
+    <image class="refresh-icon" src="{{imgUrls.iconRefresh}}" mode="aspectFit" />
+  </view>
+
+  
+  <view class="avatar-card" style="background-image: url('{{imgUrls.avatarCardBg}}'); background-size: cover; background-position: center;">
+    <view class="avatar-content">
+      <view class="avatar-wrapper" bindtap="previewAvatar">
+        <image class="avatar-img" src="{{avatarUrl}}" mode="aspectFill" />
+        <image class="avatar-frame" src="{{imgUrls.avatarFrame}}" mode="aspectFit" />
+      </view>
+      <view class="user-info">
+        <text class="nicheng">{{nicheng || '商家'}}</text>
+        <view class="uid-area">
+          <text class="uid-label">UID</text>
+          <text class="uid-value">{{uid || '------'}}</text>
+          <image class="copy-icon" src="{{imgUrls.iconCopy}}" mode="aspectFit" bindtap="copyUid" />
+        </view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="badge-area" wx:if="{{chenghaoList.length > 0}}">
+    <scroll-view class="badge-scroll" scroll-x="true" show-scrollbar="{{false}}">
+      <view class="badge-row">
+        <block wx:for="{{chenghaoList}}" wx:key="index">
+          <chenghao-tag mingcheng="{{item.mingcheng}}" texiaoJson="{{item.texiao_json}}" />
+        </block>
+      </view>
+    </scroll-view>
+  </view>
+
+  
+  <view class="asset-card" style="background-image: url('{{imgUrls.assetCardBg}}'); background-size: cover; background-position: center;">
+    <view class="card-content glass-effect">
+      <view class="balance-area">
+        <text class="balance-label">账户余额（元）</text>
+        <view class="balance-value">
+          <text class="value-num">{{sjyue}}</text>
+          <text class="value-unit">¥</text>
+        </view>
+        <view class="action-buttons">
+          <view class="action-btn recharge" bindtap="goToRecharge">
+            <image class="btn-icon" src="{{imgUrls.iconRecharge}}" mode="aspectFit" />
+            <text>充值</text>
+          </view>
+          <view class="action-btn withdraw" bindtap="goToWithdraw">
+            <image class="btn-icon" src="{{imgUrls.iconWithdraw}}" mode="aspectFit" />
+            <text>提现</text>
+          </view>
+        </view>
+      </view>
+      <view class="divider"></view>
+      <view class="stats-row">
+        <view class="stat-item">
+          <text class="stat-label">发单总量</text>
+          <text class="stat-number">{{fabu}}</text>
+        </view>
+        <view class="stat-item">
+          <text class="stat-label">退款总量</text>
+          <text class="stat-number">{{tuikuan}}</text>
+        </view>
+        <view class="stat-item">
+          <text class="stat-label">今日流水</text>
+          <text class="stat-number">{{jinriliushui}}</text>
+        </view>
+        <view class="stat-item">
+          <text class="stat-label">今月流水</text>
+          <text class="stat-number">{{jinyueliushui}}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="metrics-section">
+    <view class="metric-card" style="background-image: url('{{imgUrls.statCardBg}}'); background-size: cover; background-position: center;">
+      <view class="metric-content">
+        <image class="metric-icon" src="{{imgUrls.iconRelease}}" mode="aspectFit" />
+        <text class="metric-value">{{jinridingdan}}</text>
+        <text class="metric-label">今日派单</text>
+      </view>
+    </view>
+    <view class="metric-card" style="background-image: url('{{imgUrls.statCardBg}}'); background-size: cover; background-position: center;">
+      <view class="metric-content">
+        <image class="metric-icon" src="{{imgUrls.iconPunish}}" mode="aspectFit" />
+        <text class="metric-value">{{jinrituikuan}}</text>
+        <text class="metric-label">今日退款</text>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="function-grid">
+    <view class="func-item primary" style="background-image: url('{{imgUrls.primaryFuncBg}}'); background-size: cover; background-position: center;">
+      <view class="func-content" bindtap="goToPaiDan">
+        <image class="func-icon" src="{{imgUrls.iconRelease}}" mode="aspectFit" />
+        <text class="func-name">发布订单</text>
+        <text class="func-desc">快速派单</text>
+      </view>
+    </view>
+    <view class="func-item highlight" style="background-image: url('{{imgUrls.highlightFuncBg}}'); background-size: cover; background-position: center;">
+      <view class="func-content" bindtap="goToJiSuPaiDan">
+        <image class="func-icon" src="{{imgUrls.iconFast}}" mode="aspectFit" />
+        <text class="func-name">极速派单</text>
+        <text class="func-desc">闪电体验</text>
+      </view>
+    </view>
+    <view class="func-item" style="background-image: url('{{imgUrls.funcItemBg}}'); background-size: cover; background-position: center;">
+      <view class="func-content" bindtap="goToMyOrders">
+        <image class="func-icon" src="{{imgUrls.iconOrders}}" mode="aspectFit" />
+        <text class="func-name">我的订单</text>
+        <text class="func-desc">管理派单</text>
+      </view>
+    </view>
+    <view class="func-item" style="background-image: url('{{imgUrls.funcItemBg}}'); background-size: cover; background-position: center;">
+      <view class="func-content" bindtap="goToMessages">
+        <image class="func-icon" src="{{imgUrls.iconPunish}}" mode="aspectFit" />
+        <text class="func-name">处罚记录</text>
+        <text class="func-desc">违规查询</text>
+      </view>
+    </view>
+    <view class="func-item" style="background-image: url('{{imgUrls.funcItemBg}}'); background-size: cover; background-position: center;">
+      <view class="func-content" bindtap="goToRanking">
+        <image class="func-icon" src="{{imgUrls.iconRank}}" mode="aspectFit" />
+        <text class="func-name">商家排行</text>
+        <text class="func-desc">业绩排名</text>
+      </view>
+    </view>
+    <view class="func-item" style="background-image: url('{{imgUrls.funcItemBg}}'); background-size: cover; background-position: center;">
+      <view class="func-content" bindtap="goToKefu">
+        <image class="func-icon" src="{{imgUrls.iconService}}" mode="aspectFit" />
+        <text class="func-name">在线客服</text>
+        <text class="func-desc">帮助中心</text>
+      </view>
+    </view>
+  </view>
+
+  <view class="safe-bottom"></view>
+</view>
+
+
+<view class="loading-mask" wx:if="{{isLoading}}">
+  <view class="loading-content">
+    <view class="loading-spinner"></view>
+    <text class="loading-text">加载中...</text>
+  </view>
+</view>
+
+
+<global-notification id="global-notification" />
+<popup-notice id="popupNotice" />
+<custom-tab-bar />
\ No newline at end of file
diff --git a/pages/shangjiaduan/shangjiaduan.wxss b/pages/shangjiaduan/shangjiaduan.wxss
new file mode 100644
index 0000000..ffcc46a
--- /dev/null
+++ b/pages/shangjiaduan/shangjiaduan.wxss
@@ -0,0 +1,422 @@
+/* pages/shangjiazhongxin/shangjiazhongxin.wxss */
+/* 最终优化：指标卡片缩小，图标缩小，资产卡片微缩，背景模糊 */
+
+page {
+    background-color: #f5f7fb;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
+  }
+  
+  /* 页面背景纹理：添加模糊效果，降低对比 */
+  .page-bg {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 0;
+    opacity: 0.15;          /* 降低不透明度，更柔和 */
+    filter: blur(8rpx);     /* 轻微模糊，不刺眼 */
+    pointer-events: none;
+  }
+  
+  .page-container {
+    position: relative;
+    z-index: 1;
+    min-height: 100vh;
+    padding: 0 32rpx;
+    box-sizing: border-box;
+    background-color: transparent;
+  }
+  
+  /* ========== 未注册卡片 ========== */
+  .unregistered {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding-top: 200rpx;
+  }
+  .unreg-card {
+    width: 90%;
+    border-radius: 48rpx;
+    overflow: hidden;
+    box-shadow: 0 8rpx 20rpx rgba(0,0,0,0.2);
+    background-color: transparent;
+  }
+  .unreg-content {
+    padding: 60rpx 40rpx;
+    text-align: center;
+    background: rgba(0,0,0,0.65);
+    backdrop-filter: blur(16rpx);
+    border-radius: 48rpx;
+  }
+  .status-title {
+    font-size: 44rpx;
+    font-weight: 700;
+    color: #fff;
+    margin-bottom: 16rpx;
+  }
+  .status-desc {
+    font-size: 28rpx;
+    color: #ddd;
+    margin-bottom: 50rpx;
+  }
+  .input-group {
+    margin-bottom: 40rpx;
+  }
+  .invite-input {
+    width: 100%;
+    height: 96rpx;
+    background: rgba(255,255,255,0.2);
+    border-radius: 48rpx;
+    padding: 0 32rpx;
+    font-size: 30rpx;
+    color: #fff;
+    border: 1rpx solid rgba(255,255,255,0.3);
+    box-sizing: border-box;
+  }
+  .register-btn {
+    width: 100%;
+    height: 96rpx;
+    background: linear-gradient(135deg, #ffb347, #ff8c1a);
+    border-radius: 48rpx;
+    font-size: 34rpx;
+    font-weight: 600;
+    color: white;
+    box-shadow: 0 8rpx 20rpx rgba(255,140,26,0.3);
+    border: none;
+    line-height: 96rpx;
+  }
+  .register-tip {
+    margin-top: 32rpx;
+    font-size: 24rpx;
+    color: #ddd;
+  }
+  
+  /* ========== 已注册页面 ========== */
+  .registered {
+    padding-top: 30rpx;
+    padding-bottom: 40rpx;
+  }
+  
+  /* 刷新按钮 */
+  .refresh-btn {
+    position: absolute;
+    top: 30rpx;
+    right: 32rpx;
+    width: 72rpx;
+    height: 72rpx;
+    background: rgba(0,0,0,0.5);
+    border-radius: 36rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 20;
+    backdrop-filter: blur(10rpx);
+  }
+  .refresh-icon {
+    width: 40rpx;
+    height: 40rpx;
+    filter: brightness(0) invert(1);
+  }
+  
+  /* ========== 头像卡片 ========== */
+  .avatar-card {
+    border-radius: 60rpx;
+    overflow: hidden;
+    margin-bottom: 36rpx;
+    box-shadow: 0 6rpx 18rpx rgba(0,0,0,0.2);
+    background-color: transparent;
+  }
+  .avatar-content {
+    display: flex;
+    align-items: center;
+    padding: 28rpx 32rpx;
+    background: rgba(0,0,0,0.55);
+    backdrop-filter: blur(20rpx);
+  }
+  .avatar-wrapper {
+    position: relative;
+    width: 110rpx;
+    height: 110rpx;
+    margin-right: 28rpx;
+  }
+  .avatar-img {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    object-fit: cover;
+    border: 2rpx solid rgba(255,255,255,0.3);
+  }
+  .avatar-frame {
+    position: absolute;
+    top: -8rpx;
+    left: -8rpx;
+    width: 126rpx;
+    height: 126rpx;
+    pointer-events: none;
+  }
+  .user-info {
+    flex: 1;
+  }
+  .nicheng {
+    font-size: 40rpx;
+    font-weight: 700;
+    color: #fff;
+    margin-bottom: 16rpx;
+    text-shadow: 0 2rpx 6rpx rgba(0,0,0,0.5);
+    background: rgba(0,0,0,0.6);
+    display: inline-block;
+    padding: 6rpx 20rpx;
+    border-radius: 40rpx;
+  }
+  .uid-area {
+    display: flex;
+    align-items: center;
+  }
+  .uid-label {
+    font-size: 26rpx;
+    color: #fff;
+    background: rgba(0,0,0,0.7);
+    padding: 6rpx 16rpx;
+    border-radius: 28rpx;
+    margin-right: 16rpx;
+    backdrop-filter: blur(4rpx);
+  }
+  .uid-value {
+    font-size: 28rpx;
+    color: #fff;
+    font-family: monospace;
+    background: rgba(0,0,0,0.6);
+    padding: 6rpx 16rpx;
+    border-radius: 28rpx;
+  }
+  .copy-icon {
+    width: 40rpx;
+    height: 40rpx;
+    margin-left: 20rpx;
+    opacity: 0.9;
+    filter: drop-shadow(0 2rpx 2rpx rgba(0,0,0,0.5));
+  }
+  
+  /* 荣誉标签 */
+  .badge-area {
+    margin-bottom: 36rpx;
+  }
+  .badge-scroll {
+    white-space: nowrap;
+  }
+  .badge-row {
+    display: inline-flex;
+    gap: 16rpx;
+    padding: 8rpx 0;
+  }
+  
+  /* ========== 资产卡片（稍微缩小） ========== */
+  .asset-card {
+    border-radius: 48rpx;
+    overflow: hidden;
+    margin-bottom: 36rpx;
+    box-shadow: 0 10rpx 24rpx rgba(0,0,0,0.2);
+    background-color: transparent;
+  }
+  .glass-effect {
+    padding: 44rpx 36rpx;  /* 原 48rpx 36rpx，稍微缩小 */
+    background: rgba(0,0,0,0.55);
+    backdrop-filter: blur(20rpx);
+  }
+  .balance-area {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    flex-wrap: wrap;
+    margin-bottom: 32rpx;
+  }
+  .balance-label {
+    font-size: 28rpx;
+    color: #ffdebc;
+    font-weight: 500;
+  }
+  .balance-value {
+    display: flex;
+    align-items: baseline;
+  }
+  .value-num {
+    font-size: 64rpx;   /* 原 68rpx，稍微缩小 */
+    font-weight: 800;
+    color: #ffd966;
+    font-family: 'DIN', monospace;
+  }
+  .value-unit {
+    font-size: 32rpx;
+    color: #ffdebc;
+    margin-left: 6rpx;
+  }
+  .action-buttons {
+    display: flex;
+    gap: 24rpx;
+  }
+  .action-btn {
+    display: flex;
+    align-items: center;
+    gap: 10rpx;
+    background: rgba(255,255,255,0.9);
+    padding: 12rpx 28rpx;
+    border-radius: 60rpx;
+    font-size: 26rpx;
+    font-weight: 500;
+  }
+  .action-btn.recharge {
+    color: #ff8c1a;
+  }
+  .action-btn.withdraw {
+    color: #2d3e6e;
+  }
+  .btn-icon {
+    width: 32rpx;
+    height: 32rpx;
+  }
+  .divider {
+    height: 2rpx;
+    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.5), transparent);
+    margin: 24rpx 0;
+  }
+  .stats-row {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+  }
+  .stat-item {
+    flex: 1;
+    text-align: center;
+  }
+  .stat-label {
+    font-size: 24rpx;
+    color: #ddd;
+    margin-bottom: 12rpx;
+    display: block;
+  }
+  .stat-number {
+    font-size: 34rpx;   /* 原 38rpx，稍微缩小 */
+    font-weight: 700;
+    color: #fff;
+  }
+  
+  /* ========== 核心指标卡片组（缩小版） ========== */
+  .metrics-section {
+    display: flex;
+    gap: 24rpx;
+    margin-bottom: 40rpx;
+  }
+  .metric-card {
+    flex: 1;
+    border-radius: 36rpx;
+    overflow: hidden;
+    box-shadow: 0 6rpx 16rpx rgba(0,0,0,0.2);
+    background-color: transparent;
+  }
+  .metric-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 24rpx 0;    /* 原 36rpx 0，缩小 */
+    background: rgba(0,0,0,0.55);
+    backdrop-filter: blur(12rpx);
+  }
+  .metric-icon {
+    width: 48rpx;       /* 原 60rpx，缩小 */
+    height: 48rpx;
+    margin-bottom: 16rpx;
+    filter: brightness(0) invert(1);
+  }
+  .metric-value {
+    font-size: 44rpx;   /* 原 52rpx，缩小 */
+    font-weight: 800;
+    color: #ffd966;
+    margin-bottom: 8rpx;
+  }
+  .metric-label {
+    font-size: 24rpx;   /* 原 28rpx，缩小 */
+    color: #eee;
+  }
+  
+  /* ========== 功能宫格（图标缩小） ========== */
+  .function-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 24rpx;
+    margin-top: 12rpx;
+  }
+  .func-item {
+    border-radius: 32rpx;
+    overflow: hidden;
+    box-shadow: 0 6rpx 14rpx rgba(0,0,0,0.2);
+    background-color: transparent;
+  }
+  .func-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 32rpx 12rpx 28rpx;  /* 原 40rpx 16rpx 36rpx，稍微缩小 */
+    background: rgba(0,0,0,0.55);
+    backdrop-filter: blur(12rpx);
+    transition: all 0.2s ease;
+  }
+  .func-icon {
+    width: 64rpx;       /* 原 72rpx，缩小 */
+    height: 64rpx;
+    margin-bottom: 20rpx;
+    filter: brightness(0) invert(1);
+  }
+  .func-name {
+    font-size: 28rpx;   /* 原 32rpx，缩小 */
+    font-weight: 600;
+    color: #fff;
+    margin-bottom: 8rpx;
+  }
+  .func-desc {
+    font-size: 22rpx;   /* 原 24rpx，缩小 */
+    color: #ddd;
+  }
+  
+  /* 底部安全区 */
+  .safe-bottom {
+    height: 40rpx;
+  }
+  
+  /* 加载遮罩 */
+  .loading-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0,0,0,0.7);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 9999;
+  }
+  .loading-content {
+    background: rgba(0,0,0,0.8);
+    padding: 48rpx 64rpx;
+    border-radius: 32rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  .loading-spinner {
+    width: 72rpx;
+    height: 72rpx;
+    border: 6rpx solid rgba(255,255,255,0.3);
+    border-top-color: #ffd966;
+    border-radius: 50%;
+    animation: spin 0.8s linear infinite;
+    margin-bottom: 24rpx;
+  }
+  .loading-text {
+    font-size: 28rpx;
+    color: #fff;
+  }
+  @keyframes spin {
+    to { transform: rotate(360deg); }
+  }
\ No newline at end of file
diff --git a/pages/shangpinxiangqing/shangpinxiangqing.js b/pages/shangpinxiangqing/shangpinxiangqing.js
new file mode 100644
index 0000000..cf61147
--- /dev/null
+++ b/pages/shangpinxiangqing/shangpinxiangqing.js
@@ -0,0 +1,296 @@
+// pages/shangpinxiangqing/shangpinxiangqing.js
+const app = getApp()
+
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    // 全局变量引用
+    ossImageUrl: '',
+    apiBaseUrl: '',
+    
+    // 从上级页面传入的参数
+    shangpinId: '',           // 商品ID
+    shangpinTitle: '',        // 商品标题（可选，用于SEO）
+    shangpinPrice: '',        // 商品价格（可选）
+    
+    // 商品详情数据
+    shangpinData: null,       // 商品详情数据对象
+    isLoading: true,          // 加载状态
+    loadError: false,         // 加载错误
+    
+    // 页面字段映射（后端返回字段名）
+    fieldMapping: {
+      tupian: 'tupian',       // 商品图片URL
+      biaoti: 'biaoti',       // 商品标题
+      jiage: 'jiage',         // 商品价格
+      xiangqing: 'xiangqing', // 商品详细介绍
+      xiadanxuzhi: 'xiadanxuzhi', // 下单须知
+      guize: 'guize',         // 规则图片URL
+      xiaoliang: 'xiaoliang', // 商品销量
+      kucun: 'kucun',         // 商品库存
+      fenlei: 'fenlei',       // 商品分类（可能有用）
+      pingfen: 'pingfen'      // 商品评分（可能有用）
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    
+    
+    // 获取全局变量
+    this.setData({
+      ossImageUrl: app.globalData.ossImageUrl,
+      apiBaseUrl: app.globalData.apiBaseUrl,
+      shangpinId: options.id || '',
+      shangpinTitle: options.title || '',
+      shangpinPrice: options.price || ''
+    })
+    
+    // 验证商品ID
+    if (!this.data.shangpinId) {
+      wx.showToast({
+        title: '商品不存在',
+        icon: 'none'
+      })
+      setTimeout(() => {
+        wx.navigateBack()
+      }, 1500)
+      return
+    }
+    
+    // 加载商品详情数据
+    this.loadShangpinDetail()
+  },
+  onShow() {
+    // 原有代码...
+    
+    // 🆕 注册通知组件
+    this.registerNotificationComponent();
+},
+
+// 🆕 新增：注册通知组件
+registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+    
+    if (notificationComp && notificationComp.showNotification) {
+        console.log('🏪 商城页面注册通知组件');
+        app.globalData.globalNotification = {
+            show: (data) => notificationComp.showNotification(data),
+            hide: () => notificationComp.hideNotification()
+        };
+    }
+},
+
+  /**
+   * 加载商品详情数据
+   */
+  loadShangpinDetail() {
+    const that = this
+    const { shangpinId, apiBaseUrl } = this.data
+    
+    this.setData({ isLoading: true, loadError: false })
+    
+    wx.request({
+      url: apiBaseUrl + '/shangpin/xiangqinghuoqu/',
+      method: 'POST',
+      header: {
+        'content-type': 'application/json'
+      },
+      data: {
+        shangpin_id: shangpinId
+      },
+      success(res) {
+        
+        
+        if (res.statusCode === 200 && res.data && res.data.code === 0) {
+          // 获取商品数据
+          const shangpinData = res.data.data || {}
+          
+          // 处理价格显示
+          if (shangpinData.jiage) {
+            const jiage = parseFloat(shangpinData.jiage) || 0
+            const priceInteger = Math.floor(jiage)
+            let priceDecimal = '00'
+            
+            const decimalPart = (jiage - priceInteger).toFixed(2)
+            if (decimalPart > 0) {
+              priceDecimal = decimalPart.toString().split('.')[1]
+            }
+            
+            shangpinData.priceInteger = priceInteger
+            shangpinData.priceDecimal = priceDecimal
+          }
+          
+          // 处理图片URL（确保完整URL）
+          if (shangpinData.tupian && !shangpinData.tupian.startsWith('http')) {
+            shangpinData.tupian = that.data.ossImageUrl + shangpinData.tupian
+          }
+          
+          // 处理规则图片URL
+          if (shangpinData.guize && !shangpinData.guize.startsWith('http')) {
+            shangpinData.guize = that.data.ossImageUrl + shangpinData.guize
+          }
+          
+          // 处理销量显示
+          if (shangpinData.xiaoliang) {
+            shangpinData.xiaoliangText = that.formatXiaoliang(shangpinData.xiaoliang)
+          }
+          
+          // 处理库存显示
+          if (shangpinData.kucun) {
+            shangpinData.kucunText = shangpinData.kucun + '件'
+            shangpinData.kucunClass = shangpinData.kucun > 0 ? 'kucun-normal' : 'kucun-none'
+          }
+          
+          // 设置页面标题
+          if (shangpinData.biaoti) {
+            wx.setNavigationBarTitle({
+              title: '商品详情'
+            })
+          }
+          
+          that.setData({
+            shangpinData: shangpinData,
+            isLoading: false
+          })
+        } else {
+          that.handleLoadError(res.data?.msg || '加载失败')
+        }
+      },
+      fail(error) {
+        console.error('商品详情加载失败:', error)
+        that.handleLoadError('网络错误，请重试')
+      }
+    })
+  },
+
+  /**
+   * 格式化销量显示
+   */
+  formatXiaoliang(xiaoliang) {
+    const num = parseInt(xiaoliang) || 0
+    
+    if (num >= 10000) {
+      return (num / 10000).toFixed(1) + '万+'
+    } else if (num >= 1000) {
+      return (num / 1000).toFixed(1) + '千+'
+    } else {
+      return num + ''
+    }
+  },
+
+  /**
+   * 处理加载错误
+   */
+  handleLoadError(errorMsg) {
+    this.setData({
+      isLoading: false,
+      loadError: true
+    })
+    
+    wx.showToast({
+      title: errorMsg || '加载失败',
+      icon: 'none',
+      duration: 2000
+    })
+    
+    // 3秒后自动返回
+    setTimeout(() => {
+      wx.navigateBack()
+    }, 3000)
+  },
+
+  /**
+   * 预览商品图片
+   */
+  previewImage() {
+    const { shangpinData } = this.data
+    if (!shangpinData || !shangpinData.tupian) return
+    
+    wx.previewImage({
+      current: shangpinData.tupian,
+      urls: [shangpinData.tupian]
+    })
+  },
+
+  /**
+   * 点击立即下单按钮
+   */
+  onOrderClick() {
+    const { shangpinData, shangpinId } = this.data
+    
+    // 检查库存
+    if (shangpinData && shangpinData.kucun <= 0) {
+      wx.showToast({
+        title: '商品已售罄',
+        icon: 'none'
+      })
+      return
+    }
+    
+    // 验证必要数据
+    if (!shangpinData || !shangpinData.biaoti) {
+      wx.showToast({
+        title: '商品信息不完整',
+        icon: 'none'
+      })
+      return
+    }
+    
+    // 准备跳转数据
+    const orderData = {
+      id: shangpinId,                             // 商品ID
+      title: shangpinData.biaoti,                 // 商品标题
+      price: shangpinData.jiage,                  // 商品价格（原价）
+      priceInteger: shangpinData.priceInteger,    // 价格整数部分
+      priceDecimal: shangpinData.priceDecimal,    // 价格小数部分
+      image: shangpinData.tupian,                 // 商品图片
+      kucun: shangpinData.kucun || 0,             // 商品库存
+      xiaoliang: shangpinData.xiaoliang || 0      // 商品销量
+    }
+    
+    // 跳转到提交订单页面
+    wx.navigateTo({
+      url: `/pages/tijiao/tijiao?data=${encodeURIComponent(JSON.stringify(orderData))}`
+    })
+  },
+
+  /**
+   * 刷新页面数据
+   */
+  onRefresh() {
+    this.loadShangpinDetail()
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+    const { shangpinData, shangpinId } = this.data
+    
+    return {
+      title: shangpinData?.biaoti || '阿龙电竞 - 商品详情',
+      path: `/pages/shangpinxiangqing/shangpinxiangqing?id=${shangpinId}`,
+      imageUrl: shangpinData?.tupian || ''
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    // 页面显示时，可以检查是否需要刷新数据
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+    // 清理工作
+  }
+})
\ No newline at end of file
diff --git a/pages/shangpinxiangqing/shangpinxiangqing.json b/pages/shangpinxiangqing/shangpinxiangqing.json
new file mode 100644
index 0000000..837f016
--- /dev/null
+++ b/pages/shangpinxiangqing/shangpinxiangqing.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    }
+}
\ No newline at end of file
diff --git a/pages/shangpinxiangqing/shangpinxiangqing.wxml b/pages/shangpinxiangqing/shangpinxiangqing.wxml
new file mode 100644
index 0000000..595ed1f
--- /dev/null
+++ b/pages/shangpinxiangqing/shangpinxiangqing.wxml
@@ -0,0 +1,112 @@
+
+<view class="detail-page">
+  
+  <view class="loading-container" wx:if="{{isLoading}}">
+    <view class="loading-content">
+      <view class="loading-spinner">
+        <view class="spinner-ring"></view>
+        <view class="spinner-dot"></view>
+      </view>
+      <text class="loading-text">加载中...</text>
+    </view>
+  </view>
+  
+  
+  <view class="error-container" wx:if="{{!isLoading && loadError}}">
+    <image src="/images/error.png" class="error-icon" />
+    <text class="error-text">加载失败</text>
+    <button class="error-btn" bindtap="onRefresh">重新加载</button>
+  </view>
+  
+  
+  <view class="detail-content" wx:if="{{!isLoading && !loadError && shangpinData}}">
+    
+    <view class="image-section">
+      <view class="image-container" bindtap="previewImage">
+        <image 
+          src="{{shangpinData.tupian}}" 
+          mode="aspectFill" 
+          class="product-image"
+        />
+        
+        <view class="kucun-tag {{shangpinData.kucunClass || 'kucun-normal'}}">
+          <text class="kucun-text">{{shangpinData.kucunText || '库存充足'}}</text>
+        </view>
+      </view>
+    </view>
+    
+    
+    <view class="content-area">
+      
+      <view class="title-price-section">
+        <view class="title-row">
+          <text class="product-title">{{shangpinData.biaoti || ''}}</text>
+        </view>
+        
+        <view class="price-row">
+          
+          <view class="price-section">
+            <text class="price-icon">¥</text>
+            <text class="price-integer">{{shangpinData.priceInteger || '0'}}</text>
+            <text class="price-decimal">.{{shangpinData.priceDecimal || '00'}}</text>
+          </view>
+          
+          
+          <view class="sales-section">
+            <image src="/images/xiaoliang.png" class="sales-icon" />
+            <text class="sales-text">{{shangpinData.xiaoliangText || '0'}}次购买</text>
+          </view>
+        </view>
+      </view>
+      
+      
+      <view class="info-section" wx:if="{{shangpinData.xiangqing}}">
+        <view class="section-header">
+          <image src="/images/jieshao.png" class="section-icon" />
+          <text class="section-title">商品介绍：</text>
+        </view>
+        <view class="section-content">
+          <text class="content-text">{{shangpinData.xiangqing}}</text>
+        </view>
+      </view>
+      
+      
+      <view class="info-section" wx:if="{{shangpinData.xiadanxuzhi}}">
+        <view class="section-header">
+          <image src="/images/jieshao.png" class="section-icon" />
+          <text class="section-title">购买须知：</text>
+        </view>
+        <view class="section-content">
+          <text class="content-text">{{shangpinData.xiadanxuzhi}}</text>
+        </view>
+      </view>
+      
+      
+      <view class="rule-section" wx:if="{{shangpinData.guize}}">
+        <image 
+          src="{{shangpinData.guize}}" 
+          mode="widthFix" 
+          class="rule-image"
+          binderror="onImageError"
+        />
+      </view>
+      
+      
+      <view class="placeholder"></view>
+    </view>
+  </view>
+  
+  
+  <view class="order-btn-container" wx:if="{{!isLoading && !loadError && shangpinData}}">
+    <view class="order-btn" bindtap="onOrderClick">
+      
+      <view class="btn-glow"></view>
+      
+      <view class="btn-streamer"></view>
+      
+      <text class="btn-text">立即预约</text>
+    </view>
+  </view>
+  <global-notification id="global-notification" />
+
+</view>
\ No newline at end of file
diff --git a/pages/shangpinxiangqing/shangpinxiangqing.wxss b/pages/shangpinxiangqing/shangpinxiangqing.wxss
new file mode 100644
index 0000000..c94d2b8
--- /dev/null
+++ b/pages/shangpinxiangqing/shangpinxiangqing.wxss
@@ -0,0 +1,386 @@
+/* pages/shangpinxiangqing/shangpinxiangqing.wxss */
+.detail-page {
+    width: 100%;
+    min-height: 100vh;
+    background: #f5f5f5;
+    position: relative;
+  }
+  
+  /* 加载状态 */
+  .loading-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #f5f5f5;
+    z-index: 100;
+  }
+  
+  .loading-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  
+  .loading-spinner {
+    width: 80rpx;
+    height: 80rpx;
+    position: relative;
+    margin-bottom: 30rpx;
+  }
+  
+  .spinner-ring {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    border: 4rpx solid rgba(82, 196, 26, 0.2);
+    border-radius: 50%;
+  }
+  
+  .spinner-dot {
+    position: absolute;
+    top: 0;
+    left: 50%;
+    width: 12rpx;
+    height: 12rpx;
+    background: #52c41a;
+    border-radius: 50%;
+    transform: translateX(-50%);
+    animation: spin 1s linear infinite;
+  }
+  
+  .loading-text {
+    font-size: 28rpx;
+    color: #666;
+    font-weight: 500;
+  }
+  
+  /* 错误状态 */
+  .error-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    background: #f5f5f5;
+    z-index: 100;
+  }
+  
+  .error-icon {
+    width: 180rpx;
+    height: 180rpx;
+    opacity: 0.3;
+    margin-bottom: 30rpx;
+  }
+  
+  .error-text {
+    font-size: 30rpx;
+    color: #999;
+    margin-bottom: 40rpx;
+  }
+  
+  .error-btn {
+    background: linear-gradient(135deg, #52c41a, #389e0d);
+    color: white;
+    font-size: 26rpx;
+    font-weight: 500;
+    padding: 20rpx 50rpx;
+    border-radius: 50rpx;
+    box-shadow: 0 8rpx 24rpx rgba(82, 196, 26, 0.3);
+  }
+  
+  /* 商品详情内容 */
+  .detail-content {
+    padding-bottom: 140rpx; /* 给底部按钮留出空间 */
+  }
+  
+  /* 商品图片区域（占满屏幕） */
+  .image-section {
+    width: 100%;
+    background: white;
+  }
+  
+  .image-container {
+    width: 100%;
+    height: 750rpx; /* 正方形，占满屏幕宽度 */
+    position: relative;
+    overflow: hidden;
+    background: #f5f5f5;
+  }
+  
+  .product-image {
+    width: 100%;
+    height: 100%;
+  }
+  
+  /* 库存标签 */
+  .kucun-tag {
+    position: absolute;
+    bottom: 30rpx;
+    right: 30rpx;
+    padding: 12rpx 24rpx;
+    border-radius: 30rpx;
+    backdrop-filter: blur(10rpx);
+    z-index: 10;
+  }
+  
+  .kucun-normal {
+    background: rgba(0, 0, 0, 0.6);
+    color: white;
+  }
+  
+  .kucun-none {
+    background: rgba(255, 77, 79, 0.8);
+    color: white;
+  }
+  
+  .kucun-text {
+    font-size: 24rpx;
+    font-weight: 500;
+  }
+  
+  /* 下方内容区域（顶部有圆角，与图片重叠一部分） */
+  .content-area {
+    position: relative;
+    background: white;
+    border-radius: 40rpx 40rpx 0 0;
+    margin-top: -40rpx; /* 与图片重叠一部分，实现平滑过渡 */
+    padding: 40rpx 30rpx 0;
+    min-height: 400rpx;
+  }
+  
+  /* 标题和价格区域 */
+  .title-price-section {
+    margin-bottom: 40rpx;
+  }
+  
+  .title-row {
+    margin-bottom: 30rpx;
+  }
+  
+  .product-title {
+    font-size: 38rpx;
+    font-weight: 700;
+    color: #222;
+    line-height: 1.5;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+  }
+  
+  /* 价格和销量行 */
+  .price-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  
+  /* 价格部分 */
+  .price-section {
+    display: flex;
+    align-items: baseline;
+  }
+  
+  .price-icon {
+    font-size: 34rpx;
+    color: #ff4d4f;
+    font-weight: 600;
+  }
+  
+  .price-integer {
+    font-size: 58rpx;
+    color: #ff4d4f;
+    font-weight: 700;
+    margin-left: 4rpx;
+  }
+  
+  .price-decimal {
+    font-size: 34rpx;
+    color: #ff4d4f;
+    font-weight: 600;
+  }
+  
+  /* 销量部分 */
+  .sales-section {
+    display: flex;
+    align-items: center;
+  }
+  
+  .sales-icon {
+    width: 30rpx;
+    height: 30rpx;
+    margin-right: 12rpx;
+    opacity: 0.6;
+  }
+  
+  .sales-text {
+    font-size: 28rpx;
+    color: #999;
+    font-weight: 400;
+  }
+  
+  /* 信息区域（商品介绍、购买须知） */
+  .info-section {
+    margin-bottom: 40rpx;
+    padding-top: 30rpx;
+    border-top: 1rpx solid #f0f0f0;
+  }
+  
+  .section-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20rpx;
+  }
+  
+  .section-icon {
+    width: 36rpx;
+    height: 36rpx;
+    margin-right: 16rpx;
+  }
+  
+  .section-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #52c41a; /* 绿色 */
+  }
+  
+  .section-content {
+    line-height: 1.8;
+    padding-left: 52rpx; /* 与图标对齐 */
+  }
+  
+  .content-text {
+    font-size: 28rpx;
+    color: #333;
+    font-weight: 400;
+    white-space: pre-line;
+    line-height: 1.8;
+  }
+  
+  /* 规则图片区域 */
+  .rule-section {
+    margin: 40rpx 0;
+    padding-top: 30rpx;
+    border-top: 1rpx solid #f0f0f0;
+  }
+  
+  .rule-image {
+    width: 100%;
+    border-radius: 16rpx;
+    display: block;
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.08);
+  }
+  
+  /* 占位区域 */
+  .placeholder {
+    height: 140rpx;
+  }
+  
+  /* 立即下单按钮容器（固定底部） */
+  .order-btn-container {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    padding: 20rpx 30rpx;
+    background: linear-gradient(transparent, rgba(255, 255, 255, 0.9) 70%);
+    z-index: 100;
+  }
+  
+  /* 立即下单按钮 */
+  .order-btn {
+    background: linear-gradient(135deg, #52c41a, #389e0d);
+    border-radius: 50rpx;
+    height: 100rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 
+      0 12rpx 36rpx rgba(82, 196, 26, 0.4),
+      0 4rpx 12rpx rgba(82, 196, 26, 0.3);
+    transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
+  }
+  
+  .order-btn:active {
+    transform: scale(0.98);
+    box-shadow: 
+      0 6rpx 24rpx rgba(82, 196, 26, 0.5),
+      0 2rpx 8rpx rgba(82, 196, 26, 0.4);
+  }
+  
+  /* 按钮发光特效 */
+  .btn-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(255, 255, 255, 0.1);
+    animation: glowPulse 2s infinite;
+  }
+  
+  /* 按钮流光特效 */
+  .btn-streamer {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100rpx;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.3), transparent);
+    transform: translateX(-100%);
+    animation: streamerFlow 3s infinite;
+  }
+  
+  /* 按钮文字 */
+  .btn-text {
+    font-size: 36rpx;
+    color: white;
+    font-weight: 600;
+    letter-spacing: 2rpx;
+    position: relative;
+    z-index: 2;
+  }
+  
+  /* 动画定义 */
+  @keyframes spin {
+    0% {
+      transform: translateX(-50%) rotate(0deg);
+    }
+    100% {
+      transform: translateX(-50%) rotate(360deg);
+    }
+  }
+  
+  @keyframes glowPulse {
+    0%, 100% {
+      opacity: 0.5;
+    }
+    50% {
+      opacity: 0.8;
+    }
+  }
+  
+  @keyframes streamerFlow {
+    0% {
+      transform: translateX(-100%);
+    }
+    50% {
+      transform: translateX(100%);
+    }
+    100% {
+      transform: translateX(100%);
+    }
+  }
\ No newline at end of file
diff --git a/pages/sjchongzhi/sjchongzhi.js b/pages/sjchongzhi/sjchongzhi.js
new file mode 100644
index 0000000..889cfee
--- /dev/null
+++ b/pages/sjchongzhi/sjchongzhi.js
@@ -0,0 +1,473 @@
+// pages/shangjia-chongzhi/index.js
+import request from '../../utils/request';
+
+Page({
+  data: {
+    // 商家余额
+    sjyue: '0.00',
+    
+    // 充值金额相关
+    quickAmounts: [50, 100, 300, 500, 1000, 2000],
+    selectedAmount: 50, // 默认选择第一个
+    customAmount: '',
+    inputFocus: false,
+    
+    // 金额限制
+    minAmount: 1,
+    maxAmount: 10000,
+    
+    // 支付状态
+    canPay: false,
+    isLoading: false,
+    loadingText: '',
+    
+    // 支付状态提示
+    showStatus: false,
+    statusText: '',
+    statusSubtext: '',
+    showAction: false,
+    actionText: '',
+    
+    // 订单ID
+    currentDingdanid: '',
+    
+    // 轮询相关
+    pollingCount: 0,
+    maxPollingCount: 15
+  },
+
+  onLoad() {
+    this.initPage();
+  },
+
+  onShow() {
+    this.loadShangjiaBalance();
+    this.registerNotificationComponent();
+  },
+  registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+    
+    if (notificationComp && notificationComp.showNotification) {
+        console.log('🏪 商城页面注册通知组件');
+        app.globalData.globalNotification = {
+            show: (data) => notificationComp.showNotification(data),
+            hide: () => notificationComp.hideNotification()
+        };
+    }
+},
+
+  // 初始化页面
+  initPage() {
+    this.loadShangjiaBalance();
+    this.checkPayCondition();
+  },
+
+  // 从全局变量加载商家余额
+  loadShangjiaBalance() {
+    const app = getApp();
+    const globalData = app.globalData || {};
+    const shangjiaData = globalData.shangjia || {};
+    
+    this.setData({
+      sjyue: shangjiaData.sjyue || '0.00'
+    });
+  },
+
+  // 选择快捷金额
+  selectAmount(e) {
+    const amount = parseInt(e.currentTarget.dataset.amount);
+    
+    this.setData({
+      selectedAmount: amount,
+      customAmount: '',
+      inputFocus: false
+    }, () => {
+      this.checkPayCondition();
+    });
+  },
+
+  // 自定义金额输入
+  onCustomInput(e) {
+    const value = e.detail.value;
+    
+    // 只允许输入数字和小数点
+    let cleanedValue = value.replace(/[^\d.]/g, '');
+    
+    // 只允许一个小数点
+    const dotCount = cleanedValue.split('.').length - 1;
+    if (dotCount > 1) {
+      cleanedValue = cleanedValue.substring(0, cleanedValue.lastIndexOf('.'));
+    }
+    
+    // 限制小数点后两位
+    if (cleanedValue.includes('.')) {
+      const parts = cleanedValue.split('.');
+      if (parts[1].length > 2) {
+        cleanedValue = parts[0] + '.' + parts[1].substring(0, 2);
+      }
+    }
+    
+    this.setData({
+      customAmount: cleanedValue,
+      selectedAmount: null
+    }, () => {
+      this.checkPayCondition();
+    });
+  },
+
+  // 输入框聚焦
+  onInputFocus() {
+    this.setData({
+      inputFocus: true,
+      selectedAmount: null
+    });
+  },
+
+  // 输入框失焦
+  onInputBlur() {
+    this.setData({
+      inputFocus: false
+    }, () => {
+      this.checkPayCondition();
+    });
+  },
+
+  // 检查金额是否有效
+  checkAmountValid() {
+    const amount = this.getSelectedAmount();
+    
+    if (!amount || amount === '') {
+      return false;
+    }
+    
+    const numAmount = parseFloat(amount);
+    const min = this.data.minAmount;
+    const max = this.data.maxAmount;
+    
+    if (numAmount < min || numAmount > max || isNaN(numAmount)) {
+      return false;
+    }
+    
+    return true;
+  },
+
+  // 获取选中的金额
+  getSelectedAmount() {
+    if (this.data.selectedAmount !== null && this.data.selectedAmount !== undefined) {
+      return this.data.selectedAmount.toString();
+    } else if (this.data.customAmount) {
+      return this.data.customAmount;
+    }
+    return null;
+  },
+
+  // 检查支付条件
+  checkPayCondition() {
+    const validAmount = this.checkAmountValid();
+    
+    this.setData({
+      canPay: validAmount
+    });
+  },
+
+  // ========== 支付逻辑 ==========
+
+  // 处理支付
+  handlePay() {
+    if (!this.data.canPay) {
+      wx.showToast({
+        title: '请选择有效金额',
+        icon: 'none'
+      });
+      return;
+    }
+
+    const amount = this.getSelectedAmount();
+    const numAmount = parseFloat(amount);
+
+    // 确认支付
+    wx.showModal({
+      title: '确认充值',
+      content: `是否充值 ¥${numAmount.toFixed(2)}？`,
+      success: (res) => {
+        if (res.confirm) {
+          this.startPayment(numAmount);
+        }
+      }
+    });
+  },
+
+  // 开始支付流程
+  async startPayment(amount) {
+    this.showLoading('发起支付中...');
+
+    try {
+      const res = await request({
+        url: '/shangpin/sjcz',
+        method: 'POST',
+        data: {
+          jine: amount  // 关键字段：后端接口要求"jine"
+        }
+      });
+
+      if (res.data.code === 200) {
+        const payParams = res.data.payParams;
+        const dingdanid = res.data.dingdanid;
+        
+        this.setData({
+          currentDingdanid: dingdanid,
+          pollingCount: 0
+        });
+        
+        // 调起微信支付
+        await this.wechatPay(payParams);
+      } else {
+        this.hideLoading();
+        wx.showToast({
+          title: res.data.message || '支付发起失败',
+          icon: 'none'
+        });
+      }
+    } catch (error) {
+      console.error('发起支付失败:', error);
+      this.hideLoading();
+      wx.showToast({
+        title: '网络错误，请重试',
+        icon: 'none'
+      });
+    }
+  },
+
+  // 微信支付
+  async wechatPay(payParams) {
+    this.showLoading('调起支付中...');
+
+    return new Promise((resolve, reject) => {
+      if (!payParams || !payParams.timeStamp || !payParams.paySign) {
+        this.hideLoading();
+        wx.showToast({
+          title: '支付参数错误',
+          icon: 'none'
+        });
+        reject(new Error('支付参数错误'));
+        return;
+      }
+
+      wx.requestPayment({
+        timeStamp: payParams.timeStamp,
+        nonceStr: payParams.nonceStr,
+        package: payParams.package,
+        signType: payParams.signType || 'MD5',
+        paySign: payParams.paySign,
+        success: async () => {
+          this.hideLoading();
+          this.showStatusMessage('支付成功', '正在确认到账...', false);
+          
+          try {
+            await this.startPolling();
+            resolve();
+          } catch (error) {
+            reject(error);
+          }
+        },
+        fail: async (res) => {
+          this.hideLoading();
+          
+          let errorMsg = '支付失败';
+          if (res.errMsg.includes('cancel')) {
+            errorMsg = '您取消了支付';
+          }
+          
+          this.showStatusMessage(errorMsg, '请重新尝试', true, '重新支付');
+          
+          // 通知后端支付失败
+          try {
+            await this.notifyPaymentFailure();
+          } catch (error) {
+            console.error('支付失败通知失败:', error);
+          }
+          
+          reject(new Error(res.errMsg));
+        }
+      });
+    });
+  },
+
+  // 开始轮询支付结果
+  async startPolling() {
+    this.setData({ pollingCount: 0 });
+    
+    const poll = async () => {
+      if (this.data.pollingCount >= this.data.maxPollingCount) {
+        this.showStatusMessage('确认超时', '请联系客服确认到账情况', true, '联系客服');
+        return;
+      }
+
+      try {
+        // 🟢 修改开始：修改checkPaymentStatus的调用和返回值处理
+        const result = await this.checkPaymentStatus();
+        
+        if (result.success) {
+          // 🟢 修改：更新全局变量中的商家余额
+          const app = getApp();
+          if (app.globalData && app.globalData.shangjia) {
+            // 🟢 注意：后端返回yue，前端全局变量使用sjyue，保留两位小数
+            app.globalData.shangjia.sjyue = result.yue.toFixed(2);
+            console.log('🟢 全局变量商家余额已更新:', app.globalData.shangjia.sjyue);
+          }
+          
+          this.showStatusMessage('充值成功', '余额已到账', true, '完成');
+          this.refreshBalance();
+          return;
+        }
+        // 🟢 修改结束
+        
+        this.setData({ 
+          pollingCount: this.data.pollingCount + 1 
+        });
+        
+        const delay = this.calculatePollingDelay();
+        setTimeout(poll, delay);
+      } catch (error) {
+        console.error('轮询失败:', error);
+        this.setData({ 
+          pollingCount: this.data.pollingCount + 1 
+        });
+        setTimeout(poll, 2000);
+      }
+    };
+    
+    poll();
+  },
+
+  // 计算轮询延迟
+  calculatePollingDelay() {
+    const count = this.data.pollingCount;
+    if (count < 3) return 1000;
+    if (count < 6) return 2000;
+    if (count < 9) return 3000;
+    return 5000;
+  },
+
+  // 检查支付状态
+  async checkPaymentStatus() {
+    const dingdanid = this.data.currentDingdanid;
+    
+    if (!dingdanid) {
+      throw new Error('订单ID缺失');
+    }
+    
+    try {
+      const res = await request({
+        url: '/shangpin/sjcg',
+        method: 'POST',
+        data: {
+          dingdanid: dingdanid  // 后端接口要求"dingdanid"
+        }
+      });
+      
+      // 🟢 修改开始：返回对象，包含成功状态和余额
+      if (res.data.code === 200) {
+        return {
+          success: true,
+          yue: res.data.yue  // 🟢 注意：后端返回字段是yue
+        };
+      } else {
+        return { success: false };
+      }
+      // 🟢 修改结束
+    } catch (error) {
+      console.error('检查支付状态失败:', error);
+      return { success: false };
+    }
+  },
+
+  // 通知支付失败
+  async notifyPaymentFailure() {
+    const dingdanid = this.data.currentDingdanid;
+    
+    if (!dingdanid) return;
+    
+    try {
+      await request({
+        url: '/shangpin/sjshibai',
+        method: 'POST',
+        data: {
+          dingdanid: dingdanid  // 后端接口要求"dingdanid"
+        }
+      });
+    } catch (error) {
+      console.error('支付失败通知失败:', error);
+    }
+  },
+
+  // 刷新余额
+  async refreshBalance() {
+    try {
+      this.loadShangjiaBalance();
+    } catch (error) {
+      console.error('刷新余额失败:', error);
+    }
+  },
+
+  // ========== 状态提示 ==========
+
+  // 显示状态消息
+  showStatusMessage(title, desc, showAction = false, actionBtnText = '') {
+    this.setData({
+      showStatus: true,
+      statusText: title,
+      statusSubtext: desc,
+      showAction: showAction,
+      actionText: actionBtnText
+    });
+  },
+
+  // 处理状态按钮点击
+  handleStatusAction() {
+    const actionText = this.data.actionText;
+    
+    if (actionText === '重新支付' || actionText === '重试') {
+      this.setData({ showStatus: false });
+      setTimeout(() => {
+        this.handlePay();
+      }, 300);
+    } else if (actionText === '联系客服') {
+      wx.showModal({
+        title: '联系客服',
+        content: '联系客服',
+        showCancel: false,
+        confirmText: '我知道了'
+      });
+    } else if (actionText === '完成') {
+      this.setData({ showStatus: false });
+      this.refreshBalance();
+    }
+  },
+
+  // ========== 工具方法 ==========
+
+  // 显示加载
+  showLoading(text = '加载中...') {
+    this.setData({
+      isLoading: true,
+      loadingText: text
+    });
+  },
+
+  // 隐藏加载
+  hideLoading() {
+    this.setData({
+      isLoading: false
+    });
+  },
+
+  // 页面卸载时清理
+  onUnload() {
+    this.setData({
+      showStatus: false,
+      isLoading: false
+    });
+  }
+});
\ No newline at end of file
diff --git a/pages/sjchongzhi/sjchongzhi.json b/pages/sjchongzhi/sjchongzhi.json
new file mode 100644
index 0000000..85fce31
--- /dev/null
+++ b/pages/sjchongzhi/sjchongzhi.json
@@ -0,0 +1,13 @@
+{
+    "navigationBarTitleText": "商家充值",
+    "navigationBarBackgroundColor": "#0a0e17",
+    "navigationBarTextStyle": "white",
+    "backgroundColor": "#0a0e17",
+    "backgroundTextStyle": "light",
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    },
+    "navigationStyle": "default",
+    "disableScroll": true
+  }
\ No newline at end of file
diff --git a/pages/sjchongzhi/sjchongzhi.wxml b/pages/sjchongzhi/sjchongzhi.wxml
new file mode 100644
index 0000000..e0916af
--- /dev/null
+++ b/pages/sjchongzhi/sjchongzhi.wxml
@@ -0,0 +1,129 @@
+<view class="shangjia-chongzhi-page">
+  
+  <view class="balance-card">
+    <view class="balance-header">
+      <view class="balance-title">
+        <text class="title-text">商家余额</text>
+        <view class="title-decoration">
+          <view class="decoration-line"></view>
+          <view class="decoration-dot"></view>
+          <view class="decoration-line"></view>
+        </view>
+      </view>
+      <view class="balance-chip">
+        <text class="chip-text">VIP商家账户</text>
+      </view>
+    </view>
+    
+    <view class="balance-amount">
+      <text class="currency">¥</text>
+      <text class="amount" data-amount="{{sjyue}}">{{sjyue}}</text>
+      <text class="unit">元</text>
+    </view>
+    
+    <view class="balance-footer">
+      <view class="balance-tag">
+        <text class="tag-text">资金安全</text>
+      </view>
+      <view class="balance-tag">
+        <text class="tag-text">实时到账</text>
+      </view>
+    </view>
+    
+    
+    <view class="mech-decoration">
+      <view class="mech-line line-1"></view>
+      <view class="mech-line line-2"></view>
+      <view class="mech-corner corner-1"></view>
+      <view class="mech-corner corner-2"></view>
+      <view class="mech-corner corner-3"></view>
+      <view class="mech-corner corner-4"></view>
+    </view>
+  </view>
+  
+  
+  <view class="amount-section">
+    <view class="section-header">
+      <text class="section-title">充值金额</text>
+      <view class="section-subtitle">
+        <text class="subtitle-text">选择或输入充值金额</text>
+      </view>
+    </view>
+    
+    
+    <view class="quick-amount-grid">
+      <block wx:for="{{quickAmounts}}" wx:key="index">
+        <view 
+          class="amount-item {{selectedAmount == item ? 'active' : ''}}"
+          data-amount="{{item}}"
+          bindtap="selectAmount"
+        >
+          <text class="amount-text">¥{{item}}</text>
+          <view class="amount-halo" wx:if="{{selectedAmount == item}}"></view>
+        </view>
+      </block>
+    </view>
+    
+    
+    <view class="custom-amount">
+      <view class="custom-input-wrapper">
+        <text class="input-label">¥</text>
+        <input 
+          class="custom-input"
+          type="digit"
+          placeholder="输入其他金额"
+          placeholder-class="placeholder"
+          value="{{customAmount}}"
+          bindinput="onCustomInput"
+          bindfocus="onInputFocus"
+          bindblur="onInputBlur"
+          maxlength="6"
+        />
+        <view class="input-line {{inputFocus ? 'active' : ''}}"></view>
+      </view>
+      <text class="amount-hint">
+        单次充值范围：¥{{minAmount}} - ¥{{maxAmount}}
+      </text>
+    </view>
+  </view>
+  
+  
+  <view class="pay-section">
+    <view class="pay-button-wrapper">
+      <view 
+        class="pay-button {{canPay ? 'active' : ''}}" 
+        bindtap="handlePay"
+      >
+        <view class="button-content">
+          <text class="button-text">立即充值</text>
+        </view>
+        
+        <view class="pay-button-shine"></view>
+      </view>
+    </view>
+  </view>
+  
+  
+  <view class="payment-status" wx:if="{{showStatus}}">
+    <view class="status-content">
+      <text class="status-text">{{statusText}}</text>
+      <text class="status-subtext">{{statusSubtext}}</text>
+      
+      <view class="status-actions" wx:if="{{showAction}}">
+        <view class="action-button" bindtap="handleStatusAction">
+          <text class="action-text">{{actionText}}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+  
+  
+  <view class="loading-mask" wx:if="{{isLoading}}">
+    <view class="loading-content">
+      <view class="loading-spinner"></view>
+      <text class="loading-text">{{loadingText}}</text>
+    </view>
+  </view>
+  <global-notification id="global-notification" />
+
+</view>
\ No newline at end of file
diff --git a/pages/sjchongzhi/sjchongzhi.wxss b/pages/sjchongzhi/sjchongzhi.wxss
new file mode 100644
index 0000000..f788fce
--- /dev/null
+++ b/pages/sjchongzhi/sjchongzhi.wxss
@@ -0,0 +1,1024 @@
+/* ========================
+   阿龙电竞 - 商家充值页面
+   赛博科技风主题 - 完全修复版
+   v4.0 - 重点修复文字可见性和整体协调性
+======================== */
+
+/* 科技主题色 - 增强对比度 */
+:root {
+    --primary-color: #00f3ff;        /* 主科技蓝 */
+    --primary-light: #4dfbff;        /* 亮科技蓝 */
+    --primary-dark: #00a0b0;         /* 暗科技蓝 */
+    --secondary-color: #ff2a6d;      /* 科技粉红 */
+    --accent-color: #ffd700;         /* 科技金 */
+    --accent-purple: #9d4edd;        /* 科技紫 */
+    --dark-bg: #0a0e17;              /* 深色背景 */
+    --medium-bg: #13182b;            /* 中色背景 */
+    --light-bg: #1c2238;             /* 浅色背景 */
+    --card-bg: rgba(20, 25, 40, 0.85); /* 卡片背景 - 提高透明度 */
+    --border-glow: rgba(0, 243, 255, 0.4);
+    --text-primary: #ffffff;         /* 主要文字 */
+    --text-secondary: #a0aec0;       /* 次要文字 */
+    --text-highlight: #ffffff;       /* 高亮文字 */
+    --text-glow: #00f3ff;            /* 发光文字 */
+    --shadow-tech: 0 8rpx 24rpx rgba(0, 0, 0, 0.5);
+    --shadow-glow: 0 0 20rpx rgba(0, 243, 255, 0.25);
+  }
+  
+  /* 全局页面样式 - 修复背景 */
+  .shangjia-chongzhi-page {
+    padding: 20rpx 20rpx 100rpx;
+    color: var(--text-primary);
+    min-height: 100vh;
+    background: linear-gradient(145deg, 
+      var(--dark-bg) 0%, 
+      var(--medium-bg) 50%, 
+      var(--light-bg) 100%
+    ) !important;
+    position: relative;
+    overflow-x: hidden;
+  }
+  
+  /* 移除过强的毛玻璃效果，只保留轻微模糊 */
+  .shangjia-chongzhi-page::before {
+    display: none; /* 移除网格背景 */
+  }
+  
+  /* ========== 余额卡片样式 - 完全重写 ========== */
+  .balance-card {
+    background: rgba(20, 25, 40, 0.9); /* 降低透明度，提高文字可见性 */
+    border-radius: 25rpx;
+    padding: 35rpx 25rpx;
+    margin: 0 0 35rpx;
+    position: relative;
+    overflow: hidden;
+    border: 1.5rpx solid rgba(0, 243, 255, 0.3);
+    box-shadow: 
+      var(--shadow-tech),
+      var(--shadow-glow),
+      inset 0 0 15rpx rgba(0, 243, 255, 0.08);
+    z-index: 1;
+    /* 移除或大幅降低毛玻璃效果 */
+    backdrop-filter: blur(2px);
+  }
+  
+  /* 余额头部 */
+  .balance-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 35rpx;
+  }
+  
+  /* 余额标题 - 确保文字在最上层，完全可见 */
+  .balance-title {
+    position: relative;
+    z-index: 10; /* 确保在最上层 */
+  }
+  
+  .title-text {
+    font-size: 38rpx;
+    font-weight: 800;
+    letter-spacing: 1.5rpx;
+    color: var(--text-primary) !important; /* 强制使用白色，确保可见 */
+    text-shadow: 
+      0 0 15rpx rgba(0, 243, 255, 0.8),
+      0 0 30rpx rgba(0, 243, 255, 0.4),
+      0 0 45rpx rgba(0, 243, 255, 0.2);
+    position: relative;
+    display: inline-block;
+    /* 移除背景渐变，直接用纯色加阴影 */
+    background: none;
+    -webkit-background-clip: initial;
+    background-clip: initial;
+    filter: brightness(1.2);
+  }
+  
+  /* 标题下划线装饰 */
+  .title-decoration {
+    display: flex;
+    align-items: center;
+    margin-top: 12rpx;
+  }
+  
+  .decoration-line {
+    width: 50rpx;
+    height: 3rpx;
+    background: linear-gradient(90deg, 
+      transparent, 
+      var(--primary-color), 
+      transparent
+    );
+    border-radius: 2rpx;
+    animation: lineFlow 2s ease-in-out infinite;
+  }
+  
+  .decoration-dot {
+    width: 8rpx;
+    height: 8rpx;
+    background: var(--secondary-color);
+    border-radius: 50%;
+    margin: 0 12rpx;
+    animation: pulse 1.5s infinite;
+    box-shadow: 0 0 8rpx var(--secondary-color);
+  }
+  
+  @keyframes pulse {
+    0%, 100% { 
+      transform: scale(1); 
+      opacity: 1; 
+    }
+    50% { 
+      transform: scale(1.3); 
+      opacity: 0.8; 
+    }
+  }
+  
+  @keyframes lineFlow {
+    0% { background-position: -100% 0; }
+    100% { background-position: 200% 0; }
+  }
+  
+  /* VIP商家标签 */
+  .balance-chip {
+    background: linear-gradient(90deg, 
+      rgba(0, 243, 255, 0.15), 
+      rgba(255, 42, 109, 0.15)
+    );
+    border: 1rpx solid rgba(0, 243, 255, 0.3);
+    border-radius: 20rpx;
+    padding: 10rpx 20rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 44rpx;
+    min-width: 180rpx;
+    box-shadow: 
+      0 4rpx 12rpx rgba(0, 243, 255, 0.2),
+      inset 0 0 8rpx rgba(0, 243, 255, 0.1);
+    position: relative;
+    z-index: 10; /* 确保在最上层 */
+  }
+  
+  .chip-text {
+    font-size: 24rpx;
+    font-weight: 600;
+    color: var(--text-primary) !important;
+    text-align: center;
+    letter-spacing: 1rpx;
+    position: relative;
+    z-index: 2;
+  }
+  
+  /* 余额金额展示 - 完全重写，确保数字可见 */
+  .balance-amount {
+    text-align: center;
+    margin: 35rpx 0;
+    position: relative;
+    z-index: 10; /* 确保在最上层 */
+  }
+  
+  .currency {
+    font-size: 44rpx;
+    font-weight: 800;
+    color: var(--accent-color) !important; /* 使用金色，确保可见 */
+    margin-right: 8rpx;
+    text-shadow: 
+      0 0 20rpx rgba(255, 215, 0, 0.7),
+      0 0 40rpx rgba(255, 215, 0, 0.4);
+    display: inline-block;
+    vertical-align: middle;
+    line-height: 1;
+    /* 移除渐变背景，直接用纯色 */
+    background: none;
+    -webkit-background-clip: initial;
+    background-clip: initial;
+  }
+  
+  .amount {
+    font-size: 76rpx;
+    font-weight: 900;
+    color: var(--text-primary) !important; /* 强制使用白色 */
+    line-height: 1;
+    text-shadow: 
+      0 0 20rpx rgba(0, 243, 255, 0.8),
+      0 0 40rpx rgba(0, 243, 255, 0.5),
+      0 0 60rpx rgba(0, 243, 255, 0.3);
+    letter-spacing: -1.5rpx;
+    display: inline-block;
+    position: relative;
+    vertical-align: middle;
+    margin: 0 5rpx;
+    /* 移除渐变背景，直接用纯色加阴影 */
+    background: none;
+    -webkit-background-clip: initial;
+    background-clip: initial;
+  }
+  
+  .amount::after {
+    display: none; /* 移除模糊效果 */
+  }
+  
+  .unit {
+    font-size: 30rpx;
+    color: var(--text-secondary);
+    margin-left: 8rpx;
+    font-weight: 500;
+    vertical-align: middle;
+    line-height: 1;
+  }
+  
+  /* 余额底部标签 */
+  .balance-footer {
+    display: flex;
+    justify-content: center;
+    gap: 30rpx;
+    margin-top: 30rpx;
+    position: relative;
+    z-index: 10;
+  }
+  
+  .balance-tag {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: rgba(0, 243, 255, 0.08);
+    padding: 10rpx 22rpx;
+    border-radius: 18rpx;
+    border: 1rpx solid rgba(0, 243, 255, 0.2);
+    min-width: 150rpx;
+  }
+  
+  .tag-text {
+    font-size: 24rpx;
+    font-weight: 600;
+    color: var(--primary-light) !important;
+    text-align: center;
+    letter-spacing: 1rpx;
+  }
+  
+  /* 机甲装饰元素 - 调低透明度，不干扰文字 */
+  .mech-decoration {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    pointer-events: none;
+    z-index: 1; /* 在背景层，不在文字上层 */
+    opacity: 0.3;
+  }
+  
+  .mech-line {
+    position: absolute;
+    background: linear-gradient(90deg, 
+      transparent 0%, 
+      var(--primary-color) 50%, 
+      transparent 100%
+    );
+    opacity: 0.15;
+  }
+  
+  .line-1 {
+    top: 15rpx;
+    left: 15rpx;
+    right: 15rpx;
+    height: 1.5rpx;
+    animation: lineFlow 3s ease-in-out infinite;
+  }
+  
+  .line-2 {
+    bottom: 15rpx;
+    left: 15rpx;
+    right: 15rpx;
+    height: 1.5rpx;
+    animation: lineFlow 3s ease-in-out infinite reverse;
+  }
+  
+  .mech-corner {
+    position: absolute;
+    width: 18rpx;
+    height: 18rpx;
+    border: 1.5rpx solid var(--primary-color);
+    opacity: 0.2;
+  }
+  
+  .corner-1 {
+    top: 15rpx;
+    left: 15rpx;
+    border-right: none;
+    border-bottom: none;
+    border-top-left-radius: 6rpx;
+  }
+  
+  .corner-2 {
+    top: 15rpx;
+    right: 15rpx;
+    border-left: none;
+    border-bottom: none;
+    border-top-right-radius: 6rpx;
+  }
+  
+  .corner-3 {
+    bottom: 15rpx;
+    left: 15rpx;
+    border-right: none;
+    border-top: none;
+    border-bottom-left-radius: 6rpx;
+  }
+  
+  .corner-4 {
+    bottom: 15rpx;
+    right: 15rpx;
+    border-left: none;
+    border-top: none;
+    border-bottom-right-radius: 6rpx;
+  }
+  
+  /* ========== 充值金额区域 ========== */
+  .amount-section {
+    background: rgba(25, 30, 48, 0.9);
+    border-radius: 25rpx;
+    padding: 35rpx 25rpx;
+    margin-bottom: 35rpx;
+    border: 1rpx solid rgba(255, 255, 255, 0.08);
+    backdrop-filter: blur(4px);
+    box-shadow: 
+      var(--shadow-tech),
+      inset 0 0 15rpx rgba(0, 243, 255, 0.05);
+    position: relative;
+    z-index: 1;
+  }
+  
+  .section-header {
+    margin-bottom: 35rpx;
+  }
+  
+  .section-title {
+    font-size: 34rpx;
+    font-weight: 700;
+    color: var(--text-primary) !important;
+    display: block;
+    margin-bottom: 12rpx;
+    letter-spacing: 1rpx;
+    text-shadow: 0 0 10rpx rgba(255, 255, 255, 0.2);
+    position: relative;
+    z-index: 10;
+  }
+  
+  .section-subtitle {
+    display: flex;
+    align-items: center;
+  }
+  
+  .subtitle-text {
+    font-size: 26rpx;
+    color: var(--text-secondary);
+    position: relative;
+    z-index: 10;
+  }
+  
+  /* 快捷金额网格 */
+  .quick-amount-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 18rpx;
+    margin-bottom: 35rpx;
+  }
+  
+  .amount-item {
+    background: rgba(255, 255, 255, 0.05);
+    border: 2rpx solid rgba(255, 255, 255, 0.12);
+    border-radius: 18rpx;
+    padding: 26rpx 10rpx;
+    text-align: center;
+    position: relative;
+    transition: all 0.2s ease;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-height: 85rpx;
+    overflow: hidden;
+  }
+  
+  .amount-item:active {
+    transform: scale(0.96);
+  }
+  
+  .amount-item.active {
+    background: linear-gradient(135deg, 
+      rgba(0, 243, 255, 0.15), 
+      rgba(157, 78, 221, 0.15)
+    );
+    border-color: var(--primary-color);
+    transform: translateY(-3rpx);
+    box-shadow: 
+      0 10rpx 25rpx rgba(0, 243, 255, 0.2),
+      0 0 30rpx rgba(0, 243, 255, 0.1),
+      inset 0 0 12rpx rgba(0, 243, 255, 0.1);
+  }
+  
+  .amount-text {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: var(--text-primary) !important;
+    position: relative;
+    z-index: 10;
+    transition: all 0.3s;
+  }
+  
+  .amount-item.active .amount-text {
+    color: var(--text-highlight) !important;
+    text-shadow: 0 0 10rpx var(--primary-color);
+  }
+  
+  .amount-halo {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 90%;
+    height: 90%;
+    background: radial-gradient(
+      circle at center,
+      rgba(0, 243, 255, 0.2) 0%,
+      transparent 70%
+    );
+    border-radius: 50%;
+    animation: haloPulse 2s ease-in-out infinite;
+    opacity: 0;
+    z-index: 1; /* 在文字下面 */
+  }
+  
+  .amount-item.active .amount-halo {
+    opacity: 1;
+  }
+  
+  @keyframes haloPulse {
+    0%, 100% { 
+      opacity: 0.4; 
+      transform: translate(-50%, -50%) scale(1); 
+    }
+    50% { 
+      opacity: 0.6; 
+      transform: translate(-50%, -50%) scale(1.1); 
+    }
+  }
+  
+  /* 自定义金额输入 - 改为线条样式 */
+  .custom-amount {
+    background: transparent;
+    border-radius: 0;
+    padding: 0;
+    border: none;
+    width: 100%;
+    box-sizing: border-box;
+  }
+  
+  .custom-input-wrapper {
+    position: relative;
+    margin-bottom: 20rpx;
+    width: 100%;
+    padding-bottom: 10rpx;
+  }
+  
+  .input-label {
+    position: absolute;
+    left: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    font-size: 42rpx;
+    font-weight: 800;
+    color: var(--accent-color) !important;
+    text-shadow: 0 0 10rpx rgba(255, 215, 0, 0.5);
+    z-index: 10;
+    padding-left: 10rpx;
+  }
+  
+  .custom-input {
+    background: transparent;
+    border: none;
+    padding: 30rpx 20rpx 30rpx 60rpx;
+    font-size: 42rpx;
+    font-weight: 800;
+    color: var(--text-primary) !important;
+    width: 100%;
+    text-align: left;
+    caret-color: var(--primary-color);
+    border-radius: 0;
+    border-bottom: 2rpx solid rgba(255, 255, 255, 0.15);
+    transition: all 0.3s ease;
+    box-sizing: border-box;
+    height: 80rpx;
+  }
+  
+  .custom-input:focus {
+    border-bottom-color: var(--primary-color);
+    box-shadow: 0 0 15rpx rgba(0, 243, 255, 0.3);
+  }
+  
+  .placeholder {
+    color: rgba(160, 174, 192, 0.6) !important;
+    font-size: 34rpx;
+    font-weight: 500;
+  }
+  
+  .input-line {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 3rpx;
+    background: rgba(255, 255, 255, 0.1);
+    transition: all 0.3s ease;
+  }
+  
+  .input-line.active {
+    background: linear-gradient(90deg, 
+      var(--primary-color), 
+      var(--secondary-color), 
+      var(--primary-color)
+    );
+    height: 3rpx;
+    box-shadow: 0 0 15rpx var(--primary-color);
+    animation: lineFlash 1.5s ease-in-out infinite;
+  }
+  
+  @keyframes lineFlash {
+    0%, 100% { opacity: 0.8; }
+    50% { opacity: 1; }
+  }
+  
+  .amount-hint {
+    font-size: 24rpx;
+    color: var(--text-secondary);
+    text-align: center;
+    display: block;
+    margin-top: 15rpx;
+  }
+  
+  /* ========== 支付按钮区域 ========== */
+  .pay-section {
+    margin-top: 40rpx;
+  }
+  
+  .pay-button-wrapper {
+    width: 100%;
+  }
+  
+  /* 支付按钮 - 修复颜色问题 */
+  .pay-button {
+    width: 100%;
+    height: 100rpx;
+    background: linear-gradient(135deg, 
+      rgba(100, 116, 139, 0.8), 
+      rgba(74, 85, 104, 0.8)
+    );
+    border-radius: 22rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
+    transition: all 0.3s ease;
+    border: 1.5rpx solid rgba(255, 255, 255, 0.1);
+    box-shadow: 0 10rpx 25rpx rgba(0, 0, 0, 0.4);
+  }
+  
+  /* 激活状态 - 修复为科技蓝渐变 */
+  .pay-button.active {
+    background: linear-gradient(135deg, 
+      #008ca3,  /* 深蓝 */
+      #00b8d4,  /* 中蓝 */
+      #00f3ff   /* 亮蓝 */
+    );
+    border: 1.5rpx solid rgba(0, 243, 255, 0.6);
+    box-shadow: 
+      0 12rpx 35rpx rgba(0, 243, 255, 0.4),
+      0 0 50rpx rgba(0, 243, 255, 0.3),
+      inset 0 0 20rpx rgba(0, 243, 255, 0.15);
+  }
+  
+  .pay-button.active:active {
+    transform: scale(0.98);
+    box-shadow: 
+      0 8rpx 25rpx rgba(0, 243, 255, 0.4),
+      0 0 35rpx rgba(0, 243, 255, 0.3),
+      inset 0 0 15rpx rgba(0, 243, 255, 0.15);
+  }
+  
+  /* 按钮闪光特效 */
+  .pay-button-shine {
+    position: absolute;
+    top: -50%;
+    left: -50%;
+    width: 200%;
+    height: 200%;
+    background: linear-gradient(45deg, 
+      transparent 30%, 
+      rgba(255, 255, 255, 0.2) 50%, 
+      transparent 70%
+    );
+    animation: shine 3s infinite linear;
+    z-index: 1;
+    pointer-events: none;
+    opacity: 0;
+  }
+  
+  .pay-button.active .pay-button-shine {
+    opacity: 1;
+  }
+  
+  @keyframes shine {
+    0% { transform: translateX(-100%) translateY(-100%) rotate(45deg); }
+    100% { transform: translateX(100%) translateY(100%) rotate(45deg); }
+  }
+  
+  /* 按钮内容 */
+  .button-content {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+    z-index: 10; /* 确保按钮文字在最上层 */
+    width: 100%;
+    height: 100%;
+  }
+  
+  .button-text {
+    font-size: 38rpx;
+    font-weight: 800;
+    color: rgba(255, 255, 255, 0.9);
+    letter-spacing: 2rpx;
+    text-shadow: 0 0 5rpx rgba(0, 0, 0, 0.5);
+  }
+  
+  .pay-button.active .button-text {
+    color: white !important;
+    text-shadow: 
+      0 0 12rpx rgba(255, 255, 255, 0.8),
+      0 0 25rpx rgba(0, 243, 255, 0.6);
+  }
+  
+  /* ========== 支付状态提示 ========== */
+  .payment-status {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(10, 14, 23, 0.95);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 1000;
+    backdrop-filter: blur(10rpx);
+  }
+  
+  .status-content {
+    background: linear-gradient(135deg, 
+      rgba(25, 30, 48, 0.95), 
+      rgba(40, 47, 75, 0.95)
+    );
+    border-radius: 28rpx;
+    padding: 60rpx 40rpx;
+    text-align: center;
+    max-width: 500rpx;
+    width: 85%;
+    border: 2rpx solid var(--primary-color);
+    box-shadow: 
+      0 20rpx 50rpx rgba(0, 0, 0, 0.6),
+      0 0 50rpx rgba(0, 243, 255, 0.4);
+    position: relative;
+    overflow: hidden;
+    animation: statusAppear 0.3s ease-out;
+  }
+  
+  @keyframes statusAppear {
+    0% { opacity: 0; transform: scale(0.9); }
+    100% { opacity: 1; transform: scale(1); }
+  }
+  
+  .status-text {
+    font-size: 36rpx;
+    font-weight: 800;
+    color: var(--text-primary) !important;
+    display: block;
+    margin-bottom: 15rpx;
+    text-shadow: 0 0 10rpx rgba(0, 243, 255, 0.6);
+    position: relative;
+    z-index: 10;
+  }
+  
+  .status-subtext {
+    font-size: 28rpx;
+    color: var(--text-secondary);
+    display: block;
+    margin-bottom: 40rpx;
+    line-height: 1.4;
+    position: relative;
+    z-index: 10;
+  }
+  
+  .status-actions {
+    display: flex;
+    justify-content: center;
+    position: relative;
+    z-index: 10;
+  }
+  
+  .action-button {
+    background: linear-gradient(135deg, #008ca3, #00f3ff);
+    border-radius: 20rpx;
+    padding: 20rpx 40rpx;
+    min-width: 200rpx;
+    box-shadow: 
+      0 8rpx 24rpx rgba(0, 243, 255, 0.4),
+      0 0 16rpx rgba(0, 243, 255, 0.3);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.2s ease;
+  }
+  
+  .action-button:active {
+    transform: scale(0.95);
+    box-shadow: 
+      0 4rpx 12rpx rgba(0, 243, 255, 0.4),
+      0 0 8rpx rgba(0, 243, 255, 0.3);
+  }
+  
+  .action-text {
+    font-size: 30rpx;
+    font-weight: bold;
+    color: white;
+    text-align: center;
+    letter-spacing: 1rpx;
+  }
+  
+  /* ========== 加载遮罩 ========== */
+  .loading-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(10, 14, 23, 0.92);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 1001;
+    backdrop-filter: blur(10rpx);
+  }
+  
+  .loading-content {
+    text-align: center;
+    animation: loadingFloat 2s ease-in-out infinite;
+  }
+  
+  @keyframes loadingFloat {
+    0%, 100% { transform: translateY(0); }
+    50% { transform: translateY(-12rpx); }
+  }
+  
+  .loading-spinner {
+    width: 110rpx;
+    height: 110rpx;
+    border: 7rpx solid transparent;
+    border-top: 7rpx solid var(--primary-color);
+    border-right: 7rpx solid var(--secondary-color);
+    border-radius: 50%;
+    animation: spin 1.5s linear infinite;
+    margin: 0 auto 30rpx;
+    box-shadow: 
+      0 0 20rpx var(--primary-color),
+      inset 0 0 12rpx rgba(0, 243, 255, 0.2);
+    position: relative;
+  }
+  
+  @keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+  }
+  
+  .loading-text {
+    font-size: 28rpx;
+    color: var(--text-primary);
+    text-shadow: 0 0 10rpx rgba(0, 243, 255, 0.6);
+    letter-spacing: 1rpx;
+  }
+
+  
+
+
+/* ========== 修复背景颜色和间距 ========== */
+
+/* 1. 调整背景颜色为更亮的科技风 */
+page {
+    background: linear-gradient(135deg, 
+      #0e1424 0%,    /* 调亮深色部分 */
+      #1a2238 50%, 
+      #242d45 100%
+    ) !important;
+    height: 100%;
+  }
+  
+  /* 2. 调整页面整体间距 */
+  .shangjia-chongzhi-page {
+    padding: 20rpx 20rpx 100rpx !important; /* 稍微增加边距 */
+    background: transparent !important;
+    min-height: 100vh;
+  }
+  
+  /* 3. 调整余额卡片 */
+  .balance-card {
+    margin: 0 0 30rpx !important; /* 增加下方间距 */
+    padding: 35rpx 25rpx !important; /* 增加内边距 */
+    border-radius: 25rpx !important;
+    background: rgba(25, 30, 48, 0.9) !important; /* 调亮背景 */
+    border: 1.5rpx solid rgba(0, 243, 255, 0.4) !important; /* 加强边框 */
+  }
+  
+  /* 4. 调整余额字体和颜色 - 确保可见 */
+  .balance-amount {
+    margin: 30rpx 0 !important;
+  }
+  
+  .currency {
+    font-size: 42rpx !important;
+    color: #ffd700 !important; /* 使用更亮的金色 */
+    text-shadow: 0 0 20rpx rgba(255, 215, 0, 0.8) !important;
+  }
+  
+  .amount {
+    font-size: 72rpx !important; /* 稍微调大 */
+    color: #ffffff !important;
+    text-shadow: 
+      0 0 25rpx rgba(0, 243, 255, 0.8),
+      0 0 50rpx rgba(0, 243, 255, 0.5) !important;
+  }
+  
+  .unit {
+    font-size: 30rpx !important;
+    color: #a0aec0 !important; /* 调亮灰色 */
+  }
+  
+  /* 5. 调整充值金额区域 */
+  .amount-section {
+    margin-bottom: 30rpx !important;
+    padding: 30rpx 25rpx !important;
+    border-radius: 25rpx !important;
+    background: rgba(30, 35, 55, 0.9) !important; /* 调亮背景 */
+  }
+  
+  /* 6. 调整快捷金额网格 */
+  .quick-amount-grid {
+    gap: 18rpx !important;
+    margin-bottom: 30rpx !important;
+  }
+  
+  .amount-item {
+    min-height: 125rpx !important; /* 增加高度 */
+    padding: 25rpx 10rpx !important;
+  }
+  
+  .amount-text {
+    font-size: 32rpx !important;
+    color: #ffffff !important;
+  }
+  
+  /* 7. 调整输入区域 - 修复占位符溢出问题 */
+  .custom-amount {
+    margin-top: 20rpx !important; /* 增加上方间距 */
+  }
+  
+  .custom-input-wrapper {
+    margin-bottom: 20rpx !important;
+    padding-bottom: 15rpx !important; /* 增加底部间距 */
+  }
+  
+  .custom-input {
+    padding: 28rpx 20rpx 28rpx 60rpx !important;
+    height: 145rpx !important; /* 增加高度，让内容有足够空间 */
+    font-size: 40rpx !important;
+    color: #ffffff !important;
+    border-bottom: 2rpx solid rgba(255, 255, 255, 0.2) !important;
+  }
+  
+  .custom-input:focus {
+    border-bottom-color: #00f3ff !important;
+    box-shadow: 0 0 20rpx rgba(0, 243, 255, 0.4) !important;
+  }
+  
+  .input-label {
+    font-size: 40rpx !important;
+    color: #ffd700 !important; /* 使用金色 */
+    text-shadow: 0 0 15rpx rgba(255, 215, 0, 0.6) !important;
+    top: 50% !important;
+    transform: translateY(-50%) !important;
+  }
+  
+  .placeholder {
+    color: rgba(160, 174, 192, 0.8) !important; /* 调亮占位符 */
+    font-size: 34rpx !important;
+    font-weight: 500 !important;
+  }
+  
+  /* 8. 调整按钮区域 */
+  .pay-section {
+    margin-top: 65rpx !important;
+  }
+  
+  .pay-button {
+    height: 100rpx !important; /* 恢复适当高度 */
+    border-radius: 22rpx !important;
+  }
+  
+  .pay-button.active {
+    background: linear-gradient(135deg, 
+      #0099b0,  /* 更亮的蓝 */
+      #00ccff,  /* 亮蓝 */
+      #00f3ff   /* 最亮蓝 */
+    ) !important;
+    border: 1.5rpx solid rgba(0, 243, 255, 0.8) !important;
+  }
+  
+  .button-text {
+    font-size: 36rpx !important;
+    color: #ffffff !important;
+    text-shadow: 0 0 10rpx rgba(0, 243, 255, 0.8) !important;
+  }
+  
+  /* 9. 调整标题文字颜色 - 确保清晰可见 */
+  .title-text {
+    font-size: 36rpx !important;
+    color: #ffffff !important;
+    text-shadow: 
+      0 0 20rpx rgba(0, 243, 255, 0.8),
+      0 0 40rpx rgba(0, 243, 255, 0.4) !important;
+  }
+  
+  .section-title {
+    font-size: 34rpx !important;
+    color: #ffffff !important;
+    text-shadow: 0 0 15rpx rgba(255, 255, 255, 0.3) !important;
+  }
+  
+  .subtitle-text, 
+  .amount-hint {
+    color: #b8c2cc !important; /* 调亮灰色文字 */
+    font-size: 26rpx !important;
+  }
+  
+  /* 10. 调整卡片文字颜色 */
+  .chip-text {
+    color: #ffffff !important;
+    text-shadow: 0 0 8rpx rgba(0, 243, 255, 0.6) !important;
+  }
+  
+  .tag-text {
+    color: #4dfbff !important; /* 使用亮科技蓝 */
+    text-shadow: 0 0 8rpx rgba(0, 243, 255, 0.4) !important;
+  }
+  
+  /* 11. 增强装饰元素可见性（但不干扰文字） */
+  .mech-line {
+    opacity: 0.25 !important; /* 稍微增强可见性 */
+  }
+  
+  .mech-corner {
+    opacity: 0.3 !important; /* 稍微增强可见性 */
+  }
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
\ No newline at end of file
diff --git a/pages/sjddxq/sjddxq.js b/pages/sjddxq/sjddxq.js
new file mode 100644
index 0000000..b7fb27a
--- /dev/null
+++ b/pages/sjddxq/sjddxq.js
@@ -0,0 +1,835 @@
+// pages/sjddxq/sjddxq.js - 商家订单详情（完整版，已添加罚款/退款操作及教程按钮）
+const app = getApp()
+import request from '../../utils/request.js'
+import PopupService from '../../services/popupService.js'   // 新增：导入弹窗服务
+
+Page({
+  data: {
+    jibenShuju: {
+      dingdan_id: '', tupian: '', jieshao: '', create_time: '',
+      jine: '', nicheng: '', beizhu: '', zhuangtai: 0, fadanpingtai: 0
+    },
+    dashouInfo: { yonghuid: '', nicheng: '', avatar: '' },
+    xiangxiShuju: {
+      dashou_jiaofu: [], dashou_liuyan: '', tuikuan_liyou: '', shangjia_liuyan: ''
+    },
+    fadanData: null,
+    fenhongLilv: 0,
+    xinDingdanId: '',
+    zhuangtaiYanseMap: {
+      1: '#E8F5E9', 2: '#E3F2FD', 3: '#F3E5F5', 4: '#FFF3E0',
+      5: '#FFEBEE', 6: '#EFEBE9', 7: '#E0F7FA', 8: '#FFF8E1'
+    },
+    zhuangtaiWenziMap: {
+      1: '已下单', 2: '进行中', 3: '已完成', 4: '退款中',
+      5: '已退款', 6: '退款失败', 7: '指定中', 8: '结算中'
+    },
+    isLoading: true,
+    showChexiaoModal: false, chexiaoLiyou: '', isChexiaoLoading: false,
+    showTuikuanModal: false, tuikuanLiyou: '', isTuikuanLoading: false,
+    showFakuanModal: false, fakuanLiyou: '', fakuanJine: '', yingxiangQiangdan: true, isFakuanLoading: false,
+    showGhDashouModal: false, isGhDashouLoading: false,
+    showJiesuanConfirm: false, isJiesuanLoading: false,
+    jiesuanPingfen: 0, jiesuanLiuyan: '',
+    xingxingData: [
+      { id: 1, active: false }, { id: 2, active: false }, { id: 3, active: false },
+      { id: 4, active: false }, { id: 5, active: false }
+    ],
+    currentIMUserId: '',
+
+    // ========== 新增：罚单/订单操作弹窗控制 ==========
+    showModifyFakuanModal: false,     // 修改罚款弹窗
+    modifyFakuanLiyou: '',            // 修改后的罚款理由
+    modifyFakuanJine: '',             // 修改后的罚款金额
+    showCancelFakuanModal: false,     // 撤销罚款弹窗
+    cancelFakuanLiyou: '',            // 撤销驳回理由
+    showResubmitFakuanModal: false,   // 再次申请罚款弹窗
+    resubmitFakuanLiyou: '',          // 再次申请的理由
+    resubmitFakuanJine: '',           // 再次申请的金额
+    showCancelTuikuanModal: false,    // 撤销退款申请弹窗
+    cancelTuikuanLiyou: '',           // 撤销退款理由
+    showModifyTuikuanModal: false,    // 修改退款理由弹窗
+    modifyTuikuanLiyou: '',           // 修改后的退款理由
+    // 教程按钮状态
+    tutorialBtnHidden: false
+  },
+
+  onLoad(options) {
+    wx.setNavigationBarTitle({ title: '订单详情' })
+    this.ensureIMConnection()
+    this.jiexiTiaozhuanCanshu(options)
+    // 新增：启动教程按钮定时器
+    this.startTutorialBtnTimer()
+  },
+
+  onShow() {
+    this.registerNotificationComponent()
+    this.ensureIMConnection()
+  },
+
+  onHide() {
+    // 页面隐藏时重置弹窗服务状态，避免影响其他页面
+    PopupService.reset()
+  },
+
+  onUnload() {
+    // 清除缩进定时器，避免内存泄漏
+    if (this.tutorialTimer) {
+      clearTimeout(this.tutorialTimer)
+    }
+    // 页面卸载时重置弹窗服务
+    PopupService.reset()
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification')
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      }
+    }
+  },
+
+  ensureIMConnection() {
+    const uid = wx.getStorageSync('uid')
+    if (!uid) return
+    const targetUserId = 'Sj' + uid
+    if (wx.goEasy && wx.goEasy.getConnectionStatus) {
+      const status = wx.goEasy.getConnectionStatus()
+      if (status === 'connected' || status === 'reconnected') {
+        const currentUserId = wx.goEasy.im ? wx.goEasy.im.userId : null
+        if (currentUserId === targetUserId) {
+          this.setData({ currentIMUserId: targetUserId })
+          return
+        } else {
+          wx.goEasy.disconnect()
+        }
+      }
+    }
+    this.connectGoEasy(targetUserId)
+  },
+
+  connectGoEasy(userId) {
+    let currentUser = app.globalData.currentUser
+    if (!currentUser) {
+      const uid = wx.getStorageSync('uid')
+      currentUser = {
+        id: uid,
+        name: '用户' + (uid ? uid.substring(0, 6) : ''),
+        avatar: app.globalData.ossImageUrl + app.globalData.morentouxiang
+      }
+    }
+    wx.goEasy.connect({
+      id: userId,
+      data: {
+        name: currentUser.name,
+        avatar: currentUser.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
+      },
+      onSuccess: () => {
+        this.setData({ currentIMUserId: userId })
+        try {
+          wx.setStorageSync('savedGoEasyConnection', JSON.stringify({
+            userId, identityType: 'shangjia', lastConnectTime: Date.now()
+          }))
+          wx.setStorageSync('goEasyUserId', userId)
+        } catch (e) {}
+      },
+      onFailed: (error) => {
+        if (error.code === 408) {
+          this.setData({ currentIMUserId: userId })
+        } else {
+          console.error('IM连接失败', error)
+        }
+      }
+    })
+  },
+
+  jiexiTiaozhuanCanshu(options) {
+    try {
+      const dingdanDataStr = options.dingdanData || ''
+      if (!dingdanDataStr) {
+        wx.showToast({ title: '订单数据错误', icon: 'none' })
+        setTimeout(() => wx.navigateBack(), 1500)
+        return
+      }
+      const dingdanData = JSON.parse(decodeURIComponent(dingdanDataStr))
+      let tupianUrl = dingdanData.tupian || ''
+      if (!tupianUrl) tupianUrl = this.getTupianUrl()
+      let jine = parseFloat(dingdanData.jine || 0)
+      if (isNaN(jine)) jine = 0
+      this.setData({
+        'jibenShuju.dingdan_id': dingdanData.dingdan_id || '',
+        'jibenShuju.tupian': tupianUrl,
+        'jibenShuju.jieshao': dingdanData.jieshao || '',
+        'jibenShuju.create_time': dingdanData.create_time || '',
+        'jibenShuju.jine': jine.toFixed(2),
+        'jibenShuju.nicheng': dingdanData.nicheng || '',
+        'jibenShuju.beizhu': dingdanData.beizhu || '',
+        'jibenShuju.zhuangtai': dingdanData.zhuangtai || 0,
+        'jibenShuju.fadanpingtai': dingdanData.fadanpingtai || 0,
+        isLoading: false
+      })
+      this.jiazaiXiangxiShuju(dingdanData.dingdan_id)
+    } catch (error) {
+      console.error('解析订单数据失败', error)
+      wx.showToast({ title: '数据解析失败', icon: 'none' })
+      setTimeout(() => wx.navigateBack(), 1500)
+    }
+  },
+
+  getTupianUrl() {
+    const cacheTouxiang = wx.getStorageSync('touxiang') || ''
+    let tupianPath = cacheTouxiang || app.globalData.morentouxiang || ''
+    const ossImageUrl = app.globalData.ossImageUrl || ''
+    if (tupianPath && ossImageUrl) {
+      if (tupianPath.startsWith('/')) tupianPath = tupianPath.substring(1)
+      return ossImageUrl + tupianPath
+    }
+    return ''
+  },
+
+  async jiazaiXiangxiShuju(dingdanId) {
+    if (!dingdanId) return
+    try {
+      const res = await request({
+        url: '/dingdan/sjddxq',
+        method: 'POST',
+        data: { dingdan_id: dingdanId },
+        header: { 'content-type': 'application/json' }
+      })
+      if (res && res.data.code === 0 && res.data.data) {
+        const d = res.data.data
+        let jiaofuList = d.dashou_jiaofu || []
+        jiaofuList = jiaofuList.map(url => {
+          if (url && !url.startsWith('http')) {
+            const oss = app.globalData.ossImageUrl || ''
+            return oss + url
+          }
+          return url
+        })
+        let dashouAvatar = d.dashou_avatar || ''
+        if (dashouAvatar && !dashouAvatar.startsWith('http')) {
+          dashouAvatar = (app.globalData.ossImageUrl || '') + dashouAvatar
+        }
+        this.setData({
+          'dashouInfo.yonghuid': d.dashou_yonghuid || '',
+          'dashouInfo.nicheng': d.dashou_nicheng || '',
+          'dashouInfo.avatar': dashouAvatar,
+          'xiangxiShuju.dashou_jiaofu': jiaofuList,
+          'xiangxiShuju.dashou_liuyan': d.dashou_liuyan || '',
+          'xiangxiShuju.tuikuan_liyou': d.tuikuan_liyou || '',
+          'xiangxiShuju.shangjia_liuyan': d.shangjia_liuyan || '',
+          fadanData: d.fadan || null,
+          fenhongLilv: parseFloat(d.fenhong_lilv) || 0,
+          xinDingdanId: d.xin_dingdan_id || '',
+          'jibenShuju.zhuangtai': d.zhuangtai || this.data.jibenShuju.zhuangtai
+        })
+      } else {
+        wx.showToast({ title: res?.data?.msg || '获取详情失败', icon: 'none' })
+      }
+    } catch (err) {
+      console.error('加载详情失败', err)
+      wx.showToast({ title: '网络错误', icon: 'none' })
+    }
+  },
+
+  fuzhiWenben(e) {
+    const text = e.currentTarget.dataset.text
+    if (!text) return
+    wx.setClipboardData({ data: text })
+    wx.showToast({ title: '已复制', icon: 'success' })
+  },
+
+  yulanTupian(e) {
+    const current = e.currentTarget.dataset.url
+    const urls = e.currentTarget.dataset.urls || [current]
+    wx.previewImage({ current, urls })
+  },
+
+  goToKefu() {
+    const kefuLink = app.globalData.kefuConfig?.link || ''
+    const corpId = app.globalData.kefuConfig?.enterpriseId || ''
+    if (!kefuLink || !corpId) {
+      wx.showToast({ title: '客服配置未加载', icon: 'none' })
+      return
+    }
+    wx.openCustomerServiceChat({
+      extInfo: { url: kefuLink },
+      corpId: corpId,
+      success: (res) => console.log('跳转客服成功', res),
+      fail: (err) => {
+        console.error('跳转客服失败', err)
+        wx.showToast({ title: '暂时无法连接客服', icon: 'none' })
+      }
+    })
+  },
+
+  // ===== 联系打手（替打手订阅 + 发机器人消息 + 跳转） =====
+  goToChatWithDashou() {
+    const uid = wx.getStorageSync('uid')
+    if (!uid) return
+
+    const orderId = this.data.jibenShuju.dingdan_id
+    if (!orderId) {
+      wx.showToast({ title: '订单ID缺失', icon: 'none' })
+      return
+    }
+
+    const targetUserId = 'Sj' + uid
+    if (this.data.currentIMUserId !== targetUserId) {
+      this.ensureIMConnection()
+      wx.showToast({ title: '连接中，请稍后再试', icon: 'none' })
+      return
+    }
+
+    const that = this
+    const groupName = this.data.jibenShuju.nicheng + '的订单群'
+    const isCross = this.data.jibenShuju.fadanpingtai || 0
+    const dashouUid = this.data.dashouInfo.yonghuid
+
+    // 第一步：商家自己订阅群组
+    wx.goEasy.im.subscribeGroup({
+      groupIds: [orderId],
+      onSuccess: () => {
+        // 如果有打手，则需要帮打手订阅并发送消息
+        if (dashouUid) {
+          that.bangDashouDingyue(orderId, dashouUid)
+            .then(() => {
+              that.tiaozhuanQunLiao(orderId, groupName, isCross)
+            })
+            .catch((err) => {
+              console.error('替打手订阅失败，仍可跳转群聊', err)
+              wx.showToast({ title: '通知打手可能失败', icon: 'none' })
+              that.tiaozhuanQunLiao(orderId, groupName, isCross)
+            })
+        } else {
+          // 无打手，直接跳转
+          that.tiaozhuanQunLiao(orderId, groupName, isCross)
+        }
+      },
+      onFailed: (error) => {
+        console.error('订阅群组失败', error)
+        wx.showToast({ title: '连接群聊失败', icon: 'none' })
+      }
+    })
+  },
+
+  // 帮打手订阅群组 + 发送机器人消息
+  bangDashouDingyue(orderId, dashouUid) {
+    return new Promise((resolve, reject) => {
+      const dashouImId = 'Ds' + dashouUid
+      const appkey = 'BC-32e2991c69bc47e1b538e73aaed37fc1' // 你的GoEasy AppKey
+      const restHost = 'https://rest-hz.goeasy.io'
+
+      // 1. 通过 REST API 为打手订阅群组
+      wx.request({
+        url: restHost + '/v2/im/subscribe-groups',
+        method: 'POST',
+        header: { 'content-type': 'application/json' },
+        data: {
+          appkey: appkey,
+          userIds: [dashouImId],
+          groupIds: [orderId]
+        },
+        success: (res) => {
+          if (res.data.code === 200) {
+            // 2. 订阅成功后，以打手身份发送一条系统消息
+            wx.request({
+              url: restHost + '/v2/im/message',
+              method: 'POST',
+              header: { 'content-type': 'application/json' },
+              data: {
+                appkey: appkey,
+                senderId: dashouImId,
+                senderData: { name: '系统通知', avatar: '' },
+                to: {
+                  type: 'group',
+                  id: orderId,
+                  data: { name: '订单群', avatar: '' }
+                },
+                type: 'text',
+                payload: '此消息为系统自动发送，打手看到后会尽快回复您。'
+              },
+              success: (msgRes) => {
+                if (msgRes.data.code === 200) {
+                  resolve()
+                } else {
+                  reject(new Error('发送消息失败'))
+                }
+              },
+              fail: reject
+            })
+          } else {
+            reject(new Error('订阅打手失败'))
+          }
+        },
+        fail: reject
+      })
+    })
+  },
+
+  // 跳转群聊页面
+  tiaozhuanQunLiao(orderId, groupName, isCross) {
+    const param = {
+      groupId: orderId,
+      orderId: orderId,
+      groupName: groupName,
+      groupAvatar: '',
+      isCross: isCross
+    }
+    wx.navigateTo({
+      url: '/pages/qunliaotian/qunliaotian?data=' + encodeURIComponent(JSON.stringify(param))
+    })
+  },
+
+  // ========== 以下所有业务功能完全保持不变 ==========
+  showGhDashouConfirm() { this.setData({ showGhDashouModal: true }) },
+  closeGhDashouModal() { this.setData({ showGhDashouModal: false }) },
+  async tijiaoGhDashou() {
+    if (this.data.isGhDashouLoading) return
+    this.setData({ isGhDashouLoading: true })
+    wx.showLoading({ title: '更换中...', mask: true })
+    try {
+      const res = await request({
+        url: '/dingdan/zxsjghds',
+        method: 'POST',
+        data: { dingdan_id: this.data.jibenShuju.dingdan_id },
+        header: { 'content-type': 'application/json' }
+      })
+      wx.hideLoading()
+      this.setData({ isGhDashouLoading: false, showGhDashouModal: false })
+      if (res && res.data.code === 0) {
+        this.setData({ xinDingdanId: res.data.data?.xin_dingdan_id || '' })
+        wx.showToast({ title: '更换成功', icon: 'success' })
+        this.jiazaiXiangxiShuju(this.data.jibenShuju.dingdan_id)
+      } else {
+        wx.showToast({ title: res?.data?.msg || '更换失败', icon: 'none' })
+      }
+    } catch (err) {
+      wx.hideLoading()
+      this.setData({ isGhDashouLoading: false, showGhDashouModal: false })
+      wx.showToast({ title: '网络错误', icon: 'none' })
+    }
+  },
+
+  showFakuanModal() { this.setData({ showFakuanModal: true, fakuanLiyou: '', fakuanJine: '', yingxiangQiangdan: true }) },
+  closeFakuanModal() { this.setData({ showFakuanModal: false }) },
+  inputFakuanLiyou(e) { this.setData({ fakuanLiyou: e.detail.value.slice(0, 50) }) },
+  inputFakuanJine(e) { this.setData({ fakuanJine: e.detail.value }) },
+  toggleQiangdan() { this.setData({ yingxiangQiangdan: !this.data.yingxiangQiangdan }) },
+  jisuanFenhong() {
+    const jine = parseFloat(this.data.fakuanJine)
+    if (isNaN(jine) || jine <= 0) return '0.00'
+    return (jine * this.data.fenhongLilv).toFixed(2)
+  },
+  async tijiaoFakuan() {
+    const { fakuanLiyou, fakuanJine, jibenShuju, dashouInfo } = this.data
+    if (!fakuanLiyou.trim()) { wx.showToast({ title: '请输入罚款原因', icon: 'none' }); return }
+    const jineNum = parseFloat(fakuanJine)
+    if (isNaN(jineNum) || jineNum <= 0) { wx.showToast({ title: '请输入正确的罚款金额', icon: 'none' }); return }
+    if (this.data.isFakuanLoading) return
+    this.setData({ isFakuanLoading: true })
+    wx.showLoading({ title: '提交中...', mask: true })
+    try {
+      const res = await request({
+        url: '/dingdan/sjfksq',
+        method: 'POST',
+        data: {
+          dingdan_id: jibenShuju.dingdan_id,
+          chufa_liyou: fakuanLiyou,
+          fakuanjine: jineNum.toFixed(2),
+          yingxiang_qiangdan: this.data.yingxiangQiangdan ? 1 : 0,
+          dashou_id: dashouInfo.yonghuid
+        },
+        header: { 'content-type': 'application/json' }
+      })
+      wx.hideLoading()
+      this.setData({ isFakuanLoading: false })
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '罚款申请已提交', icon: 'success' })
+        this.setData({ showFakuanModal: false })
+        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id)
+      } else {
+        wx.showToast({ title: res?.data?.msg || '提交失败', icon: 'none' })
+      }
+    } catch (err) {
+      wx.hideLoading()
+      this.setData({ isFakuanLoading: false })
+      wx.showToast({ title: '网络错误', icon: 'none' })
+    }
+  },
+
+  showChexiaoBtn() { this.setData({ showChexiaoModal: true, chexiaoLiyou: '' }) },
+  closeChexiaoModal() { this.setData({ showChexiaoModal: false }) },
+  shuruChexiaoLiyou(e) { this.setData({ chexiaoLiyou: e.detail.value.slice(0, 50) }) },
+  async tijiaoChexiao() {
+    if (this.data.isChexiaoLoading) return
+    const { chexiaoLiyou, jibenShuju } = this.data
+    if (!chexiaoLiyou.trim()) { wx.showToast({ title: '请输入撤销原因', icon: 'none' }); return }
+    this.setData({ isChexiaoLoading: true })
+    wx.showLoading({ title: '撤销中...', mask: true })
+    try {
+      const res = await request({
+        url: '/dingdan/sjchexiao',
+        method: 'POST',
+        data: { dingdan_id: jibenShuju.dingdan_id, chexiao_liyou: chexiaoLiyou },
+        header: { 'content-type': 'application/json' }
+      })
+      wx.hideLoading()
+      this.setData({ isChexiaoLoading: false })
+      if (res && res.data.code === 0) {
+        this.setData({ 'jibenShuju.zhuangtai': 5, showChexiaoModal: false })
+        wx.showToast({ title: '撤销成功', icon: 'success' })
+      } else {
+        wx.showToast({ title: res?.data?.msg || '撤销失败', icon: 'none' })
+      }
+    } catch (err) {
+      wx.hideLoading()
+      this.setData({ isChexiaoLoading: false })
+      wx.showToast({ title: '网络错误', icon: 'none' })
+    }
+  },
+
+  showTuikuanBtn() { this.setData({ showTuikuanModal: true, tuikuanLiyou: '' }) },
+  closeTuikuanModal() { this.setData({ showTuikuanModal: false }) },
+  shuruTuikuanLiyou(e) { this.setData({ tuikuanLiyou: e.detail.value.slice(0, 50) }) },
+  async tijiaoTuikuan() {
+    if (this.data.isTuikuanLoading) return
+    const { tuikuanLiyou, jibenShuju } = this.data
+    if (!tuikuanLiyou.trim()) { wx.showToast({ title: '请输入退款原因', icon: 'none' }); return }
+    this.setData({ isTuikuanLoading: true })
+    wx.showLoading({ title: '提交中...', mask: true })
+    try {
+      const res = await request({
+        url: '/dingdan/sjtkshenqing',
+        method: 'POST',
+        data: { dingdan_id: jibenShuju.dingdan_id, tuikuan_liyou: tuikuanLiyou },
+        header: { 'content-type': 'application/json' }
+      })
+      wx.hideLoading()
+      this.setData({ isTuikuanLoading: false })
+      if (res && res.data.code === 0) {
+        this.setData({ 'jibenShuju.zhuangtai': 4, showTuikuanModal: false })
+        wx.showToast({ title: '退款申请已提交', icon: 'success' })
+      } else {
+        wx.showToast({ title: res?.data?.msg || '失败', icon: 'none' })
+      }
+    } catch (err) {
+      wx.hideLoading()
+      this.setData({ isTuikuanLoading: false })
+      wx.showToast({ title: '网络错误', icon: 'none' })
+    }
+  },
+
+  dianjiXingxing(e) {
+    const pf = e.currentTarget.dataset.index
+    const newStars = this.data.xingxingData.map((item, idx) => ({ ...item, active: idx < pf }))
+    this.setData({ xingxingData: newStars, jiesuanPingfen: pf })
+  },
+  shuruLiuyan(e) { this.setData({ jiesuanLiuyan: e.detail.value.slice(0, 50) }) },
+  showJiesuanConfirm() { this.setData({ showJiesuanConfirm: true }) },
+  closeJiesuanConfirm() { this.setData({ showJiesuanConfirm: false }) },
+  async tijiaoJiesuan() {
+    if (this.data.isJiesuanLoading) return
+    this.setData({ isJiesuanLoading: true })
+    wx.showLoading({ title: '结算中...', mask: true })
+    try {
+      const res = await request({
+        url: '/dingdan/sjjiesuan',
+        method: 'POST',
+        data: {
+          dingdan_id: this.data.jibenShuju.dingdan_id,
+          pingfen: this.data.jiesuanPingfen,
+          liuyan: this.data.jiesuanLiuyan
+        },
+        header: { 'content-type': 'application/json' }
+      })
+      wx.hideLoading()
+      this.setData({ isJiesuanLoading: false, showJiesuanConfirm: false })
+      if (res && res.data.code === 0) {
+        this.setData({ 'jibenShuju.zhuangtai': 3 })
+        wx.showToast({ title: '结算成功', icon: 'success' })
+      } else {
+        wx.showToast({ title: res?.data?.msg || '结算失败', icon: 'none' })
+      }
+    } catch (err) {
+      wx.hideLoading()
+      this.setData({ isJiesuanLoading: false })
+      wx.showToast({ title: '网络错误', icon: 'none' })
+    }
+  },
+
+  // ========== 新增：罚款操作（修改/撤销/再次申请） ==========
+  // 显示修改罚款弹窗（仅当状态为待缴纳 或 申诉中 时可用）
+  showModifyFakuan() {
+    const status = this.data.fadanData?.zhuangtai;
+    if (status !== 1 && status !== 3) {
+      wx.showToast({ title: '当前状态不可修改罚款', icon: 'none' });
+      return;
+    }
+    this.setData({
+      showModifyFakuanModal: true,
+      modifyFakuanLiyou: this.data.fadanData?.chufaliyou || '',
+      modifyFakuanJine: this.data.fadanData?.fakuanjine || ''
+    });
+  },
+  closeModifyFakuanModal() {
+    this.setData({ showModifyFakuanModal: false });
+  },
+  inputModifyFakuanLiyou(e) {
+    this.setData({ modifyFakuanLiyou: e.detail.value.slice(0, 100) });
+  },
+  inputModifyFakuanJine(e) {
+    this.setData({ modifyFakuanJine: e.detail.value });
+  },
+  async submitModifyFakuan() {
+    const { modifyFakuanLiyou, modifyFakuanJine, fadanData, jibenShuju } = this.data;
+    if (!modifyFakuanLiyou.trim()) {
+      wx.showToast({ title: '请输入罚款理由', icon: 'none' }); return;
+    }
+    const jine = parseFloat(modifyFakuanJine);
+    if (isNaN(jine) || jine <= 0) {
+      wx.showToast({ title: '请输入正确的罚款金额', icon: 'none' }); return;
+    }
+    wx.showLoading({ title: '提交中...', mask: true });
+    try {
+      const res = await request({
+        url: '/dingdan/sjfkxgycx',
+        method: 'POST',
+        data: {
+          operation: 'modify_penalty',
+          fadan_id: fadanData.id,
+          dingdan_id: jibenShuju.dingdan_id,
+          liyou: modifyFakuanLiyou,
+          jine: jine.toFixed(2)
+        }
+      });
+      wx.hideLoading();
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '修改成功', icon: 'success' });
+        this.setData({ showModifyFakuanModal: false });
+        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id); // 刷新数据
+      } else {
+        wx.showToast({ title: res?.data?.msg || '修改失败', icon: 'none' });
+      }
+    } catch (err) {
+      wx.hideLoading();
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  // 显示撤销罚款弹窗（待缴纳/申诉中 可撤销，变为已驳回）
+  showCancelFakuan() {
+    const status = this.data.fadanData?.zhuangtai;
+    if (status !== 1 && status !== 3) {
+      wx.showToast({ title: '当前状态不可撤销罚款', icon: 'none' });
+      return;
+    }
+    this.setData({ showCancelFakuanModal: true, cancelFakuanLiyou: '' });
+  },
+  closeCancelFakuanModal() {
+    this.setData({ showCancelFakuanModal: false });
+  },
+  inputCancelFakuanLiyou(e) {
+    this.setData({ cancelFakuanLiyou: e.detail.value.slice(0, 100) });
+  },
+  async submitCancelFakuan() {
+    const { cancelFakuanLiyou, fadanData, jibenShuju } = this.data;
+    if (!cancelFakuanLiyou.trim()) {
+      wx.showToast({ title: '请输入驳回理由', icon: 'none' }); return;
+    }
+    wx.showLoading({ title: '提交中...', mask: true });
+    try {
+      const res = await request({
+        url: '/dingdan/sjfkxgycx',
+        method: 'POST',
+        data: {
+          operation: 'cancel_penalty',
+          fadan_id: fadanData.id,
+          dingdan_id: jibenShuju.dingdan_id,
+          liyou: cancelFakuanLiyou
+        }
+      });
+      wx.hideLoading();
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '已撤销', icon: 'success' });
+        this.setData({ showCancelFakuanModal: false });
+        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id);
+      } else {
+        wx.showToast({ title: res?.data?.msg || '撤销失败', icon: 'none' });
+      }
+    } catch (err) {
+      wx.hideLoading();
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  // 显示再次申请罚款弹窗（仅当状态为已驳回时可用）
+  showResubmitFakuan() {
+    if (this.data.fadanData?.zhuangtai !== 4) {
+      wx.showToast({ title: '当前状态不可再次申请', icon: 'none' });
+      return;
+    }
+    this.setData({
+      showResubmitFakuanModal: true,
+      resubmitFakuanLiyou: '',
+      resubmitFakuanJine: ''
+    });
+  },
+  closeResubmitFakuanModal() {
+    this.setData({ showResubmitFakuanModal: false });
+  },
+  inputResubmitFakuanLiyou(e) {
+    this.setData({ resubmitFakuanLiyou: e.detail.value.slice(0, 100) });
+  },
+  inputResubmitFakuanJine(e) {
+    this.setData({ resubmitFakuanJine: e.detail.value });
+  },
+  async submitResubmitFakuan() {
+    const { resubmitFakuanLiyou, resubmitFakuanJine, fadanData, jibenShuju } = this.data;
+    if (!resubmitFakuanLiyou.trim()) {
+      wx.showToast({ title: '请输入罚款理由', icon: 'none' }); return;
+    }
+    const jine = parseFloat(resubmitFakuanJine);
+    if (isNaN(jine) || jine <= 0) {
+      wx.showToast({ title: '请输入正确的罚款金额', icon: 'none' }); return;
+    }
+    wx.showLoading({ title: '提交中...', mask: true });
+    try {
+      const res = await request({
+        url: '/dingdan/sjfkxgycx',
+        method: 'POST',
+        data: {
+          operation: 'resubmit_penalty',
+          fadan_id: fadanData.id,
+          dingdan_id: jibenShuju.dingdan_id,
+          liyou: resubmitFakuanLiyou,
+          jine: jine.toFixed(2)
+        }
+      });
+      wx.hideLoading();
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '申请成功', icon: 'success' });
+        this.setData({ showResubmitFakuanModal: false });
+        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id);
+      } else {
+        wx.showToast({ title: res?.data?.msg || '申请失败', icon: 'none' });
+      }
+    } catch (err) {
+      wx.hideLoading();
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  // ========== 新增：订单退款操作（撤销/修改理由） ==========
+  showCancelTuikuan() {
+    if (this.data.jibenShuju.zhuangtai !== 4) {
+      wx.showToast({ title: '只有退款中的订单可撤销', icon: 'none' });
+      return;
+    }
+    this.setData({ showCancelTuikuanModal: true, cancelTuikuanLiyou: '' });
+  },
+  closeCancelTuikuanModal() {
+    this.setData({ showCancelTuikuanModal: false });
+  },
+  inputCancelTuikuanLiyou(e) {
+    this.setData({ cancelTuikuanLiyou: e.detail.value.slice(0, 100) });
+  },
+  async submitCancelTuikuan() {
+    const { cancelTuikuanLiyou, jibenShuju } = this.data;
+    if (!cancelTuikuanLiyou.trim()) {
+      wx.showToast({ title: '请输入撤销理由', icon: 'none' }); return;
+    }
+    wx.showLoading({ title: '撤销中...', mask: true });
+    try {
+      const res = await request({
+        url: '/dingdan/sjfkxgycx',
+        method: 'POST',
+        data: {
+          operation: 'cancel_refund',
+          dingdan_id: jibenShuju.dingdan_id,
+          liyou: cancelTuikuanLiyou
+        }
+      });
+      wx.hideLoading();
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '已撤销退款申请', icon: 'success' });
+        this.setData({ showCancelTuikuanModal: false });
+        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id);
+      } else {
+        wx.showToast({ title: res?.data?.msg || '撤销失败', icon: 'none' });
+      }
+    } catch (err) {
+      wx.hideLoading();
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  showModifyTuikuan() {
+    if (this.data.jibenShuju.zhuangtai !== 4) {
+      wx.showToast({ title: '只有退款中的订单可修改理由', icon: 'none' });
+      return;
+    }
+    this.setData({
+      showModifyTuikuanModal: true,
+      modifyTuikuanLiyou: this.data.xiangxiShuju.tuikuan_liyou || ''
+    });
+  },
+  closeModifyTuikuanModal() {
+    this.setData({ showModifyTuikuanModal: false });
+  },
+  inputModifyTuikuanLiyou(e) {
+    this.setData({ modifyTuikuanLiyou: e.detail.value.slice(0, 100) });
+  },
+  async submitModifyTuikuan() {
+    const { modifyTuikuanLiyou, jibenShuju } = this.data;
+    if (!modifyTuikuanLiyou.trim()) {
+      wx.showToast({ title: '请输入退款理由', icon: 'none' }); return;
+    }
+    wx.showLoading({ title: '修改中...', mask: true });
+    try {
+      const res = await request({
+        url: '/dingdan/sjfkxgycx',
+        method: 'POST',
+        data: {
+          operation: 'modify_refund_reason',
+          dingdan_id: jibenShuju.dingdan_id,
+          liyou: modifyTuikuanLiyou
+        }
+      });
+      wx.hideLoading();
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '修改成功', icon: 'success' });
+        this.setData({ showModifyTuikuanModal: false });
+        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id);
+      } else {
+        wx.showToast({ title: res?.data?.msg || '修改失败', icon: 'none' });
+      }
+    } catch (err) {
+      wx.hideLoading();
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  // ========== 新增：教程按钮 ==========
+  startTutorialBtnTimer() {
+    if (this.tutorialTimer) clearTimeout(this.tutorialTimer);
+    this.tutorialTimer = setTimeout(() => {
+      this.setData({ tutorialBtnHidden: true });
+    }, 5000);
+  },
+  resetTutorialBtn() {
+    if (this.data.tutorialBtnHidden) {
+      this.setData({ tutorialBtnHidden: false });
+    }
+    if (this.tutorialTimer) clearTimeout(this.tutorialTimer);
+    this.tutorialTimer = setTimeout(() => {
+      this.setData({ tutorialBtnHidden: true });
+    }, 5000);
+  },
+  onTutorialBtnTap() {
+    this.resetTutorialBtn();
+    PopupService.checkAndShow(this, 'sjddxq1');
+  }
+})
\ No newline at end of file
diff --git a/pages/sjddxq/sjddxq.json b/pages/sjddxq/sjddxq.json
new file mode 100644
index 0000000..837f016
--- /dev/null
+++ b/pages/sjddxq/sjddxq.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    }
+}
\ No newline at end of file
diff --git a/pages/sjddxq/sjddxq.wxml b/pages/sjddxq/sjddxq.wxml
new file mode 100644
index 0000000..d952ee0
--- /dev/null
+++ b/pages/sjddxq/sjddxq.wxml
@@ -0,0 +1,354 @@
+
+
+<view class="sjddxq-page">
+  
+  <view class="loading-container" wx:if="{{isLoading}}">
+    
+    <view class="loading-spinner"></view>
+    
+    <text class="loading-text">加载中...</text>
+  </view>
+
+  
+  <view class="content-container" wx:if="{{!isLoading}}">
+    
+    <view class="card shangpin-card">
+      
+      <image class="shangpin-img" src="{{jibenShuju.tupian}}" mode="aspectFill"/>
+      
+      <view class="shangpin-text">
+        
+        <text class="jieshao-text">{{jibenShuju.jieshao || '无描述'}}</text>
+      </view>
+    </view>
+
+    
+    <view class="card info-card" style="border-left: 8rpx solid {{zhuangtaiYanseMap[jibenShuju.zhuangtai]}}">
+      <view class="card-title">订单信息</view>
+      
+      <view class="info-row" wx:if="{{jibenShuju.nicheng}}"><text class="label">游戏昵称</text><text class="value">{{jibenShuju.nicheng}}</text></view>
+      
+      <view class="info-row" wx:if="{{jibenShuju.beizhu}}"><text class="label">备注</text><text class="value">{{jibenShuju.beizhu}}</text></view>
+      
+      <view class="info-row"><text class="label">订单ID</text><view class="value-with-copy"><text class="value">{{jibenShuju.dingdan_id}}</text><text class="copy-btn" bindtap="fuzhiWenben" data-text="{{jibenShuju.dingdan_id}}">📋</text></view></view>
+      
+      <view class="info-row"><text class="label">创建时间</text><text class="value">{{jibenShuju.create_time}}</text></view>
+      
+      <view class="info-row"><text class="label">订单金额</text><text class="value price-red">¥{{jibenShuju.jine}}</text></view>
+      
+      <view class="info-row"><text class="label">状态</text><text class="value zhuangtai-text">{{zhuangtaiWenziMap[jibenShuju.zhuangtai]}}</text></view>
+      
+      <view class="refund-actions" wx:if="{{jibenShuju.zhuangtai == 4}}">
+        <view class="action-btn action-cancel" bindtap="showCancelTuikuan">撤销退款申请</view>
+        <view class="action-btn action-modify" bindtap="showModifyTuikuan">修改退款理由</view>
+      </view>
+    </view>
+
+    
+    <view class="card dashou-card" wx:if="{{dashouInfo.yonghuid}}">
+      <view class="card-title">服务打手</view>
+      <view class="dashou-header">
+        
+        <image class="dashou-avatar" src="{{dashouInfo.avatar || '/images/default-avatar.png'}}" mode="aspectFill"/>
+        <view class="dashou-detail">
+          
+          <text class="dashou-nicheng">{{dashouInfo.nicheng || '未知昵称'}}</text>
+          
+          <view class="dashou-id-row"><text class="label">用户ID</text><text class="value">{{dashouInfo.yonghuid}}</text><text class="copy-btn" bindtap="fuzhiWenben" data-text="{{dashouInfo.yonghuid}}">📋</text></view>
+        </view>
+      </view>
+    </view>
+
+    
+    <view class="card service-card" wx:if="{{xiangxiShuju.dashou_jiaofu.length > 0 || xiangxiShuju.dashou_liuyan || xiangxiShuju.tuikuan_liyou || xiangxiShuju.shangjia_liuyan}}">
+      <view class="card-title">服务详情</view>
+      
+      <block wx:if="{{xiangxiShuju.dashou_jiaofu.length > 0}}">
+        <view class="sub-title">交付图片</view>
+        <view class="image-grid">
+          
+          <block wx:for="{{xiangxiShuju.dashou_jiaofu}}" wx:key="index">
+            
+            <view class="grid-img-wrapper">
+              
+              <image class="grid-img" src="{{item}}" mode="aspectFill" bindtap="yulanTupian" data-url="{{item}}" data-urls="{{xiangxiShuju.dashou_jiaofu}}"/>
+            </view>
+          </block>
+        </view>
+      </block>
+      
+      <block wx:if="{{xiangxiShuju.dashou_liuyan}}">
+        <view class="sub-title">打手留言</view>
+        <view class="content-box">{{xiangxiShuju.dashou_liuyan}}</view>
+      </block>
+      
+      <block wx:if="{{xiangxiShuju.tuikuan_liyou}}">
+        <view class="sub-title">退款理由</view>
+        <view class="content-box">{{xiangxiShuju.tuikuan_liyou}}</view>
+      </block>
+      
+      <block wx:if="{{xiangxiShuju.shangjia_liuyan}}">
+        <view class="sub-title">商家留言</view>
+        <view class="content-box">{{xiangxiShuju.shangjia_liuyan}}</view>
+      </block>
+    </view>
+
+    
+    <view class="card fakuan-card" wx:if="{{fadanData}}">
+      <view class="card-title">罚款信息</view>
+      
+      <view class="info-row"><text class="label">罚款金额</text><text class="value price-red">¥{{fadanData.fakuanjine || '0.00'}}</text></view>
+      
+      <view class="info-row"><text class="label">罚款理由</text><text class="value">{{fadanData.chufaliyou || '-'}}</text></view>
+      
+      <view class="info-row"><text class="label">是否影响抢单</text><text class="value">{{fadanData.yingxiang_qiangdan == 1 ? '是' : '否'}}</text></view>
+      
+      <view class="info-row"><text class="label">罚单状态</text><text class="value">{{fadanData.zhuangtai == 1 ? '待缴纳' : fadanData.zhuangtai == 2 ? '已缴纳' : fadanData.zhuangtai == 3 ? '申诉中' : '已驳回'}}</text></view>
+      
+      <block wx:if="{{fadanData.shensuliyou}}"><view class="sub-title">申诉理由</view><view class="content-box">{{fadanData.shensuliyou}}</view></block>
+      
+      <block wx:if="{{fadanData.tongyi_chufaliyou}}"><view class="sub-title">同意处罚理由</view><view class="content-box">{{fadanData.tongyi_chufaliyou}}</view></block>
+      
+      <block wx:if="{{fadanData.bohuiliyou}}"><view class="sub-title">驳回理由</view><view class="content-box">{{fadanData.bohuiliyou}}</view></block>
+      
+      <view class="info-row"><text class="label">创建时间</text><text class="value">{{fadanData.create_time}}</text></view>
+      
+      <view class="info-row"><text class="label">更新时间</text><text class="value">{{fadanData.update_time}}</text></view>
+      
+      <view class="fakuan-actions" wx:if="{{fadanData}}">
+        
+        <block wx:if="{{fadanData.zhuangtai == 1 || fadanData.zhuangtai == 3}}">
+          <view class="action-btn action-modify" bindtap="showModifyFakuan">修改罚款</view>
+          <view class="action-btn action-cancel" bindtap="showCancelFakuan">撤销罚款</view>
+        </block>
+        
+        <block wx:if="{{fadanData.zhuangtai == 4}}">
+          <view class="action-btn action-resubmit" bindtap="showResubmitFakuan">再次申请罚款</view>
+        </block>
+      </view>
+    </view>
+
+    
+    <view class="card new-order-card" wx:if="{{xinDingdanId}}">
+      <view class="card-title">更换打手成功</view>
+      <view class="info-row"><text class="label">新订单ID</text><view class="value-with-copy"><text class="value">{{xinDingdanId}}</text><text class="copy-btn" bindtap="fuzhiWenben" data-text="{{xinDingdanId}}">📋</text></view></view>
+    </view>
+
+    
+    <view class="card jiesuan-card" wx:if="{{jibenShuju.zhuangtai == 8}}">
+      <view class="card-title">订单结算</view>
+      <view class="star-row">
+        <text class="label">打星评分</text>
+        <view class="stars">
+          
+          <block wx:for="{{xingxingData}}" wx:key="id">
+            
+            <text class="star {{item.active ? 'star-active' : ''}}" bindtap="dianjiXingxing" data-index="{{index+1}}">{{item.active ? '★' : '☆'}}</text>
+          </block>
+        </view>
+      </view>
+      
+      <textarea class="liuyan-input" placeholder="留言（选填，50字）" maxlength="50" value="{{jiesuanLiuyan}}" bindinput="shuruLiuyan"/>
+      
+      <view class="jiesuan-btn" bindtap="showJiesuanConfirm">立即结算</view>
+    </view>
+  </view>
+
+  
+  <view class="bottom-bar">
+    
+    <view class="bottom-btn-group">
+      <view class="btn-outline" bindtap="goToKefu">联系客服</view>
+      <view class="btn-outline" bindtap="goToChatWithDashou" wx:if="{{dashouInfo.yonghuid}}">联系打手</view>
+    </view>
+    
+    <view class="bottom-btn-group">
+      
+      <view class="btn-warn" bindtap="showChexiaoBtn" wx:if="{{jibenShuju.zhuangtai == 1 || jibenShuju.zhuangtai == 7}}">撤销订单</view>
+      
+      
+      
+      <view class="btn-danger" bindtap="showTuikuanBtn" wx:if="{{jibenShuju.zhuangtai == 2 || jibenShuju.zhuangtai == 8}}">申请退款</view>
+    </view>
+  </view>
+
+  
+  <view class="modal" wx:if="{{showChexiaoModal}}">
+    <view class="modal-mask" bindtap="closeChexiaoModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">撤销订单<text class="modal-close" bindtap="closeChexiaoModal">×</text></view>
+      <textarea class="modal-input" placeholder="输入撤销原因（最多50字）" maxlength="50" value="{{chexiaoLiyou}}" bindinput="shuruChexiaoLiyou"/>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeChexiaoModal">取消</view>
+        <view class="modal-btn confirm" bindtap="tijiaoChexiao">{{isChexiaoLoading ? '处理中' : '确认撤销'}}</view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="modal" wx:if="{{showTuikuanModal}}">
+    <view class="modal-mask" bindtap="closeTuikuanModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">申请退款<text class="modal-close" bindtap="closeTuikuanModal">×</text></view>
+      <textarea class="modal-input" placeholder="输入退款原因（最多50字）" maxlength="50" value="{{tuikuanLiyou}}" bindinput="shuruTuikuanLiyou"/>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeTuikuanModal">取消</view>
+        <view class="modal-btn confirm" bindtap="tijiaoTuikuan">{{isTuikuanLoading ? '处理中' : '确认申请'}}</view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="modal" wx:if="{{showGhDashouModal}}">
+    <view class="modal-mask" bindtap="closeGhDashouModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">更换打手<text class="modal-close" bindtap="closeGhDashouModal">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">确认更换打手吗？当前订单将被撤销，并生成一条相同内容的新订单（打手清空）。</text>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeGhDashouModal">取消</view>
+        <view class="modal-btn confirm" bindtap="tijiaoGhDashou">{{isGhDashouLoading ? '处理中' : '确认更换'}}</view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="modal" wx:if="{{showFakuanModal}}">
+    <view class="modal-mask" bindtap="closeFakuanModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">申请罚款<text class="modal-close" bindtap="closeFakuanModal">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">罚款原因</text>
+        <textarea class="modal-input" placeholder="输入罚款原因（最多50字）" maxlength="50" value="{{fakuanLiyou}}" bindinput="inputFakuanLiyou"/>
+        <text class="modal-tip">罚款金额</text>
+        <input class="modal-input-num" type="digit" placeholder="0.00" value="{{fakuanJine}}" bindinput="inputFakuanJine"/>
+        <view class="toggle-row" bindtap="toggleQiangdan">
+          <text class="label">是否影响抢单</text>
+          <view class="toggle {{yingxiangQiangdan ? 'toggle-on' : ''}}">
+            <view class="toggle-knob"></view>
+          </view>
+        </view>
+        <view class="fenhong-tip">此次罚款应得分红：¥{{jisuanFenhong()}}（利率 {{fenhongLilv*100}}%）</view>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeFakuanModal">取消</view>
+        <view class="modal-btn confirm" bindtap="tijiaoFakuan">{{isFakuanLoading ? '处理中' : '确认申请'}}</view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="modal" wx:if="{{showJiesuanConfirm}}">
+    <view class="modal-mask" bindtap="closeJiesuanConfirm"></view>
+    <view class="modal-content">
+      <view class="modal-hd">确认结算<text class="modal-close" bindtap="closeJiesuanConfirm">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">确认结算该订单吗？结算后状态变为“已完成”。</text>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeJiesuanConfirm">取消</view>
+        <view class="modal-btn confirm" bindtap="tijiaoJiesuan">{{isJiesuanLoading ? '处理中' : '确认结算'}}</view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="modal" wx:if="{{showModifyFakuanModal}}">
+    <view class="modal-mask" bindtap="closeModifyFakuanModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">修改罚款<text class="modal-close" bindtap="closeModifyFakuanModal">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">罚款理由</text>
+        <textarea class="modal-input" placeholder="输入罚款理由" maxlength="100" value="{{modifyFakuanLiyou}}" bindinput="inputModifyFakuanLiyou"/>
+        <text class="modal-tip">罚款金额</text>
+        <input class="modal-input-num" type="digit" placeholder="0.00" value="{{modifyFakuanJine}}" bindinput="inputModifyFakuanJine"/>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeModifyFakuanModal">取消</view>
+        <view class="modal-btn confirm" bindtap="submitModifyFakuan">确认修改</view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="modal" wx:if="{{showCancelFakuanModal}}">
+    <view class="modal-mask" bindtap="closeCancelFakuanModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">撤销罚款<text class="modal-close" bindtap="closeCancelFakuanModal">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">驳回理由</text>
+        <textarea class="modal-input" placeholder="输入驳回理由" maxlength="100" value="{{cancelFakuanLiyou}}" bindinput="inputCancelFakuanLiyou"/>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeCancelFakuanModal">取消</view>
+        <view class="modal-btn confirm" bindtap="submitCancelFakuan">确认撤销</view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="modal" wx:if="{{showResubmitFakuanModal}}">
+    <view class="modal-mask" bindtap="closeResubmitFakuanModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">再次申请罚款<text class="modal-close" bindtap="closeResubmitFakuanModal">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">罚款理由</text>
+        <textarea class="modal-input" placeholder="输入罚款理由" maxlength="100" value="{{resubmitFakuanLiyou}}" bindinput="inputResubmitFakuanLiyou"/>
+        <text class="modal-tip">罚款金额</text>
+        <input class="modal-input-num" type="digit" placeholder="0.00" value="{{resubmitFakuanJine}}" bindinput="inputResubmitFakuanJine"/>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeResubmitFakuanModal">取消</view>
+        <view class="modal-btn confirm" bindtap="submitResubmitFakuan">确认申请</view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="modal" wx:if="{{showCancelTuikuanModal}}">
+    <view class="modal-mask" bindtap="closeCancelTuikuanModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">撤销退款申请<text class="modal-close" bindtap="closeCancelTuikuanModal">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">撤销理由</text>
+        <textarea class="modal-input" placeholder="输入撤销理由" maxlength="100" value="{{cancelTuikuanLiyou}}" bindinput="inputCancelTuikuanLiyou"/>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeCancelTuikuanModal">取消</view>
+        <view class="modal-btn confirm" bindtap="submitCancelTuikuan">确认撤销</view>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="modal" wx:if="{{showModifyTuikuanModal}}">
+    <view class="modal-mask" bindtap="closeModifyTuikuanModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">修改退款理由<text class="modal-close" bindtap="closeModifyTuikuanModal">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">退款理由</text>
+        <textarea class="modal-input" placeholder="输入新的退款理由" maxlength="100" value="{{modifyTuikuanLiyou}}" bindinput="inputModifyTuikuanLiyou"/>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeModifyTuikuanModal">取消</view>
+        <view class="modal-btn confirm" bindtap="submitModifyTuikuan">确认修改</view>
+      </view>
+    </view>
+  </view>
+
+  
+  <global-notification id="global-notification" />
+
+  
+  <view 
+    class="tutorial-btn {{tutorialBtnHidden ? 'tutorial-btn-hidden' : ''}}"
+    bindtap="onTutorialBtnTap"
+    hover-class="tutorial-btn-hover"
+  >
+    <text class="tutorial-btn-text">教程</text>
+  </view>
+
+  
+  <popup-notice id="popupNotice" />
+</view>
\ No newline at end of file
diff --git a/pages/sjddxq/sjddxq.wxss b/pages/sjddxq/sjddxq.wxss
new file mode 100644
index 0000000..3f8b6b0
--- /dev/null
+++ b/pages/sjddxq/sjddxq.wxss
@@ -0,0 +1,185 @@
+/* pages/sjddxq/sjddxq.wxss - 商家订单详情页样式（正方形九宫格，圆形头像） */
+/* 页面全局背景 */
+page { background: #f5f7fa; }
+/* 页面底部留出固定栏的空间 */
+.sjddxq-page { padding-bottom: 160rpx; }
+
+/* 加载状态居中布局 */
+.loading-container { display: flex; flex-direction: column; align-items: center; justify-content: center; height: 60vh; }
+/* 加载旋转动画图标 */
+.loading-spinner { width: 64rpx; height: 64rpx; border: 6rpx solid #e0e0e0; border-top-color: #4caf50; border-radius: 50%; animation: spin 1s linear infinite; margin-bottom: 20rpx; }
+@keyframes spin { to { transform: rotate(360deg); } }
+/* 加载文字 */
+.loading-text { color: #666; font-size: 28rpx; }
+
+/* 内容区域的内边距 */
+.content-container { padding: 24rpx; }
+
+/* 通用卡片样式 */
+.card { background: #fff; border-radius: 24rpx; padding: 28rpx; margin-bottom: 24rpx; box-shadow: 0 8rpx 24rpx rgba(0,0,0,0.04); }
+/* 卡片标题样式 */
+.card-title { font-size: 32rpx; font-weight: 600; color: #1a1a1a; margin-bottom: 20rpx; padding-bottom: 12rpx; border-bottom: 1rpx solid #f0f0f0; }
+
+/* 商品卡片：左右布局 */
+.shangpin-card { display: flex; align-items: center; }
+/* 商品图片：固定宽高为正方形 */
+.shangpin-img { width: 180rpx; height: 180rpx; border-radius: 16rpx; background: #f5f5f5; margin-right: 24rpx; flex-shrink: 0; }
+.shangpin-text { flex: 1; }
+.jieshao-text { font-size: 28rpx; color: #333; line-height: 1.6; }
+
+/* 信息行：左右分布，底部虚线 */
+.info-row { display: flex; justify-content: space-between; align-items: center; padding: 14rpx 0; border-bottom: 1rpx dashed #f5f5f5; }
+.info-row:last-child { border-bottom: none; }
+.label { font-size: 28rpx; color: #888; min-width: 140rpx; }
+.value { font-size: 28rpx; color: #333; text-align: right; word-break: break-all; }
+.value-with-copy { display: flex; align-items: center; }
+/* 复制按钮 */
+.copy-btn { margin-left: 12rpx; color: #4caf50; font-size: 26rpx; padding: 4rpx 12rpx; background: #e8f5e9; border-radius: 16rpx; }
+/* 红色价格 */
+.price-red { color: #ff4444; font-weight: 600; }
+.zhuangtai-text { font-weight: 600; }
+
+/* 打手卡片头部 */
+.dashou-header { display: flex; align-items: center; }
+/* 打手头像：固定宽高，圆形 */
+.dashou-avatar { width: 88rpx; height: 88rpx; border-radius: 50%; margin-right: 20rpx; }
+.dashou-detail { flex: 1; }
+.dashou-nicheng { font-size: 30rpx; font-weight: 500; margin-bottom: 6rpx; }
+.dashou-id-row { display: flex; align-items: center; font-size: 26rpx; }
+
+/* 服务详情子标题 */
+.sub-title { font-size: 28rpx; color: #555; margin: 16rpx 0 8rpx; }
+/* 内容框（留言、理由等） */
+.content-box { background: #f9f9f9; border-radius: 12rpx; padding: 16rpx; font-size: 26rpx; color: #444; line-height: 1.5; margin-bottom: 16rpx; }
+
+/* ========= 核心：交付图片九宫格，强制正方形 ========= */
+.image-grid { display: flex; flex-wrap: wrap; margin-bottom: 16rpx; }
+/* 每个图片的外层容器 */
+.grid-img-wrapper {
+  width: calc(33.33% - 8rpx);  /* 每行三个，减去间距 */
+  margin: 4rpx;
+  position: relative;          /* 为绝对定位的图片提供锚点 */
+  overflow: hidden;
+  border-radius: 12rpx;
+}
+/* 使用伪元素撑出 1:1 的正方形高度 */
+.grid-img-wrapper::after {
+  content: '';
+  display: block;
+  padding-bottom: 100%;        /* 100% 相对于自身宽度，实现正方形 */
+}
+/* 图片绝对定位填满整个容器 */
+.grid-img {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;           /* 保持比例裁剪，不变形 */
+}
+
+/* 结算区域：星星评分 */
+.star-row { display: flex; align-items: center; justify-content: space-between; margin-bottom: 20rpx; }
+.stars { display: flex; }
+.star { font-size: 48rpx; color: #ccc; margin-left: 8rpx; transition: all 0.2s; }
+.star-active { color: #ffc107; transform: scale(1.1); }
+/* 留言输入框 */
+.liuyan-input { width: 100%; height: 120rpx; background: #f9f9f9; border-radius: 12rpx; padding: 16rpx; font-size: 28rpx; margin-bottom: 20rpx; }
+/* 结算按钮 */
+.jiesuan-btn { background: #4caf50; color: #fff; text-align: center; padding: 20rpx; border-radius: 48rpx; font-size: 30rpx; font-weight: 600; margin-top: 10rpx; }
+
+/* 底部固定操作栏 */
+.bottom-bar { position: fixed; bottom: 0; left: 0; right: 0; background: #fff; padding: 16rpx 24rpx; box-shadow: 0 -4rpx 20rpx rgba(0,0,0,0.06); display: flex; flex-direction: column; gap: 12rpx; z-index: 100; }
+.bottom-btn-group { display: flex; gap: 16rpx; }
+.btn-outline { flex: 1; text-align: center; padding: 18rpx 0; border-radius: 44rpx; font-size: 28rpx; font-weight: 500; border: 2rpx solid #1976D2; color: #1976D2; background: #fff; }
+.btn-primary { background: #2196F3; color: #fff; flex: 1; text-align: center; padding: 18rpx 0; border-radius: 44rpx; font-weight: 600; font-size: 28rpx; }
+.btn-warn { background: #ff9800; color: #fff; flex: 1; text-align: center; padding: 18rpx 0; border-radius: 44rpx; font-weight: 600; font-size: 28rpx; }
+.btn-danger { background: #f44336; color: #fff; flex: 1; text-align: center; padding: 18rpx 0; border-radius: 44rpx; font-weight: 600; font-size: 28rpx; }
+
+/* 弹窗通用样式 */
+.modal { position: fixed; top: 0; left: 0; right: 0; bottom: 0; z-index: 1000; display: flex; align-items: center; justify-content: center; }
+.modal-mask { position: absolute; width: 100%; height: 100%; background: rgba(0,0,0,0.45); }
+.modal-content { position: relative; width: 620rpx; background: #fff; border-radius: 32rpx; overflow: hidden; }
+.modal-hd { padding: 32rpx; font-size: 34rpx; font-weight: 600; display: flex; justify-content: space-between; border-bottom: 1rpx solid #f0f0f0; }
+.modal-close { color: #999; font-size: 40rpx; }
+.modal-body { padding: 32rpx; }
+.modal-tip { font-size: 28rpx; color: #555; margin-bottom: 12rpx; }
+.modal-input { width: 100%; height: 140rpx; background: #f5f5f5; border-radius: 12rpx; padding: 16rpx; font-size: 28rpx; margin-bottom: 20rpx; }
+.modal-input-num { width: 100%; height: 80rpx; background: #f5f5f5; border-radius: 12rpx; padding: 0 20rpx; font-size: 32rpx; margin-bottom: 20rpx; }
+.toggle-row { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20rpx; }
+.toggle { width: 100rpx; height: 50rpx; border-radius: 50rpx; background: #e0e0e0; display: flex; align-items: center; padding: 0 4rpx; transition: background 0.2s; }
+.toggle-on { background: #4caf50; }
+.toggle-knob { width: 42rpx; height: 42rpx; border-radius: 50%; background: #fff; transition: transform 0.2s; }
+.toggle-on .toggle-knob { transform: translateX(50rpx); }
+.fenhong-tip { text-align: center; font-size: 28rpx; color: #ff9800; margin: 16rpx 0 0; }
+.modal-btns { display: flex; border-top: 1rpx solid #f0f0f0; }
+.modal-btn { flex: 1; text-align: center; padding: 28rpx; font-size: 30rpx; font-weight: 500; }
+.modal-btn.cancel { color: #888; background: #f5f5f5; }
+.modal-btn.confirm { color: #4caf50; background: #e8f5e9; }
+
+
+
+
+/* ========== 新增：罚单/订单操作按钮样式 ========== */
+.fakuan-actions, .refund-actions {
+    display: flex;
+    gap: 20rpx;
+    margin-top: 24rpx;
+    padding-top: 16rpx;
+    border-top: 1rpx solid #f0f0f0;
+}
+.action-btn {
+    flex: 1;
+    text-align: center;
+    padding: 16rpx 0;
+    border-radius: 44rpx;
+    font-size: 28rpx;
+    font-weight: 500;
+}
+.action-modify {
+    background: #2196F3;
+    color: #fff;
+}
+.action-cancel {
+    background: #ff9800;
+    color: #fff;
+}
+.action-resubmit {
+    background: #4caf50;
+    color: #fff;
+}
+
+/* ========== 新增：教程按钮样式 ========== */
+.tutorial-btn {
+    position: fixed;
+    right: 0;
+    top: 20%;
+    transform: translateY(-50%);
+    width: 120rpx;
+    height: 120rpx;
+    background: rgba(0, 0, 0, 0.75);
+    backdrop-filter: blur(15rpx);
+    border-radius: 60rpx 0 0 60rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 10001;
+    box-shadow: -8rpx 0 20rpx rgba(0,0,0,0.3);
+    transition: right 0.3s ease-out;
+    border: 2rpx solid rgba(255,215,0,0.5);
+    border-right: none;
+}
+.tutorial-btn-text {
+    color: #FFD700;
+    font-size: 36rpx;
+    font-weight: bold;
+    writing-mode: vertical-rl;
+    letter-spacing: 6rpx;
+}
+.tutorial-btn-hidden {
+    right: -80rpx;
+}
+.tutorial-btn-hover {
+    background: rgba(0, 0, 0, 0.9);
+    transform: translateY(-50%) scale(1.05);
+}
\ No newline at end of file
diff --git a/pages/sjdingdan/sjdingdan.js b/pages/sjdingdan/sjdingdan.js
new file mode 100644
index 0000000..a0fd572
--- /dev/null
+++ b/pages/sjdingdan/sjdingdan.js
@@ -0,0 +1,323 @@
+// pages/sjdingdan/sjdingdan.js
+const app = getApp();
+import request from '../../utils/request.js';
+
+Page({
+  data: {
+    // 商品类型（和打手端用同一个接口）
+    shangpinleixing: [],
+    xuanzhongLeixingId: null,
+
+    // 搜索关键字（模糊搜索）
+    searchKeyword: '',
+
+    // 状态列表（含全部）
+    statusList: [
+      { name: '全部', key: 'all', zhuangtaiList: [1, 2, 3, 4, 5, 6, 7, 8], color: '#333333' },
+      { name: '进行中', key: 'jinxingzhong', zhuangtaiList: [2], color: '#2196F3' },
+      { name: '退款中', key: 'tuikuanzhong', zhuangtaiList: [4], color: '#FF9800' },
+      { name: '已退款', key: 'yituikuan', zhuangtaiList: [5], color: '#9E9E9E' },
+      { name: '退款失败', key: 'tuikuanshibai', zhuangtaiList: [6], color: '#F44336' },
+      { name: '已完成', key: 'yiwancheng', zhuangtaiList: [3], color: '#4CAF50' },
+      { name: '结算中', key: 'jiesuanzhong', zhuangtaiList: [8], color: '#FF5722' }
+    ],
+    currentStatusKey: 'all',
+
+    // 每个状态独立的数据集
+    sjDingdanShuju: {
+      all: { list: [], page: 1, hasMore: true, isLoading: false },
+      jinxingzhong: { list: [], page: 1, hasMore: true, isLoading: false },
+      tuikuanzhong: { list: [], page: 1, hasMore: true, isLoading: false },
+      yituikuan: { list: [], page: 1, hasMore: true, isLoading: false },
+      tuikuanshibai: { list: [], page: 1, hasMore: true, isLoading: false },
+      yiwancheng: { list: [], page: 1, hasMore: true, isLoading: false },
+      jiesuanzhong: { list: [], page: 1, hasMore: true, isLoading: false }
+    },
+
+    currentList: [],
+    hasMore: true,
+    isLoading: false,
+    isLoadingMore: false,
+    scrollViewRefreshing: false,
+    defaultImg: '/images/default-order.png',
+    ossImageUrl: app.globalData.ossImageUrl || '',
+
+    // 待结算数量
+    pendingCount: 0,
+  },
+
+  onLoad() {
+    wx.setNavigationBarTitle({ title: '我的派单' });
+    this.loadShangpinLeixing();
+    this.registerNotificationComponent();
+  },
+
+  onShow() {
+    this.registerNotificationComponent();
+    this.loadPendingCount();
+    // 如果已加载过商品类型，刷新当前状态的订单
+    if (this.data.currentStatusKey && this.data.xuanzhongLeixingId) {
+      this.loadCurrentStatusOrders(true);
+    }
+  },
+
+  // 注册全局通知组件
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  // 🆕 加载商品类型（和打手端用同一个接口 /dingdan/dsqdhqddlx）
+  async loadShangpinLeixing() {
+    try {
+      const res = await request({
+        url: '/dingdan/dsqdhqddlx',
+        method: 'POST',
+        header: { 'content-type': 'application/json' }
+      });
+      if (res.data && (res.data.code === 200 || res.data.code === 0)) {
+        let list = res.data.data.list || res.data.data || [];
+        if (!Array.isArray(list)) list = [];
+        const oss = this.data.ossImageUrl;
+        // 拼接图片完整URL
+        const processed = list.map(item => ({
+          ...item,
+          full_tupian_url: item.tupian_url && !item.tupian_url.startsWith('http')
+            ? oss + item.tupian_url
+            : (item.tupian_url || '/images/default-type.png')
+        }));
+        this.setData({
+          shangpinleixing: processed,
+          xuanzhongLeixingId: processed[0]?.id || null
+        });
+        // 初始加载全部状态订单
+        this.loadCurrentStatusOrders(true);
+      }
+    } catch (e) {
+      console.error('加载商品类型失败', e);
+    }
+  },
+
+  // 选择商品类型
+  selectLeixing(e) {
+    const id = e.currentTarget.dataset.id;
+    if (id === this.data.xuanzhongLeixingId) return;
+    this.setData({ xuanzhongLeixingId: id });
+    this.resetCurrentStatusData();
+    this.loadCurrentStatusOrders(true);
+  },
+
+  // 搜索输入（防抖）
+  onSearchInput(e) {
+    this.setData({ searchKeyword: e.detail.value });
+    if (this._searchTimer) clearTimeout(this._searchTimer);
+    this._searchTimer = setTimeout(() => {
+      this.onSearchConfirm();
+    }, 500);
+  },
+
+  // 搜索确认
+  onSearchConfirm() {
+    this.resetCurrentStatusData();
+    this.loadCurrentStatusOrders(true);
+  },
+
+  // 清除搜索
+  clearSearch() {
+    this.setData({ searchKeyword: '' });
+    this.resetCurrentStatusData();
+    this.loadCurrentStatusOrders(true);
+  },
+
+  // 切换状态Tab
+  switchStatus(e) {
+    const key = e.currentTarget.dataset.key;
+    if (key === this.data.currentStatusKey) return;
+    this.setData({ currentStatusKey: key });
+    const tabData = this.data.sjDingdanShuju[key];
+    // 如果该状态没有数据，则加载；否则只刷新视图
+    if (tabData.list.length === 0 && tabData.hasMore && !tabData.isLoading) {
+      this.loadCurrentStatusOrders(true);
+    } else {
+      this.refreshCurrentListView();
+    }
+  },
+
+  // 🆕 加载订单（核心方法，接口固定用商家订单接口 /dingdan/sjdingdanhq）
+  async loadCurrentStatusOrders(isRefresh = false) {
+    const key = this.data.currentStatusKey;
+    const tabData = this.data.sjDingdanShuju[key];
+    if (tabData.isLoading) return;
+    const page = isRefresh ? 1 : tabData.page;
+
+    this.setData({
+      [`sjDingdanShuju.${key}.isLoading`]: true,
+      isLoading: true,
+      isLoadingMore: !isRefresh
+    });
+
+    try {
+      const statusItem = this.data.statusList.find(s => s.key === key);
+      const zhuangtaiList = statusItem.zhuangtaiList;
+
+      // 构建请求参数
+      const params = {
+        zhuangtai_list: zhuangtaiList,
+        page: page,
+        page_size: 5,
+        leixing_id: this.data.xuanzhongLeixingId,  // 🆕 商品类型筛选
+        keyword: this.data.searchKeyword || undefined  // 🆕 模糊搜索
+      };
+
+      const res = await request({
+        url: '/dingdan/sjdingdanhq',  // 商家订单接口（和原来一样）
+        method: 'POST',
+        data: params,
+        header: { 'content-type': 'application/json' }
+      });
+
+      const code = res.data.code;
+      if (code === 200 || code === 0) {
+        const newList = res.data.data.list || [];
+        const hasMore = res.data.data.has_more || false;
+
+        // 处理数据：拼接图片、转换状态中文
+        const processed = newList.map(item => ({
+          ...item,
+          zhuangtaiZh: this.getZhuangtaiZh(item.zhuangtai),
+          zhuangtaiColor: statusItem.color,
+          // 如果有商品图片则用商品图片，否则用默认图
+          tupian: item.tupian
+            ? (item.tupian.startsWith('http') ? item.tupian : this.data.ossImageUrl + item.tupian)
+            : this.data.defaultImg
+        }));
+
+        const currentList = this.data.sjDingdanShuju[key].list;
+        const updatedList = isRefresh ? processed : [...currentList, ...processed];
+
+        this.setData({
+          [`sjDingdanShuju.${key}.list`]: updatedList,
+          [`sjDingdanShuju.${key}.page`]: page,
+          [`sjDingdanShuju.${key}.hasMore`]: hasMore,
+          [`sjDingdanShuju.${key}.isLoading`]: false,
+          isLoading: false,
+          isLoadingMore: false,
+          scrollViewRefreshing: false
+        });
+        this.refreshCurrentListView();
+      } else {
+        throw new Error(res.data.msg || '加载失败');
+      }
+    } catch (err) {
+      console.error('加载订单失败', err);
+      wx.showToast({ title: err.message || '加载失败', icon: 'none' });
+      this.setData({
+        [`sjDingdanShuju.${key}.isLoading`]: false,
+        isLoading: false,
+        isLoadingMore: false,
+        scrollViewRefreshing: false
+      });
+      this.refreshCurrentListView();
+    }
+  },
+
+  // 刷新当前视图
+  refreshCurrentListView() {
+    const key = this.data.currentStatusKey;
+    const tabData = this.data.sjDingdanShuju[key];
+    this.setData({
+      currentList: tabData.list,
+      hasMore: tabData.hasMore,
+      isLoading: tabData.isLoading
+    });
+  },
+
+  // 重置当前状态数据
+  resetCurrentStatusData() {
+    const key = this.data.currentStatusKey;
+    this.setData({
+      [`sjDingdanShuju.${key}.list`]: [],
+      [`sjDingdanShuju.${key}.page`]: 1,
+      [`sjDingdanShuju.${key}.hasMore`]: true,
+      [`sjDingdanShuju.${key}.isLoading`]: false
+    });
+    this.refreshCurrentListView();
+  },
+
+  // 🆕 加载待结算数量
+  async loadPendingCount() {
+    try {
+      const res = await request({
+        url: '/dingdan/sjdingdanhq',
+        method: 'POST',
+        data: {
+          zhuangtai_list: [8],
+          page: 1,
+          page_size: 1
+        }
+      });
+      if (res && res.data.code === 0) {
+        this.setData({ pendingCount: res.data.data.pending_count || 0 });
+      }
+    } catch (error) {
+      console.error('加载待结算数量失败:', error);
+    }
+  },
+
+  // 下拉刷新（由 scroll-view 触发）
+  onPullDownRefresh() {
+    if (this.data.isLoading) {
+      this.setData({ scrollViewRefreshing: false });
+      return;
+    }
+    this.setData({ scrollViewRefreshing: true });
+    this.resetCurrentStatusData();
+    this.loadCurrentStatusOrders(true);
+  },
+
+  // 上拉加载更多（由 scroll-view 触发）
+  onReachBottom() {
+    const key = this.data.currentStatusKey;
+    const tabData = this.data.sjDingdanShuju[key];
+    if (tabData.isLoading || !tabData.hasMore) return;
+    this.setData({ [`sjDingdanShuju.${key}.page`]: tabData.page + 1 });
+    this.loadCurrentStatusOrders(false);
+  },
+
+  // 🆕 手动点击"加载更多"按钮
+  onLoadMoreTap() {
+    const key = this.data.currentStatusKey;
+    const tabData = this.data.sjDingdanShuju[key];
+    if (tabData.isLoading || !tabData.hasMore) return;
+    this.setData({ [`sjDingdanShuju.${key}.page`]: tabData.page + 1 });
+    this.loadCurrentStatusOrders(false);
+  },
+
+  // 状态码转中文
+  getZhuangtaiZh(zhuangtai) {
+    const map = {
+      1: '已下单', 2: '进行中', 3: '已完成',
+      4: '退款中', 5: '已退款', 6: '退款失败',
+      7: '指定中', 8: '结算中'
+    };
+    return map[zhuangtai] || '未知状态';
+  },
+
+  // 跳转订单详情
+  goToSjDingdanXiangqing(e) {
+    const item = e.currentTarget.dataset.item;
+    if (!item) return;
+    const dataStr = encodeURIComponent(JSON.stringify(item));
+    wx.navigateTo({
+      url: `/pages/sjddxq/sjddxq?dingdanData=${dataStr}`
+    });
+  },
+
+  // 图片加载失败
+  onImageError() {}
+});
\ No newline at end of file
diff --git a/pages/sjdingdan/sjdingdan.json b/pages/sjdingdan/sjdingdan.json
new file mode 100644
index 0000000..d7516ff
--- /dev/null
+++ b/pages/sjdingdan/sjdingdan.json
@@ -0,0 +1,9 @@
+{
+    "navigationBarTitleText": "我的派单",
+    "enablePullDownRefresh": false,
+    "backgroundTextStyle": "dark",
+    "backgroundColor": "#f8f9fa",
+    "usingComponents": {
+      "global-notification": "/components/global-notification/global-notification"
+    }
+  }
\ No newline at end of file
diff --git a/pages/sjdingdan/sjdingdan.wxml b/pages/sjdingdan/sjdingdan.wxml
new file mode 100644
index 0000000..0d36a72
--- /dev/null
+++ b/pages/sjdingdan/sjdingdan.wxml
@@ -0,0 +1,135 @@
+
+<view class="sj-page">
+  
+  <view class="leixing-area">
+    <scroll-view class="leixing-scroll" scroll-x enhanced show-scrollbar="{{false}}">
+      <view class="leixing-container">
+        <block wx:for="{{shangpinleixing}}" wx:key="id">
+          <view
+            class="leixing-item {{xuanzhongLeixingId == item.id ? 'leixing-active' : ''}}"
+            data-id="{{item.id}}"
+            bindtap="selectLeixing"
+          >
+            <image class="leixing-img" src="{{item.full_tupian_url}}" mode="aspectFill"/>
+            <text class="leixing-name">{{item.jieshao || '类型'}}</text>
+          </view>
+        </block>
+      </view>
+    </scroll-view>
+  </view>
+
+  
+  <view class="filter-row">
+    <view class="search-box">
+      <image class="search-icon" src="/images/icon_search.svg" mode="aspectFit"/>
+      <input class="search-input" placeholder="搜索订单ID/介绍/昵称/打手ID" value="{{searchKeyword}}" bindinput="onSearchInput" bindconfirm="onSearchConfirm" confirm-type="search"/>
+      <view class="search-clear" wx:if="{{searchKeyword}}" bindtap="clearSearch"><text>✕</text></view>
+    </view>
+  </view>
+
+  
+  <view class="sj-pending-tip" wx:if="{{pendingCount > 0}}">
+    <text class="sj-pending-icon"></text>
+    <text class="sj-pending-text">待结算订单</text>
+    <view class="sj-pending-badge">{{pendingCount}}</view>
+  </view>
+
+  
+  <view class="main-container">
+    
+    <view class="left-status">
+      <block wx:for="{{statusList}}" wx:key="key">
+        <view class="status-item {{currentStatusKey == item.key ? 'status-active' : ''}}" data-key="{{item.key}}" bindtap="switchStatus">
+          <text class="status-name">{{item.name}}</text>
+          
+          <view class="status-dot" wx:if="{{currentStatusKey == item.key}}"></view>
+          <view wx:if="{{item.key === 'jiesuanzhong' && pendingCount > 0}}" class="sj-status-badge">{{pendingCount}}</view>
+        </view>
+      </block>
+    </view>
+
+    
+    <view class="right-wrapper">
+      <scroll-view
+        class="right-list"
+        scroll-y enhanced show-scrollbar="{{false}}"
+        refresher-enabled="{{true}}"
+        refresher-threshold="80"
+        refresher-default-style="black"
+        refresher-background="#f5f6fa"
+        refresher-triggered="{{scrollViewRefreshing}}"
+        bindrefresherrefresh="onPullDownRefresh"
+        bindscrolltolower="onReachBottom"
+        lower-threshold="50"
+      >
+        <view class="refresher-slot" slot="refresher">
+          <text wx:if="{{scrollViewRefreshing}}" class="refreshing-text">⚡ 正在刷新...</text>
+          <text wx:else class="pull-text">▼ 下拉刷新</text>
+        </view>
+
+        
+        <view class="list-inner">
+          
+          <view wx:if="{{isLoading && currentList.length === 0}}" class="loading-state">
+            <view class="loading-spinner"></view>
+            <text class="loading-tip">加载订单中...</text>
+          </view>
+
+          
+          <view wx:elif="{{!isLoading && currentList.length === 0}}" class="empty-state">
+            <image class="empty-img" src="/images/empty-order.png" mode="aspectFit"/>
+            <text class="empty-text">暂无订单</text>
+            <text class="empty-subtext">快去派发订单吧</text>
+          </view>
+
+          
+          <block wx:for="{{currentList}}" wx:key="dingdan_id">
+            <view class="order-card {{item.zhuangtai === 8 ? 'sj-card-jiesuan' : ''}}" data-item="{{item}}" bindtap="goToSjDingdanXiangqing">
+              
+              <view class="card-time" wx:if="{{item.create_time}}">{{item.create_time}}</view>
+              
+              <view class="card-content-row">
+                <image class="card-img" src="{{item.tupian}}" mode="aspectFill" binderror="onImageError"/>
+                <view class="card-info">
+                  <view class="card-title">{{item.jieshao || '暂无描述'}}</view>
+                  <view class="card-id" wx:if="{{item.dingdan_id}}">ID: {{item.dingdan_id}}</view>
+                  <view class="card-nicheng" wx:if="{{item.nicheng}}">昵称: {{item.nicheng}}</view>
+                </view>
+                <view class="card-right">
+                  <view class="card-status {{item.zhuangtai === 8 ? 'sj-status-jiesuan' : ''}}" style="color: {{item.zhuangtaiColor}};">{{item.zhuangtaiZh}}</view>
+                  <view class="card-price">
+                    <text class="price-symbol">¥</text>
+                    <text class="price-number">{{item.jine || '0.00'}}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </block>
+
+          
+          <view class="load-more" wx:if="{{hasMore && currentList.length > 0 && !isLoadingMore}}">
+            <text class="load-more-text">上拉加载更多</text>
+          </view>
+
+          
+          <view class="loading-more-state" wx:if="{{isLoadingMore}}">
+            <view class="mini-spinner"></view>
+            <text>加载中...</text>
+          </view>
+
+          
+          <view class="manual-load-more" wx:if="{{hasMore && currentList.length > 0 && !isLoadingMore}}">
+            <button class="load-more-btn" bindtap="onLoadMoreTap" loading="{{false}}">点击加载更多</button>
+          </view>
+
+          
+          <view class="no-more" wx:if="{{!hasMore && currentList.length > 0}}">
+            <text>—— 没有更多了 ——</text>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+</view>
+<global-notification id="global-notification" />
+<custom-tab-bar />
\ No newline at end of file
diff --git a/pages/sjdingdan/sjdingdan.wxss b/pages/sjdingdan/sjdingdan.wxss
new file mode 100644
index 0000000..2e85ea1
--- /dev/null
+++ b/pages/sjdingdan/sjdingdan.wxss
@@ -0,0 +1,430 @@
+/* pages/sjdingdan/sjdingdan.wxss */
+
+/* 页面容器：禁止整体滚动 */
+page {
+    height: 100%;
+    overflow: hidden;
+  }
+  .sj-page {
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background: #f5f6fa;
+  }
+  
+  /* ========== 商品类型区 ========== */
+  .leixing-area {
+    background: #fff;
+    padding: 24rpx 0;
+    border-bottom: 1rpx solid #f0f0f0;
+    flex-shrink: 0;
+  }
+  .leixing-scroll {
+    white-space: nowrap;
+  }
+  .leixing-container {
+    display: inline-flex;
+    padding: 0 24rpx;
+  }
+  .leixing-item {
+    display: inline-flex;
+    flex-direction: column;
+    align-items: center;
+    margin-right: 32rpx;
+    padding: 12rpx 20rpx;
+    border-radius: 28rpx;
+    transition: all 0.2s;
+  }
+  .leixing-item.leixing-active {
+    background: linear-gradient(135deg, #e8f0fe, #d4e4ff);
+    box-shadow: 0 4rpx 12rpx rgba(33,150,243,0.15);
+  }
+  .leixing-img {
+    width: 72rpx;
+    height: 72rpx;
+    border-radius: 50%;
+    background: #f0f0f0;
+    margin-bottom: 8rpx;
+  }
+  .leixing-name {
+    font-size: 24rpx;
+    color: #333;
+    max-width: 100rpx;
+    text-align: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  
+  /* ========== 搜索行 ========== */
+  .filter-row {
+    display: flex;
+    align-items: center;
+    padding: 20rpx 24rpx;
+    background: #fff;
+    border-bottom: 1rpx solid #f0f0f0;
+    flex-shrink: 0;
+  }
+  .search-box {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    background: #f0f2f5;
+    border-radius: 36rpx;
+    padding: 0 20rpx;
+    height: 68rpx;
+  }
+  .search-icon {
+    width: 32rpx;
+    height: 32rpx;
+    margin-right: 12rpx;
+    opacity: 0.5;
+  }
+  .search-input {
+    flex: 1;
+    font-size: 26rpx;
+    color: #333;
+  }
+  .search-clear {
+    width: 40rpx;
+    height: 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #ccc;
+    border-radius: 50%;
+    margin-left: 8rpx;
+  }
+  .search-clear text {
+    font-size: 24rpx;
+    color: #fff;
+    font-weight: bold;
+  }
+  
+  /* ========== 待结算提示条（保留原样式） ========== */
+  .sj-pending-tip {
+    margin: 20rpx 24rpx;
+    padding: 16rpx 24rpx;
+    background: linear-gradient(145deg, #ffe8cc, #ffdbb5);
+    border-left: 8rpx solid #ffaa00;
+    border-radius: 16rpx;
+    display: flex;
+    align-items: center;
+    gap: 16rpx;
+    box-shadow: 0 8rpx 20rpx rgba(255,170,0,0.3);
+    flex-shrink: 0;
+  }
+  .sj-pending-icon {
+    font-size: 36rpx;
+    color: #ffaa00;
+  }
+  .sj-pending-text {
+    font-size: 28rpx;
+    color: #b25700;
+    font-weight: 600;
+  }
+  .sj-pending-badge {
+    min-width: 44rpx;
+    height: 44rpx;
+    padding: 0 12rpx;
+    background: linear-gradient(145deg, #ff3b3b, #d10000);
+    color: #fff;
+    font-size: 26rpx;
+    font-weight: 700;
+    line-height: 44rpx;
+    text-align: center;
+    border-radius: 22rpx;
+    margin-left: auto;
+    box-shadow: 0 4rpx 12rpx rgba(255,0,0,0.5);
+  }
+  
+  /* ========== 主体布局 ========== */
+  .main-container {
+    flex: 1;
+    display: flex;
+    overflow: hidden;
+  }
+  
+  /* 左侧状态栏 */
+  .left-status {
+    width: 180rpx;
+    background: #fff;
+    border-right: 1rpx solid #f0f0f0;
+    padding: 28rpx 0;
+    flex-shrink: 0;
+  }
+  .status-item {
+    padding: 28rpx 20rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    position: relative;
+  }
+  .status-item.status-active {
+    background: linear-gradient(to right, #e3f2fd, #fff);
+  }
+  .status-name {
+    font-size: 28rpx;
+    color: #555;
+  }
+  .status-active .status-name {
+    color: #1976D2;
+    font-weight: 600;
+  }
+  .status-dot {
+    width: 14rpx;
+    height: 14rpx;
+    border-radius: 50%;
+    background: #1976D2;
+  }
+  /* 结算中状态的小红点数字 */
+  .sj-status-badge {
+    min-width: 36rpx;
+    height: 36rpx;
+    padding: 0 8rpx;
+    background: linear-gradient(145deg, #ff4d4f, #d10000);
+    color: #fff;
+    font-size: 22rpx;
+    font-weight: 700;
+    line-height: 36rpx;
+    text-align: center;
+    border-radius: 18rpx;
+    margin-left: 8rpx;
+    box-shadow: 0 4rpx 8rpx rgba(255,0,0,0.4);
+  }
+  
+  /* 右侧包裹 */
+  .right-wrapper {
+    flex: 1;
+    padding-right: 30rpx;
+    box-sizing: border-box;
+    overflow: hidden;
+  }
+  .right-list {
+    width: 100%;
+    height: 100%;
+    background: #f5f6fa;
+  }
+  .refresher-slot {
+    text-align: center;
+    padding: 14rpx 0;
+    font-size: 24rpx;
+    color: #999;
+  }
+  
+  /* 内容容器 */
+  .list-inner {
+    padding: 24rpx 0 200rpx 20rpx;
+    box-sizing: border-box;
+  }
+  
+  /* ========== 订单卡片 ========== */
+  .order-card {
+    background: #fff;
+    border-radius: 24rpx;
+    padding: 24rpx;
+    margin-bottom: 24rpx;
+    box-shadow: 0 6rpx 20rpx rgba(0,0,0,0.04);
+    box-sizing: border-box;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+  /* 结算中卡片特殊边框 */
+  .sj-card-jiesuan {
+    border: 2rpx solid #ff5722;
+    box-shadow: 0 6rpx 20rpx rgba(255,87,34,0.15);
+  }
+  .order-card:active {
+    transform: scale(0.98);
+  }
+  
+  /* 创建时间 */
+  .card-time {
+    font-size: 24rpx;
+    color: #999;
+    margin-bottom: 12rpx;
+    padding-bottom: 8rpx;
+    border-bottom: 1rpx dashed rgba(0,120,255,0.15);
+  }
+  
+  /* 内容行 */
+  .card-content-row {
+    display: flex;
+    align-items: flex-start;
+  }
+  
+  /* 商品图片 */
+  .card-img {
+    width: 130rpx;
+    height: 130rpx;
+    border-radius: 18rpx;
+    background: #f0f0f0;
+    margin-right: 24rpx;
+    flex-shrink: 0;
+  }
+  
+  /* 中间信息区 */
+  .card-info {
+    flex: 1;
+    min-height: 130rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    min-width: 0;
+  }
+  .card-title {
+    font-size: 28rpx;
+    color: #222;
+    line-height: 1.5;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+  }
+  .card-id {
+    font-size: 22rpx;
+    color: #999;
+    margin-top: 6rpx;
+  }
+  .card-nicheng {
+    font-size: 22rpx;
+    color: #666;
+    margin-top: 4rpx;
+  }
+  
+  /* 右侧状态和价格 */
+  .card-right {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    justify-content: center;
+    min-height: 130rpx;
+    margin-left: 20rpx;
+    flex-shrink: 0;
+    max-width: 160rpx;
+  }
+  .card-status {
+    font-size: 24rpx;
+    font-weight: 500;
+    padding: 4rpx 12rpx;
+    background: #f5f5f5;
+    border-radius: 20rpx;
+    margin-bottom: 8rpx;
+    white-space: nowrap;
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  /* 结算中状态红色高亮（保留原样式） */
+  .sj-status-jiesuan {
+    background: linear-gradient(145deg, #ff4d4f, #d10000) !important;
+    color: #fff !important;
+    border-color: #ffaa00;
+    box-shadow: 0 0 15rpx #ff4d4f;
+  }
+  .card-price {
+    display: flex;
+    align-items: baseline;
+    white-space: nowrap;
+  }
+  .price-symbol {
+    font-size: 28rpx;
+    color: #ffaa00;
+    font-weight: 700;
+    margin-right: 4rpx;
+  }
+  .price-number {
+    font-size: 36rpx;
+    font-weight: 700;
+    color: #333;
+  }
+  
+  /* ========== 加载与空状态 ========== */
+  .loading-state, .empty-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 120rpx 0;
+  }
+  .loading-spinner {
+    width: 52rpx;
+    height: 52rpx;
+    border: 4rpx solid #e0e0e0;
+    border-top-color: #1976D2;
+    border-radius: 50%;
+    animation: spin 0.8s linear infinite;
+    margin-bottom: 24rpx;
+  }
+  @keyframes spin {
+    to { transform: rotate(360deg); }
+  }
+  .empty-img {
+    width: 200rpx;
+    height: 200rpx;
+    opacity: 0.4;
+    margin-bottom: 24rpx;
+  }
+  .empty-text, .loading-tip {
+    font-size: 28rpx;
+    color: #999;
+  }
+  .empty-subtext {
+    font-size: 26rpx;
+    color: #b0b0b0;
+    margin-top: 10rpx;
+  }
+  
+  .load-more {
+    text-align: center;
+    padding: 36rpx 0 20rpx 0;
+    font-size: 26rpx;
+    color: #999;
+  }
+  .loading-more-state {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 20rpx 0;
+    font-size: 26rpx;
+    color: #999;
+  }
+  .mini-spinner {
+    display: inline-block;
+    width: 26rpx;
+    height: 26rpx;
+    border: 3rpx solid #ccc;
+    border-top-color: #1976D2;
+    border-radius: 50%;
+    animation: spin 0.6s linear infinite;
+    vertical-align: middle;
+    margin-right: 10rpx;
+  }
+  
+  .manual-load-more {
+    display: flex;
+    justify-content: center;
+    padding: 30rpx 0 10rpx 0;
+  }
+  .load-more-btn {
+    background: #ffffff;
+    color: #1976D2;
+    font-size: 28rpx;
+    font-weight: 500;
+    border: 2rpx solid #1976D2;
+    border-radius: 40rpx;
+    padding: 16rpx 60rpx;
+    text-align: center;
+    box-shadow: 0 4rpx 12rpx rgba(33,150,243,0.1);
+  }
+  .load-more-btn::after {
+    border: none;
+  }
+  
+  .no-more {
+    text-align: center;
+    padding: 40rpx 0;
+    font-size: 26rpx;
+    color: #999;
+  }
\ No newline at end of file
diff --git a/pages/sjpaidan/sjpaidan.js b/pages/sjpaidan/sjpaidan.js
new file mode 100644
index 0000000..36e6355
--- /dev/null
+++ b/pages/sjpaidan/sjpaidan.js
@@ -0,0 +1,357 @@
+// pages/sjpaidan/sjpaidan.js
+import request from '../../utils/request.js'
+import PopupService from '../../services/popupService.js'
+
+Page({
+  data: {
+    sjyue: '0.00',
+    shangpinList: [],
+    selectedTypeId: null,
+    selectedHuiyuanId: null,
+    selectedYaoqiuleixing: null,
+    currentTypeChenghaoList: [],
+
+    dingdanJieshao: '',
+    dingdanBeizhu: '',
+    laobanName: '',
+    zhidingUid: '',
+    jiage: '',
+
+    selectedLabelId: '',
+    selectedLabelName: '',
+
+    commissionEnabled: false,
+    commissionValue: '',
+
+    isSpecialType: false,
+    currentTypeGoodsList: [],
+    selectedGoodsId: null,
+    selectedGoodsTitle: '',
+    commissionLocked: false,
+
+    isLoading: false,
+    isSubmitting: false,
+    tutorialBtnHidden: false,
+    bgImageUrl: ''
+  },
+
+  onLoad() {
+    this.loadBgImage()
+    this.loadShangjiaYue()
+    this.loadShangpinTypes()
+    this.startTutorialBtnTimer()
+  },
+
+  onShow() {
+    this.loadShangjiaYue()
+    this.loadBgImage()
+    this.registerNotificationComponent()
+    this.startTutorialBtnTimer()
+  },
+
+  onHide() {
+    PopupService.reset()
+  },
+
+  onUnload() {
+    if (this.tutorialTimer) clearTimeout(this.tutorialTimer)
+    PopupService.reset()
+  },
+
+  loadBgImage() {
+    const app = getApp()
+    const ossBase = app.globalData.ossImageUrl || 'https://your-oss-bucket.oss-cn-region.aliyuncs.com'
+    const bgUrl = ossBase.replace(/\/$/, '') + '/beijing/shangjiapaidan/bg.jpg'
+    this.setData({ bgImageUrl: bgUrl })
+  },
+
+  loadShangjiaYue() {
+    const app = getApp()
+    const shangjiaData = app.globalData.shangjia || {}
+    this.setData({ sjyue: shangjiaData.sjyue || '0.00' })
+  },
+
+  async loadShangpinTypes() {
+    this.setData({ isLoading: true })
+    try {
+      const res = await request({
+        url: '/dingdan/sjspleixing',
+        method: 'POST'
+      })
+      if (res && res.data.code === 200) {
+        let list = res.data.data || []
+        list.reverse()
+        this.setData({ shangpinList: list, isLoading: false })
+        if (list.length > 0) {
+          this.setSelectedType(list[0])
+        }
+      } else {
+        throw new Error(res.data.msg || '加载失败')
+      }
+    } catch (error) {
+      this.setData({ isLoading: false })
+      wx.showToast({ title: '加载类型失败', icon: 'error' })
+    }
+  },
+
+  // 🔴 切换类型时清空订单介绍、备注、标签、商品模板和押金
+  setSelectedType(item) {
+    const isSpecial = item.is_special_type || false
+
+    this.setData({
+      selectedTypeId: item.id,
+      selectedHuiyuanId: item.huiyuan_id,
+      selectedYaoqiuleixing: item.yaoqiuleixing,
+      currentTypeChenghaoList: item.chenghaoList || [],
+      selectedLabelId: '',
+      selectedLabelName: '',
+      selectedGoodsId: null,
+      selectedGoodsTitle: '',
+      isSpecialType: isSpecial,
+      currentTypeGoodsList: item.goodsList || [],
+      // 清空订单介绍和备注
+      dingdanJieshao: '',
+      dingdanBeizhu: '',
+      // 重置押金，等用户选商品再设置
+      commissionEnabled: false,
+      commissionValue: '',
+      commissionLocked: false
+    })
+  },
+
+  onGoodsItemTap(e) {
+    const goodsId = e.currentTarget.dataset.id
+    if (!goodsId) return
+
+    const goods = this.data.currentTypeGoodsList.find(item => item.id == goodsId)
+    if (!goods) {
+      wx.showToast({ title: '商品数据异常', icon: 'none' })
+      return
+    }
+
+    const hasYongjin = goods.yongjin && parseFloat(goods.yongjin) > 0
+    this.setData({
+      selectedGoodsId: goods.id,
+      selectedGoodsTitle: goods.biaoqian || '',
+      dingdanJieshao: goods.jieshao || '',
+      dingdanBeizhu: '',
+      commissionEnabled: hasYongjin,
+      commissionValue: hasYongjin ? goods.yongjin : '',
+      commissionLocked: true
+    })
+  },
+
+  onDingdanJieshaoInput(e) {
+    if (this.data.isSpecialType) return
+    this.setData({ dingdanJieshao: e.detail.value })
+  },
+  onDingdanBeizhuInput(e) {
+    if (this.data.isSpecialType) return
+    this.setData({ dingdanBeizhu: e.detail.value })
+  },
+  onLaobanNameInput(e) { this.setData({ laobanName: e.detail.value }) },
+  onZhidingUidInput(e) { this.setData({ zhidingUid: e.detail.value }) },
+  onJiageInput(e) {
+    let value = e.detail.value
+    if (value === '' || /^\d+(\.\d{0,2})?$/.test(value)) {
+      this.setData({ jiage: value })
+    }
+  },
+
+  onLabelChange(e) {
+    const idx = e.detail.value
+    const label = this.data.currentTypeChenghaoList[idx]
+    if (label) {
+      this.setData({ selectedLabelId: label.id, selectedLabelName: label.mingcheng })
+    } else {
+      this.setData({ selectedLabelId: '', selectedLabelName: '' })
+    }
+  },
+
+  onCommissionToggle() {
+    if (this.data.commissionLocked) return
+    this.setData({ commissionEnabled: !this.data.commissionEnabled })
+  },
+  onCommissionValueInput(e) {
+    if (this.data.commissionLocked) return
+    let value = e.detail.value
+    if (value === '' || /^\d+(\.\d{0,2})?$/.test(value)) {
+      this.setData({ commissionValue: value })
+    }
+  },
+
+  validateForm() {
+    const {
+      selectedTypeId, dingdanJieshao, laobanName, jiage,
+      sjyue, commissionEnabled, commissionValue,
+      isSpecialType, selectedGoodsId
+    } = this.data
+
+    if (!selectedTypeId) {
+      wx.showToast({ title: '请选择订单类型', icon: 'none' })
+      return false
+    }
+    if (isSpecialType && !selectedGoodsId) {
+      wx.showToast({ title: '请选择一个商品模板', icon: 'none' })
+      return false
+    }
+    if (!dingdanJieshao.trim()) {
+      wx.showToast({ title: '请输入订单介绍', icon: 'none' })
+      return false
+    }
+    if (!laobanName.trim()) {
+      wx.showToast({ title: '请输入老板游戏昵称', icon: 'none' })
+      return false
+    }
+    if (!jiage) {
+      wx.showToast({ title: '请输入订单价格', icon: 'none' })
+      return false
+    }
+
+    const price = parseFloat(jiage)
+    if (isNaN(price) || price < 0.1 || price > 10000) {
+      wx.showToast({ title: '价格需在0.1-10000元之间', icon: 'none' })
+      return false
+    }
+    if (jiage.includes('.') && jiage.split('.')[1].length > 2) {
+      wx.showToast({ title: '最多支持两位小数', icon: 'none' })
+      return false
+    }
+
+    if (commissionEnabled) {
+      const com = parseFloat(commissionValue)
+      if (isNaN(com) || com <= 0) {
+        wx.showToast({ title: '请输入有效的佣金金额', icon: 'none' })
+        return false
+      }
+      if (com > 50000) {
+        wx.showToast({ title: '佣金建议不超过50000元', icon: 'none' })
+        return false
+      }
+    }
+
+    const balance = parseFloat(sjyue)
+    if (price > balance) {
+      wx.showModal({
+        title: '余额不足',
+        content: `当前余额${sjyue}元，需要${jiage}元。请先充值。`,
+        confirmText: '去充值',
+        success: (res) => {
+          if (res.confirm) {
+            wx.navigateTo({ url: '/pages/sjchongzhi/sjchongzhi' })
+          }
+        }
+      })
+      return false
+    }
+
+    return true
+  },
+
+  resetForm() {
+    this.setData({
+      dingdanJieshao: '',
+      dingdanBeizhu: '',
+      laobanName: '',
+      zhidingUid: '',
+      jiage: '',
+      selectedLabelId: '',
+      selectedLabelName: '',
+      selectedGoodsId: null,
+      selectedGoodsTitle: '',
+      commissionEnabled: false,
+      commissionValue: ''
+    })
+    const currentType = this.data.shangpinList.find(t => t.id === this.data.selectedTypeId)
+    if (currentType) this.setSelectedType(currentType)
+  },
+
+  async onSubmit() {
+    if (this.data.isSubmitting) return
+    if (!this.validateForm()) return
+    this.setData({ isSubmitting: true })
+
+    const postData = {
+      shangpinTypeId: this.data.selectedTypeId,
+      huiyuanId: this.data.selectedHuiyuanId,
+      yaoqiuleixing: this.data.selectedYaoqiuleixing,
+      dingdanJieshao: this.data.dingdanJieshao.trim(),
+      dingdanBeizhu: this.data.dingdanBeizhu.trim() || '',
+      laobanName: this.data.laobanName.trim(),
+      zhidingUid: this.data.zhidingUid.trim() || '',
+      jiage: this.data.jiage,
+      labelId: this.data.selectedLabelId || '',
+      labelName: this.data.selectedLabelName || '',
+      commissionEnabled: this.data.commissionEnabled,
+      commissionValue: this.data.commissionEnabled ? this.data.commissionValue : '',
+      goodsId: this.data.selectedGoodsId || ''
+    }
+
+    try {
+      const res = await request({
+        url: '/dingdan/sjpaifa',
+        method: 'POST',
+        data: postData
+      })
+      if (res && res.data.code === 200) {
+        wx.showToast({ title: '派单成功', icon: 'success' })
+        const orderAmount = parseFloat(this.data.jiage)
+        const app = getApp()
+        if (app.globalData.shangjia) {
+          const newBalance = parseFloat(app.globalData.shangjia.sjyue || '0') - orderAmount
+          app.globalData.shangjia.sjyue = newBalance.toFixed(2)
+          app.globalData.shangjia.fadanzong = (parseInt(app.globalData.shangjia.fadanzong || '0') + 1).toString()
+          app.globalData.shangjia.riliushui = (parseFloat(app.globalData.shangjia.riliushui || '0') + orderAmount).toFixed(2)
+          app.globalData.shangjia.yueliushui = (parseFloat(app.globalData.shangjia.yueliushui || '0') + orderAmount).toFixed(2)
+          this.setData({ sjyue: app.globalData.shangjia.sjyue })
+        }
+        setTimeout(() => {
+          this.resetForm()
+          this.setData({ isSubmitting: false })
+        }, 1500)
+      } else {
+        wx.showModal({ title: '派单失败', content: res.data.msg || '请稍后重试', showCancel: false })
+        this.setData({ isSubmitting: false })
+      }
+    } catch (error) {
+      wx.showModal({ title: '请求失败', content: error.message || '网络错误', showCancel: false })
+      this.setData({ isSubmitting: false })
+    }
+  },
+
+  onSelectType(e) {
+    const { item } = e.currentTarget.dataset
+    this.setSelectedType(item)
+  },
+
+  registerNotificationComponent() {
+    const app = getApp()
+    const notificationComp = this.selectComponent('#global-notification')
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      }
+    }
+  },
+
+  startTutorialBtnTimer() {
+    if (this.tutorialTimer) clearTimeout(this.tutorialTimer)
+    this.tutorialTimer = setTimeout(() => {
+      this.setData({ tutorialBtnHidden: true })
+    }, 5000)
+  },
+
+  resetTutorialBtn() {
+    if (this.data.tutorialBtnHidden) this.setData({ tutorialBtnHidden: false })
+    if (this.tutorialTimer) clearTimeout(this.tutorialTimer)
+    this.tutorialTimer = setTimeout(() => {
+      this.setData({ tutorialBtnHidden: true })
+    }, 5000)
+  },
+
+  async onTutorialBtnTap() {
+    this.resetTutorialBtn()
+    PopupService.checkAndShow(this, 'sjpd1')
+  }
+})
\ No newline at end of file
diff --git a/pages/sjpaidan/sjpaidan.json b/pages/sjpaidan/sjpaidan.json
new file mode 100644
index 0000000..484db30
--- /dev/null
+++ b/pages/sjpaidan/sjpaidan.json
@@ -0,0 +1,7 @@
+{
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    },
+    "navigationBarTitleText": "商家派单"
+    
+  }
\ No newline at end of file
diff --git a/pages/sjpaidan/sjpaidan.wxml b/pages/sjpaidan/sjpaidan.wxml
new file mode 100644
index 0000000..574e914
--- /dev/null
+++ b/pages/sjpaidan/sjpaidan.wxml
@@ -0,0 +1,164 @@
+
+<view class="page-container" style="background-image: url('{{bgImageUrl}}');">
+  <view class="balance-card">
+    <text class="balance-label">可用余额</text>
+    <view class="balance-amount">
+      <text class="amount-value">{{sjyue}}</text>
+      <text class="amount-unit">元</text>
+    </view>
+    <text class="balance-tip">派单将从此余额扣除</text>
+  </view>
+
+  <view class="section">
+    <text class="section-title">选择订单类型</text>
+    <scroll-view class="type-scroll" scroll-x="true" enable-flex>
+      <block wx:for="{{shangpinList}}" wx:key="id">
+        <view 
+          class="type-item {{selectedTypeId === item.id ? 'type-active' : ''}}"
+          data-id="{{item.id}}"
+          data-item="{{item}}"
+          bindtap="onSelectType"
+        >
+          <text class="type-text">{{item.jieshao}}</text>
+        </view>
+      </block>
+    </scroll-view>
+  </view>
+
+  <view class="section" wx:if="{{isSpecialType && currentTypeGoodsList.length > 0}}">
+    <text class="section-title">选择商品模板（点击直接选中）</text>
+    <scroll-view class="goods-scroll" scroll-x="true" enable-flex>
+      <block wx:for="{{currentTypeGoodsList}}" wx:key="id">
+        <view 
+          class="goods-item {{selectedGoodsId === item.id ? 'goods-selected' : ''}}"
+          data-id="{{item.id}}"
+          bindtap="onGoodsItemTap"
+        >
+          <text class="goods-title">{{item.biaoqian}}</text>
+          <text class="goods-detail-hint">点击选中</text>
+        </view>
+      </block>
+    </scroll-view>
+  </view>
+
+  <view class="form-container">
+    <view class="form-item">
+      <text class="form-label required">订单介绍</text>
+      <scroll-view wx:if="{{isSpecialType}}" class="form-input form-input-scroll" scroll-y="true">
+        <text>{{dingdanJieshao}}</text>
+      </scroll-view>
+      <input wx:else
+        class="form-input"
+        placeholder="请输入订单主要内容（必填，最多50字）"
+        maxlength="50"
+        value="{{dingdanJieshao}}"
+        bindinput="onDingdanJieshaoInput"
+      />
+      <text class="word-count">{{dingdanJieshao.length}}/50</text>
+    </view>
+
+    <view class="form-item" wx:if="{{!isSpecialType}}">
+      <text class="form-label">订单备注（选填）</text>
+      <input 
+        class="form-input" 
+        placeholder="填写或补充其他信息" 
+        maxlength="50"
+        value="{{dingdanBeizhu}}"
+        bindinput="onDingdanBeizhuInput"
+      />
+      <text class="word-count">{{dingdanBeizhu.length}}/50</text>
+    </view>
+
+    <view class="form-item">
+      <text class="form-label required">老板昵称/ID</text>
+      <input 
+        class="form-input" 
+        placeholder="请输入（必填，最多15字）" 
+        maxlength="15"
+        value="{{laobanName}}"
+        bindinput="onLaobanNameInput"
+      />
+      <text class="word-count">{{laobanName.length}}/15</text>
+    </view>
+
+    <view class="form-item">
+      <text class="form-label">指定UID（选填）</text>
+      <input 
+        class="form-input" 
+        placeholder="请输入指定UID" 
+        maxlength="10"
+        value="{{zhidingUid}}"
+        bindinput="onZhidingUidInput"
+      />
+    </view>
+
+    <view class="form-item">
+      <text class="form-label required">订单价格（元）</text>
+      <input 
+        class="form-input" 
+        type="digit"
+        placeholder="0.1 - 10000，支持两位小数"
+        value="{{jiage}}"
+        bindinput="onJiageInput"
+      />
+      <text class="price-tip">范围：0.1 - 10000元</text>
+    </view>
+
+    <view class="form-item" wx:if="{{currentTypeChenghaoList.length > 0}}">
+      <text class="form-label">要求打手标签*如金牌打手（选填）</text>
+      <picker 
+        mode="selector" 
+        range="{{currentTypeChenghaoList}}" 
+        range-key="mingcheng" 
+        bindchange="onLabelChange"
+      >
+        <view class="picker-view">
+          <text>{{selectedLabelName || '无'}}</text>
+        </view>
+      </picker>
+    </view>
+
+    <view class="form-item commission-item">
+      <text class="form-label">要求打手押金（建议≤50元）</text>
+      <switch checked="{{commissionEnabled}}" disabled="{{commissionLocked}}" bindchange="onCommissionToggle"/>
+      <input 
+        wx:if="{{commissionEnabled}}" 
+        class="commission-input {{commissionLocked ? 'input-disabled' : ''}}" 
+        type="digit" 
+        placeholder="押金金额" 
+        value="{{commissionValue}}"
+        disabled="{{commissionLocked}}"
+        bindinput="onCommissionValueInput"
+      />
+    </view>
+  </view>
+
+  <view class="btn-container">
+    <view 
+      class="submit-btn {{isSubmitting ? 'btn-disabled' : ''}}" 
+      bindtap="onSubmit"
+      hover-class="btn-hover"
+    >
+      <text class="btn-text">{{isSubmitting ? '派发中...' : '立即派发'}}</text>
+    </view>
+  </view>
+
+  <view class="loading-mask" wx:if="{{isLoading}}">
+    <view class="loading-content">
+      <view class="loading-spinner"></view>
+      <text class="loading-text">加载中...</text>
+    </view>
+  </view>
+
+  <global-notification id="global-notification" />
+
+  <view 
+    class="tutorial-btn {{tutorialBtnHidden ? 'tutorial-btn-hidden' : ''}}"
+    bindtap="onTutorialBtnTap"
+    hover-class="tutorial-btn-hover"
+  >
+    <text class="tutorial-btn-text">教程</text>
+  </view>
+
+  <popup-notice id="popupNotice" />
+</view>
\ No newline at end of file
diff --git a/pages/sjpaidan/sjpaidan.wxss b/pages/sjpaidan/sjpaidan.wxss
new file mode 100644
index 0000000..6e051ac
--- /dev/null
+++ b/pages/sjpaidan/sjpaidan.wxss
@@ -0,0 +1,437 @@
+/* pages/sjpaidan/sjpaidan.wxss - 黑金升级版 + 背景图由js动态拼接 */
+page {
+    background-color: #0a0a0f;
+  }
+  
+  .page-container {
+    min-height: 100vh;
+    background-size: cover;
+    background-position: center;
+    background-attachment: fixed;
+    position: relative;
+    padding: 30rpx;
+    box-sizing: border-box;
+    padding-bottom: 140rpx;
+  }
+  
+  .page-container::before {
+    content: '';
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(10, 10, 15, 0.75);
+    backdrop-filter: blur(6rpx);
+    z-index: 0;
+    pointer-events: none;
+  }
+  
+  .balance-card,
+  .section,
+  .form-container,
+  .btn-container,
+  .loading-mask {
+    position: relative;
+    z-index: 1;
+  }
+  
+  .balance-card {
+    background: linear-gradient(135deg, rgba(20,20,30,0.95), rgba(30,30,50,0.95));
+    border-radius: 24rpx;
+    padding: 36rpx;
+    margin-bottom: 40rpx;
+    color: #fff;
+    box-shadow: 0 15rpx 35rpx rgba(0,0,0,0.4), 0 0 40rpx rgba(0,180,255,0.15);
+    text-align: center;
+    border: 1.5rpx solid rgba(0,180,255,0.2);
+    backdrop-filter: blur(10rpx);
+    overflow: hidden;
+  }
+  .balance-card::before {
+    content: '';
+    position: absolute;
+    top: -50%; left: -50%;
+    width: 200%; height: 200%;
+    background: linear-gradient(45deg, transparent 30%, rgba(0,180,255,0.1) 50%, transparent 70%);
+    animation: cardShine 6s infinite linear;
+    z-index: 1;
+  }
+  @keyframes cardShine {
+    0% { transform: translateX(-100%) translateY(-100%) rotate(45deg); }
+    100% { transform: translateX(100%) translateY(100%) rotate(45deg); }
+  }
+  .balance-label {
+    font-size: 28rpx;
+    color: rgba(255,255,255,0.8);
+    margin-bottom: 18rpx;
+    font-weight: 500;
+    position: relative;
+    z-index: 2;
+  }
+  .balance-amount {
+    display: flex;
+    align-items: baseline;
+    justify-content: center;
+    margin-bottom: 15rpx;
+    position: relative;
+    z-index: 2;
+  }
+  .amount-value {
+    font-size: 64rpx;
+    font-weight: bold;
+    color: #FFD700;
+    text-shadow: 0 0 20rpx rgba(255,215,0,0.7);
+    animation: amountGlow 3s infinite alternate;
+  }
+  @keyframes amountGlow {
+    0% { color: #FFD700; text-shadow: 0 0 15rpx rgba(255,215,0,0.6); }
+    100% { color: #FFE44D; text-shadow: 0 0 25rpx rgba(255,215,0,0.9); }
+  }
+  .amount-unit {
+    font-size: 36rpx;
+    color: #FFD700;
+    margin-left: 12rpx;
+    font-weight: 500;
+  }
+  .balance-tip {
+    font-size: 24rpx;
+    color: rgba(255,255,255,0.6);
+    position: relative;
+    z-index: 2;
+  }
+  
+  .section {
+    margin-bottom: 35rpx;
+  }
+  .section-title {
+    font-size: 32rpx;
+    font-weight: 700;
+    color: #FFFFFF;
+    margin-bottom: 25rpx;
+    padding-left: 12rpx;
+    border-left: 6rpx solid #9C27B0;
+    text-shadow: 0 2rpx 4rpx rgba(0,0,0,0.3);
+  }
+  
+  .type-scroll {
+    white-space: nowrap;
+    display: flex;
+    height: 90rpx;
+  }
+  .type-item {
+    display: inline-flex;
+    flex-shrink: 0;
+    align-items: center;
+    justify-content: center;
+    height: 85rpx;
+    padding: 0 40rpx;
+    margin-right: 20rpx;
+    background: rgba(255,255,255,0.08);
+    border-radius: 45rpx;
+    border: 2rpx solid rgba(255,255,255,0.15);
+    font-size: 28rpx;
+    color: rgba(255,255,255,0.8);
+    transition: all 0.3s cubic-bezier(0.175,0.885,0.32,1.275);
+    backdrop-filter: blur(10rpx);
+  }
+  .type-active {
+    background: linear-gradient(135deg, #9C27B0 0%, #673AB7 100%);
+    border-color: #9C27B0;
+    color: white;
+    transform: scale(1.05);
+    box-shadow: 0 10rpx 25rpx rgba(156,39,176,0.4);
+  }
+  .type-text {
+    max-width: 220rpx;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    font-weight: 500;
+  }
+  
+  /* 特殊商品模板 */
+  .goods-scroll {
+    white-space: nowrap;
+    display: flex;
+    height: 160rpx;
+    margin-top: 10rpx;
+  }
+  .goods-item {
+    display: inline-flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    width: 200rpx;
+    height: 140rpx;
+    margin-right: 20rpx;
+    background: rgba(255,255,255,0.08);
+    border-radius: 20rpx;
+    border: 2rpx solid rgba(255,255,255,0.15);
+    padding: 10rpx;
+    box-sizing: border-box;
+    transition: all 0.3s;
+    backdrop-filter: blur(10rpx);
+  }
+  .goods-item:active {
+    background: rgba(255,255,255,0.15);
+    transform: scale(0.96);
+  }
+  .goods-selected {
+    border-color: #FFD700;
+    background: rgba(255,215,0,0.15);
+    box-shadow: 0 0 20rpx rgba(255,215,0,0.3);
+  }
+  .goods-title {
+    font-size: 28rpx;
+    color: #fff;
+    font-weight: 500;
+    text-align: center;
+    word-break: break-all;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+    margin-bottom: 6rpx;
+    line-height: 1.2;
+  }
+  .goods-detail-hint {
+    font-size: 20rpx;
+    color: rgba(255,255,255,0.5);
+    text-align: center;
+  }
+  
+  .form-container {
+    background: rgba(30,30,45,0.85);
+    backdrop-filter: blur(20rpx);
+    border-radius: 30rpx;
+    padding: 30rpx;
+    box-shadow: 0 10rpx 30rpx rgba(0,0,0,0.3);
+    border: 1.5rpx solid rgba(255,255,255,0.1);
+    margin-bottom: 40rpx;
+  }
+  .form-item {
+    margin-bottom: 35rpx;
+    position: relative;
+  }
+  .form-item:last-child {
+    margin-bottom: 0;
+  }
+  .form-label {
+    font-size: 30rpx;
+    font-weight: 600;
+    color: rgba(255,255,255,0.9);
+    display: block;
+    margin-bottom: 15rpx;
+  }
+  .form-label.required::after {
+    content: '*';
+    color: #ff4444;
+    margin-left: 8rpx;
+  }
+  .form-input {
+    width: 100%;
+    height: 80rpx;
+    background: rgba(255,255,255,0.1);
+    border-radius: 16rpx;
+    padding: 0 25rpx;
+    font-size: 28rpx;
+    color: #FFFFFF;
+    border: 2rpx solid rgba(255,255,255,0.2);
+    box-sizing: border-box;
+    transition: all 0.3s;
+  }
+  .form-input:focus {
+    border-color: #9C27B0;
+    background: rgba(255,255,255,0.15);
+  }
+  .input-disabled {
+    background: rgba(255,255,255,0.05);
+    color: rgba(255,255,255,0.6);
+    border-color: rgba(255,255,255,0.08);
+  }
+  .word-count {
+    position: absolute;
+    right: 0;
+    top: 0;
+    font-size: 24rpx;
+    color: rgba(255,255,255,0.5);
+  }
+  .price-tip {
+    font-size: 24rpx;
+    color: rgba(255,255,255,0.5);
+    margin-top: 10rpx;
+    display: block;
+  }
+  .picker-view {
+    background: rgba(255,255,255,0.1);
+    border-radius: 16rpx;
+    padding: 20rpx 25rpx;
+    border: 2rpx solid rgba(255,255,255,0.2);
+    color: rgba(255,255,255,0.9);
+    font-size: 28rpx;
+  }
+  .commission-item {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 20rpx;
+  }
+  .commission-item .form-label {
+    width: 100%;
+    margin-bottom: 10rpx;
+  }
+  .commission-input {
+    flex: 1;
+    background: rgba(255,255,255,0.1);
+    border-radius: 16rpx;
+    padding: 20rpx;
+    color: #fff;
+    border: 2rpx solid rgba(255,255,255,0.2);
+    font-size: 28rpx;
+  }
+  .commission-input.input-disabled {
+    background: rgba(255,255,255,0.05);
+    color: rgba(255,255,255,0.6);
+  }
+  
+  .btn-container {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: linear-gradient(to top, rgba(10,10,15,0.95), transparent);
+    padding: 30rpx;
+    box-sizing: border-box;
+    z-index: 9999;
+  }
+  .submit-btn {
+    background: linear-gradient(135deg, #ff4444 0%, #cc0000 100%);
+    border-radius: 50rpx;
+    height: 90rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-shadow: 0 10rpx 30rpx rgba(255,68,68,0.3);
+    transition: all 0.3s;
+    position: relative;
+    overflow: hidden;
+  }
+  .submit-btn::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent);
+    animation: shine 2s infinite;
+  }
+  .btn-hover {
+    transform: translateY(-2rpx);
+    box-shadow: 0 15rpx 40rpx rgba(255,68,68,0.4);
+  }
+  .btn-disabled {
+    opacity: 0.6;
+    filter: grayscale(0.3);
+    pointer-events: none;
+  }
+  .btn-text {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: white;
+    letter-spacing: 4rpx;
+    position: relative;
+    z-index: 2;
+  }
+  @keyframes shine {
+    0% { left: -100%; }
+    100% { left: 100%; }
+  }
+  
+  .loading-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0,0,0,0.8);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 10000;
+  }
+  .loading-content {
+    background: rgba(40,40,60,0.95);
+    padding: 60rpx 80rpx;
+    border-radius: 30rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    box-shadow: 0 25rpx 70rpx rgba(0,0,0,0.6);
+  }
+  .loading-spinner {
+    width: 90rpx;
+    height: 90rpx;
+    border: 8rpx solid rgba(0,180,255,0.2);
+    border-top: 8rpx solid #00B4FF;
+    border-radius: 50%;
+    animation: spin 1.2s linear infinite;
+    margin-bottom: 35rpx;
+  }
+  .loading-text {
+    font-size: 30rpx;
+    color: #00B4FF;
+    font-weight: 600;
+  }
+  @keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+  }
+  
+  .tutorial-btn {
+    position: fixed;
+    right: 0;
+    top: 20%;
+    transform: translateY(-50%);
+    width: 120rpx;
+    height: 120rpx;
+    background: rgba(0, 0, 0, 0.75);
+    backdrop-filter: blur(15rpx);
+    border-radius: 60rpx 0 0 60rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 10001;
+    box-shadow: -8rpx 0 20rpx rgba(0,0,0,0.3);
+    transition: right 0.3s ease-out;
+    border: 2rpx solid rgba(255,215,0,0.5);
+    border-right: none;
+  }
+  .tutorial-btn-text {
+    color: #FFD700;
+    font-size: 36rpx;
+    font-weight: bold;
+    writing-mode: vertical-rl;
+    letter-spacing: 6rpx;
+  }
+  .tutorial-btn-hidden {
+    right: -80rpx;
+  }
+  .tutorial-btn-hover {
+    background: rgba(0, 0, 0, 0.9);
+    transform: translateY(-50%) scale(1.05);
+  }
+
+
+
+
+
+
+  .form-input-scroll {
+    white-space: normal;
+    word-break: break-all;
+    padding: 0 25rpx;
+    box-sizing: border-box;
+  }
\ No newline at end of file
diff --git a/pages/sjpaihang/sjpaihang.js b/pages/sjpaihang/sjpaihang.js
new file mode 100644
index 0000000..9c91fcf
--- /dev/null
+++ b/pages/sjpaihang/sjpaihang.js
@@ -0,0 +1,394 @@
+// pages/shangjia-paihang/shangjia-paihang.js
+const app = getApp()
+import request from '../../utils/request.js'
+
+Page({
+  data: {
+    // 页面加载状态
+    jiazaiZhuangtai: true,
+    
+    // 排行榜类型：1=今日流水，2=今月流水
+    paihangLeixing: 1,
+    
+    // 榜单数据
+    paihangShuju: [],
+    
+    // 是否展示真实数据（后端控制）
+    xianshiZhenshiShuju: false,
+    
+    // 虚拟数据（用于当后端不允许展示时）
+    xuniShuju: [],
+    
+    // 按钮防抖控制
+    btnFangdou: false,
+    
+    // OSS图片基础URL（从全局变量获取）
+    ossImageUrl: '',
+    
+    // 默认头像（相对路径，需要与OSS基础URL拼接）
+    morentouxiang: '',
+    
+    // 用户类型：1=打手，2=管事，3=商家（当前页面固定为商家）
+    yonghuLeixing: 3,
+    
+    // 前三名特殊数据
+    qiansanMing: [],
+    
+    // 动画相关
+    crownAnimation: null,
+    
+    // 卡片点击特效
+    flashCardIndex: -1,
+    flashCardType: '',
+    flashAnimation: null,
+    
+    // 切换按钮选中状态
+    switchBgPosition: 0
+  },
+
+  onLoad() {
+    // 设置页面标题
+    wx.setNavigationBarTitle({
+      title: '商家排行榜'
+    })
+    
+    // 初始化全局变量
+    this.setData({
+      ossImageUrl: app.globalData.ossImageUrl || '',
+      morentouxiang: app.globalData.morentouxiang || ''
+    })
+    
+    // 初始化虚拟数据
+    this.initXuniShuju()
+    
+    // 加载排行榜数据
+    this.huoquPaihangShuju()
+    
+    // 开始皇冠动画
+    this.startCrownAnimation()
+  },
+
+  onShow() {
+    // 页面显示时恢复动画
+    this.registerNotificationComponent();
+    this.startCrownAnimation()
+  },
+  registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+    
+    if (notificationComp && notificationComp.showNotification) {
+        console.log('🏪 商城页面注册通知组件');
+        app.globalData.globalNotification = {
+            show: (data) => notificationComp.showNotification(data),
+            hide: () => notificationComp.hideNotification()
+        };
+    }
+},
+
+  onHide() {
+    // 页面隐藏时停止动画
+    this.stopCrownAnimation()
+  },
+
+  onUnload() {
+    // 页面卸载时停止动画
+    this.stopCrownAnimation()
+  },
+
+  // 初始化虚拟数据
+  initXuniShuju() {
+    const xuniShuju = []
+    const names = ['商业大亨', '平台巨头', '金牌商家', '优质供应商', '运营高手', 
+                   '流量之王', '服务专家', '合作典范', '商业精英', '销售冠军']
+    
+    for (let i = 0; i < 10; i++) {
+      xuniShuju.push({
+        mingci: i + 1,
+        touxiang: '',
+        nicheng: names[i] || `虚拟商家${i + 1}`,
+        uid: `S${100000 + i}`,
+        jine: (5888.88 - i * 500).toFixed(2),  // 商家显示的是流水金额
+        jineClass: 'normal'  // 金额样式
+      })
+    }
+    this.setData({ xuniShuju })
+  },
+
+  // 开始皇冠动画
+  startCrownAnimation() {
+    this.stopCrownAnimation()
+    
+    const animation = wx.createAnimation({
+      duration: 800,
+      timingFunction: 'ease-in-out'
+    })
+    
+    let scale = 1
+    const animate = () => {
+      scale = scale === 1 ? 1.15 : 1
+      
+      animation.scale(scale).step({
+        duration: 800,
+        timingFunction: 'ease-in-out'
+      })
+      
+      this.setData({
+        crownAnimation: animation.export()
+      })
+      
+      this.data.crownAnimationTimer = setTimeout(() => {
+        animate()
+      }, 800)
+    }
+    
+    animate()
+  },
+
+  // 停止皇冠动画
+  stopCrownAnimation() {
+    if (this.data.crownAnimationTimer) {
+      clearTimeout(this.data.crownAnimationTimer)
+      this.setData({
+        crownAnimationTimer: null
+      })
+    }
+  },
+
+  // 卡片点击特效
+  handleCardTap(e) {
+    const index = e.currentTarget.dataset.index
+    const type = e.currentTarget.dataset.type // 'top3' 或 'normal'
+    
+    // 创建闪光动画
+    const animation = wx.createAnimation({
+      duration: 300,
+      timingFunction: 'ease-out'
+    })
+    
+    // 快速闪光效果
+    animation.opacity(0.9).step({
+      duration: 50,
+      timingFunction: 'linear'
+    })
+    
+    animation.opacity(1).step({
+      duration: 250,
+      timingFunction: 'ease-out'
+    })
+    
+    this.setData({
+      flashCardIndex: index,
+      flashCardType: type,
+      flashAnimation: animation.export()
+    })
+    
+    // 300ms后重置闪光状态
+    setTimeout(() => {
+      this.setData({
+        flashCardIndex: -1,
+        flashCardType: ''
+      })
+    }, 300)
+  },
+
+  // 获取排行榜数据
+  async huoquPaihangShuju() {
+    this.setData({
+      jiazaiZhuangtai: true
+    })
+    
+    try {
+      // 准备请求参数
+      const requestData = {
+        leixing: this.data.paihangLeixing,
+        yonghu_leixing: this.data.yonghuLeixing
+      }
+      
+      // 使用封装的request发送请求
+      const res = await request({
+        url: '/peizhi/dsph',
+        method: 'POST',
+        data: requestData,
+        header: {
+          'content-type': 'application/json'
+        }
+      })
+      
+      // 处理返回数据
+      if (res && res.data && res.data.code === 0) {
+        const responseData = res.data.data
+        
+        // 检查后端是否允许展示
+        if (responseData.xianshi && responseData.paihang_list && responseData.paihang_list.length > 0) {
+          // 处理头像URL拼接和金额样式
+          const processedList = this.processData(responseData.paihang_list)
+          
+          // 提取前三名特殊展示
+          const qiansanMing = processedList.slice(0, 3)
+          const qitaPaihang = processedList.slice(3)
+          
+          this.setData({
+            paihangShuju: qitaPaihang,
+            qiansanMing: qiansanMing,
+            xianshiZhenshiShuju: true,
+            jiazaiZhuangtai: false
+          })
+        } else {
+          // 后端不允许展示或数据不足，显示虚拟数据
+          this.xianshiXuniShuju()
+        }
+      } else {
+        // 请求失败，显示虚拟数据
+        const errorMsg = res && res.data ? (res.data.msg || '获取数据失败') : '网络请求失败'
+        
+        wx.showToast({
+          title: errorMsg,
+          icon: 'none',
+          duration: 2000
+        })
+        
+        this.xianshiXuniShuju()
+      }
+    } catch (error) {
+      console.error('获取排行榜数据失败:', error)
+      
+      wx.showToast({
+        title: '网络请求异常，请重试',
+        icon: 'none',
+        duration: 2000
+      })
+      
+      this.xianshiXuniShuju()
+    }
+  },
+
+  // 处理数据（头像拼接和金额样式）
+  processData(list) {
+    const { ossImageUrl, morentouxiang } = this.data
+    
+    return list.map(item => {
+      // 优先使用返回的头像URL
+      let finalTouxiang = item.touxiang
+      
+      // 如果返回的头像为空，使用默认头像
+      if (!finalTouxiang && morentouxiang) {
+        finalTouxiang = morentouxiang
+      }
+      
+      // 拼接完整的URL
+      let fullTouxiangUrl = ''
+      if (finalTouxiang && ossImageUrl) {
+        // 确保路径不以斜杠开头
+        let touxiangPath = finalTouxiang
+        if (touxiangPath.startsWith('/')) {
+          touxiangPath = touxiangPath.substring(1)
+        }
+        fullTouxiangUrl = ossImageUrl + touxiangPath
+      }
+      
+      // 处理金额样式
+      const jine = parseFloat(item.jine || 0)
+      let jineClass = 'normal'
+      const jineStr = jine.toFixed(2)
+      
+      // 判断金额位数
+      const integerPart = jineStr.split('.')[0]
+      if (integerPart.length >= 7) {  // 7位数及以上
+        jineClass = 'very-small'
+      } else if (integerPart.length >= 6) {  // 6位数
+        jineClass = 'small'
+      } else if (integerPart.length >= 5) {  // 5位数
+        jineClass = 'medium'
+      }
+      
+      return {
+        ...item,
+        full_touxiang: fullTouxiangUrl,
+        jine: jineStr,
+        jineClass: jineClass
+      }
+    })
+  },
+
+  // 显示虚拟数据
+  xianshiXuniShuju() {
+    const processedList = this.processData(this.data.xuniShuju)
+    const qiansanMing = processedList.slice(0, 3)
+    const qitaPaihang = processedList.slice(3)
+    
+    this.setData({
+      paihangShuju: qitaPaihang,
+      qiansanMing: qiansanMing,
+      xianshiZhenshiShuju: false,
+      jiazaiZhuangtai: false
+    })
+  },
+
+  // 切换排行榜类型（今日/今月）
+  qiehuangPaihangLeixing(e) {
+    // 防抖处理：防止连续点击
+    if (this.data.btnFangdou) return
+    
+    const leixing = e.currentTarget.dataset.leixing
+    if (leixing == this.data.paihangLeixing) return
+    
+    // 设置防抖状态
+    this.setData({
+      btnFangdou: true
+    })
+    
+    // 更新切换按钮位置
+    this.setData({
+      paihangLeixing: leixing,
+      switchBgPosition: leixing == 1 ? 0 : 1
+    })
+    
+    // 重新加载数据
+    this.huoquPaihangShuju()
+    
+    // 1秒后解除防抖
+    setTimeout(() => {
+      this.setData({
+        btnFangdou: false
+      })
+    }, 1000)
+  },
+
+  // 用户下拉刷新
+  onPullDownRefresh() {
+    this.huoquPaihangShuju()
+    wx.stopPullDownRefresh()
+  },
+
+  // 图片加载失败处理
+  tupianJiazaiShibai(e) {
+    const index = e.currentTarget.dataset.index
+    const type = e.currentTarget.dataset.type // 'top3' 或 'normal'
+    
+    // 使用默认头像
+    const { ossImageUrl, morentouxiang } = this.data
+    let defaultUrl = ''
+    if (morentouxiang && ossImageUrl) {
+      let defaultPath = morentouxiang
+      if (defaultPath.startsWith('/')) {
+        defaultPath = defaultPath.substring(1)
+      }
+      defaultUrl = ossImageUrl + defaultPath
+    }
+    
+    if (type === 'top3') {
+      // 前三名头像加载失败
+      const key = `qiansanMing[${index}].full_touxiang`
+      this.setData({
+        [key]: defaultUrl
+      })
+    } else {
+      // 普通排名头像加载失败
+      const key = `paihangShuju[${index}].full_touxiang`
+      this.setData({
+        [key]: defaultUrl
+      })
+    }
+  }
+})
\ No newline at end of file
diff --git a/pages/sjpaihang/sjpaihang.json b/pages/sjpaihang/sjpaihang.json
new file mode 100644
index 0000000..1a33122
--- /dev/null
+++ b/pages/sjpaihang/sjpaihang.json
@@ -0,0 +1,12 @@
+{
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    },
+    "navigationBarTitleText": "商家排行榜",
+    "navigationBarBackgroundColor": "#000000",
+    "navigationBarTextStyle": "white",
+    "enablePullDownRefresh": false,
+    "backgroundColor": "#000000",
+    "backgroundTextStyle": "dark",
+    "onReachBottomDistance": 50
+  }
\ No newline at end of file
diff --git a/pages/sjpaihang/sjpaihang.wxml b/pages/sjpaihang/sjpaihang.wxml
new file mode 100644
index 0000000..3b18825
--- /dev/null
+++ b/pages/sjpaihang/sjpaihang.wxml
@@ -0,0 +1,290 @@
+
+<view class="shangjia-paihang-page">
+  
+  
+  <view class="cyber-bg">
+    
+    <view class="cyber-grid"></view>
+    
+    <view class="cyber-scanline"></view>
+    
+    <view class="data-streams">
+      <view class="stream stream-1"></view>
+      <view class="stream stream-2"></view>
+      <view class="stream stream-3"></view>
+    </view>
+    
+    <view class="floating-particles">
+      <view class="particle" wx:for="{{12}}" wx:key="index"></view>
+    </view>
+  </view>
+  
+  
+  <view class="page-header">
+    
+    <view class="title-container">
+      <text class="main-title">商家排行榜</text>
+      <view class="title-line"></view>
+      <text class="sub-title">SHANGJIA RANKING</text>
+    </view>
+    
+    
+    <view class="toggle-container">
+      <view class="toggle-bg" style="transform: translateX({{paihangLeixing == 1 ? '0' : '100%'}});"></view>
+      <view 
+        class="toggle-btn {{paihangLeixing == 1 ? 'active' : ''}} {{btnFangdou ? 'disabled' : ''}}"
+        data-leixing="1"
+        bindtap="qiehuangPaihangLeixing"
+      >
+        <text class="toggle-text">今日流水</text>
+        <view class="toggle-line {{paihangLeixing == 1 ? 'active' : ''}}"></view>
+      </view>
+      <view 
+        class="toggle-btn {{paihangLeixing == 2 ? 'active' : ''}} {{btnFangdou ? 'disabled' : ''}}"
+        data-leixing="2"
+        bindtap="qiehuangPaihangLeixing"
+      >
+        <text class="toggle-text">今月流水</text>
+        <view class="toggle-line {{paihangLeixing == 2 ? 'active' : ''}}"></view>
+      </view>
+    </view>
+  </view>
+  
+  
+  <view wx:if="{{jiazaiZhuangtai}}" class="loading-state">
+    <view class="loading-content">
+      <view class="loading-spinner">
+        <view class="spinner-outer"></view>
+        <view class="spinner-inner"></view>
+        <view class="spinner-core"></view>
+      </view>
+      <text class="loading-text">数据加载中</text>
+      <text class="loading-sub">Connecting to server...</text>
+    </view>
+  </view>
+  
+  
+  <view wx:else class="ranking-content">
+    
+    
+    <view wx:if="{{!xianshiZhenshiShuju}}" class="demo-notice">
+      <view class="notice-icon">📡</view>
+      <view class="notice-content">
+        <text class="notice-title">排行榜数据准备中</text>
+        <text class="notice-desc">当前显示为模拟数据，实时排名即将开放</text>
+      </view>
+      <view class="notice-glow"></view>
+    </view>
+    
+    
+    <view class="top-three-section" wx:if="{{qiansanMing.length > 0}}">
+      
+      
+      <view class="rank-card rank-2 {{flashCardIndex == 1 && flashCardType == 'top3' ? 'flash' : ''}}"
+            animation="{{flashCardIndex == 1 && flashCardType == 'top3' ? flashAnimation : ''}}"
+            data-index="1" data-type="top3" bindtap="handleCardTap">
+        
+        <view class="podium-base podium-silver">
+          <view class="podium-glow"></view>
+          <text class="podium-number">2</text>
+        </view>
+        
+        <view class="rank-content">
+          
+          <view class="avatar-frame frame-silver">
+            <view class="avatar-container">
+              <image class="avatar-image" src="{{qiansanMing[1] ? qiansanMing[1].full_touxiang : ''}}" mode="aspectFill" binderror="tupianJiazaiShibai"></image>
+              <view class="avatar-halo halo-silver"></view>
+              <view class="avatar-sparkles">
+                <view class="sparkle s1"></view>
+                <view class="sparkle s2"></view>
+                <view class="sparkle s3"></view>
+              </view>
+            </view>
+            <view class="rank-badge badge-silver">2</view>
+          </view>
+          
+          
+          <view class="user-info-card">
+            <view class="info-header">
+              <text class="user-name">{{qiansanMing[1] ? qiansanMing[1].nicheng : '等待上榜'}}</text>
+            </view>
+            <view class="info-body">
+              <view class="uid-row">
+                <text class="uid-label">ID:</text>
+                <text class="uid-value">{{qiansanMing[1] ? qiansanMing[1].uid : '----'}}</text>
+              </view>
+              <view class="income-row">
+                <text class="income-label">流水:</text>
+                <view class="income-value">
+                  <text class="currency">¥</text>
+                  <text class="amount {{qiansanMing[1] ? qiansanMing[1].jineClass : ''}}">{{qiansanMing[1] ? qiansanMing[1].jine : '0.00'}}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      
+      
+      <view class="rank-card rank-1 {{flashCardIndex == 0 && flashCardType == 'top3' ? 'flash' : ''}}"
+            animation="{{flashCardIndex == 0 && flashCardType == 'top3' ? flashAnimation : ''}}"
+            data-index="0" data-type="top3" bindtap="handleCardTap">
+        
+        
+        <view class="crown-container" animation="{{crownAnimation}}">
+          <view class="crown">
+            <text class="crown-icon">👑</text>
+            <view class="crown-rays">
+              <view class="ray ray-1"></view>
+              <view class="ray ray-2"></view>
+              <view class="ray ray-3"></view>
+              <view class="ray ray-4"></view>
+              <view class="ray ray-5"></view>
+              <view class="ray ray-6"></view>
+            </view>
+            <view class="crown-glow"></view>
+          </view>
+        </view>
+        
+        <view class="podium-base podium-gold">
+          <view class="podium-glow"></view>
+          <text class="podium-number">1</text>
+        </view>
+        
+        <view class="rank-content">
+          
+          <view class="avatar-frame frame-gold">
+            <view class="avatar-container">
+              <image class="avatar-image" src="{{qiansanMing[0] ? qiansanMing[0].full_touxiang : ''}}" mode="aspectFill" binderror="tupianJiazaiShibai"></image>
+              <view class="avatar-halo halo-gold"></view>
+              <view class="avatar-sparkles">
+                <view class="sparkle s1"></view>
+                <view class="sparkle s2"></view>
+                <view class="sparkle s3"></view>
+                <view class="sparkle s4"></view>
+              </view>
+            </view>
+            <view class="rank-badge badge-gold">1</view>
+          </view>
+          
+          
+          <view class="user-info-card">
+            <view class="info-header">
+              <text class="user-name">{{qiansanMing[0] ? qiansanMing[0].nicheng : '等待上榜'}}</text>
+            </view>
+            <view class="info-body">
+              <view class="uid-row">
+                <text class="uid-label">ID:</text>
+                <text class="uid-value">{{qiansanMing[0] ? qiansanMing[0].uid : '----'}}</text>
+              </view>
+              <view class="income-row">
+                <text class="income-label">流水:</text>
+                <view class="income-value">
+                  <text class="currency">¥</text>
+                  <text class="amount {{qiansanMing[0] ? qiansanMing[0].jineClass : ''}}">{{qiansanMing[0] ? qiansanMing[0].jine : '0.00'}}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      
+      
+      <view class="rank-card rank-3 {{flashCardIndex == 2 && flashCardType == 'top3' ? 'flash' : ''}}"
+            animation="{{flashCardIndex == 2 && flashCardType == 'top3' ? flashAnimation : ''}}"
+            data-index="2" data-type="top3" bindtap="handleCardTap">
+        
+        <view class="podium-base podium-bronze">
+          <view class="podium-glow"></view>
+          <text class="podium-number">3</text>
+        </view>
+        
+        <view class="rank-content">
+          
+          <view class="avatar-frame frame-bronze">
+            <view class="avatar-container">
+              <image class="avatar-image" src="{{qiansanMing[2] ? qiansanMing[2].full_touxiang : ''}}" mode="aspectFill" binderror="tupianJiazaiShibai"></image>
+              <view class="avatar-halo halo-bronze"></view>
+              <view class="avatar-sparkles">
+                <view class="sparkle s1"></view>
+                <view class="sparkle s2"></view>
+                <view class="sparkle s3"></view>
+              </view>
+            </view>
+            <view class="rank-badge badge-bronze">3</view>
+          </view>
+          
+          
+          <view class="user-info-card">
+            <view class="info-header">
+              <text class="user-name">{{qiansanMing[2] ? qiansanMing[2].nicheng : '等待上榜'}}</text>
+            </view>
+            <view class="info-body">
+              <view class="uid-row">
+                <text class="uid-label">ID:</text>
+                <text class="uid-value">{{qiansanMing[2] ? qiansanMing[2].uid : '----'}}</text>
+              </view>
+              <view class="income-row">
+                <text class="income-label">流水:</text>
+                <view class="income-value">
+                  <text class="currency">¥</text>
+                  <text class="amount {{qiansanMing[2] ? qiansanMing[2].jineClass : ''}}">{{qiansanMing[2] ? qiansanMing[2].jine : '0.00'}}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    
+    
+    <view class="other-ranks-section" wx:if="{{paihangShuju.length > 0}}">
+      <view class="section-title">
+        <view class="title-line"></view>
+        <text class="title-text">其他排名</text>
+        <view class="title-line"></view>
+      </view>
+      
+      <view class="rank-list">
+        <view class="rank-item {{flashCardIndex == index && flashCardType == 'normal' ? 'flash' : ''}}"
+              wx:for="{{paihangShuju}}" wx:key="index"
+              animation="{{flashCardIndex == index && flashCardType == 'normal' ? flashAnimation : ''}}"
+              data-index="{{index}}" data-type="normal" bindtap="handleCardTap">
+          
+          <view class="rank-number">
+            <text class="number-text">{{xianshiZhenshiShuju ? index + 4 : index + 1}}</text>
+            <view class="number-glow"></view>
+          </view>
+          
+          <view class="rank-avatar">
+            <image class="rank-avatar-img" src="{{item.full_touxiang}}" mode="aspectFill" binderror="tupianJiazaiShibai"></image>
+            <view class="rank-avatar-halo"></view>
+          </view>
+          
+          <view class="rank-info">
+            <text class="rank-name">{{item.nicheng}}</text>
+            <text class="rank-uid">UID: {{item.uid}}</text>
+          </view>
+          
+          <view class="rank-income">
+            <text class="income-currency">¥</text>
+            <text class="income-amount {{item.jineClass}}">{{item.jine}}</text>
+            <view class="income-glow"></view>
+          </view>
+          
+          <view class="rank-hover"></view>
+        </view>
+      </view>
+    </view>
+    
+    
+    <view wx:if="{{xianshiZhenshiShuju && paihangShuju.length === 0 && qiansanMing.length === 0}}" class="empty-state">
+      <view class="empty-icon">🏆</view>
+      <text class="empty-title">暂无排名数据</text>
+      <text class="empty-desc">成为第一个登榜的商家吧</text>
+    </view>
+  </view>
+  <global-notification id="global-notification" />
+
+</view>
\ No newline at end of file
diff --git a/pages/sjpaihang/sjpaihang.wxss b/pages/sjpaihang/sjpaihang.wxss
new file mode 100644
index 0000000..7dffd55
--- /dev/null
+++ b/pages/sjpaihang/sjpaihang.wxss
@@ -0,0 +1,1276 @@
+/* 管事排行榜和商家排行榜通用样式文件 */
+/* 保存为：pages/guanshi-paihang/guanshi-paihang.wxss 和 pages/shangjia-paihang/shangjia-paihang.wxss */
+
+/* ========== 基础页面样式 ========== */
+.guanshi-paihang-page,
+.shangjia-paihang-page {
+  min-height: 100vh;
+  background: #000;
+  color: #fff;
+  position: relative;
+  overflow-x: hidden;
+  padding: 40rpx 30rpx;
+  box-sizing: border-box;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif;
+}
+
+/* ========== 赛博朋克背景 ========== */
+.cyber-bg {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1;
+  pointer-events: none;
+}
+
+.cyber-grid {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-image: 
+    linear-gradient(rgba(0, 255, 255, 0.05) 1px, transparent 1px),
+    linear-gradient(90deg, rgba(0, 255, 255, 0.05) 1px, transparent 1px);
+  background-size: 50rpx 50rpx;
+  opacity: 0.3;
+}
+
+.cyber-scanline {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 3rpx;
+  background: linear-gradient(90deg, 
+    transparent 0%, 
+    #00ffff 30%, 
+    #ff00ff 50%, 
+    #00ffff 70%, 
+    transparent 100%);
+  animation: scanline 3s linear infinite;
+  filter: blur(1rpx);
+  box-shadow: 0 0 20rpx #00ffff;
+  z-index: 2;
+}
+
+@keyframes scanline {
+  0% { top: 0; }
+  100% { top: 100%; }
+}
+
+.data-streams {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  overflow: hidden;
+}
+
+.stream {
+  position: absolute;
+  width: 1rpx;
+  height: 100rpx;
+  background: linear-gradient(to bottom, transparent, #00ffff, transparent);
+  filter: blur(0.5rpx);
+  animation: streamFlow 8s linear infinite;
+}
+
+.stream-1 {
+  left: 20%;
+  animation-delay: 0s;
+}
+
+.stream-2 {
+  left: 50%;
+  animation-delay: 2s;
+}
+
+.stream-3 {
+  left: 80%;
+  animation-delay: 4s;
+}
+
+@keyframes streamFlow {
+  0% {
+    top: -100rpx;
+    opacity: 0;
+  }
+  10% {
+    opacity: 1;
+  }
+  90% {
+    opacity: 1;
+  }
+  100% {
+    top: 100%;
+    opacity: 0;
+  }
+}
+
+.floating-particles {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.particle {
+  position: absolute;
+  width: 6rpx;
+  height: 6rpx;
+  background: #00ffff;
+  border-radius: 50%;
+  filter: blur(1rpx);
+  box-shadow: 0 0 10rpx #00ffff;
+  animation: particleFloat 20s infinite linear;
+}
+
+.particle:nth-child(odd) {
+  background: #ff00ff;
+  box-shadow: 0 0 10rpx #ff00ff;
+}
+
+@keyframes particleFloat {
+  0%, 100% {
+    transform: translate(0, 0);
+  }
+  25% {
+    transform: translate(100rpx, -100rpx);
+  }
+  50% {
+    transform: translate(-50rpx, 150rpx);
+  }
+  75% {
+    transform: translate(150rpx, 50rpx);
+  }
+}
+
+/* ========== 页面头部 ========== */
+.page-header {
+  position: relative;
+  z-index: 10;
+  margin-bottom: 55rpx;
+  margin-top: -40rpx;
+}
+
+.title-container {
+  text-align: center;
+  margin-bottom: 40rpx;
+}
+
+.main-title {
+  display: block;
+  font-size: 58rpx;
+  font-weight: 900;
+  background: linear-gradient(90deg, #00ffff, #ff00ff, #ffff00);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+  text-shadow: 0 0 30rpx rgba(0, 255, 255, 0.5);
+  letter-spacing: 4rpx;
+  margin-bottom: 8rpx;
+}
+
+.title-line {
+  width: 220rpx;
+  height: 3rpx;
+  background: linear-gradient(90deg, transparent, #00ffff, #ff00ff, transparent);
+  margin: 12rpx auto;
+  position: relative;
+}
+
+.title-line::before {
+  content: '';
+  position: absolute;
+  top: -2rpx;
+  left: 0;
+  right: 0;
+  height: 7rpx;
+  background: linear-gradient(90deg, 
+    transparent 0%, 
+    rgba(0, 255, 255, 0.3) 20%, 
+    rgba(255, 0, 255, 0.3) 80%, 
+    transparent 100%);
+  filter: blur(4rpx);
+}
+
+.sub-title {
+  display: block;
+  font-size: 22rpx;
+  color: rgba(255, 255, 255, 0.6);
+  letter-spacing: 6rpx;
+  text-transform: uppercase;
+  margin-top: 5rpx;
+}
+
+.toggle-container {
+  display: flex;
+  background: rgba(10, 10, 30, 0.8);
+  border-radius: 60rpx;
+  padding: 6rpx;
+  position: relative;
+  border: 1rpx solid rgba(0, 255, 255, 0.2);
+  backdrop-filter: blur(20rpx);
+  max-width: 700rpx;
+  width: 90%;
+  margin: 0 auto;
+  box-shadow: 
+    0 10rpx 40rpx rgba(0, 0, 0, 0.8),
+    inset 0 0 20rpx rgba(0, 255, 255, 0.05);
+}
+
+.toggle-bg {
+  position: absolute;
+  top: 6rpx;
+  bottom: 6rpx;
+  width: 50%;
+  background: linear-gradient(90deg, 
+    rgba(0, 255, 255, 0.2), 
+    rgba(255, 0, 255, 0.2));
+  border-radius: 54rpx;
+  transition: transform 0.4s cubic-bezier(0.68, -0.55, 0.265, 1.55);
+  z-index: 1;
+}
+
+.toggle-btn {
+  flex: 1;
+  text-align: center;
+  padding: 30rpx 0;
+  font-size: 32rpx;
+  font-weight: 600;
+  color: rgba(255, 255, 255, 0.7);
+  position: relative;
+  z-index: 2;
+  transition: all 0.3s ease;
+  border-radius: 54rpx;
+  min-width: 200rpx;
+}
+
+.toggle-btn.active {
+  color: #ffffff;
+  text-shadow: 0 0 15rpx rgba(255, 255, 255, 0.5);
+}
+
+.toggle-btn.disabled {
+  opacity: 0.5;
+  pointer-events: none;
+}
+
+.toggle-text {
+  position: relative;
+  z-index: 1;
+}
+
+.toggle-line {
+  position: absolute;
+  bottom: 15rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 40rpx;
+  height: 3rpx;
+  background: linear-gradient(90deg, #00ffff, #ff00ff);
+  border-radius: 2rpx;
+  opacity: 0;
+  transition: opacity 0.3s ease;
+}
+
+.toggle-line.active {
+  opacity: 1;
+  box-shadow: 0 0 15rpx rgba(0, 255, 255, 0.5);
+}
+
+/* ========== 加载状态 ========== */
+.loading-state {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 60vh;
+  position: relative;
+  z-index: 10;
+}
+
+.loading-content {
+  text-align: center;
+}
+
+.loading-spinner {
+  position: relative;
+  width: 120rpx;
+  height: 120rpx;
+  margin: 0 auto 30rpx;
+}
+
+.spinner-outer {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  border: 8rpx solid transparent;
+  border-top-color: #00ffff;
+  border-right-color: #ff00ff;
+  border-radius: 50%;
+  animation: spinOuter 2s linear infinite;
+}
+
+.spinner-inner {
+  position: absolute;
+  top: 15rpx;
+  left: 15rpx;
+  right: 15rpx;
+  bottom: 15rpx;
+  border: 6rpx solid transparent;
+  border-bottom-color: #ffff00;
+  border-left-color: #00ffff;
+  border-radius: 50%;
+  animation: spinInner 1.5s linear infinite reverse;
+}
+
+.spinner-core {
+  position: absolute;
+  top: 30rpx;
+  left: 30rpx;
+  right: 30rpx;
+  bottom: 30rpx;
+  background: radial-gradient(circle, 
+    rgba(0, 255, 255, 0.2) 0%, 
+    rgba(255, 0, 255, 0.1) 50%, 
+    transparent 100%);
+  border-radius: 50%;
+}
+
+@keyframes spinOuter {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+@keyframes spinInner {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(-360deg); }
+}
+
+.loading-text {
+  display: block;
+  font-size: 32rpx;
+  color: #00ffff;
+  margin-bottom: 10rpx;
+  text-shadow: 0 0 10rpx rgba(0, 255, 255, 0.5);
+}
+
+.loading-sub {
+  display: block;
+  font-size: 24rpx;
+  color: rgba(255, 255, 255, 0.6);
+}
+
+/* ========== 虚拟数据提示 ========== */
+.demo-notice {
+  background: rgba(15, 15, 35, 0.9);
+  border-radius: 25rpx;
+  padding: 30rpx;
+  margin-bottom: 40rpx;
+  position: relative;
+  z-index: 10;
+  border: 1rpx solid rgba(255, 0, 255, 0.3);
+  backdrop-filter: blur(20rpx);
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+  box-shadow: 
+    0 10rpx 40rpx rgba(0, 0, 0, 0.8),
+    0 0 30rpx rgba(255, 0, 255, 0.2);
+}
+
+.notice-icon {
+  font-size: 60rpx;
+  margin-right: 30rpx;
+  background: linear-gradient(45deg, #ff00ff, #00ffff);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+  flex-shrink: 0;
+}
+
+.notice-content {
+  flex: 1;
+}
+
+.notice-title {
+  display: block;
+  font-size: 32rpx;
+  font-weight: 700;
+  color: #ff00ff;
+  margin-bottom: 10rpx;
+  text-shadow: 0 0 15rpx rgba(255, 0, 255, 0.5);
+}
+
+.notice-desc {
+  display: block;
+  font-size: 26rpx;
+  color: rgba(255, 255, 255, 0.7);
+  line-height: 1.4;
+}
+
+.notice-glow {
+  position: absolute;
+  top: -100%;
+  left: -100%;
+  right: -100%;
+  bottom: -100%;
+  background: radial-gradient(circle at center, 
+    rgba(255, 0, 255, 0.1) 0%, 
+    transparent 70%);
+  z-index: -1;
+}
+
+/* ========== 前三名区域 ========== */
+.top-three-section {
+  display: flex;
+  justify-content: center;
+  align-items: flex-end;
+  position: relative;
+  z-index: 10;
+  margin-bottom: 40rpx;
+  gap: 20rpx;
+  margin-top: 10rpx;
+}
+
+.rank-card {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  transition: all 0.3s ease;
+}
+
+.rank-1 {
+  width: 280rpx;
+  z-index: 30;
+  margin-bottom: 30rpx;
+}
+
+.rank-2 {
+  width: 220rpx;
+  z-index: 20;
+  margin-bottom: 0rpx;
+  margin-right: -20rpx;
+}
+
+.rank-3 {
+  width: 220rpx;
+  z-index: 20;
+  margin-bottom: 0rpx;
+  margin-left: -20rpx;
+}
+
+.rank-card.flash {
+  animation: cardFlash 0.4s ease-out;
+}
+
+@keyframes cardFlash {
+  0% { 
+    filter: brightness(1) drop-shadow(0 0 0 rgba(255, 255, 255, 0));
+  }
+  50% { 
+    filter: brightness(1.4) drop-shadow(0 0 40rpx rgba(255, 255, 255, 0.8));
+  }
+  100% { 
+    filter: brightness(1) drop-shadow(0 0 0 rgba(255, 255, 255, 0));
+  }
+}
+
+/* 奖台底座 */
+.podium-base {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 60rpx;
+  border-radius: 30rpx 30rpx 0 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1;
+}
+
+.rank-1 .podium-base {
+  height: 80rpx;
+}
+
+.podium-gold {
+  background: linear-gradient(180deg, 
+    rgba(255, 215, 0, 0.3) 0%, 
+    rgba(255, 215, 0, 0.1) 100%);
+  border: 1rpx solid rgba(255, 215, 0, 0.4);
+}
+
+.podium-silver {
+  background: linear-gradient(180deg, 
+    rgba(192, 192, 192, 0.3) 0%, 
+    rgba(192, 192, 192, 0.1) 100%);
+  border: 1rpx solid rgba(192, 192, 192, 0.4);
+}
+
+.podium-bronze {
+  background: linear-gradient(180deg, 
+    rgba(205, 127, 50, 0.3) 0%, 
+    rgba(205, 127, 50, 0.1) 100%);
+  border: 1rpx solid rgba(205, 127, 50, 0.4);
+}
+
+.podium-glow {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  border-radius: 30rpx 30rpx 0 0;
+  background: radial-gradient(ellipse at center, 
+    rgba(255, 255, 255, 0.2) 0%, 
+    transparent 70%);
+  z-index: -1;
+}
+
+.podium-number {
+  font-size: 32rpx;
+  font-weight: 900;
+  color: rgba(255, 255, 255, 0.9);
+  text-shadow: 0 0 10rpx currentColor;
+}
+
+/* ========== 皇冠容器 ========== */
+.crown-container {
+  position: absolute;
+  top: -55rpx;
+  left: 55%;
+  transform: translateX(20%) rotate(35deg)!important;
+  width: 110rpx;
+  height: 110rpx;
+  z-index: 40;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.crown {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.crown-icon {
+  font-size: 85rpx;
+  position: relative;
+  z-index: 2;
+  filter: drop-shadow(0 0 10rpx rgba(255, 215, 0, 0.8));
+  animation: crownFloat 3s ease-in-out infinite;
+  transform: rotate(5deg);
+}
+
+@keyframes crownFloat {
+  0%, 100% { 
+    transform: translateY(0) rotate(5deg) scale(1);
+    filter: drop-shadow(0 0 10rpx rgba(255, 215, 0, 0.8));
+  }
+  50% { 
+    transform: translateY(-15rpx) rotate(10deg) scale(1.1);
+    filter: drop-shadow(0 0 25rpx rgba(255, 215, 0, 1));
+  }
+}
+
+.crown-rays {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 180rpx;
+  height: 180rpx;
+  z-index: 1;
+}
+
+.ray {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 2rpx;
+  height: 80rpx;
+  background: linear-gradient(to top, 
+    transparent, 
+    rgba(255, 215, 0, 0.8), 
+    rgba(255, 215, 0, 1), 
+    rgba(255, 215, 0, 0.8), 
+    transparent);
+  transform-origin: bottom center;
+  filter: blur(1rpx);
+}
+
+.ray-1 { transform: translate(-50%, -100%) rotate(0deg); }
+.ray-2 { transform: translate(-50%, -100%) rotate(60deg); }
+.ray-3 { transform: translate(-50%, -100%) rotate(120deg); }
+.ray-4 { transform: translate(-50%, -100%) rotate(180deg); }
+.ray-5 { transform: translate(-50%, -100%) rotate(240deg); }
+.ray-6 { transform: translate(-50%, -100%) rotate(300deg); }
+
+.crown-glow {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 200rpx;
+  height: 200rpx;
+  background: radial-gradient(circle, 
+    rgba(255, 215, 0, 0.3) 0%, 
+    rgba(255, 215, 0, 0.1) 40%, 
+    transparent 70%);
+  z-index: 0;
+  animation: glowPulse 2s ease-in-out infinite;
+}
+
+@keyframes glowPulse {
+  0%, 100% { opacity: 0.5; }
+  50% { opacity: 0.8; }
+}
+
+/* ========== 排名内容 ========== */
+.rank-content {
+  position: relative;
+  width: 100%;
+  z-index: 2;
+}
+
+/* 头像框架 */
+.avatar-frame {
+  position: relative;
+  width: 160rpx;
+  height: 160rpx;
+  margin: 0 auto 30rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.rank-1 .avatar-frame {
+  width: 200rpx;
+  height: 200rpx;
+}
+
+.frame-gold {
+  filter: drop-shadow(0 0 30rpx rgba(255, 215, 0, 0.5));
+}
+
+.frame-silver {
+  filter: drop-shadow(0 0 25rpx rgba(192, 192, 192, 0.5));
+}
+
+.frame-bronze {
+  filter: drop-shadow(0 0 25rpx rgba(205, 127, 50, 0.5));
+}
+
+.avatar-container {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  overflow: hidden;
+  background: rgba(20, 20, 40, 0.8);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border: 4rpx solid transparent;
+}
+
+.rank-1 .avatar-container {
+  border-width: 6rpx;
+}
+
+.frame-gold .avatar-container {
+  border-color: rgba(255, 215, 0, 0.3);
+}
+
+.frame-silver .avatar-container {
+  border-color: rgba(192, 192, 192, 0.3);
+}
+
+.frame-bronze .avatar-container {
+  border-color: rgba(205, 127, 50, 0.3);
+}
+
+.avatar-image {
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  object-fit: cover;
+  position: relative;
+  z-index: 2;
+}
+
+/* 头像光晕 */
+.avatar-halo {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  border-radius: 50%;
+  z-index: 1;
+  pointer-events: none;
+  animation: haloRotate 10s linear infinite;
+}
+
+.halo-gold {
+  width: 220rpx;
+  height: 220rpx;
+  background: radial-gradient(circle, 
+    rgba(255, 215, 0, 0.4) 0%, 
+    rgba(255, 215, 0, 0.2) 30%, 
+    transparent 70%);
+}
+
+.rank-1 .halo-gold {
+  width: 260rpx;
+  height: 260rpx;
+}
+
+.halo-silver {
+  width: 200rpx;
+  height: 200rpx;
+  background: radial-gradient(circle, 
+    rgba(192, 192, 192, 0.4) 0%, 
+    rgba(192, 192, 192, 0.2) 30%, 
+    transparent 70%);
+}
+
+.halo-bronze {
+  width: 200rpx;
+  height: 200rpx;
+  background: radial-gradient(circle, 
+    rgba(205, 127, 50, 0.4) 0%, 
+    rgba(205, 127, 50, 0.2) 30%, 
+    transparent 70%);
+}
+
+@keyframes haloRotate {
+  0% { transform: translate(-50%, -50%) rotate(0deg); }
+  100% { transform: translate(-50%, -50%) rotate(360deg); }
+}
+
+/* 头像闪烁粒子 */
+.avatar-sparkles {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  border-radius: 50%;
+  z-index: 3;
+}
+
+.sparkle {
+  position: absolute;
+  width: 8rpx;
+  height: 8rpx;
+  background: #fff;
+  border-radius: 50%;
+  filter: blur(1rpx);
+  opacity: 0;
+  animation: sparkleTwinkle 3s ease-in-out infinite;
+}
+
+.rank-1 .sparkle {
+  width: 10rpx;
+  height: 10rpx;
+}
+
+.s1 { top: 15%; left: 15%; animation-delay: 0s; }
+.s2 { top: 25%; right: 25%; animation-delay: 0.5s; }
+.s3 { bottom: 35%; left: 35%; animation-delay: 1s; }
+.s4 { bottom: 15%; right: 15%; animation-delay: 1.5s; }
+
+@keyframes sparkleTwinkle {
+  0%, 100% { 
+    opacity: 0; 
+    transform: scale(0.5); 
+  }
+  50% { 
+    opacity: 1; 
+    transform: scale(1); 
+  }
+}
+
+/* 排名徽章 */
+.rank-badge {
+  position: absolute;
+  bottom: -10rpx;
+  right: -10rpx;
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  font-weight: 900;
+  color: #fff;
+  z-index: 10;
+  border: 3rpx solid rgba(255, 255, 255, 0.3);
+  box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.5);
+}
+
+.rank-1 .rank-badge {
+  width: 70rpx;
+  height: 70rpx;
+  font-size: 32rpx;
+  bottom: -15rpx;
+  right: -15rpx;
+}
+
+.badge-gold {
+  background: linear-gradient(135deg, #ffd700, #ff9800);
+}
+
+.badge-silver {
+  background: linear-gradient(135deg, #c0c0c0, #808080);
+}
+
+.badge-bronze {
+  background: linear-gradient(135deg, #cd7f32, #a0522d);
+}
+
+/* 用户信息卡片 */
+.user-info-card {
+  background: rgba(15, 15, 35, 0.95);
+  border-radius: 25rpx;
+  padding: 30rpx 25rpx;
+  backdrop-filter: blur(20rpx);
+  border: 1rpx solid rgba(255, 255, 255, 0.1);
+  box-shadow: 
+    0 20rpx 60rpx rgba(0, 0, 0, 0.8),
+    inset 0 0 30rpx rgba(255, 255, 255, 0.05);
+  position: relative;
+  overflow: hidden;
+}
+
+.rank-1 .user-info-card {
+  border-color: rgba(255, 215, 0, 0.3);
+  background: rgba(20, 15, 5, 0.95);
+}
+
+.rank-2 .user-info-card {
+  border-color: rgba(192, 192, 192, 0.3);
+  background: rgba(25, 25, 35, 0.95);
+}
+
+.rank-3 .user-info-card {
+  border-color: rgba(205, 127, 50, 0.3);
+  background: rgba(30, 20, 10, 0.95);
+}
+
+.info-header {
+  margin-bottom: 20rpx;
+  text-align: center;
+}
+
+.user-name {
+  font-size: 32rpx;
+  font-weight: 700;
+  color: #fff;
+  display: block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.rank-1 .user-name {
+  color: #ffd700;
+  text-shadow: 0 0 15rpx rgba(255, 215, 0, 0.7);
+  font-size: 34rpx;
+}
+
+.rank-2 .user-name {
+  color: #c0c0c0;
+  text-shadow: 0 0 10rpx rgba(192, 192, 192, 0.7);
+}
+
+.rank-3 .user-name {
+  color: #cd7f32;
+  text-shadow: 0 0 10rpx rgba(205, 127, 50, 0.7);
+}
+
+.info-body {
+  border-top: 1rpx solid rgba(255, 255, 255, 0.1);
+  padding-top: 15rpx;
+}
+
+.uid-row, .income-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12rpx;
+}
+
+.uid-row:last-child, .income-row:last-child {
+  margin-bottom: 0;
+}
+
+.uid-label, .income-label {
+  font-size: 24rpx;
+  color: rgba(255, 255, 255, 0.6);
+}
+
+.uid-value {
+  font-size: 24rpx;
+  color: rgba(255, 255, 255, 0.9);
+  font-family: 'Courier New', monospace;
+}
+
+.income-value {
+  display: flex;
+  align-items: baseline;
+}
+
+.currency {
+  font-size: 26rpx;
+  color: #4ade80;
+  margin-right: 4rpx;
+}
+
+.rank-1 .currency {
+  color: #ffd700;
+}
+
+.rank-2 .currency {
+  color: #c0c0c0;
+}
+
+.rank-3 .currency {
+  color: #cd7f32;
+}
+
+.amount {
+  font-size: 32rpx;
+  font-weight: 700;
+  color: #4ade80;
+  text-shadow: 0 0 10rpx rgba(74, 222, 128, 0.5);
+}
+
+.rank-1 .amount {
+  color: #ffd700;
+  text-shadow: 0 0 15rpx rgba(255, 215, 0, 0.7);
+}
+
+.rank-2 .amount {
+  color: #c0c0c0;
+  text-shadow: 0 0 10rpx rgba(192, 192, 192, 0.7);
+}
+
+.rank-3 .amount {
+  color: #cd7f32;
+  text-shadow: 0 0 10rpx rgba(205, 127, 50, 0.7);
+}
+
+.unit {
+  font-size: 24rpx;
+  color: rgba(255, 255, 255, 0.6);
+  margin-left: 4rpx;
+}
+
+.amount.medium {
+  font-size: 30rpx;
+}
+
+.amount.small {
+  font-size: 28rpx;
+}
+
+.amount.very-small {
+  font-size: 26rpx;
+}
+
+/* ========== 其他排名区域 ========== */
+.other-ranks-section {
+  position: relative;
+  z-index: 10;
+}
+
+.section-title {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 40rpx;
+}
+
+.title-line {
+  flex: 1;
+  height: 2rpx;
+  background: linear-gradient(90deg, 
+    transparent, 
+    #00ffff, 
+    #ff00ff, 
+    #00ffff, 
+    transparent);
+}
+
+.title-text {
+  font-size: 32rpx;
+  font-weight: 700;
+  color: #00ffff;
+  margin: 0 30rpx;
+  text-shadow: 0 0 15rpx rgba(0, 255, 255, 0.5);
+}
+
+.rank-list {
+  position: relative;
+}
+
+.rank-item {
+  display: flex;
+  align-items: center;
+  background: rgba(20, 20, 40, 0.8);
+  border-radius: 25rpx;
+  padding: 25rpx 30rpx;
+  margin-bottom: 20rpx;
+  border: 1rpx solid rgba(0, 255, 255, 0.1);
+  backdrop-filter: blur(20rpx);
+  position: relative;
+  overflow: hidden;
+  transition: all 0.3s ease;
+  box-shadow: 
+    0 10rpx 40rpx rgba(0, 0, 0, 0.6),
+    inset 0 0 20rpx rgba(0, 255, 255, 0.05);
+}
+
+.rank-item.flash {
+  animation: cardFlash 0.4s ease-out;
+}
+
+.rank-item::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: -100%;
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(90deg, 
+    transparent, 
+    rgba(0, 255, 255, 0.1), 
+    transparent);
+  transition: left 0.6s ease;
+}
+
+.rank-item:hover::before {
+  left: 100%;
+}
+
+.rank-number {
+  width: 80rpx;
+  text-align: center;
+  position: relative;
+  margin-right: 30rpx;
+  flex-shrink: 0;
+}
+
+.number-text {
+  font-size: 42rpx;
+  font-weight: 900;
+  color: rgba(255, 255, 255, 0.9);
+  position: relative;
+  z-index: 1;
+}
+
+.number-glow {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 80rpx;
+  height: 80rpx;
+  background: radial-gradient(circle, 
+    rgba(0, 255, 255, 0.2) 0%, 
+    transparent 70%);
+  z-index: 0;
+}
+
+.rank-avatar {
+  position: relative;
+  width: 100rpx;
+  height: 100rpx;
+  margin-right: 25rpx;
+  flex-shrink: 0;
+}
+
+.rank-avatar-img {
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  object-fit: cover;
+  position: relative;
+  z-index: 2;
+  border: 3rpx solid rgba(0, 255, 255, 0.2);
+}
+
+.rank-avatar-halo {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 120rpx;
+  height: 120rpx;
+  background: radial-gradient(circle, 
+    rgba(0, 255, 255, 0.2) 0%, 
+    rgba(0, 255, 255, 0.1) 30%, 
+    transparent 70%);
+  z-index: 1;
+  border-radius: 50%;
+}
+
+.rank-info {
+  flex: 1;
+  min-width: 0;
+}
+
+.rank-name {
+  display: block;
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #ffffff;
+  margin-bottom: 8rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.rank-uid {
+  display: block;
+  font-size: 24rpx;
+  color: rgba(255, 255, 255, 0.6);
+  font-family: 'Courier New', monospace;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.rank-income {
+  position: relative;
+  flex-shrink: 0;
+  display: flex;
+  align-items: baseline;
+  margin-left: 20rpx;
+}
+
+.income-currency {
+  font-size: 28rpx;
+  color: #00ffff;
+  margin-right: 4rpx;
+  opacity: 0.9;
+}
+
+.income-amount {
+  font-size: 36rpx;
+  font-weight: 700;
+  color: #4ade80;
+  text-shadow: 0 0 10rpx rgba(74, 222, 128, 0.5);
+  white-space: nowrap;
+  line-height: 1;
+}
+
+.income-unit {
+  font-size: 24rpx;
+  color: rgba(255, 255, 255, 0.6);
+  margin-left: 4rpx;
+}
+
+.income-amount.medium {
+  font-size: 34rpx;
+}
+
+.income-amount.small {
+  font-size: 32rpx;
+}
+
+.income-amount.very-small {
+  font-size: 30rpx;
+}
+
+.income-glow {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 140rpx;
+  height: 70rpx;
+  background: radial-gradient(ellipse, 
+    rgba(74, 222, 128, 0.2) 0%, 
+    transparent 70%);
+  z-index: 0;
+}
+
+.rank-hover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  border-radius: 25rpx;
+  border: 1rpx solid transparent;
+  background: linear-gradient(45deg, 
+    rgba(0, 255, 255, 0.1), 
+    rgba(255, 0, 255, 0.1)) border-box;
+  mask: linear-gradient(#fff 0 0) padding-box, linear-gradient(#fff 0 0);
+  -webkit-mask: linear-gradient(#fff 0 0) padding-box, linear-gradient(#fff 0 0);
+  -webkit-mask-composite: xor;
+  mask-composite: exclude;
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  pointer-events: none;
+}
+
+.rank-item:hover .rank-hover {
+  opacity: 1;
+}
+
+/* ========== 空状态 ========== */
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 120rpx 0;
+  text-align: center;
+  position: relative;
+  z-index: 10;
+}
+
+.empty-icon {
+  font-size: 120rpx;
+  margin-bottom: 30rpx;
+  opacity: 0.5;
+  animation: iconFloat 3s ease-in-out infinite;
+}
+
+@keyframes iconFloat {
+  0%, 100% { transform: translateY(0); }
+  50% { transform: translateY(-30rpx); }
+}
+
+.empty-title {
+  font-size: 36rpx;
+  color: rgba(255, 255, 255, 0.8);
+  margin-bottom: 15rpx;
+}
+
+.empty-desc {
+  font-size: 28rpx;
+  color: rgba(255, 255, 255, 0.5);
+}
+
+/* ========== 调整整个内容区域的上边距 ========== */
+.ranking-content {
+  position: relative;
+  z-index: 5;
+  margin-top: 10rpx;
+}
\ No newline at end of file
diff --git a/pages/sjxiaoxi/sjxiaoxi.js b/pages/sjxiaoxi/sjxiaoxi.js
new file mode 100644
index 0000000..969ab0f
--- /dev/null
+++ b/pages/sjxiaoxi/sjxiaoxi.js
@@ -0,0 +1,338 @@
+// pages/sjcf/sjcf.js
+import request from '../../utils/request.js'
+const app = getApp()
+const MEIYE_TIAOSHU = 10
+
+Page({
+  data: {
+    zongshu: 0,
+    daichuli: 0,
+    yichuli: 0,
+    shenfen: 0,
+    chufaList: [],
+    dangqianye: 1,
+    haiyougengduo: true,
+    jiazhaozhong: false,
+    jiazhaigengduo: false,
+    scrollHeight: 0,
+    showXiangqing: false,
+    xuanzhongChufa: {},
+    ossImageUrl: '',
+    fangdouTimer: null
+  },
+
+  onLoad(options) {
+    this.registerNotificationComponent()
+    this.initOSSUrl()
+    this.jisuanGaodu()
+    this.chushihuaShuju()
+  },
+
+  onShow() {
+    this.registerNotificationComponent()
+  },
+
+  onUnload() {
+    if (this.data.fangdouTimer) clearTimeout(this.data.fangdouTimer)
+  },
+
+  onReachBottom() {
+    this.shanglaShuaxin()
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification')
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      }
+    }
+  },
+
+  initOSSUrl() {
+    const ossImageUrl = app.globalData.ossImageUrl || ''
+    this.setData({ ossImageUrl })
+  },
+
+  jisuanGaodu() {
+    const systemInfo = wx.getSystemInfoSync()
+    const windowHeight = systemInfo.windowHeight
+    const height = windowHeight - 200 - 100 - 40
+    this.setData({
+      scrollHeight: height > 0 ? height : 400
+    })
+  },
+
+  chushihuaShuju() {
+    this.setData({
+      dangqianye: 1,
+      chufaList: [],
+      haiyougengduo: true
+    })
+    this.jiazhuoquTongji()
+    this.jiazhuoquChufaList()
+  },
+
+  async jiazhuoquTongji() {
+    try {
+      // 🔴【修改】商家端接口地址
+      const res = await request({
+        url: '/yonghu/sjcfjlhq',
+        method: 'POST',
+        data: { qingqiu_tongji: true }
+      })
+      if (res.statusCode === 200 && res.data.code === 0) {
+        const data = res.data.data
+        this.setData({
+          zongshu: data.zongshu || 0,
+          daichuli: data.daichuli || 0,
+          yichuli: data.yichuli || 0
+        })
+      }
+    } catch (error) {}
+  },
+
+  async jiazhuoquChufaList(isLoadMore = false) {
+    if (this.data.jiazhaozhong || this.data.jiazhaigengduo) return
+    if (isLoadMore) {
+      if (!this.data.haiyougengduo) return
+      this.setData({ jiazhaigengduo: true })
+    } else {
+      this.setData({ jiazhaozhong: true })
+    }
+    
+    try {
+      const params = {
+        page: this.data.dangqianye,
+        page_size: MEIYE_TIAOSHU
+      }
+      if (this.data.shenfen === 0) {
+        params.zhuangtai = 0
+      } else {
+        params.zhuangtai = 1
+      }
+      
+      // 🔴【修改】商家端接口地址
+      const res = await request({
+        url: '/yonghu/sjcfjlhq',
+        method: 'POST',
+        data: params
+      })
+      
+      if (res.statusCode === 200 && res.data.code === 0) {
+        const data = res.data.data
+        
+        if (data.list && Array.isArray(data.list)) {
+          const processedList = data.list.map(item => {
+            let displayTime = '--'
+            if (item.create_time) {
+              if (typeof item.create_time === 'number') {
+                displayTime = String(item.create_time)
+              } else if (typeof item.create_time === 'string') {
+                displayTime = item.create_time
+              } else {
+                displayTime = String(item.create_time)
+              }
+            }
+            
+            let displayStatus = '未知状态'
+            let statusClass = 'zhuangtai-weizhi'
+            const statusNum = Number(item.sqzhuangtai)
+            
+            if (!isNaN(statusNum)) {
+              if (statusNum === 0) {
+                displayStatus = '待处罚'
+                statusClass = 'zhuangtai-daichuli'
+              } else if (statusNum === 1) {
+                displayStatus = '已处罚'
+                statusClass = 'zhuangtai-yichufa'
+              } else if (statusNum === 2) {
+                displayStatus = '已驳回'
+                statusClass = 'zhuangtai-yibohui'
+              } else if (statusNum === 3) {
+                displayStatus = '申诉中'
+                statusClass = 'zhuangtai-shensuzhong'
+              }
+            }
+            
+            const fullZhengjuTupian = (item.zhengju_tupian || []).map(url => this.getFullImageUrl(url))
+            const fullShensuTupian = (item.shensu_tupian || []).map(url => this.getFullImageUrl(url))
+            
+            return {
+              ...item,
+              display_time: displayTime,
+              display_status: displayStatus,
+              status_class: statusClass,
+              zhengju_tupian: item.zhengju_tupian || [],
+              shensu_tupian: item.shensu_tupian || [],
+              full_zhengju_tupian: fullZhengjuTupian,
+              full_shensu_tupian: fullShensuTupian
+            }
+          })
+          
+          let newList
+          if (isLoadMore) {
+            newList = [...this.data.chufaList, ...processedList]
+          } else {
+            newList = processedList
+          }
+          
+          const hasMore = data.has_more === true
+          this.setData({
+            chufaList: newList,
+            haiyougengduo: hasMore,
+            dangqianye: this.data.dangqianye + 1
+          })
+        } else {
+          this.setData({ haiyougengduo: false })
+        }
+      } else {
+        throw new Error(res.data?.msg || '加载处罚记录失败')
+      }
+    } catch (error) {
+      this.setData({ haiyougengduo: false })
+    } finally {
+      if (isLoadMore) {
+        this.setData({ jiazhaigengduo: false })
+      } else {
+        this.setData({ jiazhaozhong: false })
+      }
+    }
+  },
+
+  qiehuanShenfen(e) {
+    const type = parseInt(e.currentTarget.dataset.type)
+    if (this.data.shenfen === type) return
+    this.setData({
+      shenfen: type,
+      dangqianye: 1,
+      chufaList: [],
+      haiyougengduo: true
+    })
+    this.jiazhuoquChufaList()
+  },
+
+  shanglaShuaxin() {
+    if (this.data.fangdouTimer) clearTimeout(this.data.fangdouTimer)
+    const timer = setTimeout(() => {
+      if (this.data.jiazhaozhong || this.data.jiazhaigengduo) return
+      if (!this.data.haiyougengduo) return
+      this.jiazhuoquChufaList(true)
+    }, 300)
+    this.setData({ fangdouTimer: timer })
+  },
+
+  chakanXiangqing(e) {
+    const item = e.currentTarget.dataset.item
+    this.setData({
+      xuanzhongChufa: item,
+      showXiangqing: true
+    })
+  },
+
+  guanbiXiangqing() {
+    this.setData({
+      showXiangqing: false,
+      xuanzhongChufa: {}
+    })
+  },
+
+  lianxiKefu() {
+    const kefuLink = app.globalData.kefuConfig?.link || '';
+    const corpId = app.globalData.kefuConfig?.enterpriseId || '';
+
+    if (!kefuLink || !corpId) {
+        wx.showToast({
+            title: '客服配置未加载',
+            icon: 'none'
+        });
+        return;
+    }
+
+    wx.openCustomerServiceChat({
+        extInfo: { url: kefuLink },
+        corpId: corpId,
+        success: (res) => {
+            console.log('跳转客服成功', res);
+        },
+        fail: (err) => {
+            console.error('跳转客服失败', err);
+            wx.showToast({
+                title: '暂时无法连接客服',
+                icon: 'none'
+            });
+        }
+    });
+  },
+
+  getFullImageUrl(relativeUrl) {
+    if (!relativeUrl) return ''
+    if (relativeUrl.startsWith('http')) {
+      return relativeUrl
+    }
+    
+    const ossUrl = this.data.ossImageUrl
+    if (!ossUrl) {
+      return relativeUrl
+    }
+    
+    let fullUrl
+    if (ossUrl.endsWith('/') && relativeUrl.startsWith('/')) {
+      fullUrl = ossUrl + relativeUrl.substring(1)
+    } else if (!ossUrl.endsWith('/') && !relativeUrl.startsWith('/')) {
+      fullUrl = ossUrl + '/' + relativeUrl
+    } else {
+      fullUrl = ossUrl + relativeUrl
+    }
+    
+    return fullUrl
+  },
+
+  yulanTupian(e) {
+    const currentUrl = e.currentTarget.dataset.url
+    const urls = e.currentTarget.dataset.urls || []
+    if (!currentUrl) return
+    
+    const fullCurrentUrl = currentUrl.startsWith('http') ? currentUrl : this.getFullImageUrl(currentUrl)
+    const fullUrls = urls.map(url => url.startsWith('http') ? url : this.getFullImageUrl(url))
+    
+    wx.previewImage({
+      current: fullCurrentUrl,
+      urls: fullUrls.length > 0 ? fullUrls : [fullCurrentUrl]
+    })
+  },
+
+  fuzhiWenben(e) {
+    const text = e.currentTarget.dataset.text
+    if (!text) return
+    
+    wx.setClipboardData({
+      data: text,
+      success: () => {
+        wx.showToast({ title: '复制成功', icon: 'success' })
+      },
+      fail: () => {
+        wx.showToast({ title: '复制失败', icon: 'none' })
+      }
+    })
+  },
+
+  imageLoadError(e) {
+    // 图片加载失败处理（可以添加默认图片）
+    const index = e.currentTarget.dataset.index
+    const type = e.currentTarget.dataset.type
+    
+    if (type === 'zhengju') {
+      const key = `xuanzhongChufa.full_zhengju_tupian[${index}]`
+      this.setData({
+        [key]: '/images/image-error.png'
+      })
+    } else if (type === 'shensu') {
+      const key = `xuanzhongChufa.full_shensu_tupian[${index}]`
+      this.setData({
+        [key]: '/images/image-error.png'
+      })
+    }
+  }
+})
\ No newline at end of file
diff --git a/pages/sjxiaoxi/sjxiaoxi.json b/pages/sjxiaoxi/sjxiaoxi.json
new file mode 100644
index 0000000..e3c4071
--- /dev/null
+++ b/pages/sjxiaoxi/sjxiaoxi.json
@@ -0,0 +1,10 @@
+{
+    "usingComponents": {
+      "global-notification": "/components/global-notification/global-notification"
+    },
+    "navigationBarTitleText": "处罚记录",
+    "navigationBarBackgroundColor": "#0a0a12",
+    "navigationBarTextStyle": "white",
+    "backgroundColor": "#0a0a12",
+    "enablePullDownRefresh": false
+  }
\ No newline at end of file
diff --git a/pages/sjxiaoxi/sjxiaoxi.wxml b/pages/sjxiaoxi/sjxiaoxi.wxml
new file mode 100644
index 0000000..a66a2be
--- /dev/null
+++ b/pages/sjxiaoxi/sjxiaoxi.wxml
@@ -0,0 +1,241 @@
+
+<view class="cfss-container">
+  
+  <view class="tongji-card">
+    <view class="tongji-title">处罚统计</view>
+    <view class="tongji-content">
+      <view class="tongji-item">
+        <text class="tongji-label">总记录</text>
+        <text class="tongji-value">{{ zongshu }}</text>
+      </view>
+      <view class="tongji-item">
+        <text class="tongji-label">待处理</text>
+        <text class="tongji-value daichuli-value">{{ daichuli }}</text>
+      </view>
+      <view class="tongji-item">
+        <text class="tongji-label">已处理</text>
+        <text class="tongji-value yichuli-value">{{ yichuli }}</text>
+      </view>
+    </view>
+  </view>
+
+  
+  <view class="leixing-qiehuan">
+    <view 
+      class="leixing-item {{ shenfen === 0 ? 'leixing-active' : '' }}"
+      bindtap="qiehuanShenfen"
+      data-type="0"
+    >
+      <text class="leixing-text">待处理</text>
+      <text class="leixing-count">{{ daichuli }}</text>
+    </view>
+    <view 
+      class="leixing-item {{ shenfen === 1 ? 'leixing-active' : '' }}"
+      bindtap="qiehuanShenfen"
+      data-type="1"
+    >
+      <text class="leixing-text">已处理</text>
+      <text class="leixing-count">{{ yichuli }}</text>
+    </view>
+  </view>
+
+  
+  <scroll-view 
+    class="chufa-list"
+    scroll-y
+    enable-back-to-top
+    scroll-with-animation
+    style="height: {{ scrollHeight }}px"
+    bindscrolltolower="shanglaShuaxin"
+  >
+    
+    <view wx:if="{{ jiazhaozhong && chufaList.length === 0 }}" class="jiazai-zhong">
+      <view class="loading-animation">
+        <view class="loading-dot"></view>
+        <view class="loading-dot"></view>
+        <view class="loading-dot"></view>
+      </view>
+      <text>加载中...</text>
+    </view>
+
+    
+    <block wx:for="{{ chufaList }}" wx:key="index">
+      <view 
+        class="chufa-card"
+        bindtap="chakanXiangqing"
+        data-item="{{ item }}"
+      >
+        
+        <view class="card-top">
+          <text class="shijian">{{ item.display_time }}</text>
+          <view class="zhuangtai-badge {{ item.status_class }}">
+            {{ item.display_status }}
+          </view>
+        </view>
+
+        
+        <view class="qingqiu-row">
+          <text class="qingqiu-label">被罚打手：</text>
+          <text class="qingqiu-value">{{ item.qingqiuid || '--' }}</text>
+        </view>
+
+        
+        <view class="liyou-row">
+          <text class="liyou-label">处罚理由：</text>
+          <text class="liyou-value">{{ item.cfliyou || '无' }}</text>
+        </view>
+
+        
+        <view class="dingdan-row">
+          <text class="dingdan-label">订单编号：</text>
+          <text class="dingdan-value">{{ item.dingdan_id || '--' }}</text>
+        </view>
+        
+        
+        <view class="card-border"></view>
+        <view class="card-glow"></view>
+      </view>
+    </block>
+
+    
+    <view wx:if="{{ jiazhaigengduo }}" class="jiazai-gengduo">
+      <view class="scan-line"></view>
+      <text>加载更多...</text>
+    </view>
+
+    
+    <view wx:if="{{ !haiyougengduo && chufaList.length > 0 }}" class="meiyou-gengduo">
+      <text>—— 没有更多记录了 ——</text>
+    </view>
+
+    
+    <view wx:if="{{ !jiazhaozhong && chufaList.length === 0 }}" class="kong-zhuangtai">
+      <view class="empty-icon">⚡</view>
+      <text class="empty-text">暂无处罚记录</text>
+      <text class="empty-subtext">所有事务已处理完毕</text>
+    </view>
+  </scroll-view>
+
+  
+  <view wx:if="{{ showXiangqing }}" class="xiangqing-modal">
+    <view class="modal-mask" bindtap="guanbiXiangqing"></view>
+    <view class="modal-content">
+      
+      <view class="modal-header">
+        <text class="modal-title">处罚详情</text>
+        <view class="modal-close" bindtap="guanbiXiangqing">
+          <text class="close-icon">×</text>
+        </view>
+      </view>
+
+      
+      <scroll-view class="modal-body" scroll-y style="max-height: 1000rpx;">
+        
+        <view class="detail-section">
+          <view class="section-title">基本信息</view>
+          <view class="detail-row">
+            <text class="detail-label">订单编号：</text>
+            <view class="detail-value-container">
+              <text class="detail-value">{{ xuanzhongChufa.dingdan_id || '--' }}</text>
+              <text class="fuzhi-btn" bindtap="fuzhiWenben" data-text="{{ xuanzhongChufa.dingdan_id }}">复制</text>
+            </view>
+          </view>
+          <view class="detail-row">
+            
+            <text class="detail-label">被罚打手ID：</text>
+            <view class="detail-value-container">
+              <text class="detail-value">{{ xuanzhongChufa.qingqiuid || '--' }}</text>
+              <text class="fuzhi-btn" bindtap="fuzhiWenben" data-text="{{ xuanzhongChufa.qingqiuid }}">复制</text>
+            </view>
+          </view>
+          <view class="detail-row">
+            <text class="detail-label">创建时间：</text>
+            <text class="detail-value">{{ xuanzhongChufa.display_time || '--' }}</text>
+          </view>
+        </view>
+
+        
+        <view class="detail-section">
+          <view class="section-title">处罚信息</view>
+          <view class="detail-row">
+            <text class="detail-label">处罚状态：</text>
+            <view class="zhuangtai-badge-inline {{ xuanzhongChufa.status_class }}">
+              {{ xuanzhongChufa.display_status }}
+            </view>
+          </view>
+          <view class="detail-row full-row">
+            <text class="detail-label">处罚理由：</text>
+            <text class="detail-value liyou-full">{{ xuanzhongChufa.cfliyou || '无' }}</text>
+          </view>
+          
+          
+          <view wx:if="{{ xuanzhongChufa.full_zhengju_tupian && xuanzhongChufa.full_zhengju_tupian.length > 0 }}" class="detail-row full-row">
+            <text class="detail-label">证据图片：</text>
+            <view class="tupian-grid">
+              <block wx:for="{{ xuanzhongChufa.full_zhengju_tupian }}" wx:key="index">
+                <view class="tupian-item">
+                  <image 
+                    src="{{ item }}" 
+                    class="tupian-image"
+                    mode="aspectFill"
+                    binderror="imageLoadError"
+                    data-index="{{ index }}"
+                    data-type="zhengju"
+                  />
+                  
+                  <view class="tupian-preview" bindtap="yulanTupian" data-url="{{ item }}" data-urls="{{ xuanzhongChufa.full_zhengju_tupian }}">
+                    <text class="preview-text">预览</text>
+                  </view>
+                </view>
+              </block>
+            </view>
+          </view>
+        </view>
+
+        
+        <view wx:if="{{ xuanzhongChufa.ssliyou || (xuanzhongChufa.full_shensu_tupian && xuanzhongChufa.full_shensu_tupian.length > 0) }}" class="detail-section">
+          <view class="section-title">申诉信息</view>
+          <view wx:if="{{ xuanzhongChufa.ssliyou }}" class="detail-row full-row">
+            <text class="detail-label">申诉理由：</text>
+            <text class="detail-value liyou-full">{{ xuanzhongChufa.ssliyou }}</text>
+          </view>
+          
+          <view wx:if="{{ xuanzhongChufa.full_shensu_tupian && xuanzhongChufa.full_shensu_tupian.length > 0 }}" class="detail-row full-row">
+            <text class="detail-label">申诉图片：</text>
+            <view class="tupian-grid">
+              <block wx:for="{{ xuanzhongChufa.full_shensu_tupian }}" wx:key="index">
+                <view class="tupian-item">
+                  <image 
+                    src="{{ item }}" 
+                    class="tupian-image"
+                    mode="aspectFill"
+                    binderror="imageLoadError"
+                    data-index="{{ index }}"
+                    data-type="shensu"
+                  />
+                  
+                  <view class="tupian-preview" bindtap="yulanTupian" data-url="{{ item }}" data-urls="{{ xuanzhongChufa.full_shensu_tupian }}">
+                    <text class="preview-text">预览</text>
+                  </view>
+                </view>
+              </block>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+
+      
+      
+      <view class="modal-footer">
+        <view class="btn-group-single">
+          <view class="btn btn-kefu" bindtap="lianxiKefu">
+            <text>联系客服</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  
+  <global-notification id="global-notification" />
+</view>
\ No newline at end of file
diff --git a/pages/sjxiaoxi/sjxiaoxi.wxss b/pages/sjxiaoxi/sjxiaoxi.wxss
new file mode 100644
index 0000000..204439d
--- /dev/null
+++ b/pages/sjxiaoxi/sjxiaoxi.wxss
@@ -0,0 +1,751 @@
+/* pages/sjcf/sjcf.wxss */
+/* 🔴【样式与cfss页面基本相同，只添加了独占按钮样式】 */
+
+:root {
+    --cyber-blue: rgba(0, 243, 255, 0.7);
+    --cyber-pink: rgba(255, 0, 255, 0.7);
+    --cyber-purple: rgba(157, 0, 255, 0.7);
+    --cyber-green: rgba(0, 255, 157, 0.7);
+    --cyber-red: rgba(255, 0, 102, 0.7);
+    
+    --cyber-bg: #2a2a3a;
+    --cyber-card: #333344;
+    --cyber-border: rgba(255, 255, 255, 0.15);
+    --cyber-glow: rgba(0, 243, 255, 0.2);
+    
+    --cyber-text: #ffffff;
+    --cyber-text-light: #e6e6e6;
+    --cyber-text-lighter: #cccccc;
+}
+
+.cfss-container {
+    padding: 30rpx;
+    background: var(--cyber-bg);
+    min-height: 100vh;
+    color: var(--cyber-text) !important;
+    position: relative;
+    overflow: hidden;
+    box-sizing: border-box;
+}
+
+/* 恢复网格背景 */
+.cfss-container::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    
+    background-image: 
+      linear-gradient(rgba(0, 243, 255, 0.05) 1px, transparent 1px),
+      linear-gradient(90deg, rgba(0, 243, 255, 0.05) 1px, transparent 1px);
+    background-size: 40rpx 40rpx;
+    pointer-events: none;
+    opacity: 0.15;
+    z-index: 0;
+}
+
+/* ====== 统计卡片 ====== */
+.tongji-card {
+    background: rgba(255, 0, 102, 0.3);
+    border-radius: 20rpx;
+    padding: 30rpx;
+    margin-bottom: 30rpx;
+    border: 1rpx solid var(--cyber-border);
+    box-shadow: 
+      0 0 20rpx rgba(255, 0, 102, 0.2),
+      inset 0 0 10rpx rgba(0, 243, 255, 0.05);
+    position: relative;
+    overflow: hidden;
+    z-index: 1;
+}
+
+.tongji-title {
+    color: var(--cyber-blue);
+    font-size: 34rpx;
+    font-weight: bold;
+    margin-bottom: 30rpx;
+    text-shadow: 0 0 8rpx var(--cyber-blue);
+    letter-spacing: 2rpx;
+}
+
+.tongji-content {
+    display: flex;
+    justify-content: space-between;
+}
+
+.tongji-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    flex: 1;
+}
+
+.tongji-label {
+    color: var(--cyber-text-light) !important;
+    font-size: 26rpx;
+    margin-bottom: 15rpx;
+    opacity: 0.9;
+}
+
+.tongji-value {
+    color: var(--cyber-text) !important;
+    font-size: 44rpx;
+    font-weight: bold;
+    text-shadow: 0 0 8rpx currentColor;
+}
+
+.daichuli-value {
+    color: var(--cyber-red) !important;
+    text-shadow: 0 0 8rpx rgba(255, 0, 102, 0.3);
+}
+
+.yichuli-value {
+    color: var(--cyber-green) !important;
+    text-shadow: 0 0 8rpx rgba(0, 255, 157, 0.3);
+}
+
+/* ====== 类型切换 ====== */
+.leixing-qiehuan {
+    display: flex;
+    background: rgba(255, 0, 102, 0.3);
+    border-radius: 16rpx;
+    padding: 10rpx;
+    margin-bottom: 30rpx;
+    border: 1rpx solid var(--cyber-border);
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.2);
+    z-index: 1;
+}
+
+.leixing-item {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 25rpx 0;
+    border-radius: 12rpx;
+    transition: all 0.3s;
+}
+
+.leixing-item:active {
+    transform: scale(0.98);
+}
+
+.leixing-active {
+    background: linear-gradient(135deg, rgba(0, 243, 255, 0.15), rgba(157, 0, 255, 0.15));
+    box-shadow: 0 0 15rpx rgba(0, 243, 255, 0.2);
+}
+
+.leixing-text {
+    font-size: 28rpx;
+    font-weight: bold;
+    margin-bottom: 8rpx;
+    color: var(--cyber-text-light) !important;
+}
+
+.leixing-active .leixing-text {
+    color: var(--cyber-text) !important;
+    text-shadow: 0 0 8rpx var(--cyber-blue);
+}
+
+.leixing-count {
+    font-size: 24rpx;
+    color: var(--cyber-text-lighter) !important;
+    opacity: 0.9;
+}
+
+.leixing-active .leixing-count {
+    color: rgba(255, 255, 255, 0.9) !important;
+}
+
+/* ====== 处罚列表 ====== */
+.chufa-list {
+    margin-bottom: 0;
+    padding-bottom: 30rpx;
+    z-index: 1;
+}
+
+/* 加载动画 */
+.jiazai-zhong {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 60rpx 0;
+    color: var(--cyber-blue);
+}
+
+.loading-animation {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 20rpx;
+}
+
+.loading-dot {
+    width: 20rpx;
+    height: 20rpx;
+    border-radius: 50%;
+    background-color: var(--cyber-blue);
+    margin: 0 10rpx;
+    animation: pulse 1.5s infinite ease-in-out;
+}
+
+.loading-dot:nth-child(2) {
+    animation-delay: 0.2s;
+}
+
+.loading-dot:nth-child(3) {
+    animation-delay: 0.4s;
+}
+
+@keyframes pulse {
+    0%, 100% { 
+        transform: scale(0.8);
+        opacity: 0.5;
+    }
+    50% { 
+        transform: scale(1.2);
+        opacity: 1;
+    }
+}
+
+/* 处罚卡片 */
+.chufa-card {
+    background: rgba(560, 50, 65, 0.8);
+    border-radius: 20rpx;
+    padding: 30rpx;
+    margin-bottom: 30rpx;
+    border: 1rpx solid var(--cyber-border);
+    position: relative;
+    overflow: hidden;
+    transition: all 0.3s;
+    z-index: 1;
+}
+
+.chufa-card:active {
+    transform: translateY(-4rpx);
+    box-shadow: 
+      0 10rpx 30rpx rgba(0, 0, 0, 0.3),
+      0 0 25rpx var(--cyber-glow);
+}
+
+.card-border {
+    position: absolute;
+    top: -1px;
+    left: -1px;
+    right: -1px;
+    bottom: -1px;
+    border-radius: 21rpx;
+    background: linear-gradient(45deg, rgba(138, 60, 138, 0.3), rgba(131, 208, 212, 0.3), rgba(255, 0, 255, 0.3), rgba(0, 243, 255, 0.3));
+    z-index: -1;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+}
+
+.chufa-card:active .card-border {
+    opacity: 0.3;
+}
+
+.card-top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 25rpx;
+}
+
+.shijian {
+    color: var(--cyber-text-light) !important;
+    font-size: 26rpx;
+    font-family: 'Courier New', monospace;
+    letter-spacing: 1rpx;
+    opacity: 0.9;
+}
+
+.zhuangtai-badge {
+    padding: 8rpx 25rpx;
+    border-radius: 20rpx;
+    font-size: 24rpx;
+    font-weight: bold;
+    text-transform: uppercase;
+    letter-spacing: 2rpx;
+    border: 1rpx solid;
+    box-shadow: 0 0 8rpx;
+    color: #ffffff !important;
+}
+
+.zhuangtai-daichuli {
+    background: rgba(255, 0, 102, 0.2);
+    border-color: var(--cyber-red);
+    box-shadow: 0 0 8rpx rgba(255, 0, 102, 0.2);
+}
+
+.zhuangtai-yichufa {
+    background: rgba(0, 255, 157, 0.2);
+    border-color: var(--cyber-green);
+    box-shadow: 0 0 8rpx rgba(0, 255, 157, 0.2);
+}
+
+.zhuangtai-yibohui {
+    background: rgba(102, 102, 102, 0.2);
+    border-color: #666;
+    box-shadow: 0 0 8rpx rgba(102, 102, 102, 0.2);
+}
+
+.zhuangtai-shensuzhong {
+    background: rgba(255, 165, 0, 0.2);
+    border-color: #FFA500;
+    box-shadow: 0 0 8rpx rgba(255, 165, 0, 0.2);
+}
+
+.zhuangtai-weizhi {
+    background: rgba(128, 0, 255, 0.2);
+    border-color: rgba(128, 0, 255, 0.5);
+    box-shadow: 0 0 8rpx rgba(128, 0, 255, 0.2);
+}
+
+/* 其他文字内容 */
+.qingqiu-row, .liyou-row, .dingdan-row {
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 20rpx;
+}
+
+.qingqiu-label, .liyou-label, .dingdan-label {
+    color: var(--cyber-text-light) !important;
+    font-size: 26rpx;
+    font-weight: bold;
+    margin-right: 15rpx;
+    opacity: 0.9;
+    flex-shrink: 0;
+}
+
+.qingqiu-value, .liyou-value, .dingdan-value {
+    color: var(--cyber-text) !important;
+    font-size: 26rpx;
+    flex: 1;
+    word-break: break-all;
+}
+
+.liyou-value {
+    line-height: 1.5;
+}
+
+.dingdan-value {
+    font-family: 'Courier New', monospace;
+    letter-spacing: 1rpx;
+}
+
+/* 加载更多 */
+.jiazai-gengduo {
+    text-align: center;
+    padding: 40rpx 0;
+    color: var(--cyber-blue);
+    position: relative;
+    overflow: hidden;
+}
+
+.scan-line {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 2rpx;
+    background: linear-gradient(90deg, transparent, var(--cyber-blue), transparent);
+    animation: scan 2s linear infinite;
+}
+
+@keyframes scan {
+    0% { left: -100%; }
+    100% { left: 100%; }
+}
+
+/* 没有更多数据 */
+.meiyou-gengduo {
+    text-align: center;
+    padding: 40rpx 0;
+    color: var(--cyber-green);
+    font-size: 28rpx;
+    opacity: 0.9;
+}
+
+/* 空状态 */
+.kong-zhuangtai {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 100rpx 40rpx;
+    text-align: center;
+    z-index: 1;
+}
+
+.empty-icon {
+    font-size: 120rpx;
+    color: var(--cyber-blue);
+    margin-bottom: 30rpx;
+    text-shadow: 0 0 15rpx var(--cyber-blue);
+    animation: pulse 2s infinite;
+}
+
+.empty-text {
+    font-size: 34rpx;
+    color: var(--cyber-text) !important;
+    margin-bottom: 15rpx;
+    font-weight: bold;
+}
+
+.empty-subtext {
+    font-size: 28rpx;
+    color: var(--cyber-text-light) !important;
+    opacity: 0.8;
+}
+
+/* ====== 弹窗样式 ====== */
+.xiangqing-modal {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.modal-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.7);
+}
+
+.modal-content {
+    position: relative;
+    background: #3a3a4a;
+    border-radius: 30rpx;
+    width: 90%;
+    max-height: 80vh;
+    display: flex;
+    flex-direction: column;
+    border: 1rpx solid var(--cyber-border);
+    box-shadow: 0 0 35rpx rgba(135, 218, 223, 0.3);
+    z-index: 1001;
+}
+
+.modal-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 40rpx 30rpx 30rpx 30rpx;
+    border-bottom: 1rpx solid rgba(157, 250, 253, 0.2);
+    flex-shrink: 0;
+}
+
+.modal-title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: var(--cyber-blue);
+    text-shadow: 0 0 8rpx var(--cyber-blue);
+}
+
+.modal-close {
+    width: 60rpx;
+    height: 60rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 50%;
+    background: rgba(137, 210, 214, 0.1);
+    border: 1rpx solid rgba(0, 243, 255, 0.3);
+}
+
+.modal-close:active {
+    background: rgba(0, 243, 255, 0.2);
+    transform: scale(0.95);
+}
+
+.close-icon {
+    font-size: 40rpx;
+    color: var(--cyber-blue);
+    line-height: 1;
+}
+
+/* 弹窗主体 */
+.modal-body {
+    flex: 1;
+    padding: 30rpx;
+    overflow-y: auto;
+    min-height: 200rpx;
+    box-sizing: border-box;
+}
+
+/* 详情区域 */
+.detail-section {
+    margin-bottom: 40rpx;
+}
+
+.section-title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: var(--cyber-blue);
+    margin-bottom: 25rpx;
+    padding-bottom: 15rpx;
+    border-bottom: 1rpx solid rgba(0, 243, 255, 0.2);
+    text-shadow: 0 0 8rpx var(--cyber-blue);
+}
+
+.detail-row {
+    display: flex;
+    margin-bottom: 25rpx;
+    align-items: center;
+}
+
+.detail-label {
+    color: var(--cyber-text-light) !important;
+    font-size: 30rpx;
+    min-width: 180rpx;
+    margin-right: 20rpx;
+    line-height: 1.5;
+    opacity: 0.9;
+    flex-shrink: 0;
+}
+
+.detail-value-container {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.detail-value {
+    color: var(--cyber-text) !important;
+    font-size: 30rpx;
+    line-height: 1.5;
+    word-break: break-all;
+    opacity: 0.95;
+    flex: 1;
+    margin-right: 20rpx;
+}
+
+.fuzhi-btn {
+    color: var(--cyber-blue);
+    font-size: 24rpx;
+    padding: 8rpx 20rpx;
+    border-radius: 8rpx;
+    background: rgba(0, 243, 255, 0.1);
+    border: 1rpx solid rgba(0, 243, 255, 0.3);
+    flex-shrink: 0;
+}
+
+.fuzhi-btn:active {
+    background: rgba(0, 243, 255, 0.2);
+}
+
+.full-row {
+    flex-direction: column;
+    align-items: flex-start;
+}
+
+.full-row .detail-label {
+    margin-bottom: 10rpx;
+    min-width: auto;
+}
+
+/* 弹窗内的状态标签 */
+.zhuangtai-badge-inline {
+    padding: 8rpx 24rpx;
+    border-radius: 20rpx;
+    font-size: 26rpx;
+    font-weight: bold;
+    text-transform: uppercase;
+    letter-spacing: 1rpx;
+    border: 1rpx solid;
+    min-width: 120rpx;
+    text-align: center;
+    color: #ffffff !important;
+}
+
+/* 理由方框 */
+.liyou-full {
+    background: rgba(255, 255, 255, 0.05);
+    padding: 25rpx 30rpx;
+    border-radius: 15rpx;
+    line-height: 1.6;
+    border: 1rpx solid rgba(218, 176, 176, 0.1);
+    color: var(--cyber-text) !important;
+    width: 100%;
+    box-sizing: border-box;
+    margin: 0;
+    display: block;
+    opacity: 0.95;
+}
+
+/* 图片网格样式 */
+.tupian-grid {
+    display: flex;
+    flex-wrap: wrap;
+    margin-top: 10rpx;
+    margin-left: -5rpx;
+    margin-right: -5rpx;
+}
+
+.tupian-item {
+    width: calc(33.333% - 10rpx);
+    margin: 5rpx;
+    aspect-ratio: 1;
+    border-radius: 10rpx;
+    overflow: hidden;
+    position: relative;
+    border: 1rpx solid rgba(0, 243, 255, 0.2);
+}
+
+.tupian-image {
+    width: 100%;
+    height: 100%;
+}
+
+/* 图片预览遮罩 */
+.tupian-preview {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.3);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+}
+
+.tupian-item:hover .tupian-preview {
+    opacity: 1;
+}
+
+.preview-text {
+    color: white;
+    font-size: 24rpx;
+    background: rgba(0, 243, 255, 0.7);
+    padding: 8rpx 16rpx;
+    border-radius: 8rpx;
+}
+
+/* 🔴【新增】弹窗底部按钮独占一行样式 */
+.modal-footer {
+    padding: 30rpx;
+    border-top: 1rpx solid rgba(0, 243, 255, 0.2);
+    flex-shrink: 0;
+}
+
+.btn-group-single {
+    display: flex;
+    width: 100%;
+}
+
+.btn-group-single .btn {
+    flex: 1;
+    height: 90rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 15rpx;
+    font-size: 32rpx;
+    font-weight: bold;
+    transition: all 0.3s;
+    border: 1rpx solid;
+    box-shadow: 0 0 12rpx;
+    color: var(--cyber-text) !important;
+}
+
+.btn-group-single .btn:active {
+    transform: scale(0.98);
+}
+
+/* 按钮样式 */
+.btn-kefu {
+    background: rgba(0, 243, 255, 0.1);
+    border-color: var(--cyber-blue);
+    box-shadow: 0 0 12rpx rgba(0, 243, 255, 0.2);
+}
+
+/* 响应式调整 */
+@media (max-width: 375px) {
+    .tongji-value {
+        font-size: 36rpx;
+    }
+    
+    .shijian,
+    .qingqiu-label,
+    .liyou-label,
+    .dingdan-label {
+        font-size: 24rpx;
+    }
+    
+    .qingqiu-value,
+    .liyou-value,
+    .dingdan-value {
+        font-size: 24rpx;
+    }
+    
+    .modal-content {
+        width: 95%;
+    }
+}
+
+
+
+/* 🔴【关键修改】图片网格和图片样式 */
+.tupian-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 12rpx;
+    margin-top: 10rpx;
+    width: 100%;
+  }
+  
+  .tupian-item {
+    position: relative;
+    width: 100%;
+    aspect-ratio: 1;
+    border-radius: 12rpx;
+    overflow: hidden;
+    border: 1rpx solid rgba(0, 243, 255, 0.3);
+    background-color: rgba(0, 0, 0, 0.2);
+  }
+  
+  .tupian-image {
+    width: 100%;
+    height: 100%;
+    display: block;
+    object-fit: cover;
+  }
+  
+  /* 图片预览遮罩 */
+  .tupian-preview {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.3);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+  }
+  
+  .tupian-item:hover .tupian-preview {
+    opacity: 1;
+  }
+  
+  .preview-text {
+    color: white;
+    font-size: 24rpx;
+    background: rgba(0, 243, 255, 0.7);
+    padding: 8rpx 16rpx;
+    border-radius: 8rpx;
+  }
\ No newline at end of file
diff --git a/pages/tijiao/tijiao.js b/pages/tijiao/tijiao.js
new file mode 100644
index 0000000..b7dc1e1
--- /dev/null
+++ b/pages/tijiao/tijiao.js
@@ -0,0 +1,313 @@
+// pages/tijiao/tijiao.js
+const app = getApp()
+import request from '../../utils/request.js'
+import PopupService from '../../services/popupService.js'
+
+Page({
+  data: {
+    ossImageUrl: '',
+    apiBaseUrl: '',
+    shangpinData: null,
+    shangpinId: '',
+    nicheng: '',
+    beizhu: '',
+    zhiding: '',
+    jine: 0,
+    isSubmitting: false,
+    canSubmit: false,
+    isPaying: false,
+    orderId: '',
+    payParams: null,
+    checkCount: 0,
+    maxCheckCount: 3
+  },
+
+  onLoad(options) {
+    this.setData({
+      ossImageUrl: app.globalData.ossImageUrl || '',
+      apiBaseUrl: app.globalData.apiBaseUrl || ''
+    })
+    wx.setNavigationBarTitle({ title: '提交订单' })
+    try {
+      if (options.data) {
+        const shangpinData = JSON.parse(decodeURIComponent(options.data))
+        if (shangpinData.image && !shangpinData.image.startsWith('http')) {
+          shangpinData.image = this.data.ossImageUrl + shangpinData.image
+        }
+        if (shangpinData.price) {
+          const price = parseFloat(shangpinData.price) || 0
+          const priceInteger = Math.floor(price)
+          let priceDecimal = '00'
+          const decimalPart = (price - priceInteger).toFixed(2)
+          if (decimalPart > 0) {
+            priceDecimal = decimalPart.toString().split('.')[1]
+          }
+          shangpinData.priceInteger = priceInteger
+          shangpinData.priceDecimal = priceDecimal
+        }
+        this.setData({
+          shangpinData: shangpinData,
+          shangpinId: shangpinData.id || '',
+          jine: parseFloat(shangpinData.price) || 0,
+        })
+      } else {
+        this.handleDataError('商品数据不完整')
+      }
+    } catch (error) {
+      this.handleDataError('解析商品数据失败')
+    }
+    PopupService.checkAndShow(this, 'tijiao');
+  },
+
+  onHide() {
+    const popupComp = this.selectComponent('#popupNotice');
+    if (popupComp && popupComp.cleanup) {
+      popupComp.cleanup();
+    }
+  },
+
+  onShow() {
+    this.registerNotificationComponent();
+  },
+
+  registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  handleDataError(errorMsg) {
+    wx.showToast({ title: errorMsg || '数据错误', icon: 'none' })
+    setTimeout(() => { wx.navigateBack() }, 1500)
+  },
+
+  onNicknameInput(e) {
+    this.setData({ nicheng: e.detail.value.trim() }, () => { this.checkFormValid() })
+  },
+  onRemarkInput(e) {
+    this.setData({ beizhu: e.detail.value.trim() })
+  },
+  onZhidingInput(e) {
+    this.setData({ zhiding: e.detail.value.trim() })
+  },
+
+  checkFormValid() {
+    const { nicheng } = this.data
+    this.setData({ canSubmit: nicheng && nicheng.length > 0 && nicheng.length <= 15 })
+  },
+
+  // 提交订单（生产版：已去掉所有调试日志，保留关键错误日志）
+  onSubmitOrder() {
+    const { nicheng, beizhu, zhiding, jine, shangpinId, canSubmit, isSubmitting } = this.data
+
+    if (!canSubmit) {
+      wx.showToast({ title: '请填写游戏昵称', icon: 'none' })
+      return
+    }
+
+    // 防重复提交
+    if (isSubmitting) return
+
+    this.setData({ isSubmitting: true, isPaying: false })
+    wx.showLoading({ title: '创建订单中...', mask: true })
+
+    // 10秒超时
+    const timeoutTimer = setTimeout(() => {
+      wx.hideLoading()
+      wx.showToast({ title: '网络超时，请检查您是否已登录', icon: 'none' })
+      this.setData({ isSubmitting: false, isPaying: false })
+    }, 10000)
+
+    // 获取登录 code（虚拟支付必须每单刷新 session_key）
+    wx.login({
+      success: (loginRes) => {
+        const orderData = {
+          shangpin_id: shangpinId,
+          nicheng: nicheng,
+          beizhu: beizhu || '',
+          zhiding: zhiding || '',
+          jine: jine,
+          code: loginRes.code
+        }
+
+        request({
+          url: '/dingdan/virtual_xiadan',
+          method: 'POST',
+          data: orderData
+        })
+        .then(res => {
+          clearTimeout(timeoutTimer)
+          wx.hideLoading()
+
+          if (res.statusCode === 200 && res.data && res.data.code === 0 && res.data.data) {
+            const payParams = res.data.data.payParams || {}
+            this.setData({
+              orderId: res.data.data.dingdanid,
+              payParams: payParams,
+              isSubmitting: false,
+              isPaying: true,
+              checkCount: 0
+            })
+            // 调起虚拟支付
+            this.triggerVirtualPayment(payParams)
+          } else {
+            const msg = (res.data && res.data.msg) || '创建订单失败'
+            wx.showToast({ title: msg, icon: 'none' })
+            this.setData({ isSubmitting: false, isPaying: false })
+          }
+        })
+        .catch(error => {
+          clearTimeout(timeoutTimer)
+          wx.hideLoading()
+          console.error('下单请求异常', error)
+          wx.showToast({ title: '创建订单失败', icon: 'none' })
+          this.setData({ isSubmitting: false, isPaying: false })
+        })
+      },
+      fail: () => {
+        clearTimeout(timeoutTimer)
+        wx.hideLoading()
+        wx.showToast({ title: '获取登录状态失败', icon: 'none' })
+        this.setData({ isSubmitting: false, isPaying: false })
+      }
+    })
+  },
+
+  // 调起虚拟支付（防抖已通过 isPaying 状态控制）
+  triggerVirtualPayment(payParams) {
+    // 参数完整性检查
+    if (!payParams || !payParams.signData || !payParams.paySig || !payParams.signature) {
+      console.error('支付参数不完整', payParams)
+      wx.showToast({ title: '支付参数异常', icon: 'none' })
+      this.setData({ isSubmitting: false, isPaying: false })
+      return
+    }
+
+    wx.requestVirtualPayment({
+      signData: payParams.signData,
+      paySig: payParams.paySig,
+      signature: payParams.signature,
+      mode: payParams.mode || 'short_series_coin',
+      success: (res) => {
+        // 支付成功，进入复查流程
+        this.onPaymentSuccess()
+      },
+      fail: (err) => {
+        console.error('支付失败', err)
+        if (err.errCode === -2 || (err.errMsg && err.errMsg.indexOf('cancel') !== -1)) {
+          this.handleUserCancel()
+        } else {
+          this.handlePaymentFail(err)
+        }
+      }
+    })
+  },
+
+  // 用户取消支付
+  handleUserCancel() {
+    wx.showToast({ title: '已取消支付', icon: 'none', duration: 1500 })
+    if (this.data.orderId) {
+      request({
+        url: '/dingdan/shibai',
+        method: 'POST',
+        data: { dingdanid: this.data.orderId }
+      }).catch(() => {})
+    }
+    this.setData({ isSubmitting: false, isPaying: false })
+  },
+
+  // 其他支付失败
+  handlePaymentFail(err) {
+    wx.showToast({ title: '支付失败', icon: 'none', duration: 1500 })
+    if (this.data.orderId) {
+      request({
+        url: '/dingdan/shibai',
+        method: 'POST',
+        data: {
+          dingdanid: this.data.orderId,
+          yuanyin: 'payment_fail'
+        }
+      }).catch(() => {})
+    }
+    this.setData({ isSubmitting: false, isPaying: false })
+  },
+
+  // 支付成功，开始双重确认
+  onPaymentSuccess() {
+    if (!this.data.orderId) {
+      wx.showToast({ title: '订单ID丢失', icon: 'none' })
+      this.setData({ isSubmitting: false, isPaying: false })
+      return
+    }
+    wx.showToast({ title: '支付成功，确认中...', icon: 'none', duration: 1500 })
+    this.checkOrderStatus()
+  },
+
+  // 复查订单状态（最多重试3次）
+  checkOrderStatus() {
+    const { orderId, checkCount, maxCheckCount } = this.data
+    wx.showLoading({
+      title: `确认支付状态${checkCount > 0 ? `(${checkCount + 1})` : ''}`,
+      mask: true
+    })
+
+    const timeoutTimer = setTimeout(() => {
+      wx.hideLoading()
+      this.handleConfirmError('网络超时')
+    }, 5000)
+
+    request({
+      url: '/dingdan/virtual_fucha',
+      method: 'POST',
+      data: { dingdanid: orderId }
+    })
+    .then(res => {
+      clearTimeout(timeoutTimer)
+      wx.hideLoading()
+      if ( res.data && res.data.code === 0) {
+        this.handleConfirmSuccess()
+      } else {
+        const msg = (res.data && res.data.msg) || '订单状态异常'
+        this.handleConfirmError(msg)
+      }
+    })
+    .catch(error => {
+      clearTimeout(timeoutTimer)
+      wx.hideLoading()
+      this.handleConfirmError('检查失败')
+    })
+  },
+
+  handleConfirmSuccess() {
+    wx.showToast({ title: '购买成功！', icon: 'success', duration: 1500 })
+    setTimeout(() => {
+      wx.switchTab({ url: '/pages/index/index' })
+    }, 1500)
+    this.setData({ isSubmitting: false, isPaying: false })
+  },
+
+  handleConfirmError(errorMsg) {
+    const { checkCount, maxCheckCount } = this.data
+    const newCheckCount = checkCount + 1
+    if (newCheckCount < maxCheckCount) {
+      this.setData({ checkCount: newCheckCount })
+      setTimeout(() => { this.checkOrderStatus() }, 1000)
+    } else {
+      wx.showModal({
+        title: '支付确认中',
+        content: '支付已成功，但订单状态确认异常。请稍后在订单列表查看，如有问题请联系客服。',
+        showCancel: false,
+        confirmText: '我知道了',
+        success: (res) => {
+          if (res.confirm) wx.switchTab({ url: '/pages/index/index' })
+        }
+      })
+      this.setData({ isSubmitting: false, isPaying: false })
+    }
+  }
+})
\ No newline at end of file
diff --git a/pages/tijiao/tijiao.json b/pages/tijiao/tijiao.json
new file mode 100644
index 0000000..837f016
--- /dev/null
+++ b/pages/tijiao/tijiao.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    }
+}
\ No newline at end of file
diff --git a/pages/tijiao/tijiao.wxml b/pages/tijiao/tijiao.wxml
new file mode 100644
index 0000000..3a6b85e
--- /dev/null
+++ b/pages/tijiao/tijiao.wxml
@@ -0,0 +1,124 @@
+
+<view class="submit-page">
+  
+  <view class="product-section">
+    <view class="product-card">
+      
+      <view class="product-image-box">
+        <image 
+          src="{{shangpinData && shangpinData.image ? shangpinData.image : ''}}" 
+          mode="aspectFill" 
+          class="product-image"
+        />
+      </view>
+      
+      
+      <view class="product-info">
+        <view class="product-title">
+          <text class="title-text">{{shangpinData && shangpinData.title ? shangpinData.title : '商品标题'}}</text>
+        </view>
+        
+        
+        <view class="price-info">
+          <text class="price-label">价格：</text>
+          <view class="price-value">
+            <text class="price-icon">¥</text>
+            <text class="price-integer">{{shangpinData && shangpinData.priceInteger ? shangpinData.priceInteger : '0'}}</text>
+            <text class="price-decimal">.{{shangpinData && shangpinData.priceDecimal ? shangpinData.priceDecimal : '00'}}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  
+  
+  <view class="form-section">
+    <view class="form-card">
+      
+      <view class="form-item-row">
+        <view class="item-label-row">
+          <text class="label-text-bold">昵称</text>
+          <text class="label-required">*</text>
+        </view>
+        <input 
+          class="item-input-row"
+          type="text"
+          placeholder="请输入您的昵称"
+          placeholder-class="input-placeholder-gray"
+          maxlength="15"
+          value="{{nicheng}}"
+          bindinput="onNicknameInput"
+        />
+      </view>
+      
+      
+      <view class="form-item-row">
+        <view class="item-label-row">
+          <text class="label-text-bold">备注</text>
+        </view>
+        <input 
+          class="item-input-row"
+          type="text"
+          placeholder="请补充您要补充的其他联系信息"
+          placeholder-class="input-placeholder-gray"
+          maxlength="30"
+          value="{{beizhu}}"
+          bindinput="onRemarkInput"
+        />
+      </view>
+      
+      
+      <view class="form-item-row">
+        <view class="item-label-row">
+          <text class="label-text-bold">指定服务者ID(选填)</text>
+        </view>
+        <input 
+          class="item-input-row"
+          type="text"
+          placeholder="填写您需要指定的服务者"
+          placeholder-class="input-placeholder-gray"
+          maxlength="20"
+          value="{{zhiding}}"
+          bindinput="onZhidingInput"
+        />
+      </view>
+      
+      
+      <view class="payment-item">
+        <view class="payment-method">
+          <image src="/images/weixinzhifu.png" class="payment-icon" />
+          <text class="payment-text">微信支付</text>
+          <view class="payment-checkbox">
+            <text class="checkbox-text">✓</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  
+  
+  <view class="footer-section">
+    <view class="total-price">
+      <text class="total-label">总价：</text>
+      <view class="total-value">
+        <text class="price-icon">¥</text>
+        <text class="price-integer">{{shangpinData && shangpinData.priceInteger ? shangpinData.priceInteger : '0'}}</text>
+        <text class="price-decimal">.{{shangpinData && shangpinData.priceDecimal ? shangpinData.priceDecimal : '00'}}</text>
+      </view>
+    </view>
+    
+    <view 
+      class="submit-btn {{canSubmit && !isSubmitting ? 'submit-btn-active' : 'submit-btn-disabled'}}" 
+      bindtap="onSubmitOrder"
+    >
+      <text class="btn-text">{{isSubmitting ? '提交中...' : '提交订单'}}</text>
+      <view class="btn-glow"></view>
+    </view>
+  </view>
+
+  
+  <global-notification id="global-notification" />
+
+  
+  <popup-notice id="popupNotice" />
+</view>
\ No newline at end of file
diff --git a/pages/tijiao/tijiao.wxss b/pages/tijiao/tijiao.wxss
new file mode 100644
index 0000000..c622155
--- /dev/null
+++ b/pages/tijiao/tijiao.wxss
@@ -0,0 +1,280 @@
+/* pages/tijiao/tijiao.wxss */
+
+.submit-page {
+    display: flex;
+    flex-direction: column;
+    min-height: 100vh;
+    background: linear-gradient(135deg, #f8f9ff 0%, #f0f3ff 100%);
+    box-sizing: border-box;
+  }
+  
+  /* 商品信息区域 */
+  .product-section {
+    padding: 30rpx 30rpx 20rpx 30rpx;
+    flex-shrink: 0;
+  }
+  
+  .product-card {
+    background: white;
+    border-radius: 20rpx;
+    padding: 30rpx;
+    display: flex;
+    align-items: center;
+    box-shadow: 0 8rpx 32rpx rgba(0, 0, 0, 0.06);
+  }
+  
+  .product-image-box {
+    width: 160rpx;
+    height: 160rpx;
+    border-radius: 16rpx;
+    overflow: hidden;
+    background: #f5f5f5;
+    flex-shrink: 0;
+    margin-right: 24rpx;
+  }
+  
+  .product-image {
+    width: 100%;
+    height: 100%;
+  }
+  
+  .product-info {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: 160rpx;
+  }
+  
+  .product-title {
+    margin-bottom: 20rpx;
+  }
+  
+  .title-text {
+    font-size: 30rpx;
+    font-weight: 600;
+    color: #222;
+    line-height: 1.4;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+  }
+  
+  .price-info {
+    display: flex;
+    align-items: baseline;
+  }
+  
+  .price-label {
+    font-size: 26rpx;
+    color: #666;
+    font-weight: 500;
+  }
+  
+  .price-value {
+    display: flex;
+    align-items: baseline;
+  }
+  
+  .price-icon {
+    font-size: 28rpx;
+    color: #ff4d4f;
+    font-weight: 600;
+  }
+  
+  .price-integer {
+    font-size: 38rpx;
+    color: #ff4d4f;
+    font-weight: 700;
+    margin-left: 4rpx;
+  }
+  
+  .price-decimal {
+    font-size: 28rpx;
+    color: #ff4d4f;
+    font-weight: 600;
+  }
+  
+  /* 表单区域 */
+  .form-section {
+    padding: 0 30rpx 20rpx 30rpx;
+    flex-shrink: 0;
+  }
+  
+  .form-card {
+    background: white;
+    border-radius: 20rpx;
+    padding: 30rpx;
+    box-shadow: 0 6rpx 24rpx rgba(0, 0, 0, 0.05);
+  }
+  
+  .form-item-row {
+    display: flex;
+    align-items: center;
+    padding: 25rpx 0;
+    border-bottom: 1rpx solid #f5f5f5;
+  }
+  
+  .form-item-row:last-child {
+    border-bottom: none;
+  }
+  
+  .item-label-row {
+    width: 220rpx;
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+  }
+  
+  .label-text-bold {
+    font-size: 30rpx;
+    font-weight: 600;
+    color: #333;
+  }
+  
+  .label-required {
+    font-size: 30rpx;
+    color: #ff4d4f;
+    margin-left: 8rpx;
+  }
+  
+  .item-input-row {
+    flex: 1;
+    font-size: 28rpx;
+    color: #222;
+    height: 60rpx;
+    line-height: 60rpx;
+    padding: 0 20rpx;
+    text-align: right;
+    background: #fafafa;
+    border-radius: 10rpx;
+  }
+  
+  .input-placeholder-gray {
+    color: #999;
+    font-size: 28rpx;
+  }
+  
+  /* 支付方式 */
+  .payment-item {
+    margin-top: 30rpx;
+    padding-top: 30rpx;
+    border-top: 1rpx solid #f0f0f0;
+  }
+  
+  .payment-method {
+    display: flex;
+    align-items: center;
+    padding: 20rpx 0;
+  }
+  
+  .payment-icon {
+    width: 48rpx;
+    height: 48rpx;
+    margin-right: 20rpx;
+  }
+  
+  .payment-text {
+    font-size: 28rpx;
+    color: #333;
+    font-weight: 500;
+    flex: 1;
+  }
+  
+  .payment-checkbox {
+    width: 40rpx;
+    height: 40rpx;
+    border-radius: 50%;
+    background: #52c41a;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .checkbox-text {
+    color: white;
+    font-size: 28rpx;
+    font-weight: 600;
+  }
+  
+  /* 底部操作栏 */
+  .footer-section {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 20rpx 30rpx;
+    background: white;
+    box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.08);
+    margin-top: auto;
+    flex-shrink: 0;
+  }
+  
+  .total-price {
+    display: flex;
+    align-items: baseline;
+    flex: 1;
+  }
+  
+  .total-label {
+    font-size: 30rpx;
+    color: #333;
+    font-weight: 600;
+  }
+  
+  .total-value {
+    display: flex;
+    align-items: baseline;
+  }
+  
+  .submit-btn {
+    width: 240rpx;
+    height: 88rpx;
+    border-radius: 44rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
+    transition: all 0.3s;
+  }
+  
+  .submit-btn-active {
+    background: linear-gradient(135deg, #52c41a, #389e0d);
+    box-shadow: 0 8rpx 32rpx rgba(255, 77, 79, 0.4);
+  }
+  
+  .submit-btn-disabled {
+    background: #ccc;
+    box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+  }
+  
+  .submit-btn-active:active {
+    transform: scale(0.98);
+    box-shadow: 0 4rpx 20rpx rgba(255, 77, 79, 0.5);
+  }
+  
+  .btn-text {
+    font-size: 32rpx;
+    color: white;
+    font-weight: 600;
+    position: relative;
+    z-index: 2;
+  }
+  
+  .btn-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent);
+    transform: translateX(-100%);
+    animation: btnGlow 3s infinite;
+  }
+  
+  @keyframes btnGlow {
+    0% { transform: translateX(-100%); }
+    50% { transform: translateX(100%); }
+    100% { transform: translateX(100%); }
+  }
\ No newline at end of file
diff --git a/pages/tixian/components/mode1/mode1.js b/pages/tixian/components/mode1/mode1.js
new file mode 100644
index 0000000..097c9aa
--- /dev/null
+++ b/pages/tixian/components/mode1/mode1.js
@@ -0,0 +1,484 @@
+// pages/tixian/tixian.js
+// 子组件版本 - 完整代码，仅适配生命周期，业务逻辑不动
+
+import request from '../../../../utils/request.js';
+import upload from '../../../../utils/upload.js';
+import PopupService from '../../../../services/popupService.js';
+
+const app = getApp();
+const PAGE_SIZE = 10;
+let lastPullDownTime = 0;
+const PULL_DOWN_INTERVAL = 2000;
+
+Component({
+  data: {
+    imgUrls: {
+      pageBg: '',
+      cardBg: '',
+      iconWechat: '',
+      iconAlipay: '',
+      iconRecord: '',
+      iconRefresh: '',
+    },
+    assetList: [],
+    totalAmount: '0.00',
+    selectedAsset: null,
+    txfangshi: null,
+    txdianhua: '',
+    txzh: '',
+    txtupian: '',
+    ossImageUrl: '',
+    showTixianModal: false,
+    tixianAmount: '',
+    shouxufei: '0.00',
+    shijidaozhang: '0.00',
+    currentRate: '0.00',
+    recordList: [],
+    page: 1,
+    nomore: false,
+    loading: false,
+    isRefreshing: false,
+    canloadmore: true,
+    showSkfsModal: false,
+    tempTxfangshi: null,
+    tempTxPhone: '',
+    tempTxAccount: '',
+    tempTxImage: '',
+    choosingImage: false,
+    showModifyModal: false,
+    modifyingRecord: null,
+    modifyTxfangshi: null,
+    modifyTxPhone: '',
+    modifyTxAccount: '',
+    modifyTxImage: '',
+    modifyImageUrl: '',
+    showFailModal: false,
+    currentFailReason: '',
+    isLoading: false,
+  },
+
+  attached() {
+    this.initImageUrls();
+    this.loadAllAssets();
+    this.loadWithdrawMethod();
+    this.loadWithdrawRecords(true);
+  },
+
+  pageLifetimes: {
+    show() {
+      this.registerNotification();
+      PopupService.checkAndShow(this, 'tixian');
+    },
+    hide() {
+      const popup = this.selectComponent('#popupNotice');
+      popup?.cleanup?.();
+    }
+  },
+
+  methods: {
+    // 下拉刷新
+    onPullDownRefresh() {
+      if (this.data.isRefreshing) {
+        wx.stopPullDownRefresh();
+        return;
+      }
+      this.setData({ isRefreshing: true });
+      this.loadWithdrawRecords(true).then(() => {
+        wx.stopPullDownRefresh();
+        this.setData({ isRefreshing: false });
+      }).catch(() => {
+        wx.stopPullDownRefresh();
+        this.setData({ isRefreshing: false });
+      });
+    },
+
+    // 底部按钮加载更多
+    loadMoreRecords() {
+      if (this.data.nomore) {
+        wx.showToast({ title: '没有更多记录了', icon: 'none' });
+        return;
+      }
+      if (this.data.loading) return;
+      this.loadWithdrawRecords();
+    },
+
+    initImageUrls() {
+      const ossBase = app.globalData.ossImageUrl || '';
+      const imgDir = `${ossBase}beijing/tixian/`;
+      this.setData({
+        imgUrls: {
+          pageBg: `${imgDir}page_bg.png`,
+          cardBg: `${imgDir}card_bg.png`,
+          iconWechat: `${imgDir}icon_wechat.png`,
+          iconAlipay: `${imgDir}icon_alipay.png`,
+          iconRecord: `${imgDir}icon_record.png`,
+          iconRefresh: `${imgDir}icon_refresh.png`,
+          assetTileBg: `${imgDir}asset_tile_bg.png`,
+        }
+      });
+    },
+
+    async loadAllAssets() {
+      this.setData({ isLoading: true });
+      try {
+        const res = await request({ url: '/yonghu/tixianzichan', method: 'POST' });
+        if (res?.data?.code === 200) {
+          const data = res.data.data;
+          const assets = [];
+          if (data.dashou_yue && parseFloat(data.dashou_yue) > 0) {
+            assets.push({ type: 'dashou_yue', label: '打手佣金', amount: data.dashou_yue, rate: data.dashou_rate || 0 });
+          }
+          if (data.dashou_yajin && parseFloat(data.dashou_yajin) > 0) {
+            assets.push({ type: 'dashou_yajin', label: '打手保证金', amount: data.dashou_yajin, rate: data.dashou_yajin_rate || 0 });
+          }
+          if (data.shangjia_yue && parseFloat(data.shangjia_yue) > 0) {
+            assets.push({ type: 'shangjia_yue', label: '商家余额', amount: data.shangjia_yue, rate: data.shangjia_rate || 0 });
+          }
+          if (data.guanshi_fenyong && parseFloat(data.guanshi_fenyong) > 0) {
+            assets.push({ type: 'guanshi_fenyong', label: '管事分红', amount: data.guanshi_fenyong, rate: data.guanshi_rate || 0 });
+          }
+          if (data.zuzhang_fenyong && parseFloat(data.zuzhang_fenyong) > 0) {
+            assets.push({ type: 'zuzhang_fenyong', label: '组长分红', amount: data.zuzhang_fenyong, rate: data.zuzhang_rate || 0 });
+          }
+          if (data.kaoheguan_fenyong && parseFloat(data.kaoheguan_fenyong) > 0) {
+            assets.push({ type: 'kaoheguan_fenyong', label: '考核官分佣', amount: data.kaoheguan_fenyong, rate: data.kaoheguan_rate || 0 });
+          }
+          let total = 0;
+          assets.forEach(item => { total += parseFloat(item.amount); });
+          this.setData({ assetList: assets, totalAmount: total.toFixed(2), isLoading: false });
+          // 缓存费率
+          wx.setStorageSync('dashouRate', data.dashou_rate || 0);
+          wx.setStorageSync('dashou_yajin_rate', data.dashou_yajin_rate || 0);
+          wx.setStorageSync('shangjia_rate', data.shangjia_rate || 0);
+          wx.setStorageSync('guanshi_rate', data.guanshi_rate || 0);
+          wx.setStorageSync('zuzhang_rate', data.zuzhang_rate || 0);
+          wx.setStorageSync('kaoheguan_rate', data.kaoheguan_rate || 0);
+        } else {
+          throw new Error(res?.data?.msg || '获取资产失败');
+        }
+      } catch (err) {
+        console.error(err);
+        wx.showToast({ title: '加载失败', icon: 'none' });
+        this.setData({ isLoading: false });
+      }
+    },
+
+    async loadWithdrawMethod() {
+      const txzh = wx.getStorageSync('txzh') || '';
+      const txtupian = wx.getStorageSync('txtupian') || '';
+      const txfangshi = wx.getStorageSync('txfangshi') || null;
+      const txdianhua = wx.getStorageSync('txdianhua') || '';
+      if (txzh || txtupian) {
+        this.setData({ txzh, txtupian, txfangshi, txdianhua, ossImageUrl: app.globalData.ossImageUrl || '' });
+      } else {
+        try {
+          const res = await request({ url: '/yonghu/tixianhq', method: 'POST' });
+          if (res?.data?.code === 0) {
+            const data = res.data.data;
+            this.setData({
+              txzh: data.txzh || '',
+              txtupian: data.txtupian || '',
+              txfangshi: data.txfangshi || null,
+              txdianhua: data.txdianhua || '',
+            });
+            wx.setStorageSync('txzh', data.txzh || '');
+            wx.setStorageSync('txtupian', data.txtupian || '');
+            wx.setStorageSync('txfangshi', data.txfangshi || null);
+            wx.setStorageSync('txdianhua', data.txdianhua || '');
+          }
+        } catch (err) {}
+      }
+    },
+
+    onSelectAsset(e) {
+      const index = e.currentTarget.dataset.index;
+      const asset = this.data.assetList[index];
+      if (!asset || parseFloat(asset.amount) <= 0) {
+        wx.showToast({ title: '无可提现金额', icon: 'none' });
+        return;
+      }
+      this.setData({
+        selectedAsset: asset,
+        showTixianModal: true,
+        tixianAmount: '',
+        shouxufei: '0.00',
+        shijidaozhang: '0.00',
+        currentRate: asset.rate
+      });
+    },
+
+    onAmountInput(e) {
+      let val = e.detail.value;
+      if (val && !/^\d*\.?\d{0,2}$/.test(val)) return;
+      this.setData({ tixianAmount: val });
+      if (val && parseFloat(val) > 0) {
+        const amount = parseFloat(val);
+        const rate = parseFloat(this.data.selectedAsset.rate) || 0;
+        const fee = amount * rate;
+        const actual = amount - fee;
+        this.setData({ shouxufei: fee.toFixed(2), shijidaozhang: actual.toFixed(2) });
+      } else {
+        this.setData({ shouxufei: '0.00', shijidaozhang: '0.00' });
+      }
+    },
+
+    onQuickAmount(e) {
+      const val = e.currentTarget.dataset.value;
+      this.setData({ tixianAmount: val.toString() });
+      this.onAmountInput({ detail: { value: val.toString() } });
+    },
+
+    async onConfirmWithdraw() {
+      const { selectedAsset, tixianAmount, txfangshi, txzh, txtupian, txdianhua } = this.data;
+      if (!selectedAsset) { wx.showToast({ title: '请选择提现项目', icon: 'none' }); return; }
+      const amount = parseFloat(tixianAmount);
+      if (isNaN(amount) || amount <= 0) { wx.showToast({ title: '请输入有效金额', icon: 'none' }); return; }
+      if (amount > parseFloat(selectedAsset.amount)) { wx.showToast({ title: '超过可提现金额', icon: 'none' }); return; }
+      if (!txfangshi || (!txzh && !txtupian)) {
+        wx.showToast({ title: '请先设置收款方式', icon: 'none' });
+        this.setData({ showTixianModal: false });
+        this.onSetSkfs();
+        return;
+      }
+      let leixing = 1;
+      switch (selectedAsset.type) {
+        case 'dashou_yue': leixing = 1; break;
+        case 'dashou_yajin': leixing = 5; break;
+        case 'shangjia_yue': leixing = 6; break;
+        case 'guanshi_fenyong': leixing = 2; break;
+        case 'zuzhang_fenyong': leixing = 3; break;
+        case 'kaoheguan_fenyong': leixing = 4; break;
+      }
+      let txskfs = 0;
+      if (txzh && txtupian) txskfs = 3;
+      else if (txzh) txskfs = 1;
+      else if (txtupian) txskfs = 2;
+      try {
+        const res = await request({
+          url: '/yonghu/tixian',
+          method: 'POST',
+          data: { leixing, jine: amount.toFixed(2), fangshi: txfangshi, txskfs }
+        });
+        if (res?.data?.code === 0) {
+          const newAssetList = this.data.assetList.map(item => {
+            if (item.type === selectedAsset.type) {
+              const newAmount = (parseFloat(item.amount) - amount).toFixed(2);
+              return { ...item, amount: newAmount };
+            }
+            return item;
+          });
+          let newTotal = 0;
+          newAssetList.forEach(item => { newTotal += parseFloat(item.amount); });
+          this.setData({ assetList: newAssetList, totalAmount: newTotal.toFixed(2), showTixianModal: false, selectedAsset: null });
+          this.loadWithdrawRecords(true);
+          wx.showToast({ title: '提现申请已提交', icon: 'success' });
+        } else {
+          wx.showToast({ title: res?.data?.msg || '提现失败', icon: 'none' });
+        }
+      } catch (err) {
+        wx.showToast({ title: '网络错误', icon: 'none' });
+      }
+    },
+
+    onCloseTixianModal() {
+      this.setData({ showTixianModal: false, selectedAsset: null, tixianAmount: '' });
+    },
+
+    onSetSkfs() {
+      this.setData({
+        showSkfsModal: true,
+        tempTxfangshi: this.data.txfangshi,
+        tempTxPhone: this.data.txdianhua,
+        tempTxAccount: this.data.txzh,
+        tempTxImage: ''
+      });
+    },
+
+    onSelectFangshi(e) {
+      this.setData({ tempTxfangshi: e.currentTarget.dataset.fangshi });
+    },
+
+    onPhoneInput(e) { this.setData({ tempTxPhone: e.detail.value }); },
+    onAccountInput(e) { this.setData({ tempTxAccount: e.detail.value }); },
+
+    onChooseImage() {
+      if (this.data.choosingImage) return;
+      this.setData({ choosingImage: true });
+      wx.chooseMedia({
+        count: 1, mediaType: ['image'],
+        success: (res) => { this.setData({ tempTxImage: res.tempFiles[0].tempFilePath }); },
+        complete: () => { this.setData({ choosingImage: false }); }
+      });
+    },
+
+    onPreviewImage() {
+      if (this.data.tempTxImage) wx.previewImage({ urls: [this.data.tempTxImage] });
+    },
+
+    onDeleteImage() { this.setData({ tempTxImage: '' }); },
+
+    async onConfirmSkfs() {
+      const { tempTxfangshi, tempTxPhone, tempTxAccount, tempTxImage } = this.data;
+      if (!tempTxfangshi) { wx.showToast({ title: '请选择提现方式', icon: 'none' }); return; }
+      if (!tempTxPhone) { wx.showToast({ title: '请输入收款人电话', icon: 'none' }); return; }
+      if (tempTxfangshi == 1 && !tempTxImage) { wx.showToast({ title: '请上传微信收款码', icon: 'none' }); return; }
+      if (tempTxfangshi == 2 && !tempTxAccount && !tempTxImage) {
+        wx.showToast({ title: '请填写支付宝账号或上传收款码', icon: 'none' }); return;
+      }
+      const formData = { txdianhua: tempTxPhone, txzh: tempTxAccount || '' };
+      try {
+        const res = await upload({ url: '/yonghu/sksc', formData, filePath: tempTxImage || null, fileName: 'file' });
+        if (res?.data?.code === 0) {
+          const data = res.data.data;
+          this.setData({
+            txfangshi: tempTxfangshi, txdianhua: tempTxPhone, txzh: data.txzh || '', txtupian: data.txtupian || '', showSkfsModal: false
+          });
+          wx.setStorageSync('txfangshi', tempTxfangshi);
+          wx.setStorageSync('txdianhua', tempTxPhone);
+          wx.setStorageSync('txzh', data.txzh || '');
+          wx.setStorageSync('txtupian', data.txtupian || '');
+          wx.showToast({ title: '设置成功', icon: 'success' });
+        } else {
+          wx.showToast({ title: res?.data?.msg || '保存失败', icon: 'none' });
+        }
+      } catch (err) {
+        wx.showToast({ title: '网络错误', icon: 'none' });
+      }
+    },
+
+    onCloseSkfsModal() { this.setData({ showSkfsModal: false }); },
+
+    async loadWithdrawRecords(refresh = false) {
+      const now = Date.now();
+      if (now - lastPullDownTime < PULL_DOWN_INTERVAL && !refresh) return;
+      if (this.data.loading || this.data.isRefreshing) return;
+      const page = refresh ? 1 : this.data.page;
+      if (this.data.nomore && !refresh) return;
+      this.setData({ loading: true, isRefreshing: refresh });
+      lastPullDownTime = now;
+      try {
+        const res = await request({ url: '/yonghu/tixianjiluhq', method: 'POST', data: { page, limit: PAGE_SIZE } });
+        if (res?.data?.code === 0) {
+          const list = (res.data.data.list || []).map(item => ({
+            ...item,
+            statusText: this.getStatusText(item.zhuangtai),
+            statusColor: this.getStatusColor(item.zhuangtai)
+          }));
+          const newList = refresh ? list : [...this.data.recordList, ...list];
+          const hasMore = res.data.data.has_more === true;
+          this.setData({
+            recordList: newList, page: page + 1, nomore: !hasMore, canloadmore: hasMore,
+            loading: false, isRefreshing: false
+          });
+        } else {
+          this.setData({ loading: false, isRefreshing: false });
+        }
+      } catch (err) {
+        this.setData({ loading: false, isRefreshing: false });
+      }
+    },
+
+    onModifyRecord(e) {
+      const record = e.currentTarget.dataset.record;
+      if (parseInt(record.zhuangtai) !== 1) {
+        wx.showToast({ title: '只有审核中的记录可修改', icon: 'none' });
+        return;
+      }
+      this.setData({
+        modifyingRecord: record,
+        modifyTxfangshi: record.fangshi,
+        modifyTxPhone: record.txdianhua || '',
+        modifyTxAccount: record.txzh || '',
+        modifyTxImage: '',
+        modifyImageUrl: record.txtupian ? (app.globalData.ossImageUrl + record.txtupian) : '',
+        showModifyModal: true
+      });
+    },
+
+    onSelectModifyFangshi(e) { this.setData({ modifyTxfangshi: e.currentTarget.dataset.fangshi }); },
+    onModifyPhoneInput(e) { this.setData({ modifyTxPhone: e.detail.value }); },
+    onModifyAccountInput(e) { this.setData({ modifyTxAccount: e.detail.value }); },
+
+    onChooseModifyImage() {
+      if (this.data.choosingImage) return;
+      this.setData({ choosingImage: true });
+      wx.chooseMedia({
+        count: 1, mediaType: ['image'],
+        success: (res) => { this.setData({ modifyTxImage: res.tempFiles[0].tempFilePath }); },
+        complete: () => { this.setData({ choosingImage: false }); }
+      });
+    },
+
+    onPreviewModifyImage() {
+      if (this.data.modifyTxImage) wx.previewImage({ urls: [this.data.modifyTxImage] });
+      else if (this.data.modifyImageUrl) wx.previewImage({ urls: [this.data.modifyImageUrl] });
+    },
+
+    onDeleteModifyImage() { this.setData({ modifyTxImage: '' }); },
+
+    async onConfirmModify() {
+      const { modifyTxfangshi, modifyTxPhone, modifyTxAccount, modifyTxImage, modifyingRecord } = this.data;
+      if (!modifyTxfangshi) { wx.showToast({ title: '请选择提现方式', icon: 'none' }); return; }
+      if (!modifyTxPhone) { wx.showToast({ title: '请输入收款人电话', icon: 'none' }); return; }
+      if (modifyTxfangshi == 1 && !modifyTxImage) { wx.showToast({ title: '请上传微信收款码', icon: 'none' }); return; }
+      if (modifyTxfangshi == 2 && !modifyTxAccount && !modifyTxImage) {
+        wx.showToast({ title: '请填写支付宝账号或上传收款码', icon: 'none' }); return;
+      }
+      const formData = { tixian_id: modifyingRecord.id, fangshi: modifyTxfangshi, txdianhua: modifyTxPhone, txzh: modifyTxAccount || '' };
+      try {
+        const res = await upload({ url: '/yonghu/yonghutxshxg', formData, filePath: modifyTxImage || null, fileName: 'file' });
+        if (res?.data?.code === 0) {
+          const data = res.data.data;
+          const newList = this.data.recordList.map(item => {
+            if (item.id === modifyingRecord.id) {
+              return { ...item, fangshi: modifyTxfangshi, txdianhua: modifyTxPhone, txzh: modifyTxAccount || '', txtupian: data.txtupian || modifyingRecord.txtupian };
+            }
+            return item;
+          });
+          this.setData({ recordList: newList, showModifyModal: false, modifyingRecord: null });
+          wx.showToast({ title: '修改成功', icon: 'success' });
+        } else {
+          wx.showToast({ title: res?.data?.msg || '修改失败', icon: 'none' });
+        }
+      } catch (err) {
+        wx.showToast({ title: '网络错误', icon: 'none' });
+      }
+    },
+
+    onCloseModifyModal() { this.setData({ showModifyModal: false, modifyingRecord: null }); },
+
+    onViewFailReason(e) {
+      const record = e.currentTarget.dataset.record;
+      const reason = record.fail_reason || record.shibaiyuanyin || '暂无详细信息';
+      this.setData({ currentFailReason: reason, showFailModal: true });
+    },
+
+    onCloseFailModal() { this.setData({ showFailModal: false }); },
+
+    getStatusText(zhuangtai) {
+      const s = parseInt(zhuangtai);
+      if (s === 1) return '审核中';
+      if (s === 2) return '成功';
+      if (s === 3) return '失败';
+      return '未知';
+    },
+    getStatusColor(zhuangtai) {
+      const s = parseInt(zhuangtai);
+      if (s === 1) return '#F5A623';
+      if (s === 2) return '#2ED158';
+      if (s === 3) return '#FF4D4F';
+      return '#999';
+    },
+
+    registerNotification() {
+      const comp = this.selectComponent('#global-notification');
+      if (comp?.showNotification) {
+        app.globalData.globalNotification = {
+          show: (data) => comp.showNotification(data),
+          hide: () => comp.hideNotification()
+        };
+      }
+    },
+    stopPropagation() {}
+  }
+});
\ No newline at end of file
diff --git a/pages/tixian/components/mode1/mode1.json b/pages/tixian/components/mode1/mode1.json
new file mode 100644
index 0000000..9fd2c37
--- /dev/null
+++ b/pages/tixian/components/mode1/mode1.json
@@ -0,0 +1,21 @@
+
+{
+    "component": true,
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification",
+        "popup-notice": "/components/popup-notice/popup-notice"
+    },
+    "navigationBarTitleText": "提现中心",
+    "navigationBarBackgroundColor": "#1a0b2e",
+    "navigationBarTextStyle": "white",
+    "backgroundColor": "#1a0b2e",
+    "enablePullDownRefresh": false,
+    "onReachBottomDistance": 50,
+    "navigationStyle": "default",
+    "disableScroll": false
+  }
+
+
+
+
+
diff --git a/pages/tixian/components/mode1/mode1.wxml b/pages/tixian/components/mode1/mode1.wxml
new file mode 100644
index 0000000..7fb3bab
--- /dev/null
+++ b/pages/tixian/components/mode1/mode1.wxml
@@ -0,0 +1,133 @@
+
+
+
+<view class="app">
+  
+  <image class="global-bg" src="{{imgUrls.pageBg}}" mode="aspectFill" />
+  
+  
+  <view class="assets-section">
+    <view class="main-card" style="background-image: url('{{imgUrls.cardBg}}'); background-size: cover;">
+      
+      <view class="balance-wrap">
+        <text class="balance-label">可提总余额</text>
+        <text class="balance-value">¥{{totalAmount}}</text>
+      </view>
+
+      
+      <view class="inner-divider"></view>
+
+      
+      <text class="assets-hint">← 左右滑动查看更多资产 →</text>
+
+      
+      <scroll-view class="assets-scroll" scroll-x="true" show-scrollbar="{{false}}" enhanced>
+        <view class="assets-track">
+          <block wx:for="{{assetList}}" wx:key="index">
+            
+            <view class="asset-tile" bindtap="onSelectAsset" data-index="{{index}}" style="background-image: url('{{imgUrls.assetTileBg}}'); background-size: cover; background-position: center;">
+              <text class="asset-name">{{item.label}}</text>
+              <text class="asset-balance">¥{{item.amount}}</text>
+              <text class="asset-fee">费率 {{item.rate}}%</text>
+            </view>
+          </block>
+          <view wx:if="{{assetList.length === 0 && !isLoading}}" class="assets-empty">暂无可用资金</view>
+        </view>
+      </scroll-view>
+    </view>
+
+    
+    <view class="divider-line"></view>
+  </view>
+
+  
+  <view class="history-section">
+    <view class="history-header">
+      <text class="history-title">提现记录</text>
+      <text class="history-settings" bindtap="onSetSkfs">收款方式</text>
+    </view>
+    <scroll-view class="history-scroll" scroll-y enable-back-to-top bindscrolltolower="onLoadMoreFromScroll">
+      <view wx:for="{{recordList}}" wx:key="index" class="history-item">
+        <view class="history-info">
+          <text class="history-amount">¥{{item.jine}}</text>
+          <text class="history-time">{{item.create}}</text>
+        </view>
+        <view class="history-detail">
+          <text class="history-method">{{item.fangshi == 1 ? '微信' : '支付宝'}}</text>
+          <text class="history-type">{{item.leixing == 1 ? '佣金' : (item.leixing == 2 ? '分红' : (item.leixing == 3 ? '组长' : (item.leixing == 4 ? '考核官' : '保证金')))}}</text>
+        </view>
+        <view class="history-status">
+          <view wx:if="{{item.zhuangtai == 1}}" class="status-badge status-wait" bindtap="onModifyRecord" data-record="{{item}}">{{item.statusText}} ✏修改</view>
+          <view wx:elif="{{item.zhuangtai == 3}}" class="status-badge status-fail">
+            {{item.statusText}}
+            <text class="fail-link" bindtap="onViewFailReason" data-record="{{item}}">详情</text>
+          </view>
+          <view wx:else class="status-badge status-done">{{item.statusText}}</view>
+        </view>
+      </view>
+      <view wx:if="{{loading}}" class="load-tip">加载中...</view>
+      <view wx:if="{{nomore && recordList.length > 0}}" class="more-tip">—— 没有更多了 ——</view>
+      <view wx:if="{{!nomore && recordList.length > 0}}" class="load-more-btn" bindtap="loadMoreRecords">加载更多记录</view>
+    </scroll-view>
+  </view>
+
+  <view class="safe-bottom"></view>
+</view>
+
+
+
+<view wx:if="{{showTixianModal}}" class="modal-mask" bindtap="onCloseTixianModal">
+  <view class="modal-dialog" catchtap="stopPropagation">
+    <view class="modal-header">提现</view>
+    <view class="modal-body">
+      <view class="info-row"><text>项目</text><text>{{selectedAsset.label}}</text></view>
+      <view class="info-row"><text>可提</text><text>¥{{selectedAsset.amount}}</text></view>
+      <view class="info-row"><text>费率</text><text>{{currentRate}}%</text></view>
+      <view class="amount-row"><text>金额</text><input type="digit" placeholder="0.00" value="{{tixianAmount}}" bindinput="onAmountInput" /></view>
+      <view class="quick-row"><view wx:for="{{[100,200,500,1000]}}" wx:key="item" class="quick-chip" data-value="{{item}}" bindtap="onQuickAmount">¥{{item}}</view></view>
+      <view class="fee-row"><text>手续费 ¥{{shouxufei}}</text><text>到账 ¥{{shijidaozhang}}</text></view>
+      <view class="method-row"><text>收款方式 {{txfangshi == 1 ? '微信' : (txfangshi == 2 ? '支付宝' : '未设置')}}</text><text class="link-text" bindtap="onSetSkfs">更换</text></view>
+    </view>
+    <view class="modal-footer"><view class="modal-btn cancel" bindtap="onCloseTixianModal">取消</view><view class="modal-btn confirm" bindtap="onConfirmWithdraw">确认</view></view>
+  </view>
+</view>
+
+
+<view wx:if="{{showSkfsModal}}" class="modal-mask" bindtap="onCloseSkfsModal">
+  <view class="modal-dialog" catchtap="stopPropagation">
+    <view class="modal-header">收款方式</view>
+    <view class="modal-body">
+      <view class="toggle-row"><view class="toggle-item {{tempTxfangshi == 1 ? 'active' : ''}}" bindtap="onSelectFangshi" data-fangshi="1">微信</view><view class="toggle-item {{tempTxfangshi == 2 ? 'active' : ''}}" bindtap="onSelectFangshi" data-fangshi="2">支付宝</view></view>
+      <input class="field-input" placeholder="手机号" value="{{tempTxPhone}}" bindinput="onPhoneInput" />
+      <view wx:if="{{tempTxfangshi == 2}}"><input class="field-input" placeholder="支付宝账号" value="{{tempTxAccount}}" bindinput="onAccountInput" /></view>
+      <view class="upload-wrap"><view wx:if="{{!tempTxImage}}" class="upload-trigger" bindtap="onChooseImage">+ 上传收款码</view><view wx:else class="image-preview"><image src="{{tempTxImage}}" mode="aspectFill" /><view class="image-actions"><text bindtap="onPreviewImage">预览</text><text bindtap="onDeleteImage">删除</text></view></view></view>
+    </view>
+    <view class="modal-footer"><view class="modal-btn cancel" bindtap="onCloseSkfsModal">取消</view><view class="modal-btn confirm" bindtap="onConfirmSkfs">保存</view></view>
+  </view>
+</view>
+
+
+<view wx:if="{{showModifyModal}}" class="modal-mask" bindtap="onCloseModifyModal">
+  <view class="modal-dialog" catchtap="stopPropagation">
+    <view class="modal-header">修改信息</view>
+    <view class="modal-body">
+      <view class="toggle-row"><view class="toggle-item {{modifyTxfangshi == 1 ? 'active' : ''}}" bindtap="onSelectModifyFangshi" data-fangshi="1">微信</view><view class="toggle-item {{modifyTxfangshi == 2 ? 'active' : ''}}" bindtap="onSelectModifyFangshi" data-fangshi="2">支付宝</view></view>
+      <input class="field-input" placeholder="电话" value="{{modifyTxPhone}}" bindinput="onModifyPhoneInput" />
+      <view wx:if="{{modifyTxfangshi == 2}}"><input class="field-input" placeholder="支付宝账号" value="{{modifyTxAccount}}" bindinput="onModifyAccountInput" /></view>
+      <view class="upload-wrap"><view wx:if="{{modifyImageUrl}}" class="current-img"><image src="{{modifyImageUrl}}" mode="aspectFill" bindtap="onPreviewModifyImage" /></view><view class="upload-trigger" bindtap="onChooseModifyImage">+ 上传新图片</view><view wx:if="{{modifyTxImage}}" class="image-preview"><image src="{{modifyTxImage}}" mode="aspectFill" /><view class="image-actions"><text bindtap="onPreviewModifyImage">预览</text><text bindtap="onDeleteModifyImage">删除</text></view></view></view>
+    </view>
+    <view class="modal-footer"><view class="modal-btn cancel" bindtap="onCloseModifyModal">取消</view><view class="modal-btn confirm" bindtap="onConfirmModify">确认</view></view>
+  </view>
+</view>
+
+
+<view wx:if="{{showFailModal}}" class="modal-mask" bindtap="onCloseFailModal">
+  <view class="modal-dialog" catchtap="stopPropagation">
+    <view class="modal-header">失败原因</view>
+    <view class="modal-body">{{currentFailReason}}</view>
+    <view class="modal-footer"><view class="modal-btn confirm" bindtap="onCloseFailModal">知道了</view></view>
+  </view>
+</view>
+
+<global-notification id="global-notification" />
+<popup-notice id="popupNotice" />
\ No newline at end of file
diff --git a/pages/tixian/components/mode1/mode1.wxss b/pages/tixian/components/mode1/mode1.wxss
new file mode 100644
index 0000000..a4c4b31
--- /dev/null
+++ b/pages/tixian/components/mode1/mode1.wxss
@@ -0,0 +1,424 @@
+/* pages/tixian/tixian.wxss - 终极优化版 */
+
+page {
+    background-color: #f5f7fb;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+    height: 100%;
+  }
+  
+  .app {
+    display: flex;
+    flex-direction: column;
+    min-height: 100vh;
+    padding: 0 24rpx 0;
+    position: relative;
+    z-index: 1;
+    box-sizing: border-box;
+  }
+  
+  /* 页面背景模糊极低，不影响阅读 */
+  .global-bg {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: -1;
+    opacity: 0.1;
+    object-fit: cover;
+    filter: blur(1rpx);
+  }
+  
+  /* 资产区域整体与顶部保持间距 */
+  .assets-section {
+    margin-top: 24rpx;
+    flex-shrink: 0;
+  }
+  
+  /* 主卡片玻璃质感 - 模糊加重避免抢眼，同时文字对比加强 */
+  .main-card {
+    background: rgba(248, 250, 252, 0.88);      /* 稍微降低透明度，让背景更柔和 */
+    backdrop-filter: blur(28rpx);               /* 增强模糊，不抢眼 */
+    -webkit-backdrop-filter: blur(28rpx);
+    border-radius: 48rpx;
+    padding: 30rpx 28rpx 24rpx;                /* 稍微缩小高度 */
+    margin-bottom: 20rpx;
+    box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.04);
+    border: 1rpx solid rgba(255, 255, 255, 0.4);
+    background-size: cover;
+  }
+  
+  /* 总余额 - 字体加深加粗，增加阴影提高可读性 */
+  .balance-wrap {
+    text-align: center;
+    margin-bottom: 20rpx;                      /* 减小间距，让卡片更紧凑 */
+  }
+  .balance-label {
+    font-size: 28rpx;
+    color: #0f172a;                            /* 更深色 */
+    letter-spacing: 1px;
+    display: block;
+    margin-bottom: 10rpx;
+    font-weight: 700;                          /* 加粗 */
+    text-shadow: 0 1rpx 2rpx rgba(255,255,255,0.8);
+  }
+  .balance-value {
+    font-size: 68rpx;
+    font-weight: 800;
+    color: #0f172a;
+    font-family: 'DIN', monospace;
+    letter-spacing: -1rpx;
+    text-shadow: 0 1rpx 2rpx rgba(255,255,255,0.6);
+  }
+  
+  /* 内部分隔线（横杠）- 明显且保持层次 */
+  .inner-divider {
+    width: 60%;
+    height: 2rpx;
+    background: linear-gradient(90deg, transparent, #64748b, #64748b, transparent); /* 加深颜色 */
+    margin: 0 auto 20rpx auto;
+    border-radius: 2rpx;
+    opacity: 0.9;
+  }
+  
+  /* 左右滑动提示 - 字体明显 */
+  .assets-hint {
+    display: block;
+    text-align: center;
+    font-size: 24rpx;
+    color: #334155;                            /* 深灰 */
+    margin-bottom: 14rpx;
+    font-weight: 600;
+  }
+  
+  .assets-scroll {
+    width: 100%;
+    white-space: nowrap;
+  }
+  .assets-track {
+    display: inline-flex;
+    gap: 16rpx;
+  }
+  
+  /* 资产小卡片 - 背景半透模糊，字体深色加粗 */
+  .asset-tile {
+    width: 170rpx;
+    background: rgba(255, 255, 255, 0.75);     /* 稍微提高透明度，让模糊背景透出 */
+    backdrop-filter: blur(8rpx);               /* 自身轻微模糊，不抢眼 */
+    border-radius: 28rpx;
+    padding: 18rpx 12rpx;
+    display: inline-flex;
+    flex-direction: column;
+    align-items: center;
+    text-align: center;
+    border: 1rpx solid rgba(255,255,255,0.5);
+    box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.02);
+    transition: all 0.2s;
+    white-space: normal;
+    background-size: cover;
+    background-position: center;
+  }
+  .asset-tile:active {
+    background: rgba(255, 255, 255, 0.9);
+    transform: scale(0.98);
+  }
+  .asset-name {
+    font-size: 24rpx;
+    font-weight: 700;                          /* 加粗 */
+    color: #1e293b;                            /* 深色 */
+    margin-bottom: 10rpx;
+    text-shadow: 0 1rpx 1rpx rgba(255,255,255,0.5);
+  }
+  .asset-balance {
+    font-size: 28rpx;
+    font-weight: 800;                          /* 加粗 */
+    color: #2d6a4f;
+    font-family: monospace;
+    margin-bottom: 6rpx;
+    text-shadow: 0 1rpx 1rpx rgba(255,255,255,0.3);
+  }
+  .asset-fee {
+    font-size: 20rpx;
+    font-weight: 600;                          /* 加粗并加深 */
+    color: #475569;
+    text-shadow: 0 1rpx 1rpx rgba(255,255,255,0.3);
+  }
+  .assets-empty {
+    width: 400rpx;
+    text-align: center;
+    color: #a0abb9;
+    padding: 40rpx 0;
+  }
+  
+  /* 外部层次分隔线 - 保持不变，保留分层 */
+  .divider-line {
+    height: 2rpx;
+    background: linear-gradient(90deg, transparent, #cbd5e1, #cbd5e1, transparent);
+    margin: 16rpx 0 20rpx;
+    width: 80%;
+    margin-left: auto;
+    margin-right: auto;
+  }
+  
+  /* 提现记录区 - 无改动，自然贴底 */
+  .history-section {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    min-height: 0;
+    margin-top: 0;
+  }
+  .history-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: baseline;
+    padding: 0 8rpx 20rpx;
+    flex-shrink: 0;
+  }
+  .history-title {
+    font-size: 34rpx;
+    font-weight: 600;
+    color: #1e293b;
+  }
+  .history-settings {
+    font-size: 28rpx;
+    color: #3b82f6;
+  }
+  .history-scroll {
+    flex: 1;
+    width: 100%;
+    padding: 0 20rpx;
+    box-sizing: border-box;
+  }
+  .history-item {
+    display: flex;
+    align-items: center;
+    padding: 28rpx 0;
+    border-bottom: 1rpx solid rgba(0,0,0,0.05);
+  }
+  .history-info {
+    width: 160rpx;
+  }
+  .history-amount {
+    font-size: 36rpx;
+    font-weight: 700;
+    color: #1e293b;
+    display: block;
+  }
+  .history-time {
+    font-size: 22rpx;
+    color: #94a3b8;
+  }
+  .history-detail {
+    flex: 1;
+    padding: 0 20rpx;
+  }
+  .history-method {
+    font-size: 30rpx;
+    color: #334155;
+    display: block;
+    margin-bottom: 6rpx;
+  }
+  .history-type {
+    font-size: 24rpx;
+    color: #94a3b8;
+  }
+  .history-status {
+    text-align: right;
+  }
+  .status-badge {
+    font-size: 26rpx;
+    font-weight: 500;
+    padding: 6rpx 14rpx;
+    border-radius: 30rpx;
+    display: inline-block;
+  }
+  .status-wait {
+    color: #f59e0b;
+    background: rgba(245,158,11,0.1);
+  }
+  .status-done {
+    color: #10b981;
+    background: rgba(16,185,129,0.1);
+  }
+  .status-fail {
+    color: #ef4444;
+    background: rgba(239,68,68,0.1);
+  }
+  .fail-link {
+    margin-left: 8rpx;
+    text-decoration: underline;
+  }
+  .load-tip, .more-tip {
+    text-align: center;
+    padding: 30rpx;
+    font-size: 24rpx;
+    color: #94a3b8;
+  }
+  .load-more-btn {
+    margin: 16rpx 0 20rpx;
+    padding: 20rpx;
+    text-align: center;
+    background: rgba(255,255,255,0.7);
+    backdrop-filter: blur(8rpx);
+    border-radius: 40rpx;
+    font-size: 28rpx;
+    color: #3b82f6;
+    border: 1rpx solid rgba(255,255,255,0.5);
+  }
+  .load-more-btn:active {
+    background: rgba(255,255,255,0.9);
+  }
+  .safe-bottom {
+    height: 12rpx;
+    flex-shrink: 0;
+  }
+  
+  /* ========== 弹窗样式（完整保留） ========== */
+  .modal-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0,0,0,0.5);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 1000;
+  }
+  .modal-dialog {
+    width: 600rpx;
+    background: rgba(255,255,255,0.96);
+    backdrop-filter: blur(20rpx);
+    border-radius: 48rpx;
+    overflow: hidden;
+    box-shadow: 0 20rpx 40rpx rgba(0,0,0,0.1);
+    border: 1rpx solid rgba(255,255,255,0.6);
+  }
+  .modal-header {
+    padding: 36rpx 32rpx 20rpx;
+    font-size: 36rpx;
+    font-weight: 700;
+    border-bottom: 1rpx solid rgba(0,0,0,0.05);
+  }
+  .modal-body {
+    padding: 32rpx;
+  }
+  .info-row, .amount-row, .method-row {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 24rpx;
+    font-size: 28rpx;
+  }
+  .amount-row input {
+    border: 1rpx solid rgba(0,0,0,0.1);
+    border-radius: 28rpx;
+    padding: 16rpx 20rpx;
+    width: 260rpx;
+    background: rgba(255,255,255,0.9);
+  }
+  .quick-row {
+    display: flex;
+    gap: 16rpx;
+    margin: 24rpx 0;
+  }
+  .quick-chip {
+    flex: 1;
+    background: rgba(241,245,249,0.8);
+    text-align: center;
+    padding: 12rpx;
+    border-radius: 40rpx;
+    font-size: 28rpx;
+  }
+  .fee-row {
+    display: flex;
+    justify-content: space-between;
+    background: rgba(248,250,252,0.8);
+    padding: 20rpx;
+    border-radius: 28rpx;
+    margin: 20rpx 0;
+  }
+  .link-text {
+    color: #3b82f6;
+  }
+  .toggle-row {
+    display: flex;
+    gap: 20rpx;
+    margin-bottom: 28rpx;
+  }
+  .toggle-item {
+    flex: 1;
+    text-align: center;
+    padding: 20rpx;
+    border: 1rpx solid rgba(0,0,0,0.08);
+    border-radius: 30rpx;
+    background: rgba(255,255,255,0.8);
+  }
+  .toggle-item.active {
+    border-color: #3b82f6;
+    background: #eff6ff;
+  }
+  .field-input {
+    width: 100%;
+    border: 1rpx solid rgba(0,0,0,0.08);
+    border-radius: 28rpx;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+    box-sizing: border-box;
+    background: rgba(255,255,255,0.9);
+  }
+  .upload-trigger {
+    background: rgba(241,245,249,0.8);
+    border: 1rpx dashed #cbd5e1;
+    border-radius: 28rpx;
+    padding: 28rpx;
+    text-align: center;
+  }
+  .image-preview {
+    margin-top: 16rpx;
+    position: relative;
+  }
+  .image-preview image {
+    width: 100%;
+    height: 200rpx;
+    border-radius: 28rpx;
+  }
+  .image-actions {
+    display: flex;
+    justify-content: space-around;
+    background: rgba(0,0,0,0.6);
+    padding: 12rpx;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    color: white;
+    border-bottom-left-radius: 28rpx;
+    border-bottom-right-radius: 28rpx;
+  }
+  .current-img {
+    margin: 20rpx 0;
+  }
+  .current-img image {
+    width: 100%;
+    height: 140rpx;
+    border-radius: 24rpx;
+  }
+  .modal-footer {
+    display: flex;
+    border-top: 1rpx solid rgba(0,0,0,0.05);
+  }
+  .modal-btn {
+    flex: 1;
+    text-align: center;
+    padding: 28rpx;
+    font-size: 30rpx;
+  }
+  .modal-btn.cancel {
+    color: #8f9bb3;
+    border-right: 1rpx solid rgba(0,0,0,0.05);
+  }
+  .modal-btn.confirm {
+    color: #3b82f6;
+  }
\ No newline at end of file
diff --git a/pages/tixian/components/mode2/mode2.js b/pages/tixian/components/mode2/mode2.js
new file mode 100644
index 0000000..6ccb60b
--- /dev/null
+++ b/pages/tixian/components/mode2/mode2.js
@@ -0,0 +1,587 @@
+// pages/tixian/components/mode2/mode2.js
+// UI 与 mode1 完全一致，业务逻辑为自动打款审核收款
+import request from '../../../../utils/request.js';
+import PopupService from '../../../../services/popupService.js';
+
+const app = getApp();
+const yemianshuju = 5;
+let lastPullDownTime = 0;
+const PULL_DOWN_INTERVAL = 2000;
+
+const TX_STATUS = {
+    SHENHEZHONG: 1,
+    TIXIAN_CHENGGONG: 2,
+    TIXIAN_SHIBAI: 3,
+    SHENHE_CHENGGONG: 4,
+    SHENHE_SHIBAI: 5,
+    DAI_SHOUKUAN: 6,
+};
+
+const ASSET_CONFIG = {
+    dashou_yue:        { leixing: 1, label: '打手佣金' },
+    guanshi_fenyong:   { leixing: 2, label: '管事分红' },
+    zuzhang_fenyong:   { leixing: 3, label: '组长分红' },
+    kaoheguan_fenyong: { leixing: 4, label: '考核官分佣' },
+    dashou_yajin:      { leixing: 5, label: '打手保证金' },
+    shangjia_yue:      { leixing: 6, label: '商家余额' },
+};
+
+const LEIXING_LABEL = {
+    1: '打手佣金', 2: '管事分红', 3: '组长分红',
+    4: '考核官分佣', 5: '打手保证金', 6: '商家余额',
+};
+
+Component({
+    properties: { options: { type: Object, value: {} } },
+    data: {
+        imgUrls: {
+            pageBg: '', cardBg: '', assetTileBg: '',
+        },
+        assetList: [],
+        totalAmount: '0.00',
+        selectedAsset: null,
+        isLoadingAssets: false,
+        tixianleixing: null,
+        tixianjine: '',
+        currentRate: '0.00',
+        showTixian: false,
+        recordList: [],
+        page: 1,
+        loading: false,
+        nomore: false,
+        canloadmore: true,
+        isRefreshing: false,
+        shouxufei: '0.00',
+        shijidaozhang: '0.00',
+        currentTixianId: null,
+        submitting: false,
+        mchId: '',
+        currentStatusFilter: 0,
+        statusTabs: [
+            { value: 0, label: '全部' },
+            { value: 1, label: '审核中' },
+            { value: 6, label: '待收款' },
+            { value: 4, label: '审核成功' },
+            { value: 5, label: '审核失败' },
+            { value: 2, label: '提现成功' },
+            { value: 3, label: '提现失败' },
+        ],
+        hasPendingCollect: false,
+        showCollectConfirm: false,
+        collectConfirmRecord: null,
+        showDetailModal: false,
+        detailTitle: '',
+        detailContent: '',
+    },
+    lifetimes: {
+        attached() {
+            this.initImageUrls();
+            this.chushihuashuju();
+        }
+    },
+    pageLifetimes: {
+        show() {
+            this.registerNotificationComponent();
+            this.loadAllAssets();
+            PopupService.checkAndShow(this, 'tixian');
+        },
+        hide() {
+            const popupComp = this.selectComponent('#popupNotice');
+            if (popupComp && popupComp.cleanup) popupComp.cleanup();
+        }
+    },
+    methods: {
+        registerNotificationComponent() {
+            const notificationComp = this.selectComponent('#global-notification');
+            if (notificationComp && notificationComp.showNotification) {
+                app.globalData.globalNotification = {
+                    show: (data) => notificationComp.showNotification(data),
+                    hide: () => notificationComp.hideNotification()
+                };
+            }
+        },
+
+        initImageUrls() {
+            const ossBase = app.globalData.ossImageUrl || '';
+            const imgDir = `${ossBase}beijing/tixian/`;
+            this.setData({
+                imgUrls: {
+                    pageBg: `${imgDir}page_bg.png`,
+                    cardBg: `${imgDir}card_bg.png`,
+                    assetTileBg: `${imgDir}asset_tile_bg.png`,
+                }
+            });
+        },
+
+        parseZhuangtai(item) {
+            const raw = item.zhuangtai ?? item.status ?? item.state;
+            const n = parseInt(raw, 10);
+            return Number.isNaN(n) ? -1 : n;
+        },
+
+        /** 规范化列表字段（兼容后端多种命名 / 嵌套 audit） */
+        normalizeRecordFields(item) {
+            const audit = item.audit || item.shenhe || item.shenhe_info || {};
+            const shenheJiluId = item.shenhe_jilu_id ?? item.shenheJiluId
+                ?? item.audit_id ?? item.shenheid ?? audit.id ?? audit.shenhe_jilu_id ?? null;
+            const shenheDanhao = String(
+                item.shenhe_danhao || item.shenheDanhao || item.audit_shenhe_danhao
+                || audit.shenhe_danhao || audit.danhao || ''
+            ).trim();
+            const tixianjiluId = item.tixianjilu_id ?? item.tixianjiluId ?? item.id ?? null;
+            const zhuangtai = this.parseZhuangtai(item);
+            return {
+                ...item,
+                zhuangtai: zhuangtai >= 0 ? zhuangtai : item.zhuangtai,
+                shenhe_jilu_id: shenheJiluId,
+                shenhe_danhao: shenheDanhao,
+                tixianjilu_id: tixianjiluId,
+            };
+        },
+
+        hasAuditJiluId(item) {
+            const id = item.shenhe_jilu_id;
+            return id !== null && id !== undefined && id !== '' && id !== 0 && id !== '0';
+        },
+
+        hasShenheDanhao(item) {
+            return !!(item.shenhe_danhao && String(item.shenhe_danhao).trim());
+        },
+
+        isNewAuditRecord(item) {
+            return this.hasAuditJiluId(item) && this.hasShenheDanhao(item);
+        },
+
+        /** 待收款是否可点击：状态6 + 审核记录ID + 审核单号 缺一不可 */
+        canCollectRecord(item) {
+            return this.parseZhuangtai(item) === TX_STATUS.DAI_SHOUKUAN
+                && this.hasAuditJiluId(item)
+                && this.hasShenheDanhao(item);
+        },
+
+        getLeixingLabel(leixing) {
+            return LEIXING_LABEL[parseInt(leixing)] || '提现';
+        },
+
+        getStatusBadgeClass(status) {
+            switch (parseInt(status)) {
+                case TX_STATUS.SHENHEZHONG: return 'status-wait';
+                case TX_STATUS.TIXIAN_CHENGGONG:
+                case TX_STATUS.SHENHE_CHENGGONG: return 'status-done';
+                case TX_STATUS.DAI_SHOUKUAN: return 'status-pending';
+                case TX_STATUS.TIXIAN_SHIBAI:
+                case TX_STATUS.SHENHE_SHIBAI: return 'status-fail';
+                default: return 'status-wait';
+            }
+        },
+
+        processRecordItem(item) {
+            item = this.normalizeRecordFields(item);
+            const isNew = this.isNewAuditRecord(item);
+            const status = this.parseZhuangtai(item);
+            let statusText = '未知';
+            let canCollect = false;
+            let canShowDetail = false;
+            let detailReason = '';
+
+            switch (status) {
+                case TX_STATUS.SHENHEZHONG: statusText = '审核中'; break;
+                case TX_STATUS.TIXIAN_CHENGGONG: statusText = '提现成功'; break;
+                case TX_STATUS.TIXIAN_SHIBAI:
+                    statusText = '提现失败';
+                    if (item.fail_reason || item.bhliyou) {
+                        canShowDetail = true;
+                        detailReason = item.fail_reason || item.bhliyou;
+                    }
+                    break;
+                case TX_STATUS.SHENHE_CHENGGONG: statusText = '审核成功'; break;
+                case TX_STATUS.SHENHE_SHIBAI:
+                    statusText = '审核失败';
+                    if (item.bhliyou) { canShowDetail = true; detailReason = item.bhliyou; }
+                    break;
+                case TX_STATUS.DAI_SHOUKUAN:
+                    statusText = '待收款';
+                    canCollect = this.canCollectRecord(item);
+                    break;
+            }
+
+            return {
+                ...item,
+                isNewAudit: isNew,
+                leixingLabel: this.getLeixingLabel(item.leixing),
+                statusText,
+                statusBadgeClass: this.getStatusBadgeClass(status),
+                canCollect,
+                canShowDetail,
+                detailReason,
+            };
+        },
+
+        gengxinYue(data, leixing) {
+            if (!data) return;
+            if (data.new_yongjin !== undefined && data.new_yongjin !== null) {
+                app.globalData.yongjin = data.new_yongjin;
+            }
+            if (data.new_fenyong !== undefined && data.new_fenyong !== null) {
+                app.globalData.guanshi.fenyongtixian = data.new_fenyong;
+            }
+            if (data.new_yajin !== undefined && data.new_yajin !== null) {
+                app.globalData.yajin = data.new_yajin;
+            }
+            if (data.new_shangjia_yue !== undefined && data.new_shangjia_yue !== null) {
+                if (app.globalData.shangjia) app.globalData.shangjia.sjyue = data.new_shangjia_yue;
+            }
+            if (data.current_rate !== undefined && leixing) {
+                const rate = parseFloat(data.current_rate);
+                const rateKeyMap = { 1: 'dashouRate', 5: 'dashou_yajin_rate', 6: 'shangjia_rate', 2: 'guanshi_rate', 3: 'zuzhang_rate', 4: 'kaoheguan_rate' };
+                const key = rateKeyMap[leixing];
+                if (key) wx.setStorageSync(key, rate);
+            }
+        },
+
+        updatePendingCollectFlag(list) {
+            const hasPending = (list || []).some(item => item.canCollect);
+            if (hasPending !== this.data.hasPendingCollect) {
+                this.setData({ hasPendingCollect: hasPending });
+            }
+        },
+
+        async loadAllAssets() {
+            this.setData({ isLoadingAssets: true });
+            try {
+                const res = await request({ url: '/yonghu/tixianzichan', method: 'POST' });
+                if (res?.data?.code === 200 || res?.data?.code === 0) {
+                    const data = res.data.data || {};
+                    const assets = [];
+                    const pushAsset = (type, amount, rate) => {
+                        const cfg = ASSET_CONFIG[type];
+                        if (!cfg || !amount || parseFloat(amount) <= 0) return;
+                        assets.push({
+                            type,
+                            leixing: cfg.leixing,
+                            label: cfg.label,
+                            amount: parseFloat(amount).toFixed(2),
+                            rate: rate || 0,
+                        });
+                    };
+                    pushAsset('dashou_yue', data.dashou_yue, data.dashou_rate);
+                    pushAsset('dashou_yajin', data.dashou_yajin, data.dashou_yajin_rate);
+                    pushAsset('shangjia_yue', data.shangjia_yue, data.shangjia_rate);
+                    pushAsset('guanshi_fenyong', data.guanshi_fenyong, data.guanshi_rate);
+                    pushAsset('zuzhang_fenyong', data.zuzhang_fenyong, data.zuzhang_rate);
+                    pushAsset('kaoheguan_fenyong', data.kaoheguan_fenyong, data.kaoheguan_rate);
+
+                    let total = 0;
+                    assets.forEach(item => { total += parseFloat(item.amount); });
+                    this.setData({ assetList: assets, totalAmount: total.toFixed(2), isLoadingAssets: false });
+                } else {
+                    throw new Error(res?.data?.msg || '获取资产失败');
+                }
+            } catch (err) {
+                console.error('loadAllAssets', err);
+                this.setData({ isLoadingAssets: false });
+            }
+        },
+
+        chushihuashuju() {
+            this.loadAllAssets();
+            this.huoquJilu(true);
+        },
+
+        /** 点击资产卡片（与 mode1 一致） */
+        onSelectAsset(e) {
+            const index = e.currentTarget.dataset.index;
+            const asset = this.data.assetList[index];
+            if (!asset || parseFloat(asset.amount) <= 0) {
+                wx.showToast({ title: '无可提现金额', icon: 'none' });
+                return;
+            }
+            this.setData({
+                selectedAsset: asset,
+                tixianleixing: asset.leixing,
+                currentRate: asset.rate,
+                tixianjine: '',
+                shouxufei: '0.00',
+                shijidaozhang: '0.00',
+                showTixian: true,
+            });
+        },
+
+        onJineInput(e) {
+            this.setData({ tixianjine: e.detail.value, shouxufei: '0.00', shijidaozhang: '0.00' });
+        },
+
+        onQuickAmountTap(e) {
+            const value = e.currentTarget.dataset.value;
+            this.setData({ tixianjine: value.toString(), shouxufei: '0.00', shijidaozhang: '0.00' });
+        },
+
+        onStatusFilterTap(e) {
+            const value = parseInt(e.currentTarget.dataset.value);
+            if (value === this.data.currentStatusFilter) return;
+            this.setData({ currentStatusFilter: value });
+            this.huoquJilu(true);
+        },
+
+        async onConfirmTixian() {
+            if (this.data.submitting) return;
+            const { tixianleixing, tixianjine, selectedAsset } = this.data;
+            if (!tixianleixing || !selectedAsset) {
+                wx.showToast({ title: '请选择提现类型', icon: 'none' });
+                return;
+            }
+            const jineValue = parseFloat(tixianjine);
+            if (!tixianjine || isNaN(jineValue) || jineValue <= 0) {
+                wx.showToast({ title: '请输入有效金额', icon: 'none' });
+                return;
+            }
+            if (jineValue > parseFloat(selectedAsset.amount)) {
+                wx.showToast({ title: `超过可提${selectedAsset.label}`, icon: 'none' });
+                return;
+            }
+
+            this.setData({ submitting: true });
+            try {
+                const res = await request({
+                    url: '/yonghu/zddksh',
+                    method: 'POST',
+                    data: { leixing: tixianleixing, jine: jineValue.toFixed(2) }
+                });
+                if (res.statusCode === 200 && res.data && res.data.code === 0) {
+                    const data = res.data.data || {};
+                    this.gengxinYue(data, tixianleixing);
+                    if (data.shouxufei !== undefined) {
+                        this.setData({
+                            shouxufei: parseFloat(data.shouxufei || 0).toFixed(2),
+                            shijidaozhang: parseFloat(data.shijidaozhang || 0).toFixed(2),
+                        });
+                    }
+                    this.setData({ showTixian: false, submitting: false, selectedAsset: null });
+                    await this.loadAllAssets();
+                    this.huoquJilu(true);
+                    wx.showModal({
+                        title: '申请已提交',
+                        content: '您的提现申请已提交，请等待后台审核。审核通过后，请在本页「提现记录」中点击「收款」按钮，主动确认后才能到账微信零钱。',
+                        showCancel: false,
+                    });
+                } else {
+                    wx.showModal({ title: '提现申请失败', content: res.data?.msg || '未知错误', showCancel: false });
+                    this.setData({ submitting: false });
+                }
+            } catch (err) {
+                wx.showModal({ title: '网络错误', content: '网络连接失败，请稍后重试', showCancel: false });
+                this.setData({ submitting: false });
+            }
+        },
+
+        onCollectTap(e) {
+            const index = e.currentTarget.dataset.index;
+            const record = this.data.recordList[index];
+            if (!record) return;
+            if (this.parseZhuangtai(record) !== TX_STATUS.DAI_SHOUKUAN) {
+                wx.showToast({ title: '当前状态不可收款', icon: 'none' });
+                return;
+            }
+            if (!this.hasShenheDanhao(record) || !this.hasAuditJiluId(record)) {
+                wx.showToast({ title: '审核信息不完整，请刷新后重试', icon: 'none' });
+                return;
+            }
+            if (this.data.submitting) {
+                wx.showToast({ title: '正在处理中，请稍后', icon: 'none' });
+                return;
+            }
+            this.setData({ showCollectConfirm: true, collectConfirmRecord: record });
+        },
+
+        onCloseCollectConfirm() {
+            if (this.data.submitting) return;
+            this.setData({ showCollectConfirm: false, collectConfirmRecord: null });
+        },
+
+        async onConfirmCollect() {
+            if (this.data.submitting) return;
+            let record = this.data.collectConfirmRecord;
+            if (!record) return;
+
+            if (!this.canCollectRecord(record)) {
+                await this.huoquJilu(true, true);
+                const refreshed = (this.data.recordList || []).find(
+                    r => String(r.id) === String(record.id)
+                        || String(r.tixianjilu_id) === String(record.tixianjilu_id)
+                );
+                if (refreshed) record = refreshed;
+            }
+            if (!this.canCollectRecord(record)) {
+                wx.showModal({
+                    title: '暂时无法收款',
+                    content: '缺少审核单号或审核记录ID，请下拉刷新后重试。仍不行请联系客服。',
+                    showCancel: false,
+                });
+                return;
+            }
+
+            this.setData({ showCollectConfirm: false, submitting: true, collectConfirmRecord: record });
+            try {
+                const res = await request({
+                    url: '/yonghu/tixiansq',
+                    method: 'POST',
+                    data: {
+                        shenhe_danhao: record.shenhe_danhao,
+                        shenhe_jilu_id: record.shenhe_jilu_id || '',
+                        tixianjilu_id: record.tixianjilu_id || record.id || '',
+                        leixing: record.leixing,
+                    }
+                });
+                if (res.statusCode === 200 && res.data && res.data.code === 0) {
+                    const data = res.data.data;
+                    this.setData({
+                        currentTixianId: data.tixian_id,
+                        mchId: data.mch_id || '',
+                        collectConfirmRecord: record,
+                    });
+                    this.tiaoqiWeixinQueRen(data.package_info);
+                } else {
+                    wx.showModal({ title: '收款失败', content: res.data?.msg || '无法发起收款，请稍后重试', showCancel: false });
+                    this.setData({ submitting: false, collectConfirmRecord: null });
+                }
+            } catch (err) {
+                wx.showModal({ title: '网络错误', content: '网络连接失败，请稍后重试', showCancel: false });
+                this.setData({ submitting: false, collectConfirmRecord: null });
+            }
+        },
+
+        tiaoqiWeixinQueRen(packageInfo) {
+            const appId = app.globalData.appId;
+            const mchId = this.data.mchId;
+            if (!appId || !mchId) {
+                wx.showModal({ title: '配置错误', content: '无法调起收款，请联系客服', showCancel: false });
+                this.setData({ submitting: false, collectConfirmRecord: null });
+                return;
+            }
+            wx.requestMerchantTransfer({
+                appId, mchId, package: packageInfo,
+                success: () => { this.tongzhiHouduanQueRen(1); },
+                fail: () => {
+                    this.tongzhiHouduanQueRen(0);
+                    wx.showModal({
+                        title: '确认收款失败',
+                        content: '微信收款确认失败，您可在记录中再次点击「收款」重试。',
+                        showCancel: false,
+                    });
+                }
+            });
+        },
+
+        async tongzhiHouduanQueRen(result) {
+            if (!this.data.currentTixianId) {
+                this.setData({ submitting: false, collectConfirmRecord: null });
+                return;
+            }
+            const record = this.data.collectConfirmRecord;
+            try {
+                const res = await request({
+                    url: '/yonghu/tixianqr',
+                    method: 'POST',
+                    data: {
+                        tixian_id: this.data.currentTixianId,
+                        result: result,
+                        shenhe_danhao: record ? record.shenhe_danhao : '',
+                        shenhe_jilu_id: record ? (record.shenhe_jilu_id || '') : '',
+                        tixianjilu_id: record ? (record.tixianjilu_id || record.id || '') : '',
+                        leixing: record ? record.leixing : '',
+                    }
+                });
+                if (res.statusCode === 200 && res.data && res.data.code === 0) {
+                    const data = res.data.data || {};
+                    this.gengxinYue(data, record ? record.leixing : null);
+                    await this.loadAllAssets();
+                    this.huoquJilu(true);
+                    if (result === 1) PopupService.checkAndShow(this, 'tixianchenggong');
+                    wx.showToast({
+                        title: result === 1 ? '提现成功' : '收款已取消',
+                        icon: result === 1 ? 'success' : 'none',
+                        duration: 3000,
+                    });
+                } else {
+                    wx.showModal({ title: '确认状态失败', content: res.data?.msg || '操作失败', showCancel: false });
+                }
+            } catch (err) {
+                wx.showModal({ title: '网络错误', content: '网络连接失败', showCancel: false });
+            } finally {
+                this.setData({ submitting: false, currentTixianId: null, collectConfirmRecord: null });
+            }
+        },
+
+        onViewDetail(e) {
+            const index = e.currentTarget.dataset.index;
+            const record = this.data.recordList[index];
+            if (!record || !record.canShowDetail) return;
+            const status = parseInt(record.zhuangtai);
+            let detailTitle = '失败原因';
+            if (status === TX_STATUS.SHENHE_SHIBAI) detailTitle = '审核失败原因';
+            else if (status === TX_STATUS.TIXIAN_SHIBAI) detailTitle = '提现失败原因';
+            this.setData({
+                showDetailModal: true,
+                detailTitle,
+                detailContent: record.detailReason || '暂无详细信息',
+            });
+        },
+
+        onCloseDetailModal() {
+            this.setData({ showDetailModal: false, detailTitle: '', detailContent: '' });
+        },
+
+        onCloseTixian() {
+            if (this.data.submitting) { wx.showToast({ title: '正在处理中，请稍后', icon: 'none' }); return; }
+            this.setData({
+                showTixian: false, selectedAsset: null, tixianleixing: null,
+                tixianjine: '', shouxufei: '0.00', shijidaozhang: '0.00', submitting: false,
+            });
+        },
+
+        async huoquJilu(fresh = false, force = false) {
+            const now = Date.now();
+            if (!force && now - lastPullDownTime < 2000 && !fresh) return;
+            if (!force && (this.data.loading || this.data.isRefreshing)) return;
+            const page = fresh ? 1 : this.data.page;
+            if (fresh) this.setData({ nomore: false, canloadmore: true, isRefreshing: true });
+            if (this.data.nomore && !fresh) return;
+            this.setData({ loading: true });
+            lastPullDownTime = now;
+            try {
+                const res = await request({
+                    url: '/yonghu/tixianjiluhq',
+                    method: 'POST',
+                    data: { page, limit: yemianshuju, mode: 2, zhuangtai: this.data.currentStatusFilter }
+                });
+                if (res.statusCode === 200 && res.data && res.data.code === 0) {
+                    const data = res.data.data;
+                    const processedList = (data.list || []).map(item => this.processRecordItem(item));
+                    const newList = fresh ? processedList : [...this.data.recordList, ...processedList];
+                    this.setData({
+                        recordList: newList,
+                        page: page + 1,
+                        nomore: !(data.has_more === true),
+                        canloadmore: data.has_more === true,
+                        loading: false,
+                        isRefreshing: false,
+                    });
+                    this.updatePendingCollectFlag(newList);
+                } else {
+                    this.setData({ loading: false, isRefreshing: false });
+                }
+            } catch (err) {
+                this.setData({ loading: false, isRefreshing: false });
+            }
+        },
+
+        onReachBottom() {
+            if (this.data.canloadmore && !this.data.nomore && !this.data.loading && !this.data.isRefreshing) {
+                const now = Date.now();
+                if (now - lastPullDownTime >= PULL_DOWN_INTERVAL) this.huoquJilu();
+            }
+        },
+
+        stopPropagation() {}
+    }
+});
diff --git a/pages/tixian/components/mode2/mode2.json b/pages/tixian/components/mode2/mode2.json
new file mode 100644
index 0000000..498339e
--- /dev/null
+++ b/pages/tixian/components/mode2/mode2.json
@@ -0,0 +1,15 @@
+{
+    "component": true,
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification",
+        "popup-notice": "/components/popup-notice/popup-notice"
+    },
+    "navigationBarTitleText": "提现中心",
+    "navigationBarBackgroundColor": "#1a0b2e",
+    "navigationBarTextStyle": "white",
+    "backgroundColor": "#1a0b2e",
+    "enablePullDownRefresh": false,
+    "onReachBottomDistance": 50,
+    "navigationStyle": "default",
+    "disableScroll": false
+  }
diff --git a/pages/tixian/components/mode2/mode2.wxml b/pages/tixian/components/mode2/mode2.wxml
new file mode 100644
index 0000000..9f1a5cb
--- /dev/null
+++ b/pages/tixian/components/mode2/mode2.wxml
@@ -0,0 +1,152 @@
+
+<view class="app">
+  <image class="global-bg" src="{{imgUrls.pageBg}}" mode="aspectFill" />
+
+  
+  <view class="assets-section">
+    <view class="main-card" style="background-image: url('{{imgUrls.cardBg}}'); background-size: cover;">
+      <view class="balance-wrap">
+        <text class="balance-label">可提总余额</text>
+        <text class="balance-value">¥{{totalAmount}}</text>
+      </view>
+      <view class="inner-divider"></view>
+      <text class="assets-hint">← 左右滑动查看更多资产 →</text>
+      <scroll-view class="assets-scroll" scroll-x="true" show-scrollbar="{{false}}" enhanced>
+        <view class="assets-track">
+          <block wx:for="{{assetList}}" wx:key="type">
+            <view
+              class="asset-tile"
+              bindtap="onSelectAsset"
+              data-index="{{index}}"
+              style="background-image: url('{{imgUrls.assetTileBg}}'); background-size: cover; background-position: center;"
+            >
+              <text class="asset-name">{{item.label}}</text>
+              <text class="asset-balance">¥{{item.amount}}</text>
+              <text class="asset-fee">费率 {{item.rate}}%</text>
+            </view>
+          </block>
+          <view wx:if="{{assetList.length === 0 && !isLoadingAssets}}" class="assets-empty">暂无可用资金</view>
+        </view>
+      </scroll-view>
+    </view>
+    <view class="divider-line"></view>
+  </view>
+
+  
+  <view class="history-section">
+    <view class="history-header">
+      <text class="history-title">提现记录</text>
+    </view>
+
+    <view wx:if="{{hasPendingCollect}}" class="pending-tip">
+      您有审核通过的提现待收款，请点击「收款」按钮，在微信中主动确认后才能到账。
+    </view>
+
+    <scroll-view class="filter-scroll" scroll-x show-scrollbar="{{false}}">
+      <view class="filter-track">
+        <view
+          wx:for="{{statusTabs}}"
+          wx:key="value"
+          class="filter-chip {{currentStatusFilter == item.value ? 'active' : ''}}"
+          bindtap="onStatusFilterTap"
+          data-value="{{item.value}}"
+        >{{item.label}}</view>
+      </view>
+    </scroll-view>
+
+    <scroll-view class="history-scroll" scroll-y enable-back-to-top bindscrolltolower="onReachBottom">
+      <view wx:for="{{recordList}}" wx:key="index" class="history-item">
+        <view class="history-info">
+          <text class="history-amount">¥{{item.jine}}</text>
+          <text class="history-time">{{item.create}}</text>
+        </view>
+        <view class="history-detail">
+          <text class="history-method">微信零钱</text>
+          <text class="history-type">{{item.leixingLabel}}</text>
+        </view>
+        <view class="history-status">
+          
+          <view
+            wx:if="{{item.canCollect}}"
+            class="status-badge status-pending collect-tappable"
+            bindtap="onCollectTap"
+            data-index="{{index}}"
+          >
+            <text>{{item.statusText}}</text>
+            <text class="collect-sub">点击收款</text>
+          </view>
+          <view wx:elif="{{item.canShowDetail}}" class="status-badge status-fail">
+            {{item.statusText}}
+            <text class="fail-link" bindtap="onViewDetail" data-index="{{index}}">详情</text>
+          </view>
+          <view wx:else class="status-badge {{item.statusBadgeClass}}">{{item.statusText}}</view>
+        </view>
+      </view>
+      <view wx:if="{{loading}}" class="load-tip">加载中...</view>
+      <view wx:if="{{nomore && recordList.length > 0}}" class="more-tip">—— 没有更多了 ——</view>
+      <view wx:if="{{!nomore && recordList.length > 0}}" class="load-more-btn" bindtap="onReachBottom">加载更多记录</view>
+      <view wx:if="{{recordList.length === 0 && !loading}}" class="load-tip">暂无提现记录</view>
+    </scroll-view>
+  </view>
+
+  <view class="safe-bottom"></view>
+</view>
+
+
+<view wx:if="{{showTixian}}" class="modal-mask" bindtap="onCloseTixian">
+  <view class="modal-dialog" catchtap="stopPropagation">
+    <view class="modal-header">申请提现</view>
+    <view class="modal-body">
+      <view class="auto-tip">提交后需等待审核，审核通过后请在本页点击「收款」确认到账</view>
+      <view class="info-row"><text>项目</text><text>{{selectedAsset.label}}</text></view>
+      <view class="info-row"><text>可提</text><text>¥{{selectedAsset.amount}}</text></view>
+      <view class="info-row"><text>费率</text><text>{{currentRate}}%</text></view>
+      <view class="amount-row">
+        <text>金额</text>
+        <input type="digit" placeholder="0.00" value="{{tixianjine}}" bindinput="onJineInput" />
+      </view>
+      <view class="quick-row">
+        <view wx:for="{{[100,200,500,1000]}}" wx:key="item" class="quick-chip" data-value="{{item}}" bindtap="onQuickAmountTap">¥{{item}}</view>
+      </view>
+      <view class="fee-row">
+        <text>手续费 ¥{{shouxufei}}</text>
+        <text>到账 ¥{{shijidaozhang}}</text>
+      </view>
+    </view>
+    <view class="modal-footer">
+      <view class="modal-btn cancel" bindtap="onCloseTixian">取消</view>
+      <view class="modal-btn confirm" bindtap="onConfirmTixian">{{submitting ? '处理中' : '提交申请'}}</view>
+    </view>
+  </view>
+</view>
+
+
+<view wx:if="{{showCollectConfirm}}" class="modal-mask" bindtap="onCloseCollectConfirm">
+  <view class="modal-dialog" catchtap="stopPropagation">
+    <view class="modal-header">确认收款</view>
+    <view class="modal-body">
+      <view class="auto-tip">审核已通过，{{collectConfirmRecord.leixingLabel}} ¥{{collectConfirmRecord.jine}}</view>
+      <view>请点击「去收款」，然后在微信弹窗中主动确认，资金才会打入您的微信零钱。</view>
+      <view class="warn-tip" wx:if="{{collectConfirmRecord.shenhe_danhao}}">审核单号：{{collectConfirmRecord.shenhe_danhao}}</view>
+      <view class="warn-tip">注意：审核通过≠已到账，必须您本人点击确认才能完成收款！</view>
+    </view>
+    <view class="modal-footer">
+      <view class="modal-btn cancel" bindtap="onCloseCollectConfirm">稍后再说</view>
+      <view class="modal-btn confirm" bindtap="onConfirmCollect">{{submitting ? '处理中...' : '去收款'}}</view>
+    </view>
+  </view>
+</view>
+
+
+<view wx:if="{{showDetailModal}}" class="modal-mask" bindtap="onCloseDetailModal">
+  <view class="modal-dialog" catchtap="stopPropagation">
+    <view class="modal-header">{{detailTitle}}</view>
+    <view class="modal-body">{{detailContent}}</view>
+    <view class="modal-footer">
+      <view class="modal-btn confirm" bindtap="onCloseDetailModal">知道了</view>
+    </view>
+  </view>
+</view>
+
+<global-notification id="global-notification" />
+<popup-notice id="popupNotice" />
diff --git a/pages/tixian/components/mode2/mode2.wxss b/pages/tixian/components/mode2/mode2.wxss
new file mode 100644
index 0000000..b6a5ea4
--- /dev/null
+++ b/pages/tixian/components/mode2/mode2.wxss
@@ -0,0 +1,407 @@
+/* mode2 自动打款 - UI 完全复用 mode1 样式 */
+
+page {
+  background-color: #f5f7fb;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+  height: 100%;
+}
+
+.app {
+  display: flex;
+  flex-direction: column;
+  min-height: 100vh;
+  padding: 0 24rpx 0;
+  position: relative;
+  z-index: 1;
+  box-sizing: border-box;
+}
+
+.global-bg {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: -1;
+  opacity: 0.1;
+  object-fit: cover;
+  filter: blur(1rpx);
+}
+
+.assets-section {
+  margin-top: 24rpx;
+  flex-shrink: 0;
+}
+
+.main-card {
+  background: rgba(248, 250, 252, 0.88);
+  backdrop-filter: blur(28rpx);
+  -webkit-backdrop-filter: blur(28rpx);
+  border-radius: 48rpx;
+  padding: 30rpx 28rpx 24rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.04);
+  border: 1rpx solid rgba(255, 255, 255, 0.4);
+  background-size: cover;
+}
+
+.balance-wrap {
+  text-align: center;
+  margin-bottom: 20rpx;
+}
+.balance-label {
+  font-size: 28rpx;
+  color: #0f172a;
+  letter-spacing: 1px;
+  display: block;
+  margin-bottom: 10rpx;
+  font-weight: 700;
+  text-shadow: 0 1rpx 2rpx rgba(255,255,255,0.8);
+}
+.balance-value {
+  font-size: 68rpx;
+  font-weight: 800;
+  color: #0f172a;
+  font-family: 'DIN', monospace;
+  letter-spacing: -1rpx;
+  text-shadow: 0 1rpx 2rpx rgba(255,255,255,0.6);
+}
+
+.inner-divider {
+  width: 60%;
+  height: 2rpx;
+  background: linear-gradient(90deg, transparent, #64748b, #64748b, transparent);
+  margin: 0 auto 20rpx auto;
+  border-radius: 2rpx;
+  opacity: 0.9;
+}
+
+.assets-hint {
+  display: block;
+  text-align: center;
+  font-size: 24rpx;
+  color: #334155;
+  margin-bottom: 14rpx;
+  font-weight: 600;
+}
+
+.assets-scroll {
+  width: 100%;
+  white-space: nowrap;
+}
+.assets-track {
+  display: inline-flex;
+  gap: 16rpx;
+}
+
+.asset-tile {
+  width: 170rpx;
+  background: rgba(255, 255, 255, 0.75);
+  backdrop-filter: blur(8rpx);
+  border-radius: 28rpx;
+  padding: 18rpx 12rpx;
+  display: inline-flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  border: 1rpx solid rgba(255,255,255,0.5);
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.02);
+  transition: all 0.2s;
+  white-space: normal;
+  background-size: cover;
+  background-position: center;
+}
+.asset-tile:active {
+  background: rgba(255, 255, 255, 0.9);
+  transform: scale(0.98);
+}
+.asset-name {
+  font-size: 24rpx;
+  font-weight: 700;
+  color: #1e293b;
+  margin-bottom: 10rpx;
+  text-shadow: 0 1rpx 1rpx rgba(255,255,255,0.5);
+}
+.asset-balance {
+  font-size: 28rpx;
+  font-weight: 800;
+  color: #2d6a4f;
+  font-family: monospace;
+  margin-bottom: 6rpx;
+  text-shadow: 0 1rpx 1rpx rgba(255,255,255,0.3);
+}
+.asset-fee {
+  font-size: 20rpx;
+  font-weight: 600;
+  color: #475569;
+  text-shadow: 0 1rpx 1rpx rgba(255,255,255,0.3);
+}
+.assets-empty {
+  width: 400rpx;
+  text-align: center;
+  color: #a0abb9;
+  padding: 40rpx 0;
+}
+
+.divider-line {
+  height: 2rpx;
+  background: linear-gradient(90deg, transparent, #cbd5e1, #cbd5e1, transparent);
+  margin: 16rpx 0 20rpx;
+  width: 80%;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.history-section {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  margin-top: 0;
+}
+.history-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: baseline;
+  padding: 0 8rpx 20rpx;
+  flex-shrink: 0;
+}
+.history-title {
+  font-size: 34rpx;
+  font-weight: 600;
+  color: #1e293b;
+}
+.history-scroll {
+  flex: 1;
+  width: 100%;
+  padding: 0 20rpx;
+  box-sizing: border-box;
+}
+.history-item {
+  display: flex;
+  align-items: center;
+  padding: 28rpx 0;
+  border-bottom: 1rpx solid rgba(0,0,0,0.05);
+}
+.history-info { width: 160rpx; }
+.history-amount {
+  font-size: 36rpx;
+  font-weight: 700;
+  color: #1e293b;
+  display: block;
+}
+.history-time {
+  font-size: 22rpx;
+  color: #94a3b8;
+}
+.history-detail {
+  flex: 1;
+  padding: 0 20rpx;
+}
+.history-method {
+  font-size: 30rpx;
+  color: #334155;
+  display: block;
+  margin-bottom: 6rpx;
+}
+.history-type {
+  font-size: 24rpx;
+  color: #94a3b8;
+}
+.history-status { text-align: right; }
+
+.status-badge {
+  font-size: 26rpx;
+  font-weight: 500;
+  padding: 6rpx 14rpx;
+  border-radius: 30rpx;
+  display: inline-block;
+}
+.status-wait {
+  color: #f59e0b;
+  background: rgba(245,158,11,0.1);
+}
+.status-done {
+  color: #10b981;
+  background: rgba(16,185,129,0.1);
+}
+.status-fail {
+  color: #ef4444;
+  background: rgba(239,68,68,0.1);
+}
+.status-pending {
+  color: #3b82f6;
+  background: rgba(59,130,246,0.1);
+}
+.fail-link {
+  margin-left: 8rpx;
+  text-decoration: underline;
+}
+.collect-tappable {
+  display: inline-flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 4rpx;
+  padding: 10rpx 18rpx;
+  cursor: pointer;
+  border: 2rpx solid rgba(59,130,246,0.35);
+  box-shadow: 0 4rpx 12rpx rgba(59,130,246,0.15);
+}
+.collect-tappable:active {
+  transform: scale(0.97);
+  opacity: 0.9;
+}
+.collect-sub {
+  font-size: 22rpx;
+  font-weight: 700;
+  color: #1d4ed8;
+  text-decoration: underline;
+}
+
+.load-tip, .more-tip {
+  text-align: center;
+  padding: 30rpx;
+  font-size: 24rpx;
+  color: #94a3b8;
+}
+.load-more-btn {
+  margin: 16rpx 0 20rpx;
+  padding: 20rpx;
+  text-align: center;
+  background: rgba(255,255,255,0.7);
+  backdrop-filter: blur(8rpx);
+  border-radius: 40rpx;
+  font-size: 28rpx;
+  color: #3b82f6;
+  border: 1rpx solid rgba(255,255,255,0.5);
+}
+.load-more-btn:active { background: rgba(255,255,255,0.9); }
+.safe-bottom { height: 12rpx; flex-shrink: 0; }
+
+/* 自动打款专属（少量追加） */
+.pending-tip {
+  margin: 0 8rpx 16rpx;
+  padding: 16rpx 20rpx;
+  font-size: 24rpx;
+  color: #1d4ed8;
+  background: rgba(59,130,246,0.08);
+  border-radius: 20rpx;
+  line-height: 1.5;
+}
+.filter-scroll {
+  width: 100%;
+  white-space: nowrap;
+  margin-bottom: 12rpx;
+}
+.filter-track {
+  display: inline-flex;
+  gap: 12rpx;
+  padding: 0 8rpx;
+}
+.filter-chip {
+  flex-shrink: 0;
+  padding: 10rpx 22rpx;
+  font-size: 24rpx;
+  color: #64748b;
+  background: rgba(255,255,255,0.8);
+  border-radius: 30rpx;
+  border: 1rpx solid rgba(0,0,0,0.06);
+}
+.filter-chip.active {
+  color: #3b82f6;
+  background: #eff6ff;
+  border-color: #3b82f6;
+}
+.auto-tip {
+  font-size: 24rpx;
+  color: #3b82f6;
+  margin-bottom: 20rpx;
+  line-height: 1.5;
+}
+.warn-tip {
+  font-size: 24rpx;
+  color: #f59e0b;
+  margin-top: 16rpx;
+  font-weight: 600;
+}
+
+/* 弹窗（与 mode1 一致） */
+.modal-mask {
+  position: fixed;
+  top: 0; left: 0; right: 0; bottom: 0;
+  background: rgba(0,0,0,0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1000;
+}
+.modal-dialog {
+  width: 600rpx;
+  background: rgba(255,255,255,0.96);
+  backdrop-filter: blur(20rpx);
+  border-radius: 48rpx;
+  overflow: hidden;
+  box-shadow: 0 20rpx 40rpx rgba(0,0,0,0.1);
+  border: 1rpx solid rgba(255,255,255,0.6);
+}
+.modal-header {
+  padding: 36rpx 32rpx 20rpx;
+  font-size: 36rpx;
+  font-weight: 700;
+  border-bottom: 1rpx solid rgba(0,0,0,0.05);
+}
+.modal-body {
+  padding: 32rpx;
+  font-size: 28rpx;
+  color: #334155;
+  line-height: 1.6;
+}
+.info-row, .amount-row {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 24rpx;
+  font-size: 28rpx;
+}
+.amount-row input {
+  border: 1rpx solid rgba(0,0,0,0.1);
+  border-radius: 28rpx;
+  padding: 16rpx 20rpx;
+  width: 260rpx;
+  background: rgba(255,255,255,0.9);
+}
+.quick-row {
+  display: flex;
+  gap: 16rpx;
+  margin: 24rpx 0;
+}
+.quick-chip {
+  flex: 1;
+  background: rgba(241,245,249,0.8);
+  text-align: center;
+  padding: 12rpx;
+  border-radius: 40rpx;
+  font-size: 28rpx;
+}
+.fee-row {
+  display: flex;
+  justify-content: space-between;
+  background: rgba(248,250,252,0.8);
+  padding: 20rpx;
+  border-radius: 28rpx;
+  margin: 20rpx 0;
+}
+.modal-footer {
+  display: flex;
+  border-top: 1rpx solid rgba(0,0,0,0.05);
+}
+.modal-btn {
+  flex: 1;
+  text-align: center;
+  padding: 28rpx;
+  font-size: 30rpx;
+}
+.modal-btn.cancel {
+  color: #8f9bb3;
+  border-right: 1rpx solid rgba(0,0,0,0.05);
+}
+.modal-btn.confirm { color: #3b82f6; }
diff --git a/pages/tixian/tixian.js b/pages/tixian/tixian.js
new file mode 100644
index 0000000..7764518
--- /dev/null
+++ b/pages/tixian/tixian.js
@@ -0,0 +1,75 @@
+// pages/tixian/tixian.js
+import request from '../../utils/request.js';
+import PopupService from '../../services/popupService.js';
+
+const app = getApp();
+
+Page({
+    data: {
+        pageMode: 0,       // 0:加载中  1:收款码模式  2:微信零钱模式
+        pageOptions: {},   // 保存启动参数，传给子组件
+        loadError: false,  // 获取模式失败时展示错误状态
+    },
+
+    onLoad(options) {
+        this.setData({
+            pageOptions: options || {}
+        });
+        this.fetchPageMode();
+    },
+
+    // ✅ 用 onShow，别用 pageLifetimes
+    onShow() {
+        this.registerNotificationComponent();
+        // 如果已经在某个模式下，可以刷新一下子组件数据（可选）
+        // 弹窗检查
+        PopupService.checkAndShow(this, 'tixian');
+    },
+
+    onHide() {
+        const popupComp = this.selectComponent('#popupNotice');
+        if (popupComp && popupComp.cleanup) {
+            popupComp.cleanup();
+        }
+    },
+
+    // ✅ 注册通知组件（弹窗依赖它）
+    registerNotificationComponent() {
+        const notificationComp = this.selectComponent('#global-notification');
+        if (notificationComp && notificationComp.showNotification) {
+            app.globalData.globalNotification = {
+                show: (data) => notificationComp.showNotification(data),
+                hide: () => notificationComp.hideNotification()
+            };
+        }
+    },
+
+    async fetchPageMode() {
+        try {
+            const res = await request({
+                url: '/peizhi/hqtxzsym',
+                method: 'POST'
+            });
+
+            if (res.statusCode === 200 && res.data && res.data.code === 0) {
+                const mode = parseInt(res.data.data.mode);
+                this.setData({
+                    pageMode: (mode === 1 || mode === 2) ? mode : 1,
+                    loadError: false
+                });
+            } else {
+                this.setData({ pageMode: 1, loadError: false });
+            }
+        } catch (err) {
+            console.error('获取展示模式失败:', err);
+            this.setData({ loadError: true });
+        }
+    },
+
+    retryFetch() {
+        this.setData({ loadError: false, pageMode: 0 });
+        this.fetchPageMode();
+    },
+
+    stopPropagation() {}
+});
\ No newline at end of file
diff --git a/pages/tixian/tixian.json b/pages/tixian/tixian.json
new file mode 100644
index 0000000..fd80470
--- /dev/null
+++ b/pages/tixian/tixian.json
@@ -0,0 +1,15 @@
+{
+    "usingComponents": {
+        "mode1": "./components/mode1/mode1",
+        "mode2": "./components/mode2/mode2"
+    },
+    
+    "navigationBarTitleText": "提现中心",
+    "navigationBarBackgroundColor": "#1a0b2e",
+    "navigationBarTextStyle": "white",
+    "backgroundColor": "#1a0b2e",
+    "enablePullDownRefresh": false,
+    "onReachBottomDistance": 50,
+    "navigationStyle": "default",
+    "disableScroll": false
+ }
diff --git a/pages/tixian/tixian.wxml b/pages/tixian/tixian.wxml
new file mode 100644
index 0000000..88e6cdd
--- /dev/null
+++ b/pages/tixian/tixian.wxml
@@ -0,0 +1,33 @@
+
+<view class="tixian-container">
+
+
+<view wx:if="{{pageMode === 0 && !loadError}}" class="loading-center">
+    <view class="loading-spinner"></view>
+    <text class="loading-text">加载中...</text>
+</view>
+
+
+<view wx:elif="{{loadError}}" class="error-center">
+    <text class="error-text">加载失败，请检查网络</text>
+    <view class="retry-btn" bindtap="retryFetch">点击重试</view>
+</view>
+
+
+<mode1 
+    wx:elif="{{pageMode === 2}}" 
+    options="{{pageOptions}}"
+    id="tixian-mode1"
+/>
+
+
+<mode2 
+    wx:elif="{{pageMode === 1}}" 
+    options="{{pageOptions}}"
+    id="tixian-mode2"
+/>
+
+<global-notification id="global-notification" />
+  <popup-notice id="popupNotice" />
+
+</view>
\ No newline at end of file
diff --git a/pages/tixian/tixian.wxss b/pages/tixian/tixian.wxss
new file mode 100644
index 0000000..6aa6530
--- /dev/null
+++ b/pages/tixian/tixian.wxss
@@ -0,0 +1,50 @@
+/* pages/tixian/tixian.wxss */
+.tixian-container {
+    width: 100%;
+    min-height: 100vh;
+    position: relative;
+}
+
+/* 加载状态 */
+.loading-center, .error-center {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 100vh;
+    color: #ffffff;
+    background: #1a0b2e;  /* 与赛博朋克背景统一 */
+}
+
+.loading-spinner {
+    width: 60rpx;
+    height: 60rpx;
+    border: 4rpx solid rgba(157, 78, 221, 0.3);
+    border-top-color: #9d4edd;
+    border-radius: 50%;
+    animation: spin 0.8s linear infinite;
+    margin-bottom: 30rpx;
+}
+
+.loading-text {
+    font-size: 28rpx;
+    color: rgba(255, 255, 255, 0.7);
+}
+
+.error-text {
+    font-size: 28rpx;
+    margin-bottom: 30rpx;
+}
+
+.retry-btn {
+    padding: 20rpx 60rpx;
+    background: linear-gradient(90deg, #6a11cb, #2575fc);
+    color: white;
+    border-radius: 40rpx;
+    font-size: 28rpx;
+}
+
+@keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+}
\ No newline at end of file
diff --git a/pages/wode/wode.js b/pages/wode/wode.js
new file mode 100644
index 0000000..26caa22
--- /dev/null
+++ b/pages/wode/wode.js
@@ -0,0 +1,178 @@
+// pages/gerenzhongxin/gerenzhongxin.js
+const app = getApp()
+
+Page({
+  data: {
+    avatarUrl: '',
+    userNicheng: '',
+    userUid: '',
+    showLoginBtn: false,
+    orderCounts: { daifuwu:0, fuwuzhong:0, yiwancheng:0, yituikuan:0 },
+    // 图标
+    settingIcon: '', daifuwuIcon: '', fuwuzhongIcon: '', yiwanchengIcon: '', yituikuanIcon: '',
+    dashouIcon: '', shangjiaIcon: '', guanshiIcon: '', kefuIcon: '',
+    zuzhangIcon: '', guanzhualongIcon: '', arrowRightIcon: '', qingchuIcon: '',
+    bottomSafePadding: 0
+  },
+
+  onLoad() {
+    this.initIconUrls()
+    this.loadUserData()
+    this.setBottomSafe()
+  },
+
+  onShow() {
+    this.loadUserData()
+    this.updateOrderCounts()
+    this.registerNotification()
+    this.checkAvatarPrompt()
+    this.initIconUrls()
+  },
+
+  setBottomSafe() {
+    const sys = wx.getSystemInfoSync()
+    const safeBottom = sys.screenHeight - sys.safeArea.bottom  // 底部安全区高度(px)
+    const tabBarHeight = (sys.windowWidth / 750) * 100          // 100rpx 转为 px
+    this.setData({
+      bottomSafePadding: safeBottom + tabBarHeight + 4  // 4px 微调，确保不留缝隙
+    })
+  },
+
+  registerNotification() {
+    const comp = this.selectComponent('#global-notification')
+    if (comp?.showNotification) {
+      app.globalData.globalNotification = {
+        show: d => comp.showNotification(d),
+        hide: () => comp.hideNotification()
+      }
+    }
+  },
+
+  checkAvatarPrompt() {
+    const ds = wx.getStorageSync('dashoustatus')
+    const tx = wx.getStorageSync('touxiang') || ''
+    if (ds === 1 && (!tx || tx === 'a_long/morentouxiang.jpg')) {
+      wx.showModal({
+        title: '提示', content: '请先设置头像',
+        confirmText: '去设置', confirmColor: '#C9A962',
+        success: r => r.confirm && wx.navigateTo({ url: '/pages/xiugai/xiugai' })
+      })
+    }
+  },
+
+  initIconUrls() {
+    const base = (app.globalData.ossImageUrl || '') + '/beijing/tubiao/'
+    this.setData({
+      settingIcon: base + 'grzx_shezhi.jpg',
+      daifuwuIcon: base + 'grzx_daifuwu.jpg',
+      fuwuzhongIcon: base + 'grzx_fuwuzhong.jpg',
+      yiwanchengIcon: base + 'grzx_yiwancheng.jpg',
+      yituikuanIcon: base + 'grzx_yituikuan.jpg',
+      dashouIcon: base + 'grzx_dashou.jpg',
+      shangjiaIcon: base + 'grzx_shangjia.jpg',
+      guanshiIcon: base + 'grzx_guanshi.jpg',
+      kefuIcon: base + 'grzx_kefu.jpg',
+      zuzhangIcon: base + 'grzx_zuzhang.jpg',
+      guanzhualongIcon: base + 'grzx_guanzhualong.jpg',
+      arrowRightIcon: base + 'grzx_arrow_right.jpg',
+      qingchuIcon: base + 'grzx_qingchu.jpg',
+      kaoheguanIcon: base + 'kaoheguan.png',   // 考核官认证图标
+    })
+  },
+
+  loadUserData() {
+    const token = wx.getStorageSync('token')
+    const nick = wx.getStorageSync('nicheng') || ''
+    const uid = wx.getStorageSync('uid') || ''
+    const tx = wx.getStorageSync('touxiang') || ''
+    const def = app.globalData.morentouxiang || ''
+    const oss = app.globalData.ossImageUrl || ''
+    let avt = ''
+    if (tx) avt = tx.startsWith('http') ? tx : oss + tx
+    else if (def) avt = def.startsWith('http') ? def : oss + def
+    this.setData({
+      avatarUrl: avt, userNicheng: nick, userUid: uid,
+      showLoginBtn: !token || !nick || !uid
+    })
+  },
+
+  updateOrderCounts() {
+    const c = app.globalData.dingdanTiaoshu || {}
+    this.setData({ orderCounts: {
+      daifuwu: c.daifuwu||0, fuwuzhong: c.fuwuzhong||0,
+      yiwancheng: c.yiwancheng||0, yituikuan: c.yituikuan||0
+    }})
+  },
+
+  goToSetting() { wx.navigateTo({ url: '/pages/xiugai/xiugai' }) },
+
+  handleWechatLogin() {
+    wx.showLoading({ title: '登录中...' })
+    wx.login({
+      success: r => {
+        if (r.code) this.sendLoginRequest(r.code)
+        else { wx.hideLoading(); wx.showToast({ title: '获取code失败', icon: 'none' }) }
+      },
+      fail: () => { wx.hideLoading(); wx.showToast({ title: '微信登录失败', icon: 'none' }) }
+    })
+  },
+
+  sendLoginRequest(code) {
+    const api = app.globalData.apiBaseUrl
+    if (!api) return wx.hideLoading()
+    wx.request({
+      url: api + '/yonghu/wechatlogin', method: 'POST', data: { code },
+      header: { 'content-type': 'application/json' },
+      success: res => {
+        if (res.statusCode === 200 && res.data?.code === 0 && res.data.data) {
+          const d = res.data.data
+          wx.setStorageSync('token', d.token)
+          ;['nicheng','uid','touxiang','dashoustatus','guanshistatus','shangjiastatus','zuzhangstatus','kaoheguanstatus'].forEach(k => {
+            if (d[k] !== undefined) wx.setStorageSync(k, d[k])
+          })
+          app.globalData.zuzhangstatus = d.zuzhangstatus
+          app.globalData.dingdanTiaoshu = {
+            daifuwu: d.dingdantiaoshu?.daifuwu||0,
+            fuwuzhong: d.dingdantiaoshu?.fuwuzhong||0,
+            yiwancheng: d.dingdantiaoshu?.yiwancheng||0,
+            yituikuan: d.dingdantiaoshu?.yituikuan||0
+          }
+          ;['shangjiastatus','dashoustatus','guanshistatus'].forEach(f => {
+            if (d[f] !== undefined) app.globalData[f] = d[f]
+          })
+          this.loadUserData(); this.updateOrderCounts()
+          wx.showToast({ title: '登录成功', icon: 'success' })
+        } else wx.showToast({ title: res.data?.msg || '登录失败', icon: 'none' })
+        wx.hideLoading()
+      },
+      fail: () => { wx.hideLoading(); wx.showToast({ title: '网络错误', icon: 'none' }) }
+    })
+  },
+
+  goToOrder(e) { wx.navigateTo({ url: `/pages/dingdan/dingdan?type=${e.currentTarget.dataset.type}` }) },
+  goToAuth(e) { wx.navigateTo({ url: `/pages/renzheng/renzheng?type=${e.currentTarget.dataset.type}` }) },
+
+  goToKefu() {
+    const { link, enterpriseId } = app.globalData.kefuConfig || {}
+    if (!link || !enterpriseId) { wx.showToast({ title: '客服配置未加载', icon: 'none' }); return }
+    wx.openCustomerServiceChat({ extInfo: { url: link }, corpId: enterpriseId })
+  },
+  goToCustomService() { this.goToKefu() },
+  goToGuanzhuA() { wx.navigateTo({ url: '/pages/guanzhual/guanzhual' }) },
+
+  clearCache() {
+    wx.showModal({
+      title: '清除缓存', content: '将清除所有登录数据，确定继续？',
+      confirmText: '确定', cancelText: '取消',
+      success: r => {
+        if (r.confirm) {
+          wx.clearStorageSync()
+          app.globalData.dingdanTiaoshu = { daifuwu:0, fuwuzhong:0, yiwancheng:0, yituikuan:0 }
+          this.setData({ avatarUrl:'', userNicheng:'', userUid:'', showLoginBtn:true,
+            orderCounts:{ daifuwu:0, fuwuzhong:0, yiwancheng:0, yituikuan:0 } })
+          wx.showToast({ title: '已清除', icon: 'success' })
+        }
+      }
+    })
+  }
+})
\ No newline at end of file
diff --git a/pages/wode/wode.json b/pages/wode/wode.json
new file mode 100644
index 0000000..241131f
--- /dev/null
+++ b/pages/wode/wode.json
@@ -0,0 +1,11 @@
+{
+    "usingComponents": {
+      "global-notification": "/components/global-notification/global-notification",
+      "custom-tab-bar": "/custom-tab-bar/index"
+    },
+    "navigationBarTitleText": "个人中心",
+    "navigationBarBackgroundColor": "#F7F3ED",
+    "navigationBarTextStyle": "black",
+    "backgroundColor": "#F7F3ED",
+    "enablePullDownRefresh": false
+  }
\ No newline at end of file
diff --git a/pages/wode/wode.wxml b/pages/wode/wode.wxml
new file mode 100644
index 0000000..515095d
--- /dev/null
+++ b/pages/wode/wode.wxml
@@ -0,0 +1,123 @@
+<view class="page-root">
+  <view class="bg-layer"></view>
+
+  <scroll-view class="main-scroll" scroll-y="true" enhanced show-scrollbar="{{false}}">
+    <view class="main-content">
+      
+      <view class="hero">
+        <view class="settings-icon" bindtap="goToSetting">
+          <image src="{{settingIcon}}" mode="aspectFit" class="icon-dark" />
+        </view>
+        <view class="user-block">
+          <view class="avatar-outside">
+            <image class="avatar" src="{{avatarUrl}}" mode="aspectFill" />
+          </view>
+          <view class="user-text">
+            <text class="nickname">{{userNicheng || '点击登录'}}</text>
+            <text class="uid">UID: {{userUid || '••••••'}}</text>
+          </view>
+        </view>
+        <button wx:if="{{showLoginBtn}}" class="login-btn" bindtap="handleWechatLogin">一键登录</button>
+      </view>
+
+      
+      <view class="section">
+        <view class="title-line gradient-bg">
+          <text class="title-text">我的订单</text>
+        </view>
+        <view class="frosted-box">
+          <view class="order-row">
+            <view class="order-unit" bindtap="goToOrder" data-type="daifuwu">
+              <view class="icon-bg"><image src="{{daifuwuIcon}}" mode="aspectFit" class="icon-dark icon-size" /></view>
+              <text class="order-name">待服务</text>
+              <view class="badge" wx:if="{{orderCounts.daifuwu > 0}}">{{orderCounts.daifuwu}}</view>
+            </view>
+            <view class="order-unit" bindtap="goToOrder" data-type="fuwuzhong">
+              <view class="icon-bg"><image src="{{fuwuzhongIcon}}" mode="aspectFit" class="icon-dark icon-size" /></view>
+              <text class="order-name">服务中</text>
+              <view class="badge" wx:if="{{orderCounts.fuwuzhong > 0}}">{{orderCounts.fuwuzhong}}</view>
+            </view>
+            <view class="order-unit" bindtap="goToOrder" data-type="yiwancheng">
+              <view class="icon-bg"><image src="{{yiwanchengIcon}}" mode="aspectFit" class="icon-dark icon-size" /></view>
+              <text class="order-name">已完成</text>
+              <view class="badge" wx:if="{{orderCounts.yiwancheng > 0}}">{{orderCounts.yiwancheng}}</view>
+            </view>
+            <view class="order-unit" bindtap="goToOrder" data-type="yituikuan">
+              <view class="icon-bg"><image src="{{yituikuanIcon}}" mode="aspectFit" class="icon-dark icon-size" /></view>
+              <text class="order-name">已退款</text>
+              <view class="badge" wx:if="{{orderCounts.yituikuan > 0}}">{{orderCounts.yituikuan}}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      
+      <view class="section">
+        <view class="title-line gradient-bg">
+          <text class="title-text">更多服务</text>
+        </view>
+        <view class="service-row">
+          <view class="service-unit" bindtap="goToKefu">
+            <view class="icon-bg"><image src="{{kefuIcon}}" mode="aspectFit" class="icon-color icon-size" /></view>
+            <text class="service-name">在线客服</text>
+          </view>
+          <view class="service-unit" bindtap="goToGuanzhuA">
+            <view class="icon-bg"><image src="{{guanzhualongIcon}}" mode="aspectFit" class="icon-color icon-size" /></view>
+            <text class="service-name">关注阿龙</text>
+          </view>
+        </view>
+      </view>
+
+      
+      <view class="section">
+        <view class="title-line gradient-bg">
+          <text class="title-text">身份认证</text>
+        </view>
+        <view class="auth-row">
+          <view class="auth-unit" bindtap="goToAuth" data-type="dashou">
+            <view class="icon-bg"><image src="{{dashouIcon}}" mode="aspectFit" class="icon-dark icon-size" /></view>
+            <text class="auth-name">接单员认证</text>
+          </view>
+          <view class="auth-unit" bindtap="goToAuth" data-type="shangjia">
+            <view class="icon-bg"><image src="{{shangjiaIcon}}" mode="aspectFit" class="icon-dark icon-size" /></view>
+            <text class="auth-name">商家认证</text>
+          </view>
+          <view class="auth-unit" bindtap="goToAuth" data-type="zuzhang">
+            <view class="icon-bg"><image src="{{zuzhangIcon}}" mode="aspectFit" class="icon-dark icon-size" /></view>
+            <text class="auth-name">组长认证</text>
+          </view>
+          <view class="auth-unit" bindtap="goToAuth" data-type="guanshi">
+            <view class="icon-bg"><image src="{{guanshiIcon}}" mode="aspectFit" class="icon-dark icon-size" /></view>
+            <text class="auth-name">管事认证</text>
+          </view>
+          <view class="auth-unit" bindtap="goToAuth" data-type="kaoheguan">
+        <view class="icon-bg"><image src="{{kaoheguanIcon}}" mode="aspectFit" class="icon-dark icon-size" /></view>
+        <text class="auth-name">考核官认证</text>
+        </view>
+        </view>
+      </view>
+
+      
+      <view class="section section-close">
+        <view class="title-line gradient-bg">
+          <text class="title-text">系统功能</text>
+        </view>
+        <view class="clear-row" bindtap="clearCache">
+          <view class="icon-bg"><image src="{{qingchuIcon}}" mode="aspectFit" class="icon-dark icon-size" /></view>
+          <text class="clear-word">清除缓存</text>
+          <image src="{{arrowRightIcon}}" mode="aspectFit" class="arrow-right" />
+        </view>
+      </view>
+
+      
+      <view class="footer">
+        <text class="copyright">© 2026 星阙网络技术</text>
+        <text class="divider">|</text>
+        <text class="coop" bindtap="goToCustomService">我要做同款</text>
+      </view>
+    </view>
+  </scroll-view>
+</view>
+
+<custom-tab-bar />
+<global-notification id="global-notification" />
\ No newline at end of file
diff --git a/pages/wode/wode.wxss b/pages/wode/wode.wxss
new file mode 100644
index 0000000..0864783
--- /dev/null
+++ b/pages/wode/wode.wxss
@@ -0,0 +1,254 @@
+/* pages/gerenzhongxin/gerenzhongxin.wxss — 最终完美版（毛玻璃强化+图标左右贴边） */
+
+/* 全局 */
+page {
+    background: #F7F3ED;
+    height: 100vh;
+    overflow: hidden;
+  }
+  
+  .page-root {
+    position: relative;
+    width: 100%;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .bg-layer {
+    position: fixed;
+    top: 0; left: 0;
+    width: 100vw; height: 100vh;
+    background: radial-gradient(ellipse at 30% 20%, rgba(201,169,98,0.08) 0%, transparent 60%),
+                radial-gradient(ellipse at 80% 70%, rgba(201,169,98,0.05) 0%, transparent 50%);
+    z-index: 0;
+    pointer-events: none;
+  }
+  
+  .main-scroll {
+    position: relative;
+    z-index: 2;
+    flex: 1;
+    width: 100%;
+    overflow-y: auto;
+    padding-bottom: calc(140rpx + env(safe-area-inset-bottom));
+  }
+  
+  .main-content {
+    padding: 60rpx 40rpx 0;
+  }
+  
+  /* 图标基础 */
+  .icon-dark {
+    filter: brightness(0) saturate(100%) opacity(0.65);
+  }
+  .icon-color {
+    filter: none;
+  }
+  .icon-size {
+    width: 52rpx;
+    height: 52rpx;
+  }
+  
+  /* 图标独立淡金背景 */
+  .icon-bg {
+    background: rgba(201,169,98,0.08);
+    border-radius: 24rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 18rpx;
+  }
+  
+  /* 头部（头像完美正圆） */
+  .hero {
+    position: relative;
+    margin-bottom: 100rpx;
+  }
+  .settings-icon {
+    position: absolute;
+    top: 0; right: 0;
+    width: 60rpx; height: 60rpx;
+    display: flex; align-items: center; justify-content: center;
+  }
+  .user-block {
+    display: flex; align-items: center;
+  }
+  .avatar-outside {
+    width: 140rpx;
+    height: 140rpx;
+    border-radius: 50%;
+    background: rgba(201,169,98,0.06);
+    padding: 10rpx;
+    margin-right: 35rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+  }
+  .avatar {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    display: block;
+    border: none;
+  }
+  .nickname {
+    font-size: 44rpx; font-weight: 700; color: #1A1A1A;
+    display: block;
+  }
+  .uid {
+    font-size: 28rpx; color: #7A7A7A;
+    margin-top: 12rpx;
+    display: block;
+  }
+  .login-btn {
+    margin-top: 45rpx;
+    width: 100%; height: 92rpx;
+    background: linear-gradient(135deg, #C9A962, #D4B56A);
+    color: white; font-size: 34rpx; font-weight: 600;
+    border-radius: 46rpx;
+    border: none;
+  }
+  
+  /* 分区间距 */
+  .section {
+    margin-top: 110rpx;
+  }
+  .section-close {
+    margin-top: 80rpx;
+  }
+  
+  .title-line {
+    margin-bottom: 40rpx;
+    padding: 18rpx 28rpx;
+    line-height: 1.2;
+  }
+  .gradient-bg {
+    background: linear-gradient(to right, rgba(201,169,98,0.01), rgba(201,169,98,0.10));
+  }
+  .title-text {
+    font-size: 38rpx;
+    font-weight: 700;
+    color: #1A1A1A;
+    letter-spacing: 2rpx;
+  }
+  
+  /* 毛玻璃订单容器（强化玻璃质感，淡灰半透，无白边） */
+  .frosted-box {
+    background: rgba(235, 235, 240, 0.45);   /* 淡灰玻璃底 */
+    backdrop-filter: blur(25px);
+    -webkit-backdrop-filter: blur(25px);
+    border-radius: 36rpx;
+    padding: 45rpx 0;                        /* 去掉左右内边距，让图标真正贴边 */
+    box-shadow: 0 4rpx 16rpx rgba(0,0,0,0.05), inset 0 1rpx 0 rgba(255,255,255,0.7);
+    border: none;
+  }
+  
+  /* 订单行 - 图标完全左右贴边，间距最大化 */
+  .order-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 5rpx;    /* 极微的内边距，防止图片被裁剪，但视觉上仍贴边 */
+  }
+  .order-unit {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    position: relative;
+    flex: 1;           /* 等分剩余空间 */
+    margin: 0;         /* 无额外间距 */
+  }
+  .order-name {
+    font-size: 28rpx;
+    color: #1C1C1C;
+    margin-top: 18rpx;
+    font-weight: 500;
+  }
+  .badge {
+    position: absolute;
+    top: -10rpx;
+    right: 12rpx;
+    background: #C5615E;
+    color: #fff;
+    font-size: 22rpx;
+    min-width: 38rpx;
+    height: 38rpx;
+    border-radius: 19rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 8rpx;
+    font-weight: 600;
+  }
+  
+  /* 更多服务 */
+  .service-row {
+    display: flex;
+    gap: 80rpx;
+    justify-content: flex-start;
+  }
+  .service-unit {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  .service-name {
+    font-size: 28rpx;
+    color: #1C1C1C;
+    margin-top: 18rpx;
+    font-weight: 500;
+  }
+  
+  /* 身份认证 */
+  .auth-row {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  gap: 25rpx 17rpx;   /* 行间距20rpx，列间距10rpx，可根据实际微调 */
+  align-items: center;
+}
+  .auth-unit {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    flex: 1;
+    min-width: 25%;          /* 确保一行最多四个，第五个自动换行 */
+  }
+  .auth-name {
+    font-size: 28rpx;
+    color: #1C1C1C;
+    margin-top: 18rpx;
+    font-weight: 500;
+  }
+  
+  /* 清除缓存 */
+  .clear-row {
+    display: flex;
+    align-items: center;
+    padding: 22rpx 0;
+  }
+  .clear-word {
+    flex: 1;
+    font-size: 30rpx;
+    color: #1C1C1C;
+    margin-left: 18rpx;
+    font-weight: 500;
+  }
+  .arrow-right {
+    width: 36rpx;
+    height: 36rpx;
+    opacity: 0.45;
+    margin-left: 15rpx;
+  }
+  
+  /* 底部 */
+  .footer {
+    margin-top: 130rpx;
+    padding-bottom: 20rpx;
+    text-align: center;
+    font-size: 26rpx;
+    color: #aaa;
+  }
+  .divider { margin: 0 15rpx; }
+  .coop { color: #C9A962; font-weight: 500; }
\ No newline at end of file
diff --git a/pages/wodedashou/wodedashou.js b/pages/wodedashou/wodedashou.js
new file mode 100644
index 0000000..bc8091e
--- /dev/null
+++ b/pages/wodedashou/wodedashou.js
@@ -0,0 +1,194 @@
+// pages/wodedashou/wodedashou.js
+import request from '../../utils/request.js'
+const app = getApp()
+
+Page({
+  data: {
+    // 统计
+    yaoqingzongshu: 0,
+    zaixianCount: 0,
+    zhengchangCount: 0,
+    fengjinCount: 0,
+
+    // 列表
+    dashouList: [],
+    currentPage: 1,
+    pageSize: 10,
+    hasMore: true,
+    isLoading: false,      // 首次加载或筛选时使用
+    isLoadingMore: false,  // 上拉加载更多时使用
+
+    // 筛选条件
+    keyword: '',
+    zhanghaozhuangtai: null,  // null=全部, 1=正常, 2=封禁
+    zaixianzhuangtai: null,   // null=全部, 1=在线, 2=离线
+
+    // 公共资源
+    ossImageUrl: '',
+    defaultAvatar: ''
+  },
+
+  onLoad() {
+    this.initGlobal()
+    this.jiazaiShuju(true)
+    this.registerNotification()
+  },
+
+  registerNotification() {
+    const comp = this.selectComponent('#global-notification')
+    if (comp?.showNotification) {
+      app.globalData.globalNotification = {
+        show: d => comp.showNotification(d),
+        hide: () => comp.hideNotification()
+      }
+    }
+  },
+
+  initGlobal() {
+    const g = app.globalData
+    this.setData({
+      ossImageUrl: g.ossImageUrl || '',
+      defaultAvatar: (g.ossImageUrl || '') + (g.morentouxiang || '')
+    })
+  },
+
+  // 手动点击刷新按钮（重新加载第一页）
+  shuaxinShuju() {
+    if (this.data.isLoading) return
+    this.setData({ currentPage: 1 })
+    this.jiazaiShuju(true)
+  },
+
+  // 上拉触底加载更多（同时也作为按钮点击方法）
+  shanglaJiazaiGengduo() {
+    if (!this.data.hasMore || this.data.isLoadingMore || this.data.isLoading) return
+    this.jiazaiShuju(false)
+  },
+
+  // 核心数据请求
+  async jiazaiShuju(isFirstLoad) {
+    if (isFirstLoad && this.data.isLoading) return
+    if (!isFirstLoad && this.data.isLoadingMore) return
+
+    this.setData({
+      isLoading: isFirstLoad ? true : this.data.isLoading,
+      isLoadingMore: isFirstLoad ? false : true
+    })
+
+    try {
+      const res = await request({
+        url: '/yonghu/gshqyqds',
+        method: 'POST',
+        data: {
+          page: isFirstLoad ? 1 : this.data.currentPage,
+          pageSize: this.data.pageSize,
+          keyword: this.data.keyword,
+          zhanghaozhuangtai: this.data.zhanghaozhuangtai,
+          zaixianzhuangtai: this.data.zaixianzhuangtai
+        }
+      })
+
+      if (res.data.code === 200) {
+        this.handleResponse(res.data.data, isFirstLoad)
+      } else {
+        wx.showToast({ title: res.data.message || '加载失败', icon: 'none' })
+        if (!isFirstLoad) {
+          this.setData({ currentPage: this.data.currentPage - 1 })
+        }
+      }
+    } catch (err) {
+      wx.showToast({ title: '网络异常', icon: 'none' })
+      if (!isFirstLoad) {
+        this.setData({ currentPage: this.data.currentPage - 1 })
+      }
+    } finally {
+      this.setData({
+        isLoading: false,
+        isLoadingMore: false
+      })
+    }
+  },
+
+  handleResponse(data, isFirstLoad) {
+    const process = (list) => list.map(item => ({
+      ...item,
+      touxiangUrl: this.fullAvatar(item.touxiang)
+    }))
+
+    if (isFirstLoad) {
+      this.setData({
+        dashouList: process(data.dashouList || []),
+        yaoqingzongshu: data.yaoqingzongshu || 0,
+        zaixianCount: data.zaixianCount || 0,
+        zhengchangCount: data.zhengchangCount || 0,
+        fengjinCount: data.fengjinCount || 0,
+        currentPage: data.hasMore ? 2 : 1,
+        hasMore: data.hasMore
+      })
+    } else {
+      this.setData({
+        dashouList: [...this.data.dashouList, ...process(data.dashouList || [])],
+        currentPage: this.data.currentPage + 1,
+        hasMore: data.hasMore
+      })
+    }
+  },
+
+  fullAvatar(relative) {
+    if (!relative) return this.data.defaultAvatar
+    if (relative.startsWith('http')) return relative
+    return this.data.ossImageUrl + relative
+  },
+
+  // 筛选输入
+  onKeywordInput(e) {
+    this.setData({ keyword: e.detail.value.trim() })
+  },
+
+  // picker 变更
+  onZhanghaoChange(e) {
+    const idx = parseInt(e.detail.value, 10)
+    this.setData({ zhanghaozhuangtai: idx === 0 ? null : idx })
+  },
+  onZaixianChange(e) {
+    const idx = parseInt(e.detail.value, 10)
+    this.setData({ zaixianzhuangtai: idx === 0 ? null : idx })
+  },
+
+  // 点击筛选按钮
+  applyFilter() {
+    if (this.data.isLoading) return
+    this.setData({ currentPage: 1 })
+    this.jiazaiShuju(true)
+  },
+
+  // 联系打手（私聊）
+  contactDashou(e) {
+    const dashouUid = e.currentTarget.dataset.uid
+    const myUid = wx.getStorageSync('uid')
+    const role = app.globalData.currentRole || 'normal'
+
+    if (role !== 'guanshi') {
+      wx.showModal({ title: '提示', content: '请先切换到管事身份', showCancel: false })
+      return
+    }
+
+    // 确保连接为管事身份
+    app.globalData.currentRole = 'guanshi'
+    wx.setStorageSync('currentRole', 'guanshi')
+    if (app.connectForCurrentRole) {
+      app.connectForCurrentRole()
+    }
+
+    const targetUserId = 'Ds' + dashouUid
+    const item = this.data.dashouList.find(i => i.uid === dashouUid)
+    const param = {
+      toUserId: targetUserId,
+      toName: item?.nicheng || '打手',
+      toAvatar: item?.touxiangUrl || ''
+    }
+    wx.navigateTo({
+      url: '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param))
+    })
+  }
+})
\ No newline at end of file
diff --git a/pages/wodedashou/wodedashou.json b/pages/wodedashou/wodedashou.json
new file mode 100644
index 0000000..837f016
--- /dev/null
+++ b/pages/wodedashou/wodedashou.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    }
+}
\ No newline at end of file
diff --git a/pages/wodedashou/wodedashou.wxml b/pages/wodedashou/wodedashou.wxml
new file mode 100644
index 0000000..6fbb206
--- /dev/null
+++ b/pages/wodedashou/wodedashou.wxml
@@ -0,0 +1,93 @@
+<view class="page-container">
+  
+  <view class="fixed-header">
+    <view class="header-bar">
+      <text class="title">我的下级</text>
+      <view class="refresh-btn" bindtap="shuaxinShuju">↻</view>
+    </view>
+
+    
+    <view class="search-box">
+      <input class="search-input" placeholder="搜索ID/昵称" value="{{keyword}}" bindinput="onKeywordInput" />
+      <view class="search-icon" bindtap="applyFilter">🔍</view>
+    </view>
+
+    
+    <view class="filter-row">
+      <view class="filter-item">
+        <text>账号状态</text>
+        <picker mode="selector" range="{{['全部','正常','封禁']}}" bindchange="onZhanghaoChange">
+          <view class="picker-trigger">
+            {{zhanghaozhuangtai === null ? '全部' : (zhanghaozhuangtai === 1 ? '正常' : '封禁')}}
+          </view>
+        </picker>
+      </view>
+      <view class="filter-item">
+        <text>在线状态</text>
+        <picker mode="selector" range="{{['全部','在线','离线']}}" bindchange="onZaixianChange">
+          <view class="picker-trigger">
+            {{zaixianzhuangtai === null ? '全部' : (zaixianzhuangtai === 1 ? '在线' : '离线')}}
+          </view>
+        </picker>
+      </view>
+      <view class="filter-btn" bindtap="applyFilter">筛选</view>
+    </view>
+
+    
+    <view class="stats-cards">
+      <view class="stat-item"><text class="stat-num">{{yaoqingzongshu}}</text><text class="stat-label">邀请总数</text></view>
+      <view class="stat-item"><text class="stat-num">{{zaixianCount}}</text><text class="stat-label">在线</text></view>
+      <view class="stat-item"><text class="stat-num">{{zhengchangCount}}</text><text class="stat-label">正常</text></view>
+      <view class="stat-item"><text class="stat-num">{{fengjinCount}}</text><text class="stat-label">封禁</text></view>
+    </view>
+  </view>
+
+  
+  <scroll-view 
+    class="list-scroll" 
+    scroll-y 
+    enable-back-to-top 
+    bindscrolltolower="shanglaJiazaiGengduo" 
+    lower-threshold="80"
+  >
+    <view class="list-container">
+      <block wx:for="{{dashouList}}" wx:key="uid">
+        <view class="dashou-card">
+          <image class="avatar" src="{{item.touxiangUrl}}" mode="aspectFill" />
+          <view class="info-right">
+            <view class="row1">
+              <text class="nick">{{item.nicheng}}</text>
+              <view class="badges">
+                <text class="badge {{item.zaixianzhuangtai==1?'online':'offline'}}">{{item.zaixianzhuangtai==1?'在线':'离线'}}</text>
+                <text class="badge {{item.zhanghaozhuangtai==1?'normal':'banned'}}">{{item.zhanghaozhuangtai==1?'正常':'封禁'}}</text>
+              </view>
+            </view>
+            <text class="uid">ID: {{item.uid}}</text>
+            <view class="row2">
+              <text class="tag">接单 {{item.jiedanzongliang || 0}}</text>
+              <text class="tag">成交 {{item.chengjiaozongliang || 0}}</text>
+              <text class="tag">退款 {{item.tuikuanliang || 0}}</text>
+              <text class="tag">余额 ¥{{item.yue || '0.00'}}</text>
+            </view>
+            <view class="contact-btn" data-uid="{{item.uid}}" bindtap="contactDashou">联系</view>
+          </view>
+        </view>
+      </block>
+
+      
+      <view wx:if="{{hasMore && !isLoadingMore}}" class="load-more-btn" bindtap="shanglaJiazaiGengduo">
+        加载更多
+      </view>
+
+      
+      <view class="load-state" wx:if="{{isLoadingMore}}"><text>加载中…</text></view>
+      <view class="load-state" wx:if="{{!hasMore && dashouList.length > 0}}"><text>— 已全部加载 —</text></view>
+      <view class="empty" wx:if="{{!isLoading && dashouList.length === 0}}">
+        <image src="/images/empty.png" mode="aspectFit" />
+        <text>暂无下级打手</text>
+      </view>
+    </view>
+  </scroll-view>
+
+  <global-notification id="global-notification" />
+</view>
\ No newline at end of file
diff --git a/pages/wodedashou/wodedashou.wxss b/pages/wodedashou/wodedashou.wxss
new file mode 100644
index 0000000..d7bb29c
--- /dev/null
+++ b/pages/wodedashou/wodedashou.wxss
@@ -0,0 +1,258 @@
+/* 全局 */
+page {
+    background: linear-gradient(135deg, #f5f7fa 0%, #e4e9f2 100%);
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .page-container {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+  
+  /* 固定头部区域 */
+  .fixed-header {
+    flex-shrink: 0;
+    background: rgba(255,255,255,0.7);
+    backdrop-filter: blur(20px);
+    padding: 20rpx 30rpx 10rpx;
+    z-index: 10;
+  }
+  
+  .header-bar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  
+  .title {
+    font-size: 44rpx;
+    font-weight: 700;
+    color: #2c3e50;
+  }
+  
+  .refresh-btn {
+    width: 60rpx;
+    height: 60rpx;
+    border-radius: 50%;
+    background: rgba(255,255,255,0.8);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 36rpx;
+    color: #5a6d7e;
+    transition: all 0.3s;
+  }
+  
+  .refresh-btn:active { background: rgba(200,200,200,0.5); }
+  
+  /* 搜索栏 */
+  .search-box {
+    display: flex;
+    margin: 15rpx 0;
+    background: white;
+    border-radius: 40rpx;
+    padding: 8rpx 20rpx;
+    box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.05);
+  }
+  
+  .search-input {
+    flex: 1;
+    height: 70rpx;
+    font-size: 28rpx;
+  }
+  
+  .search-icon {
+    width: 70rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 36rpx;
+    color: #7f8c8d;
+  }
+  
+  /* 筛选行 */
+  .filter-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 5rpx;
+  }
+  
+  .filter-item {
+    display: flex;
+    align-items: center;
+    font-size: 26rpx;
+    color: #2c3e50;
+  }
+  
+  .picker-trigger {
+    margin-left: 10rpx;
+    background: rgba(255,255,255,0.8);
+    border-radius: 20rpx;
+    padding: 6rpx 20rpx;
+    border: 1rpx solid #e0e0e0;
+    min-width: 100rpx;
+    text-align: center;
+  }
+  
+  .filter-btn {
+    background: linear-gradient(135deg, #6c8cbf, #8aa5d0);
+    color: white;
+    border-radius: 30rpx;
+    padding: 10rpx 35rpx;
+    font-size: 26rpx;
+    font-weight: 500;
+  }
+  
+  /* 统计卡片 */
+  .stats-cards {
+    display: flex;
+    justify-content: space-around;
+    margin-top: 15rpx;
+    margin-bottom: 10rpx;
+    padding: 25rpx 0;
+    background: rgba(255,255,255,0.65);
+    backdrop-filter: blur(15px);
+    border-radius: 24rpx;
+    box-shadow: 0 8rpx 20rpx rgba(0,0,0,0.05);
+  }
+  
+  .stat-item { display: flex; flex-direction: column; align-items: center; }
+  .stat-num { font-size: 40rpx; font-weight: 700; color: #2c3e50; }
+  .stat-label { font-size: 24rpx; color: #7f8c8d; margin-top: 8rpx; }
+  
+  /* 列表滚动区域（占据剩余高度） */
+  .list-scroll {
+    flex: 1;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+  }
+  
+  /* 列表内部容器 */
+  .list-container {
+    padding-bottom: 30rpx;
+  }
+  
+  /* 打手卡片 */
+  .dashou-card {
+    display: flex;
+    align-items: center;
+    background: rgba(255,255,255,0.75);
+    backdrop-filter: blur(12px);
+    border-radius: 24rpx;
+    padding: 24rpx;
+    margin-bottom: 20rpx;
+    box-shadow: 0 6rpx 16rpx rgba(0,0,0,0.06);
+    transition: transform 0.2s;
+  }
+  
+  .dashou-card:active { transform: scale(0.99); }
+  
+  .avatar {
+    width: 120rpx;
+    height: 120rpx;
+    border-radius: 50%;
+    border: 3rpx solid rgba(255,255,255,0.8);
+    box-shadow: 0 4rpx 10rpx rgba(0,0,0,0.1);
+    margin-right: 20rpx;
+    flex-shrink: 0;
+  }
+  
+  .info-right { flex: 1; display: flex; flex-direction: column; }
+  
+  .row1 {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  
+  .nick {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #1e272e;
+    max-width: 200rpx;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  
+  .badges { display: flex; gap: 10rpx; }
+  .badge {
+    padding: 4rpx 16rpx;
+    border-radius: 20rpx;
+    font-size: 22rpx;
+    font-weight: 500;
+    color: white;
+  }
+  
+  .online { background: #27ae60; }
+  .offline { background: #bdc3c7; }
+  .normal { background: #2980b9; }
+  .banned { background: #e74c3c; }
+  
+  .uid { font-size: 24rpx; color: #7f8c8d; margin: 6rpx 0; }
+  
+  .row2 {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 12rpx;
+    margin: 6rpx 0;
+  }
+  
+  .tag {
+    background: #f0f3f7;
+    padding: 4rpx 14rpx;
+    border-radius: 16rpx;
+    font-size: 22rpx;
+    color: #34495e;
+  }
+  
+  .contact-btn {
+    margin-top: 8rpx;
+    align-self: flex-end;
+    background: linear-gradient(135deg, #f39c12, #e67e22);
+    color: white;
+    padding: 10rpx 28rpx;
+    border-radius: 30rpx;
+    font-size: 26rpx;
+    font-weight: 500;
+    box-shadow: 0 4rpx 8rpx rgba(243,156,18,0.3);
+  }
+  
+  /* 加载状态 */
+  .load-state { text-align: center; padding: 30rpx; color: #95a5a6; font-size: 24rpx; }
+  
+  /* 加载更多按钮（新增） */
+  .load-more-btn {
+    width: 280rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    background: rgba(108, 140, 191, 0.15);
+    backdrop-filter: blur(10px);
+    border-radius: 40rpx;
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #5a6d7e;
+    border: 1rpx solid rgba(108, 140, 191, 0.3);
+    margin: 20rpx auto;
+  }
+
+  .load-more-btn:active {
+    background: rgba(108, 140, 191, 0.25);
+    transform: scale(0.97);
+  }
+  
+  .empty {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding-top: 80rpx;
+  }
+  
+  .empty image { width: 240rpx; height: 240rpx; opacity: 0.5; }
+  .empty text { margin-top: 30rpx; color: #b0b8c0; font-size: 28rpx; }
\ No newline at end of file
diff --git a/pages/xiaoxi/xiaoxi.js b/pages/xiaoxi/xiaoxi.js
new file mode 100644
index 0000000..a880cd8
--- /dev/null
+++ b/pages/xiaoxi/xiaoxi.js
@@ -0,0 +1,377 @@
+// pages/xiaoxi/xiaoxi.js
+const app = getApp();
+import { formatDate } from '../../static/lib/utils';
+const { jianquanxian } = require('../../utils/imAuth/jianquanxian');
+
+Page({
+    data: {
+        allConversations: [],
+        filteredConversations: [],
+        activeTab: 0,
+        tabUnread: [0, 0, 0],
+        displayCount: 10,
+        searchKeyword: '',
+        actionPopup: { visible: false, conversation: null },
+        currentUser: null,
+        notificationMuted: false,
+        scrollHeight: 0
+    },
+
+    _permissionSeq: 0,
+
+    onLoad() {
+        this.calculateScrollHeight();
+        const muted = wx.getStorageSync('notificationMuted') || false;
+        this.setData({ notificationMuted: muted });
+    },
+
+    onShow() {
+        if (!this.checkLoginStatus()) return;
+        this.checkPermissionAndAutoConnect();
+    },
+
+    // ❌ 原版注释保留：删除所有清理逻辑，监听器永久存活
+    onHide() {},
+    onUnload() {},
+
+    // ========== 鉴权检查 ==========
+    async checkPermissionAndAutoConnect() {
+        const seq = ++this._permissionSeq;
+        let quanxian;
+        try {
+            quanxian = await jianquanxian(app);
+        } catch (e) {
+            return;
+        }
+        if (seq !== this._permissionSeq) return;
+
+        if (!quanxian.allowed) {
+            const currentRole = app.globalData.currentRole || 'normal';
+            let content = '您没有权限使用消息功能';
+            if (currentRole === 'dashou') content = '您需要先充值会员才能使用消息功能';
+            wx.showModal({
+                title: '权限不足',
+                content,
+                showCancel: false,
+                confirmText: '我知道了'
+            });
+            return;
+        }
+        this.autoConnect();
+    },
+
+    // ========== 登录状态检查 ==========
+    checkLoginStatus() {
+        const uid = wx.getStorageSync('uid');
+        if (!uid) {
+            wx.showToast({ title: '请先登录', icon: 'none' });
+            setTimeout(() => { wx.redirectTo({ url: '/pages/wode/wode' }); }, 1500);
+            return false;
+        }
+        let currentUser = app.globalData.currentUser;
+        if (!currentUser) {
+            currentUser = {
+                id: uid,
+                name: '用户' + uid.substring(0, 6),
+                avatar: app.globalData.ossImageUrl + app.globalData.morentouxiang
+            };
+            app.globalData.currentUser = currentUser;
+        }
+        this.setData({ currentUser });
+        return true;
+    },
+
+    // ========== 自动连接 ==========
+    autoConnect() {
+        const role = app.globalData.currentRole || 'normal';
+        const uid = wx.getStorageSync('uid');
+        const prefixMap = { normal: 'Boss', dashou: 'Ds', shangjia: 'Sj', guanshi: 'Gs', zuzhang: 'Zz' };
+        const prefix = prefixMap[role] || 'Boss';
+        const targetUserId = prefix + uid;
+
+        const status = wx.goEasy.getConnectionStatus ? wx.goEasy.getConnectionStatus() : 'disconnected';
+        if (status === 'connected' || status === 'reconnected') {
+            const currentUserId = wx.goEasy.im ? wx.goEasy.im.userId : null;
+            if (currentUserId === targetUserId) {
+                this.setupConversationListener();
+                this.loadConversations();
+                return;
+            } else {
+                wx.goEasy.disconnect();
+            }
+        }
+        this.connectGoEasy(targetUserId);
+    },
+
+    connectGoEasy(userId) {
+        const { currentUser } = this.data;
+        if (!currentUser) return;
+        wx.goEasy.connect({
+            id: userId,
+            data: {
+                name: currentUser.name,
+                avatar: currentUser.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
+            },
+            onSuccess: () => {
+                try {
+                    const connection = {
+                        userId: userId,
+                        identityType: app.globalData.currentRole,
+                        lastConnectTime: Date.now(),
+                        autoReconnect: true,
+                        status: 'connected'
+                    };
+                    wx.setStorageSync('savedGoEasyConnection', JSON.stringify(connection));
+                    wx.setStorageSync('goEasyUserId', userId);
+                } catch (e) {}
+                this.setupConversationListener();
+                this.loadConversations();
+            },
+            onFailed: (error) => {
+                if (error.code === 408) {
+                    this.setupConversationListener();
+                    this.loadConversations();
+                } else {
+                    wx.showToast({ title: '连接失败，请重试', icon: 'none' });
+                }
+            }
+        });
+    },
+
+    // ========== 会话监听（永不清理） ==========
+    setupConversationListener() {
+        if (this.conversationsUpdatedListener) {
+            wx.goEasy.im.off(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, this.conversationsUpdatedListener);
+        }
+        this.conversationsUpdatedListener = (result) => {
+            this.renderConversations(result);
+        };
+        wx.goEasy.im.on(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, this.conversationsUpdatedListener);
+    },
+
+    loadConversations() {
+        wx.goEasy.im.latestConversations({
+            onSuccess: (result) => {
+                this.renderConversations(result.content);
+            },
+            onFailed: () => {
+                wx.showToast({ title: '获取会话失败', icon: 'none' });
+            }
+        });
+    },
+
+    // ========== 会话渲染与排序 ==========
+    renderConversations(content) {
+        if (!content || !content.conversations) {
+            this.setData({ allConversations: [] }, () => this.applyFilter());
+            return;
+        }
+        let list = content.conversations;
+        const defaultAvatar = app.globalData.ossImageUrl + app.globalData.morentouxiang;
+        list.forEach(item => {
+            if (item.data && item.data.avatar) {
+                if (!item.data.avatar.startsWith('http')) {
+                    item.data.avatar = app.globalData.ossImageUrl + item.data.avatar;
+                }
+            } else {
+                item.data.avatar = defaultAvatar;
+            }
+            if (item.lastMessage && item.lastMessage.timestamp) {
+                item.lastMessage.date = formatDate(item.lastMessage.timestamp);
+            }
+        });
+
+        list.sort((a, b) => {
+            if (a.top && !b.top) return -1;
+            if (!a.top && b.top) return 1;
+            if (a.unread > 0 && b.unread <= 0) return -1;
+            if (a.unread <= 0 && b.unread > 0) return 1;
+            return (b.lastMessage.timestamp || 0) - (a.lastMessage.timestamp || 0);
+        });
+
+        this.setData({ allConversations: list, displayCount: 10 }, () => {
+            this.applyFilter();
+        });
+
+        const unreadTotal = content.unreadTotal !== undefined ? content.unreadTotal : list.reduce((sum, c) => sum + (c.unread || 0), 0);
+        if (app && app.emitEvent) {
+            app.emitEvent('tabBarBadgeChanged', { badgeText: unreadTotal > 0 ? String(unreadTotal) : '' });
+        }
+
+        // ✅ 每次渲染会话后，无条件重新订阅所有群组，确保订阅关系始终有效
+        this.subscribeGroupsIfNeeded(list);
+    },
+
+    /**
+     * 群组订阅（依赖：GoEasy IM）
+     * 根据官方文档，需要主动 subscribeGroup 才能接收群聊消息。
+     * 为了应对切后台、网络波动等导致的订阅丢失，这里不再缓存订阅状态，
+     * 每次获取到群组列表时都直接订阅，保证消息不丢失。
+     */
+    subscribeGroupsIfNeeded(conversations) {
+        if (!wx.goEasy?.im || typeof wx.goEasy.im.subscribeGroup !== 'function') return;
+
+        const groupIds = conversations
+            .filter(c => c.type === 'group' && c.groupId)
+            .map(c => c.groupId);
+
+        if (groupIds.length === 0) return;
+
+        // 不再判断缓存，直接订阅当前所有群组
+        wx.goEasy.im.subscribeGroup({
+            groupIds: groupIds,
+            onSuccess: () => {
+                // 可选的日志输出，不影响功能
+                // console.log('群组订阅成功', groupIds);
+            },
+            onFailed: (error) => {
+                console.error('群组订阅失败:', error);
+            }
+        });
+    },
+
+    applyFilter() {
+        const { allConversations, activeTab, searchKeyword } = this.data;
+        let filtered = [];
+        if (activeTab === 0) {
+            filtered = allConversations.filter(c => c.type === 'group' && c.data && c.data.orderId);
+        } else if (activeTab === 1) {
+            filtered = allConversations.filter(c => c.type === 'private');
+        } else if (activeTab === 2) {
+            filtered = allConversations.filter(c => c.type === 'cs');
+        }
+
+        if (searchKeyword.trim()) {
+            const kw = searchKeyword.trim().toLowerCase();
+            filtered = filtered.filter(c => {
+                const name = (c.data && c.data.name || '').toLowerCase();
+                const orderId = (c.data && c.data.orderId || '').toLowerCase();
+                const id = (c.userId || c.groupId || '').toLowerCase();
+                return name.includes(kw) || id.includes(kw) || orderId.includes(kw);
+            });
+        }
+
+        const tabUnread = [0, 0, 0];
+        allConversations.forEach(c => {
+            if (c.type === 'group' && c.data && c.data.orderId) tabUnread[0] += c.unread || 0;
+            else if (c.type === 'private') tabUnread[1] += c.unread || 0;
+            else if (c.type === 'cs') tabUnread[2] += c.unread || 0;
+        });
+
+        this.setData({ filteredConversations: filtered, tabUnread });
+    },
+
+    switchTab(e) {
+        const index = parseInt(e.currentTarget.dataset.index);
+        this.setData({ activeTab: index, displayCount: 10, searchKeyword: '' }, () => this.applyFilter());
+    },
+
+    onSearchInput(e) {
+        this.setData({ searchKeyword: e.detail.value, displayCount: 10 }, () => this.applyFilter());
+    },
+
+    onScrollToLower() {
+        const { displayCount, filteredConversations } = this.data;
+        if (displayCount < filteredConversations.length) {
+            this.setData({ displayCount: Math.min(displayCount + 10, filteredConversations.length) });
+        }
+    },
+
+    onRefresh() {
+        this.loadConversations();
+    },
+
+    chat(e) {
+        const conversation = e.currentTarget.dataset.conversation;
+        if (!conversation) return;
+
+        if (conversation.type === 'private') {
+            const param = {
+                toUserId: conversation.userId,
+                toName: conversation.data.name,
+                toAvatar: conversation.data.avatar
+            };
+            wx.navigateTo({ url: '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param)) });
+        } else if (conversation.type === 'group') {
+            const param = {
+                groupId: conversation.groupId,
+                orderId: conversation.data.orderId || '',
+                groupName: conversation.data.name,
+                groupAvatar: conversation.data.avatar,
+                isCross: conversation.data.isCross || 0
+            };
+            wx.navigateTo({ url: '/pages/qunliaotian/qunliaotian?data=' + encodeURIComponent(JSON.stringify(param)) });
+        } else if (conversation.type === 'cs') {
+            const param = { teamId: conversation.teamId || conversation.id };
+            wx.navigateTo({ url: '/pages/kefuliaotian/kefuliaotian?data=' + encodeURIComponent(JSON.stringify(param)) });
+        }
+    },
+
+    chatKefu() {
+        const param = { teamId: 'support_team' };
+        wx.navigateTo({ url: '/pages/kefuliaotian/kefuliaotian?data=' + encodeURIComponent(JSON.stringify(param)) });
+    },
+
+    showAction(e) {
+        const conversation = e.currentTarget.dataset.conversation;
+        this.setData({ ['actionPopup.conversation']: conversation, ['actionPopup.visible']: true });
+    },
+    closeMask() {
+        this.setData({ ['actionPopup.visible']: false });
+    },
+    topConversation() {
+        let conversation = this.data.actionPopup.conversation;
+        if (!conversation) return;
+        const top = !conversation.top;
+        wx.showLoading({ title: '处理中...' });
+        if (conversation.type === 'private') {
+            wx.goEasy.im.topPrivateConversation({
+                userId: conversation.userId, top,
+                onSuccess: () => {
+                    wx.hideLoading(); this.loadConversations();
+                    wx.showToast({ title: top ? '已置顶' : '已取消置顶' });
+                },
+                onFailed: () => { wx.hideLoading(); wx.showToast({ title: '操作失败', icon: 'none' }); }
+            });
+        } else {
+            wx.goEasy.im.topGroupConversation({
+                groupId: conversation.groupId, top,
+                onSuccess: () => {
+                    wx.hideLoading(); this.loadConversations();
+                    wx.showToast({ title: top ? '已置顶' : '已取消置顶' });
+                },
+                onFailed: () => { wx.hideLoading(); wx.showToast({ title: '操作失败', icon: 'none' }); }
+            });
+        }
+        this.closeMask();
+    },
+    removeConversation() {
+        let conversation = this.data.actionPopup.conversation;
+        if (!conversation) return;
+        wx.showLoading({ title: '删除中...' });
+        wx.goEasy.im.removeConversation({
+            conversation: conversation,
+            onSuccess: () => { wx.hideLoading(); this.loadConversations(); wx.showToast({ title: '已删除' }); },
+            onFailed: () => { wx.hideLoading(); wx.showToast({ title: '删除失败', icon: 'none' }); }
+        });
+        this.closeMask();
+    },
+
+    toggleNotification() {
+        const newMuted = !this.data.notificationMuted;
+        this.setData({ notificationMuted: newMuted });
+        wx.setStorageSync('notificationMuted', newMuted);
+        wx.showToast({ title: newMuted ? '已静音' : '已开启通知', icon: 'none' });
+    },
+
+    calculateScrollHeight() {
+        const systemInfo = wx.getSystemInfoSync();
+        const windowHeight = systemInfo.windowHeight;
+        const windowWidth = systemInfo.windowWidth;
+        const rpxRatio = 750 / windowWidth;
+        const headerHeight = 150 / rpxRatio;
+        const tabBarHeight = 130 / rpxRatio;
+        const safeAreaBottom = systemInfo.safeArea ? (windowHeight - systemInfo.safeArea.bottom) : 0;
+        this.setData({ scrollHeight: windowHeight - headerHeight - tabBarHeight - safeAreaBottom });
+    }
+});
\ No newline at end of file
diff --git a/pages/xiaoxi/xiaoxi.json b/pages/xiaoxi/xiaoxi.json
new file mode 100644
index 0000000..7e4a6e8
--- /dev/null
+++ b/pages/xiaoxi/xiaoxi.json
@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+      "global-notification": "/components/global-notification/global-notification", 
+      "custom-tab-bar": "/custom-tab-bar/index"
+    }
+  }
\ No newline at end of file
diff --git a/pages/xiaoxi/xiaoxi.wxml b/pages/xiaoxi/xiaoxi.wxml
new file mode 100644
index 0000000..c238480
--- /dev/null
+++ b/pages/xiaoxi/xiaoxi.wxml
@@ -0,0 +1,68 @@
+<view class="msg-page">
+  
+  <view class="header">
+    <view class="search-bar">
+      <input class="search-input" placeholder="搜索订单/用户ID/昵称" bindinput="onSearchInput" value="{{searchKeyword}}" />
+      <text class="search-icon">🔍</text>
+    </view>
+    <view class="notify-switch" bindtap="toggleNotification">
+      <text class="notify-text">{{notificationMuted ? '静音' : '通知'}}</text>
+    </view>
+  </view>
+
+  
+  <view class="tab-row">
+    <view class="tab-item {{activeTab === 0 ? 'active' : ''}}" data-index="0" bindtap="switchTab">
+      <text class="tab-label">订单消息</text>
+      <text class="tab-badge" wx:if="{{tabUnread[0] > 0}}">{{tabUnread[0]}}</text>
+    </view>
+    <view class="tab-item {{activeTab === 1 ? 'active' : ''}}" data-index="1" bindtap="switchTab">
+      <text class="tab-label">用户消息</text>
+      <text class="tab-badge" wx:if="{{tabUnread[1] > 0}}">{{tabUnread[1]}}</text>
+    </view>
+    <view class="tab-item {{activeTab === 2 ? 'active' : ''}}" data-index="2" bindtap="switchTab">
+      <text class="tab-label">客服消息</text>
+      <text class="tab-badge" wx:if="{{tabUnread[2] > 0}}">{{tabUnread[2]}}</text>
+    </view>
+  </view>
+
+  
+  <scroll-view class="conversation-list" scroll-y="true" bindscrolltolower="onScrollToLower" style="height: {{scrollHeight}}px">
+    <block wx:for="{{filteredConversations}}" wx:key="key" wx:for-index="i" wx:if="{{i < displayCount}}">
+      <view class="conversation-item {{item.unread > 0 ? 'has-unread' : ''}}" data-conversation="{{item}}" bindtap="chat" bindlongpress="showAction">
+        <image class="avatar" src="{{item.data.avatar}}" mode="aspectFill" />
+        <view class="info">
+          <view class="top-line">
+            <text class="name">{{item.data.name}}</text>
+            <text class="time">{{item.lastMessage.date}}</text>
+          </view>
+          <view class="bottom-line">
+            <text class="last-msg">{{item.lastMessage.type === 'text' ? item.lastMessage.payload.text : '[其他消息]'}}</text>
+            <view class="unread-dot" wx:if="{{item.unread > 0}}">{{item.unread > 99 ? '99+' : item.unread}}</view>
+          </view>
+        </view>
+      </view>
+    </block>
+    
+    
+    <view class="kefu-entry" wx:if="{{activeTab === 2 && filteredConversations.length === 0}}">
+      <button class="kefu-btn" bindtap="chatKefu">联系客服</button>
+    </view>
+    <view class="load-tip" wx:if="{{filteredConversations.length > displayCount}}">上拉加载更多</view>
+    <view class="empty" wx:if="{{filteredConversations.length === 0 && activeTab !== 2}}">
+      <text>暂无相关消息</text>
+    </view>
+  </scroll-view>
+
+  
+  <view class="action-mask" wx:if="{{actionPopup.visible}}" catchtap="closeMask">
+    <view class="action-sheet">
+      <view class="action-btn" bindtap="topConversation">{{actionPopup.conversation.top ? '取消置顶' : '置顶聊天'}}</view>
+      <view class="action-btn" bindtap="removeConversation">删除聊天</view>
+      <view class="action-btn cancel" catchtap="closeMask">取消</view>
+    </view>
+  </view>
+
+  
+  <custom-tab-bar />
+</view>
\ No newline at end of file
diff --git a/pages/xiaoxi/xiaoxi.wxss b/pages/xiaoxi/xiaoxi.wxss
new file mode 100644
index 0000000..09a88ee
--- /dev/null
+++ b/pages/xiaoxi/xiaoxi.wxss
@@ -0,0 +1,38 @@
+.msg-page { background: #f5f5f5; min-height: 100vh; }
+
+.header { display: flex; align-items: center; padding: 20rpx 24rpx; background: #fff; border-bottom: 1rpx solid #e8e8e8; }
+.search-bar { flex: 1; display: flex; align-items: center; background: #f0f0f0; border-radius: 40rpx; padding: 0 20rpx; height: 68rpx; }
+.search-input { flex: 1; height: 68rpx; font-size: 28rpx; }
+.search-icon { font-size: 32rpx; margin-left: 10rpx; color: #999; }
+.notify-switch { margin-left: 20rpx; }
+.notify-text { font-size: 26rpx; color: #666; padding: 10rpx 16rpx; background: #f0f0f0; border-radius: 30rpx; }
+
+.tab-row { display: flex; background: #fff; border-bottom: 1rpx solid #e8e8e8; }
+.tab-item { flex: 1; display: flex; justify-content: center; align-items: center; padding: 24rpx 0; position: relative; color: #666; font-size: 28rpx; }
+.tab-item.active { color: #07c160; font-weight: 600; }
+.tab-item.active::after { content: ''; position: absolute; bottom: 0; left: 50%; transform: translateX(-50%); width: 60rpx; height: 6rpx; background: #07c160; border-radius: 3rpx; }
+.tab-badge { background: #fa5151; color: #fff; font-size: 20rpx; border-radius: 20rpx; padding: 2rpx 12rpx; margin-left: 8rpx; min-width: 32rpx; text-align: center; }
+
+.conversation-list { background: #fff; }
+.conversation-item { display: flex; align-items: center; padding: 20rpx 24rpx; border-bottom: 1rpx solid #f0f0f0; }
+.has-unread { background: #fafafa; }
+.avatar { width: 96rpx; height: 96rpx; border-radius: 12rpx; margin-right: 20rpx; background: #eee; }
+.info { flex: 1; }
+.top-line { display: flex; justify-content: space-between; margin-bottom: 8rpx; }
+.name { font-size: 30rpx; color: #1a1a1a; font-weight: 500; }
+.time { font-size: 22rpx; color: #999; }
+.bottom-line { display: flex; justify-content: space-between; align-items: center; }
+.last-msg { font-size: 26rpx; color: #888; flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.unread-dot { background: #fa5151; color: #fff; font-size: 20rpx; border-radius: 50%; min-width: 36rpx; height: 36rpx; line-height: 36rpx; text-align: center; margin-left: 12rpx; }
+.load-tip { text-align: center; padding: 24rpx; color: #999; font-size: 24rpx; }
+.empty { text-align: center; padding: 200rpx 0; color: #bbb; font-size: 28rpx; }
+
+/* 客服入口 */
+.kefu-entry { text-align: center; padding: 100rpx 0; }
+.kefu-btn { width: 300rpx; background: #07c160; color: #fff; border-radius: 40rpx; font-size: 28rpx; }
+
+/* 操作弹窗 */
+.action-mask { position: fixed; top: 0; left: 0; right: 0; bottom: 0; background: rgba(0,0,0,0.4); z-index: 10000; }
+.action-sheet { position: absolute; bottom: 0; left: 0; right: 0; background: #fff; border-radius: 24rpx 24rpx 0 0; padding: 20rpx 20rpx 150rpx 20rpx; }
+.action-btn { text-align: center; padding: 28rpx 0; font-size: 32rpx; border-bottom: 1rpx solid #eee; }
+.cancel { color: #999; margin-top: 12rpx; border-bottom: none; }
\ No newline at end of file
diff --git a/pages/xiugai/xiugai.js b/pages/xiugai/xiugai.js
new file mode 100644
index 0000000..4615e24
--- /dev/null
+++ b/pages/xiugai/xiugai.js
@@ -0,0 +1,228 @@
+// pages/xiugai/xiugai.js
+const app = getApp()
+import upload from '../../utils/upload.js'
+
+Page({
+  data: {
+    avatarUrl: '',
+    uid: '',
+    nicheng: '',
+    phone: '',
+    originalAvatar: '',
+    originalNicheng: '',
+    isSaving: false,
+    hasChanges: false,
+    newAvatarFile: null,
+    isLoading: true,
+    isAvatarActive: false,
+    nicknameError: ''
+  },
+
+  onLoad() {
+    wx.setNavigationBarTitle({ title: '编辑资料' })
+    this.loadUserData()
+  },
+
+  onShow() {
+    this.registerNotificationComponent();
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  // 加载用户数据（手机号只读，不参与修改逻辑）
+  loadUserData() {
+    try {
+      const uid = wx.getStorageSync('uid') || ''
+      const nicheng = wx.getStorageSync('nicheng') || ''
+      const phone = wx.getStorageSync('phone') || ''
+      const touxiang = wx.getStorageSync('touxiang') || ''
+      
+      const ossImageUrl = app.globalData.ossImageUrl || ''
+      const defaultAvatar = app.globalData.morentouxiang || ''
+      
+      let avatarUrl = ''
+      if (touxiang) {
+        avatarUrl = touxiang.startsWith('http') ? touxiang : `${ossImageUrl}${touxiang}`
+      } else if (defaultAvatar) {
+        avatarUrl = defaultAvatar.startsWith('http') ? defaultAvatar : `${ossImageUrl}${defaultAvatar}`
+      }
+      
+      this.setData({
+        avatarUrl,
+        uid,
+        nicheng,
+        phone,                   // 仅展示
+        originalAvatar: touxiang,
+        originalNicheng: nicheng,
+        isLoading: false
+      })
+    } catch (error) {
+      console.error('加载用户数据失败:', error)
+      this.setData({ isLoading: false })
+      wx.showToast({ title: '加载数据失败', icon: 'none' })
+    }
+  },
+
+  // 微信头像选择（未改动）
+  onChooseAvatar(e) {
+    const avatarTempPath = e.detail.avatarUrl
+    this.setData({
+      avatarUrl: avatarTempPath,
+      newAvatarFile: avatarTempPath
+    }, () => {
+      this.checkChanges()
+    })
+  },
+
+  chooseAvatar() {
+    // 仅保留动画效果（透明按钮已触发 onChooseAvatar）
+    this.setData({ isAvatarActive: true })
+    setTimeout(() => {
+      this.setData({ isAvatarActive: false })
+    }, 500)
+  },
+
+  // 昵称输入（未改动）
+  onNicknameInput(e) {
+    const value = e.detail.value.trim()
+    this.setData({
+      nicheng: value,
+      nicknameError: ''
+    }, () => {
+      this.checkChanges()
+    })
+  },
+
+  // 检查变化（只比较昵称和头像）
+  checkChanges() {
+    const { originalNicheng, nicheng, newAvatarFile } = this.data;
+    const hasChanges = (nicheng !== originalNicheng) || (newAvatarFile !== null);
+    this.setData({ hasChanges });
+  },
+
+  // 保存（不包含手机号逻辑）
+  async onSave() {
+    if (!this.data.hasChanges) {
+      wx.showToast({ title: '没有需要保存的更改', icon: 'none' });
+      return;
+    }
+    if (this.data.isSaving) return;
+    
+    // 验证数据（昵称）
+    if (!this.validateData()) return;
+    
+    this.setData({ isSaving: true });
+    wx.showLoading({ title: '保存中...', mask: true });
+    
+    try {
+      const formData = {};
+      if (this.data.nicheng !== this.data.originalNicheng) {
+        formData.nicheng = this.data.nicheng;
+      }
+      
+      const res = await upload({
+        url: '/yonghu/xiugai',
+        formData,
+        filePath: this.data.newAvatarFile,
+        fileName: 'avatar'
+      });
+      
+      if (res.statusCode === 200 && res.data) {
+        const response = res.data;
+        if (response.code === 0) {
+          await this.handleUpdateSuccess(response.data);
+        } else {
+          throw new Error(response.msg || '保存失败');
+        }
+      } else {
+        throw new Error('网络错误');
+      }
+    } catch (error) {
+      console.error('保存失败:', error);
+      if (error.message.includes('认证失败') || error.message.includes('401')) {
+        wx.showModal({
+          title: '提示',
+          content: '登录已过期，请重新登录',
+          complete: (res) => {
+            if (res.confirm) {
+              wx.removeStorageSync('token');
+              wx.removeStorageSync('userInfo');
+              wx.switchTab({ url: '/pages/wode/wode' });
+            }
+          }
+        });
+      } else {
+        wx.showToast({ title: error.message || '保存失败', icon: 'none' });
+      }
+    } finally {
+      wx.hideLoading();
+      this.setData({ isSaving: false });
+    }
+  },
+
+  // 验证数据（只验证昵称）
+  validateData() {
+    const { nicheng } = this.data;
+    let hasError = false;
+    this.setData({ nicknameError: '' });
+    
+    if (nicheng && nicheng.length > 20) {
+      this.setData({ nicknameError: '昵称不能超过20个字符' });
+      hasError = true;
+    }
+    if (nicheng !== this.data.originalNicheng && nicheng.trim() === '') {
+      this.setData({ nicknameError: '昵称不能为空' });
+      hasError = true;
+    }
+    if (hasError) {
+      if (this.data.nicknameError) {
+        wx.showToast({ title: this.data.nicknameError, icon: 'none' });
+      }
+      return false;
+    }
+    return true;
+  },
+
+  // 更新成功处理（不再处理手机号）
+  async handleUpdateSuccess(updateData) {
+    if (updateData.touxiang !== undefined && updateData.touxiang !== null) {
+      wx.setStorageSync('touxiang', updateData.touxiang);
+    }
+    if (updateData.nicheng !== undefined && updateData.nicheng !== null) {
+      wx.setStorageSync('nicheng', updateData.nicheng);
+    }
+    
+    if (updateData.nicheng) {
+      app.globalData.userNicheng = updateData.nicheng;
+    }
+    
+    const ossImageUrl = app.globalData.ossImageUrl || '';
+    let avatarUrl = this.data.avatarUrl;
+    if (updateData.touxiang) {
+      avatarUrl = updateData.touxiang.startsWith('http') ? 
+        updateData.touxiang : `${ossImageUrl}${updateData.touxiang}`;
+    }
+    
+    this.setData({
+      avatarUrl,
+      originalAvatar: updateData.touxiang || this.data.originalAvatar,
+      originalNicheng: updateData.nicheng || this.data.originalNicheng,
+      newAvatarFile: null,
+      hasChanges: false
+    });
+    
+    wx.showToast({
+      title: '保存成功',
+      icon: 'success',
+      duration: 2000
+    });
+  }
+});
\ No newline at end of file
diff --git a/pages/xiugai/xiugai.json b/pages/xiugai/xiugai.json
new file mode 100644
index 0000000..a0b74ef
--- /dev/null
+++ b/pages/xiugai/xiugai.json
@@ -0,0 +1,10 @@
+{
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    },
+    "navigationBarTitleText": "编辑资料",
+    "navigationBarBackgroundColor": "#ffffff",
+    "navigationBarTextStyle": "black",
+    "backgroundColor": "#f8f9fa",
+    "enablePullDownRefresh": false
+  }
\ No newline at end of file
diff --git a/pages/xiugai/xiugai.wxml b/pages/xiugai/xiugai.wxml
new file mode 100644
index 0000000..5ce8a48
--- /dev/null
+++ b/pages/xiugai/xiugai.wxml
@@ -0,0 +1,66 @@
+
+<view class="xiugai-page">
+  
+  
+  <view class="avatar-section">
+    <view class="avatar-container {{isAvatarActive ? 'active' : ''}}">
+      <image class="avatar-image" src="{{avatarUrl}}" mode="aspectFill"></image>
+      <view class="avatar-halo"></view>
+      <view class="avatar-hint">点击更换头像</view>
+    </view>
+    <button 
+      class="avatar-trigger-button"
+      open-type="chooseAvatar"
+      bindchooseavatar="onChooseAvatar"
+      hover-class="none"
+    ></button>
+  </view>
+  
+  
+  <view class="form-section">
+    
+    <view class="form-item">
+      <view class="item-label">UID</view>
+      <view class="item-value readonly">{{uid || '••••••'}}</view>
+    </view>
+    
+    
+    <view class="form-item">
+      <view class="item-label">昵称</view>
+      <view class="input-container">
+        <input 
+          class="item-input {{nicknameError ? 'error' : ''}}" 
+          type="text" 
+          placeholder="请输入昵称"
+          placeholder-class="placeholder"
+          maxlength="20"
+          value="{{nicheng}}"
+          bindinput="onNicknameInput"
+        />
+        <view class="error-hint" wx:if="{{nicknameError}}">{{nicknameError}}</view>
+      </view>
+    </view>
+    
+    
+    <view class="form-item">
+      <view class="item-label">手机号</view>
+      <view class="item-value readonly">{{phone || '未绑定'}}</view>
+    </view>
+  </view>
+  
+  
+  <button 
+    class="save-btn" 
+    bindtap="onSave"
+    hover-class="btn-hover"
+    disabled="{{isSaving || !hasChanges}}"
+  >
+    <view class="btn-content">
+      {{isSaving ? '保存中...' : '确认保存'}}
+      <view class="btn-sparkle" wx:if="{{!isSaving}}"></view>
+    </view>
+  </button>
+  
+  <view class="safe-area"></view>
+  <global-notification id="global-notification" />
+</view>
\ No newline at end of file
diff --git a/pages/xiugai/xiugai.wxss b/pages/xiugai/xiugai.wxss
new file mode 100644
index 0000000..469cc97
--- /dev/null
+++ b/pages/xiugai/xiugai.wxss
@@ -0,0 +1,477 @@
+/* pages/xiugai/xiugai.wxss */
+/* ====== 您的原始样式代码（完全未改动） ====== */
+page {
+    background: linear-gradient(135deg, #fffaf0 0%, #f0f8ff 100%);
+    min-height: 100vh;
+  }
+  
+  .xiugai-page {
+    padding: 30rpx 40rpx 100rpx;
+  }
+  
+  /* ============ 头像区域样式 ============ */
+  .avatar-section {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 60rpx;
+    padding-top: 30rpx;
+  }
+  
+  .avatar-container {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  
+  /* 头像图片 - 添加呼吸动画 */
+  .avatar-image {
+    width: 200rpx;
+    height: 200rpx;
+    border-radius: 50%;
+    border: 6rpx solid #fff;
+    background-color: #f8f9fa;
+    z-index: 2;
+    position: relative;
+    /* 呼吸动画：温和的放大缩小 */
+    animation: gentleBreath 3s ease-in-out infinite;
+    /* 基础阴影 */
+    box-shadow: 
+      0 0 0 1rpx rgba(0, 200, 83, 0.3),
+      0 15rpx 40rpx rgba(0, 200, 83, 0.15);
+  }
+  
+  /* 温和的呼吸动画 */
+  @keyframes gentleBreath {
+    0%, 100% {
+      transform: scale(1);
+      box-shadow: 
+        0 0 0 2rpx rgba(0, 200, 83, 0.4),
+        0 15rpx 40rpx rgba(0, 200, 83, 0.2);
+    }
+    50% {
+      transform: scale(1.03);
+      box-shadow: 
+        0 0 0 5rpx rgba(0, 200, 83, 0.6),
+        0 20rpx 50rpx rgba(0, 200, 83, 0.3);
+    }
+  }
+  
+  /* 边缘微光效果 - 更细腻 */
+  .avatar-halo {
+    position: absolute;
+    top: -8rpx;
+    left: -8rpx;
+    right: -8rpx;
+    bottom: -8rpx;
+    border-radius: 50%;
+    background: transparent;
+    border: 2rpx solid #00C853;
+    animation: gentleGlow 2s ease-in-out infinite;
+    opacity: 0;
+    z-index: 1;
+    pointer-events: none;
+  }
+  
+  /* 温和的光晕动画 */
+  @keyframes gentleGlow {
+    0%, 100% {
+      opacity: 0;
+      transform: scale(0.98);
+      border-color: rgba(0, 200, 83, 0.3);
+    }
+    50% {
+      opacity: 1;
+      transform: scale(1.05);
+      border-color: rgba(0, 200, 83, 0.8);
+    }
+  }
+  
+  /* 像素点环绕效果 */
+  .avatar-container::before {
+    content: '';
+    position: absolute;
+    top: -15rpx;
+    left: -15rpx;
+    right: -15rpx;
+    bottom: -15rpx;
+    border-radius: 50%;
+    background: 
+      radial-gradient(circle at 30% 30%, rgba(0, 200, 83, 0.1) 0%, transparent 50%),
+      radial-gradient(circle at 70% 70%, rgba(100, 221, 23, 0.1) 0%, transparent 50%);
+    animation: pixelOrbit 4s linear infinite;
+    z-index: 0;
+    pointer-events: none;
+  }
+  
+  @keyframes pixelOrbit {
+    0% {
+      transform: rotate(0deg);
+    }
+    100% {
+      transform: rotate(360deg);
+    }
+  }
+  
+  /* 更换提示 */
+  .avatar-hint {
+    margin-top: 25rpx;
+    font-size: 28rpx;
+    color: #666;
+    padding: 12rpx 30rpx;
+    background: rgba(255, 255, 255, 0.9);
+    border-radius: 25rpx;
+    border: 1rpx solid #eee;
+    box-shadow: 0 5rpx 15rpx rgba(0, 0, 0, 0.05);
+    position: relative;
+    overflow: hidden;
+  }
+  
+  /* 提示文字底部的微光 */
+  .avatar-hint::before {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 2rpx;
+    background: linear-gradient(90deg, transparent, #00C853, transparent);
+    animation: hintGlow 2s ease-in-out infinite;
+  }
+  
+  @keyframes hintGlow {
+    0%, 100% {
+      opacity: 0.3;
+    }
+    50% {
+      opacity: 1;
+    }
+  }
+  
+  /* 点击特效 - 缩放效果 */
+  .avatar-container.active .avatar-image {
+    animation: clickScale 0.5s ease;
+  }
+  
+  @keyframes clickScale {
+    0%, 100% {
+      transform: scale(1);
+    }
+    50% {
+      transform: scale(0.95);
+    }
+  }
+  
+  /* 下载状态 */
+  .avatar-container.downloading .avatar-image {
+    opacity: 0.7;
+    filter: grayscale(30%);
+  }
+  
+  /* 增强光晕效果 */
+  .avatar-halo {
+    position: absolute;
+    top: -8rpx;
+    left: -8rpx;
+    right: -8rpx;
+    bottom: -8rpx;
+    border-radius: 50%;
+    background: transparent;
+    border: 3rpx solid transparent;
+    animation: gentleGlow 2s ease-in-out infinite, colorShift 3s ease-in-out infinite;
+    opacity: 0;
+    z-index: 1;
+    pointer-events: none;
+  }
+  
+  @keyframes gentleGlow {
+    0%, 100% {
+      opacity: 0;
+      transform: scale(0.98);
+    }
+    50% {
+      opacity: 1;
+      transform: scale(1.05);
+    }
+  }
+  
+  @keyframes colorShift {
+    0% {
+      border-color: rgba(0, 200, 83, 0.5);
+    }
+    33% {
+      border-color: rgba(100, 221, 23, 0.5);
+    }
+    66% {
+      border-color: rgba(0, 255, 153, 0.5);
+    }
+    100% {
+      border-color: rgba(0, 200, 83, 0.5);
+    }
+  }
+  
+  /* 头像呼吸效果 */
+  .avatar-image {
+    width: 200rpx;
+    height: 200rpx;
+    border-radius: 50%;
+    border: 6rpx solid #fff;
+    background-color: #f8f9fa;
+    z-index: 2;
+    position: relative;
+    animation: gentleBreath 4s ease-in-out infinite;
+    box-shadow: 
+      0 0 0 1rpx rgba(0, 200, 83, 0.3),
+      0 15rpx 40rpx rgba(0, 200, 83, 0.15);
+  }
+  
+  @keyframes gentleBreath {
+    0%, 100% {
+      transform: scale(1);
+      box-shadow: 
+        0 0 0 2rpx rgba(0, 200, 83, 0.4),
+        0 15rpx 40rpx rgba(0, 200, 83, 0.2);
+    }
+    50% {
+      transform: scale(1.03);
+      box-shadow: 
+        0 0 0 5rpx rgba(0, 200, 83, 0.6),
+        0 20rpx 50rpx rgba(0, 200, 83, 0.3);
+    }
+  }
+  
+  /* 表单区域 */
+  .form-section {
+    background: white;
+    border-radius: 25rpx;
+    overflow: hidden;
+    margin-bottom: 50rpx;
+    box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.08);
+    border: 1rpx solid #f0f0f0;
+  }
+  
+  .form-item {
+    display: flex;
+    align-items: center;
+    padding: 40rpx;
+    border-bottom: 1rpx solid #f0f0f0;
+    min-height: 110rpx;
+  }
+  
+  .form-item:last-child {
+    border-bottom: none;
+  }
+  
+  .item-label {
+    width: 150rpx;
+    font-size: 32rpx;
+    color: #333;
+    font-weight: 500;
+    flex-shrink: 0;
+  }
+  
+  .item-value.readonly {
+    flex: 1;
+    font-size: 32rpx;
+    color: #666;
+  }
+  
+  .item-input {
+    flex: 1;
+    font-size: 32rpx;
+    color: #333;
+    height: 50rpx;
+    line-height: 50rpx;
+  }
+  
+  .placeholder {
+    color: #ccc;
+    font-size: 30rpx;
+  }
+  
+  /* 输入框容器 */
+  .input-container {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  }
+  
+  /* 输入框错误样式 */
+  .item-input.error {
+    border-bottom: 2rpx solid #ff4d4f;
+    animation: shake 0.5s;
+  }
+  
+  @keyframes shake {
+    0%, 100% { transform: translateX(0); }
+    10%, 30%, 50%, 70%, 90% { transform: translateX(-2rpx); }
+    20%, 40%, 60%, 80% { transform: translateX(2rpx); }
+  }
+  
+  /* 错误提示 */
+  .error-hint {
+    font-size: 24rpx;
+    color: #ff4d4f;
+    margin-top: 8rpx;
+    padding-left: 10rpx;
+    animation: fadeIn 0.3s;
+  }
+  
+  /* 手机号正确提示 */
+  .phone-hint {
+    font-size: 24rpx;
+    color: #00C853;
+    margin-top: 8rpx;
+    padding-left: 10rpx;
+    animation: fadeIn 0.3s;
+  }
+  
+  @keyframes fadeIn {
+    from { opacity: 0; transform: translateY(-10rpx); }
+    to { opacity: 1; transform: translateY(0); }
+  }
+  
+  /* 保存按钮 */
+  .save-btn {
+    width: 100%;
+    height: 100rpx;
+    line-height: 100rpx;
+    border-radius: 50rpx;
+    background: linear-gradient(135deg, #00C853 0%, #64DD17 100%);
+    color: white;
+    font-size: 34rpx;
+    font-weight: 500;
+    border: none;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 15rpx 40rpx rgba(0, 200, 83, 0.25);
+    margin-top: 30rpx;
+  }
+  
+  .save-btn[disabled] {
+    background: linear-gradient(135deg, #cccccc 0%, #aaaaaa 100%);
+    color: #999;
+    box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.1);
+  }
+  
+  .btn-content {
+    position: relative;
+    z-index: 2;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 100%;
+  }
+  
+  .btn-sparkle {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(
+      90deg,
+      transparent 0%,
+      rgba(255, 255, 255, 0.2) 50%,
+      transparent 100%
+    );
+    animation: sparkleMove 2.5s ease-in-out infinite;
+    z-index: 1;
+  }
+  
+  @keyframes sparkleMove {
+    0% { left: -100%; }
+    100% { left: 100%; }
+  }
+  
+  .btn-hover {
+    opacity: 0.9;
+    transform: scale(0.98);
+  }
+  
+  /* 底部安全区域 */
+  .safe-area {
+    height: 100rpx;
+    width: 100%;
+  }
+  
+  /* 🔥🔥🔥【修改开始：新增透明按钮样式】 */
+  /* 说明：此样式仅作用于新增的 .avatar-trigger-button，使其透明并覆盖在头像区域 */
+  /* 此修改不会影响上方任何原有样式，仅新增样式规则 */
+  
+  /* 确保头像区域为相对定位，作为透明按钮的定位参考 */
+  .avatar-section {
+    position: relative;
+    display: flex;
+    justify-content: center;
+    margin-bottom: 60rpx;
+    padding-top: 30rpx;
+  }
+  
+  /* 透明功能按钮样式 */
+  .avatar-trigger-button {
+    /* 覆盖在原始头像容器上 */
+    position: absolute;
+    top: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 200rpx;
+    height: 200rpx;
+    border-radius: 50%;
+    z-index: 100;
+    /* 关键：完全透明不可见 */
+    background: transparent;
+    border: none;
+    padding: 0;
+    margin: 0;
+    opacity: 0;
+    
+    /* 清除所有默认样式 */
+    line-height: 1;
+    font-size: 0;
+  }
+  
+  /* 移除按钮默认边框 */
+  .avatar-trigger-button::after {
+    border: none;
+  }
+  /* 🔥🔥🔥【修改结束】 */
+
+  /* ====== 以下为新增样式（手机号获取按钮） ====== */
+
+/* 手机号行布局 */
+.phone-row {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  
+  /* 手机号文本 */
+  .phone-value {
+    font-size: 32rpx;
+    color: #333;
+    flex: 1;
+  }
+  
+  /* 获取手机号按钮 */
+  .get-phone-btn {
+    flex-shrink: 0;
+    margin-left: 20rpx;
+    padding: 10rpx 24rpx;
+    background: #4a6cf7;
+    color: #fff;
+    font-size: 26rpx;
+    border-radius: 40rpx;
+    border: none;
+    line-height: 1.4;
+    height: 60rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .phone-btn-hover {
+    opacity: 0.8;
+  }
\ No newline at end of file
diff --git a/pages/xuanren/xuanren.js b/pages/xuanren/xuanren.js
new file mode 100644
index 0000000..5ac9bb3
--- /dev/null
+++ b/pages/xuanren/xuanren.js
@@ -0,0 +1,66 @@
+// pages/xuanren/xuanren.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/pages/xuanren/xuanren.json b/pages/xuanren/xuanren.json
new file mode 100644
index 0000000..f1ce457
--- /dev/null
+++ b/pages/xuanren/xuanren.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {
+      "custom-tab-bar": "/custom-tab-bar/index"
+    }
+  }
\ No newline at end of file
diff --git a/pages/xuanren/xuanren.wxml b/pages/xuanren/xuanren.wxml
new file mode 100644
index 0000000..86909c4
--- /dev/null
+++ b/pages/xuanren/xuanren.wxml
@@ -0,0 +1,2 @@
+<view></view>
+<custom-tab-bar />
\ No newline at end of file
diff --git a/pages/xuanren/xuanren.wxss b/pages/xuanren/xuanren.wxss
new file mode 100644
index 0000000..9103bc8
--- /dev/null
+++ b/pages/xuanren/xuanren.wxss
@@ -0,0 +1 @@
+/* pages/xuanren/xuanren.wxss */
\ No newline at end of file
diff --git a/pages/yaoqingdashou/yaoqingdashou.js b/pages/yaoqingdashou/yaoqingdashou.js
new file mode 100644
index 0000000..0dc5359
--- /dev/null
+++ b/pages/yaoqingdashou/yaoqingdashou.js
@@ -0,0 +1,248 @@
+// pages/yaoqingma/yaoqingma.js
+// 阿龙电竞 - 邀请码页面 (优化重构版)
+import request from '../../utils/request.js'
+
+Page({
+  /**
+   * 页面的初始数据 (字段保持与你渲染层一致)
+   */
+  data: {
+    yaoqingma: '', // 邀请码
+    isLoading: false, // 是否正在加载
+    copySuccess: false, // 是否复制成功
+    copyTimer: null // 复制成功提示计时器
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    
+    // 仅初始化，不自动请求
+    this.chushihuaYaoqingma();
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    // 每次显示页面时重置复制状态
+    if (this.data.copySuccess) {
+      this.chongzhiCopyZhuangtai();
+    }
+  },
+  onShow() {
+    // 原有代码...
+    
+    // 🆕 注册通知组件
+    this.registerNotificationComponent();
+    this.registerNotificationComponent();
+},
+
+// 🆕 新增：注册通知组件
+registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+    
+    if (notificationComp && notificationComp.showNotification) {
+        console.log('🏪 商城页面注册通知组件');
+        app.globalData.globalNotification = {
+            show: (data) => notificationComp.showNotification(data),
+            hide: () => notificationComp.hideNotification()
+        };
+    }
+},
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+    // 清理计时器
+    if (this.data.copyTimer) {
+      clearTimeout(this.data.copyTimer);
+    }
+  },
+
+  /**
+   * 初始化邀请码数据
+   */
+  chushihuaYaoqingma: function () {
+    
+    // 只从缓存读取并显示，不主动请求
+    try {
+      const cachedYaoqingma = wx.getStorageSync('yaoqingma');
+      if (cachedYaoqingma && cachedYaoqingma.trim() !== '') {
+        
+        this.setData({ yaoqingma: cachedYaoqingma });
+      } else {
+        
+      }
+    } catch (error) {
+     
+    }
+  },
+
+  /**
+   * 处理邀请码相关操作 (主入口函数)
+   * 如果没有邀请码则生成，如果有则复制
+   */
+  chuliYaoqingma: async function () {
+    // 防止重复点击
+    if (this.data.isLoading) {
+      return;
+    }
+
+    // 如果已经有邀请码，执行复制操作
+    if (this.data.yaoqingma && this.data.yaoqingma.trim() !== '') {
+      this.fuzhiYaoqingma();
+      return;
+    }
+
+    // 如果没有邀请码，向后端请求生成
+    await this.shengchengYaoqingma();
+  },
+
+  /**
+   * 向后端请求生成邀请码
+   */
+  shengchengYaoqingma: async function () {
+    
+    this.setData({ isLoading: true });
+
+    try {
+      // 使用封装的request工具发送POST请求（与你的调用方式一致）
+      const response = await request({
+        url: '/yonghu/yaoqingma',
+        method: 'POST'
+        // 如果需要参数可以在此添加 data: {}
+      });
+
+      
+
+      // 处理业务响应
+      if (response.data.code === 200) {
+        const newYaoqingma = response.data.data.yaoqingma;
+        this.chuliShengchengChenggong(newYaoqingma);
+      } else {
+        this.chuliShiwu('生成失败', response.message);
+      }
+    } catch (error) {
+      // 处理网络或系统错误
+      
+      this.chuliShiwu('网络错误', error.message || '请检查网络后重试');
+    }
+  },
+
+  /**
+   * 处理生成成功的逻辑
+   */
+  chuliShengchengChenggong: function (newYaoqingma) {
+    
+
+    // 更新页面数据
+    this.setData({
+      yaoqingma: newYaoqingma,
+      isLoading: false
+    });
+
+    // 保存到缓存
+    try {
+      wx.setStorageSync('yaoqingma', newYaoqingma);
+      
+    } catch (error) {
+     
+    }
+
+    // 显示成功提示
+    wx.showToast({
+      title: '生成成功！',
+      icon: 'success',
+      duration: 2000
+    });
+  },
+
+  /**
+   * 处理错误情况
+   */
+  chuliShiwu: function (title, message) {
+    this.setData({ isLoading: false });
+
+    wx.showToast({
+      title: message || title,
+      icon: 'none',
+      duration: 3000
+    });
+  },
+
+  /**
+   * 复制邀请码到剪贴板
+   */
+  fuzhiYaoqingma: function () {
+    const yaoqingma = this.data.yaoqingma;
+
+    if (!yaoqingma || yaoqingma.trim() === '') {
+      wx.showToast({
+        title: '暂无邀请码可复制',
+        icon: 'none',
+        duration: 2000
+      });
+      return;
+    }
+
+    
+    wx.setClipboardData({
+      data: yaoqingma,
+      success: () => {
+        
+        this.setData({ copySuccess: true });
+        wx.showToast({
+          title: '已复制',
+          icon: 'success',
+          duration: 1500
+        });
+        // 2秒后重置状态
+        const timer = setTimeout(() => {
+          this.chongzhiCopyZhuangtai();
+        }, 2000);
+        this.setData({ copyTimer: timer });
+      },
+      fail: (error) => {
+        console.error('复制失败:', error);
+        wx.showToast({
+          title: '复制失败',
+          icon: 'none',
+          duration: 2000
+        });
+      }
+    });
+  },
+
+  /**
+   * 重置复制状态
+   */
+  chongzhiCopyZhuangtai: function () {
+    if (this.data.copyTimer) {
+      clearTimeout(this.data.copyTimer);
+    }
+    this.setData({
+      copySuccess: false,
+      copyTimer: null
+    });
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+    if (this.data.yaoqingma) {
+      return {
+        title: '我的阿龙电竞邀请码',
+        path: `/pages/yaoqingma/yaoqingma?yaoqingma=${this.data.yaoqingma}`
+      };
+    }
+    return {
+      title: '阿龙电竞陪玩平台',
+      path: '/pages/index/index'
+    };
+  }
+});
\ No newline at end of file
diff --git a/pages/yaoqingdashou/yaoqingdashou.json b/pages/yaoqingdashou/yaoqingdashou.json
new file mode 100644
index 0000000..6d5bf3e
--- /dev/null
+++ b/pages/yaoqingdashou/yaoqingdashou.json
@@ -0,0 +1,13 @@
+{
+    "usingComponents": {
+        "global-notification": "/components/global-notification/global-notification"
+    },
+    "navigationBarTitleText": "我的邀请码",
+    "navigationBarBackgroundColor": "#0a0e17",
+    "navigationBarTextStyle": "white",
+    "backgroundColor": "#0a0e17",
+    "backgroundTextStyle": "light",
+    "enablePullDownRefresh": false,
+    "onReachBottomDistance": 50,
+    "disableScroll": false
+  }
\ No newline at end of file
diff --git a/pages/yaoqingdashou/yaoqingdashou.wxml b/pages/yaoqingdashou/yaoqingdashou.wxml
new file mode 100644
index 0000000..6a79b7e
--- /dev/null
+++ b/pages/yaoqingdashou/yaoqingdashou.wxml
@@ -0,0 +1,85 @@
+
+<view class="yaoqingma-page">
+  
+  <view class="top-decoration"></view>
+  
+  
+  <view class="page-title">
+    <text class="title-text">专属邀请码</text>
+    <text class="title-sub">分享邀请码，招募更多大手</text>
+  </view>
+  
+  
+  <view class="yaoqingma-card {{isLoading ? 'card-loading' : ''}}">
+    
+    <view class="card-corner top-left"></view>
+    <view class="card-corner top-right"></view>
+    <view class="card-corner bottom-left"></view>
+    <view class="card-corner bottom-right"></view>
+    
+    
+    <view class="card-content">
+      
+      <view wx:if="{{isLoading}}" class="loading-container">
+        <view class="loading-spinner"></view>
+        <text class="loading-text">正在生成邀请码...</text>
+      </view>
+      
+      
+      <view wx:else class="code-container">
+        <text class="code-label">我的邀请码</text>
+        <view class="code-display">
+          <text class="code-text {{copySuccess ? 'code-copied' : ''}}">{{yaoqingma || '点击下方按钮生成'}}</text>
+          <view wx:if="{{yaoqingma}}" class="code-status {{copySuccess ? 'status-show' : ''}}">
+            <text class="iconfont icon-success">✓</text>
+            <text>已复制</text>
+          </view>
+        </view>
+        
+        <text class="code-tip">此邀请码用于招募大手，每个管事唯一</text>
+      </view>
+    </view>
+  </view>
+  
+  
+  <view class="action-area">
+    
+    <view 
+      class="action-btn {{isLoading ? 'btn-disabled' : ''}} {{yaoqingma ? 'btn-copy' : 'btn-generate'}}" 
+      bindtap="{{isLoading ? '' : 'chuliYaoqingma'}}"
+      hover-class="btn-hover"
+      hover-stay-time="50"
+    >
+      
+      <view class="btn-glow"></view>
+      
+      
+      <view class="btn-content">
+        <text class="btn-icon">{{yaoqingma ? '📋' : '✨'}}</text>
+        <text class="btn-text">{{yaoqingma ? '一键复制邀请码' : '生成我的邀请码'}}</text>
+      </view>
+      
+      
+      <text class="btn-desc">{{yaoqingma ? '点击复制到剪贴板' : '点击生成专属邀请码'}}</text>
+    </view>
+    
+    
+    <view class="instruction">
+      <view class="instruction-item">
+        <text class="instruction-icon">🔗</text>
+        <text class="instruction-text">将邀请码分享给打手，他们注册时填写即可绑定</text>
+      </view>
+      <view class="instruction-item">
+        <text class="instruction-icon">💰</text>
+        <text class="instruction-text">成功邀请的打手充值押金，您将获得分佣奖励</text>
+      </view>
+      <view class="instruction-item">
+        <text class="instruction-icon">⚠️</text>
+        <text class="instruction-text">邀请码仅限本人使用，请勿泄露给他人</text>
+      </view>
+    </view>
+  </view>
+  <global-notification id="global-notification" />
+
+  
+</view>
\ No newline at end of file
diff --git a/pages/yaoqingdashou/yaoqingdashou.wxss b/pages/yaoqingdashou/yaoqingdashou.wxss
new file mode 100644
index 0000000..0ab84aa
--- /dev/null
+++ b/pages/yaoqingdashou/yaoqingdashou.wxss
@@ -0,0 +1,405 @@
+/* 阿龙电竞 - 邀请码页面样式 */
+/* 页面整体样式 */
+.yaoqingma-page {
+    min-height: 100vh;
+    background: linear-gradient(135deg, #0a0e17 0%, #141a2a 100%);
+    padding: 40rpx 30rpx;
+    position: relative;
+    overflow: hidden;
+    color: #fff;
+  }
+  
+  /* 顶部装饰条 */
+  .top-decoration {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 6rpx;
+    background: linear-gradient(90deg, 
+      transparent 0%, 
+      #00ff88 20%, 
+      #00ff88 80%, 
+      transparent 100%
+    );
+    opacity: 0.7;
+  }
+  
+  /* 页面标题 */
+  .page-title {
+    text-align: center;
+    margin-bottom: 60rpx;
+    margin-top: 40rpx;
+  }
+  
+  .title-text {
+    display: block;
+    font-size: 52rpx;
+    font-weight: bold;
+    background: linear-gradient(45deg, #fff 30%, #00ffaa 100%);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    background-clip: text;
+    letter-spacing: 4rpx;
+    margin-bottom: 16rpx;
+  }
+  
+  .title-sub {
+    display: block;
+    font-size: 28rpx;
+    color: #88aaff;
+    opacity: 0.8;
+  }
+  
+  /* 邀请码卡片 */
+  .yaoqingma-card {
+    background: rgba(20, 25, 40, 0.8);
+    border-radius: 24rpx;
+    padding: 50rpx 40rpx;
+    margin-bottom: 60rpx;
+    position: relative;
+    border: 1rpx solid rgba(0, 255, 136, 0.2);
+    box-shadow: 0 10rpx 30rpx rgba(0, 255, 136, 0.1);
+    transition: all 0.3s ease;
+  }
+  
+  /* 卡片加载状态 */
+  .card-loading {
+    opacity: 0.7;
+  }
+  
+  /* 卡片装饰角 */
+  .card-corner {
+    position: absolute;
+    width: 40rpx;
+    height: 40rpx;
+    border: 2rpx solid #00ff88;
+    opacity: 0.6;
+  }
+  
+  .top-left {
+    top: 12rpx;
+    left: 12rpx;
+    border-right: none;
+    border-bottom: none;
+  }
+  
+  .top-right {
+    top: 12rpx;
+    right: 12rpx;
+    border-left: none;
+    border-bottom: none;
+  }
+  
+  .bottom-left {
+    bottom: 12rpx;
+    left: 12rpx;
+    border-right: none;
+    border-top: none;
+  }
+  
+  .bottom-right {
+    bottom: 12rpx;
+    right: 12rpx;
+    border-left: none;
+    border-top: none;
+  }
+  
+  /* 卡片内容 */
+  .card-content {
+    position: relative;
+    z-index: 2;
+  }
+  
+  /* 加载状态样式 */
+  .loading-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 40rpx 0;
+  }
+  
+  .loading-spinner {
+    width: 80rpx;
+    height: 80rpx;
+    border: 6rpx solid rgba(0, 255, 136, 0.2);
+    border-top-color: #00ff88;
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+    margin-bottom: 30rpx;
+  }
+  
+  @keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+  }
+  
+  .loading-text {
+    font-size: 28rpx;
+    color: #88ffcc;
+    opacity: 0.9;
+  }
+  
+  /* 正常展示状态 */
+  .code-container {
+    text-align: center;
+  }
+  
+  .code-label {
+    display: block;
+    font-size: 32rpx;
+    color: #aaddff;
+    margin-bottom: 40rpx;
+    letter-spacing: 4rpx;
+  }
+  
+  .code-display {
+    background: rgba(0, 20, 30, 0.7);
+    border-radius: 16rpx;
+    padding: 40rpx 30rpx;
+    margin-bottom: 30rpx;
+    border: 1rpx solid rgba(0, 255, 136, 0.3);
+    position: relative;
+    overflow: hidden;
+  }
+  
+  .code-text {
+    display: block;
+    font-size: 48rpx;
+    font-weight: bold;
+    letter-spacing: 8rpx;
+    font-family: 'Courier New', monospace;
+    color: #00ffaa;
+    text-shadow: 0 0 10rpx rgba(0, 255, 136, 0.5);
+    transition: all 0.3s ease;
+    word-break: break-all;
+  }
+  
+  /* 复制成功后的样式 */
+  .code-copied {
+    color: #88ffaa;
+    text-shadow: 0 0 20rpx rgba(136, 255, 170, 0.8);
+    transform: scale(1.02);
+  }
+  
+  .code-status {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 255, 136, 0.1);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+    border-radius: 16rpx;
+  }
+  
+  .status-show {
+    opacity: 1;
+  }
+  
+  .code-status .iconfont {
+    font-size: 60rpx;
+    color: #00ff88;
+    margin-bottom: 20rpx;
+  }
+  
+  .code-status text {
+    font-size: 28rpx;
+    color: #ccffee;
+  }
+  
+  .code-tip {
+    display: block;
+    font-size: 24rpx;
+    color: #8899cc;
+    opacity: 0.8;
+    margin-top: 20rpx;
+  }
+  
+  /* 操作按钮区域 */
+  .action-area {
+    margin-top: 40rpx;
+  }
+  
+  /* 操作按钮 */
+  .action-btn {
+    background: linear-gradient(135deg, rgba(0, 255, 136, 0.1) 0%, rgba(0, 200, 255, 0.1) 100%);
+    border-radius: 20rpx;
+    padding: 50rpx 40rpx;
+    margin-bottom: 50rpx;
+    position: relative;
+    overflow: hidden;
+    border: 1rpx solid rgba(0, 255, 136, 0.3);
+    transition: all 0.3s ease;
+    text-align: center;
+  }
+  
+  /* 按钮悬停效果 */
+  .btn-hover {
+    transform: translateY(-4rpx);
+    box-shadow: 0 20rpx 40rpx rgba(0, 255, 136, 0.2);
+  }
+  
+  /* 生成按钮样式 */
+  .btn-generate {
+    background: linear-gradient(135deg, rgba(0, 255, 136, 0.15) 0%, rgba(0, 200, 255, 0.15) 100%);
+  }
+  
+  /* 复制按钮样式 */
+  .btn-copy {
+    background: linear-gradient(135deg, rgba(0, 255, 136, 0.2) 0%, rgba(0, 255, 200, 0.2) 100%);
+  }
+  
+  /* 禁用状态 */
+  .btn-disabled {
+    opacity: 0.6;
+    pointer-events: none;
+  }
+  
+  /* 按钮光效 */
+  .btn-glow {
+    position: absolute;
+    top: -50%;
+    left: -50%;
+    width: 200%;
+    height: 200%;
+    background: radial-gradient(
+      circle at center,
+      rgba(0, 255, 136, 0.3) 0%,
+      transparent 70%
+    );
+    opacity: 0;
+    animation: pulse 3s infinite;
+  }
+  
+  @keyframes pulse {
+    0%, 100% { opacity: 0.3; transform: scale(0.8); }
+    50% { opacity: 0.6; transform: scale(1.1); }
+  }
+  
+  .btn-content {
+    position: relative;
+    z-index: 2;
+    margin-bottom: 20rpx;
+  }
+  
+  .btn-icon {
+    display: block;
+    font-size: 60rpx;
+    margin-bottom: 20rpx;
+    opacity: 0.9;
+  }
+  
+  .btn-text {
+    display: block;
+    font-size: 40rpx;
+    font-weight: bold;
+    color: #fff;
+    letter-spacing: 2rpx;
+    text-shadow: 0 0 10rpx rgba(0, 255, 136, 0.5);
+  }
+  
+  .btn-desc {
+    display: block;
+    font-size: 26rpx;
+    color: #aaddff;
+    opacity: 0.8;
+  }
+  
+  /* 使用说明 */
+  .instruction {
+    background: rgba(30, 35, 50, 0.5);
+    border-radius: 16rpx;
+    padding: 40rpx 30rpx;
+    border: 1rpx solid rgba(100, 150, 255, 0.1);
+  }
+  
+  .instruction-item {
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 30rpx;
+  }
+  
+  .instruction-item:last-child {
+    margin-bottom: 0;
+  }
+  
+  .instruction-icon {
+    font-size: 36rpx;
+    margin-right: 20rpx;
+    opacity: 0.8;
+    flex-shrink: 0;
+    margin-top: 4rpx;
+  }
+  
+  .instruction-text {
+    font-size: 26rpx;
+    color: #ccddee;
+    line-height: 1.5;
+    opacity: 0.9;
+  }
+  
+  /* 底部装饰 */
+  .bottom-decoration {
+    text-align: center;
+    margin-top: 60rpx;
+    padding-top: 40rpx;
+    border-top: 1rpx solid rgba(255, 255, 255, 0.1);
+  }
+  
+  .platform-name {
+    font-size: 24rpx;
+    color: #8899cc;
+    opacity: 0.7;
+    letter-spacing: 2rpx;
+  }
+
+
+
+  /* pages/yaoqingma/yaoqingma.wxss - 仅修改按钮部分 */
+/* ... 其他样式保持不变 ... */
+
+/* 操作按钮 - 缩小尺寸 */
+.action-btn {
+    background: linear-gradient(135deg, rgba(0, 255, 136, 0.1) 0%, rgba(0, 200, 255, 0.1) 100%);
+    border-radius: 20rpx;
+    padding: 36rpx 30rpx; /* 减小内边距 */
+    margin-bottom: 50rpx;
+    position: relative;
+    overflow: hidden;
+    border: 1rpx solid rgba(0, 255, 136, 0.3);
+    transition: all 0.3s ease;
+    text-align: center;
+  }
+  
+  /* 按钮内容相应调整 */
+  .btn-icon {
+    display: block;
+    font-size: 52rpx; /* 适当缩小图标 */
+    margin-bottom: 16rpx;
+    opacity: 0.9;
+  }
+  
+  .btn-text {
+    display: block;
+    font-size: 34rpx; /* 适当缩小字体 */
+    font-weight: bold;
+    color: #fff;
+    letter-spacing: 2rpx;
+    text-shadow: 0 0 10rpx rgba(0, 255, 136, 0.5);
+  }
+  
+  .btn-desc {
+    display: block;
+    font-size: 24rpx; /* 适当缩小说明文字 */
+    color: #aaddff;
+    opacity: 0.8;
+    margin-top: 8rpx;
+  }
+  
+  /* ... 其他样式保持不变 ... */
\ No newline at end of file
diff --git a/pages/yqguanshi/yqguanshi.js b/pages/yqguanshi/yqguanshi.js
new file mode 100644
index 0000000..7a0fff4
--- /dev/null
+++ b/pages/yqguanshi/yqguanshi.js
@@ -0,0 +1,356 @@
+// pages/zuzhanghaibao/zuzhanghaibao.js
+import request from '../../utils/request.js';
+
+const app = getApp();
+
+Page({
+  data: {
+    qrcodeUrl: '',              // 二维码完整URL
+    yaoqingma: '',              // 组长邀请码字符串
+    isLoading: false,
+    showPosterCanvas: false,
+    posterImageTemp: '',         // 生成的海报临时路径
+    avatarUrl: '',               // 用户头像完整URL
+    uid: '',
+    nickName: '',
+  },
+
+  onLoad() {
+    this.loadFromCache();
+    this.loadUserInfo();
+  },
+
+  onShow() {
+    this.registerNotificationComponent();
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  /**
+   * 从缓存加载二维码URL和邀请码
+   * 缓存键名使用独特拼音，避免与管事页面冲突
+   */
+  loadFromCache() {
+    try {
+      const relativeUrl = wx.getStorageSync('zuzhang_haibao_url');
+      if (relativeUrl) {
+        const fullUrl = this.getFullImageUrl(relativeUrl);
+        this.setData({ qrcodeUrl: fullUrl });
+      }
+      const yaoqingma = wx.getStorageSync('zuzhang_yaoqingma');
+      if (yaoqingma) {
+        this.setData({ yaoqingma });
+      }
+    } catch (error) {
+      console.error('读取缓存失败', error);
+    }
+  },
+
+  /**
+   * 加载用户头像、昵称、UID
+   */
+  loadUserInfo() {
+    const touxiang = wx.getStorageSync('touxiang');
+    const ossUrl = app.globalData.ossImageUrl || '';
+    const defaultAvatar = ossUrl + (app.globalData.morentouxiang || 'avatar/default.jpg');
+    let avatarUrl = defaultAvatar;
+    if (touxiang && typeof touxiang === 'string' && touxiang.trim() !== '') {
+      avatarUrl = this.getFullImageUrl(touxiang);
+    }
+    const uid = wx.getStorageSync('uid') || '';
+    // 组长昵称可能从全局变量或缓存获取
+    let nickName = app.globalData.nicheng || wx.getStorageSync('nicheng') || '组长';
+    this.setData({ avatarUrl, uid, nickName });
+  },
+
+  /**
+   * 拼接完整图片URL
+   */
+  getFullImageUrl(url) {
+    if (!url) return '';
+    const ossUrl = app.globalData.ossImageUrl || '';
+    return url.startsWith('http') ? url : ossUrl + url;
+  },
+
+  /**
+   * 刷新/获取二维码和邀请码
+   * 调用 /peizhi/zuzhanghb 接口
+   */
+  refreshQRCode() {
+    if (this.data.isLoading) return;
+    this.setData({ isLoading: true });
+
+    request({
+      url: '/peizhi/zuzhanghb',
+      method: 'POST',
+    })
+      .then(res => {
+        if (res.data && res.data.code === 0) {
+          const { url: relativeUrl, yaoqingma } = res.data.data; // 假设返回字段为 url 和 yaoqingma
+          if (relativeUrl) {
+            wx.setStorageSync('zuzhang_haibao_url', relativeUrl);
+            const fullUrl = this.getFullImageUrl(relativeUrl);
+            this.setData({ qrcodeUrl: fullUrl });
+          }
+          if (yaoqingma) {
+            wx.setStorageSync('zuzhang_yaoqingma', yaoqingma);
+            this.setData({ yaoqingma });
+          }
+          wx.showToast({ title: '获取成功', icon: 'success' });
+        } else {
+          wx.showToast({ title: res.data.msg || '获取失败', icon: 'none' });
+        }
+      })
+      .catch(err => {
+        console.error('获取组长海报失败', err);
+        wx.showToast({ title: '网络错误', icon: 'none' });
+      })
+      .finally(() => {
+        this.setData({ isLoading: false });
+      });
+  },
+
+  /**
+   * 保存二维码到相册（先下载网络图片）
+   */
+  saveToAlbum() {
+    if (!this.data.qrcodeUrl) {
+      wx.showToast({ title: '暂无二维码', icon: 'none' });
+      return;
+    }
+
+    wx.showLoading({ title: '保存中...', mask: true });
+    wx.downloadFile({
+      url: this.data.qrcodeUrl,
+      success: (res) => {
+        wx.hideLoading();
+        if (res.statusCode === 200) {
+          this.downloadAndSave(res.tempFilePath);
+        } else {
+          wx.showToast({ title: '下载失败', icon: 'none' });
+        }
+      },
+      fail: (err) => {
+        wx.hideLoading();
+        console.error('下载二维码失败', err);
+        wx.showToast({ title: '下载失败', icon: 'none' });
+      }
+    });
+  },
+
+  /**
+   * 复制邀请码到剪贴板
+   */
+  copyInviteCode() {
+    if (!this.data.yaoqingma) {
+      wx.showToast({ title: '暂无邀请码', icon: 'none' });
+      return;
+    }
+    wx.setClipboardData({
+      data: this.data.yaoqingma,
+      success: () => {
+        wx.showToast({ title: '复制成功', icon: 'success' });
+      },
+      fail: () => {
+        wx.showToast({ title: '复制失败', icon: 'none' });
+      }
+    });
+  },
+
+  /**
+   * 生成专属海报（包含头像、二维码、昵称、标语）
+   */
+  generateMyPoster() {
+    if (!this.data.qrcodeUrl) {
+      wx.showToast({ title: '请先生成二维码', icon: 'none' });
+      return;
+    }
+
+    wx.showLoading({ title: '生成海报中...', mask: true });
+
+    const ossUrl = app.globalData.ossImageUrl || '';
+    // 🔥 组长海报背景图路径：beijing/zuzhangbeijing.jpg
+    const bgUrl = ossUrl + 'beijing/zuzhangbeijing.jpg';
+    const urls = [bgUrl, this.data.qrcodeUrl, this.data.avatarUrl];
+
+    // 并行加载所有图片
+    const promises = urls.map(url => this.loadImage(url));
+    Promise.all(promises)
+      .then((images) => {
+        wx.hideLoading();
+        this.setData({ showPosterCanvas: true }, () => {
+          // 确保 canvas 已渲染
+          setTimeout(() => {
+            this.drawPoster(images[0], images[1], images[2]);
+          }, 200);
+        });
+      })
+      .catch((err) => {
+        wx.hideLoading();
+        wx.showToast({ title: '图片加载失败', icon: 'none' });
+        console.error('图片加载失败', err);
+      });
+  },
+
+  /**
+   * 加载图片为本地路径（用于 canvas 绘制）
+   */
+  loadImage(url) {
+    return new Promise((resolve, reject) => {
+      wx.getImageInfo({
+        src: url,
+        success: (res) => resolve(res.path),
+        fail: reject
+      });
+    });
+  },
+
+  /**
+   * 绘制海报
+   * @param {string} bgPath    背景图本地路径
+   * @param {string} qrPath    二维码本地路径
+   * @param {string} avatarPath 头像本地路径
+   */
+  drawPoster(bgPath, qrPath, avatarPath) {
+    const ctx = wx.createCanvasContext('posterCanvas', this);
+    const query = wx.createSelectorQuery().in(this);
+    query.select('.poster-canvas').boundingClientRect(rect => {
+      if (!rect) {
+        wx.showToast({ title: '画布获取失败', icon: 'none' });
+        return;
+      }
+      const canvasWidth = rect.width;
+      const canvasHeight = rect.height;
+
+      // 1. 绘制背景
+      ctx.drawImage(bgPath, 0, 0, canvasWidth, canvasHeight);
+
+      // 🔥【位置调整】二维码向右上角移动一丢丢 (增加 margin 从 5 到 15)
+      const qrSize = 100;
+      const margin = 15;  // 原来 5，现在 15，向右下各移一点，但看起来更协调
+      const qrX = canvasWidth - qrSize - margin;
+      const qrY = canvasHeight - qrSize - margin;
+      ctx.drawImage(qrPath, qrX, qrY, qrSize, qrSize);
+
+      // 🔥【位置调整】头像也向右上移动一丢丢 (原来 margin 5，现在 margin 15)
+      const avatarSize = 60;
+      const avatarMargin = 15;
+      const avatarX = avatarMargin + 10;  // 原来 margin 5+20，现在 15+20，相当于右移10
+      const avatarY = canvasHeight - avatarSize - avatarMargin;
+      
+      // 圆形头像裁剪
+      ctx.save();
+      ctx.beginPath();
+      ctx.arc(avatarX + avatarSize/2, avatarY + avatarSize/2, avatarSize/2, 0, 2 * Math.PI);
+      ctx.clip();
+      ctx.drawImage(avatarPath, avatarX, avatarY, avatarSize, avatarSize);
+      ctx.restore();
+
+      // 绘制昵称（右侧）
+      ctx.setFontSize(16);
+      ctx.setFillStyle('#333333');  // 根据背景图颜色可调整
+      ctx.setTextAlign('left');
+      
+      let nick = this.data.nickName || '组长';
+      if (nick.length > 3) {
+        nick = nick.substring(0, 3) + '...';
+      }
+      const nameText = nick;
+      const textX = avatarX + avatarSize + 8;
+      const textY = avatarY + avatarSize/2 + 6;
+      ctx.fillText(nameText, textX, textY);
+
+      // 绘制邀请语
+      ctx.setFontSize(18);
+      ctx.setFillStyle('#ffaa00');  // 金黄色，呼应组长主题
+      ctx.setTextAlign('left');
+      const slogan = '加入我的团队 ✦';
+      const sloganX = avatarX;
+      const sloganY = avatarY - 12;
+      ctx.fillText(slogan, sloganX, sloganY);
+
+      // 异步绘制
+      ctx.draw(false, () => {
+        wx.canvasToTempFilePath({
+          canvasId: 'posterCanvas',
+          success: (res) => {
+            this.setData({ posterImageTemp: res.tempFilePath });
+          },
+          fail: (err) => {
+            console.error('生成海报临时文件失败', err);
+          }
+        }, this);
+      });
+    }).exec();
+  },
+
+  /**
+   * 保存生成的海报
+   */
+  savePoster() {
+    if (!this.data.posterImageTemp) {
+      wx.showToast({ title: '海报尚未生成', icon: 'none' });
+      return;
+    }
+    this.downloadAndSave(this.data.posterImageTemp);
+  },
+
+  /**
+   * 隐藏海报画布，返回主界面
+   */
+  hidePoster() {
+    this.setData({ showPosterCanvas: false, posterImageTemp: '' });
+  },
+
+  /**
+   * 通用保存图片到相册（带权限检查）
+   */
+  downloadAndSave(filePath) {
+    wx.getSetting({
+      success: (res) => {
+        if (!res.authSetting['scope.writePhotosAlbum']) {
+          wx.authorize({
+            scope: 'scope.writePhotosAlbum',
+            success: () => {
+              this._saveImage(filePath);
+            },
+            fail: () => {
+              wx.showModal({
+                title: '提示',
+                content: '需要您授权保存到相册',
+                success: (modalRes) => {
+                  if (modalRes.confirm) {
+                    wx.openSetting();
+                  }
+                }
+              });
+            }
+          });
+        } else {
+          this._saveImage(filePath);
+        }
+      }
+    });
+  },
+
+  _saveImage(filePath) {
+    wx.saveImageToPhotosAlbum({
+      filePath: filePath,
+      success: () => {
+        wx.showToast({ title: '保存成功', icon: 'success' });
+      },
+      fail: (err) => {
+        console.error('保存失败', err);
+        wx.showToast({ title: '保存失败', icon: 'none' });
+      }
+    });
+  },
+});
\ No newline at end of file
diff --git a/pages/yqguanshi/yqguanshi.json b/pages/yqguanshi/yqguanshi.json
new file mode 100644
index 0000000..e979c12
--- /dev/null
+++ b/pages/yqguanshi/yqguanshi.json
@@ -0,0 +1,8 @@
+{
+    "usingComponents": {
+      "global-notification": "/components/global-notification/global-notification"
+    },
+    "navigationBarTitleText": "组长海报",
+    "navigationBarBackgroundColor": "#0a0e17",
+    "navigationBarTextStyle": "white"
+  }
\ No newline at end of file
diff --git a/pages/yqguanshi/yqguanshi.wxml b/pages/yqguanshi/yqguanshi.wxml
new file mode 100644
index 0000000..c702e9c
--- /dev/null
+++ b/pages/yqguanshi/yqguanshi.wxml
@@ -0,0 +1,82 @@
+
+<view class="page-container">
+  
+  <view class="grid-bg"></view>
+  <view class="mech-line line-h"></view>
+  <view class="mech-line line-v"></view>
+
+  <view class="content">
+    
+    <view class="title-section">
+      <text class="title">⚡ 组长专属海报 ⚡</text>
+      <text class="subtitle">邀请管事加入团队，自动填充您的邀请码</text>
+    </view>
+
+    
+    <view class="qrcode-section">
+      <view class="qrcode-wrapper" wx:if="{{qrcodeUrl}}">
+        <image class="qrcode-img" src="{{qrcodeUrl}}" mode="widthFix" />
+        <view class="qrcode-glow"></view>
+      </view>
+      <view class="empty-qrcode" wx:else>
+        <text class="empty-icon">⚡</text>
+        <text class="empty-text">点击下方按钮生成您的专属二维码</text>
+      </view>
+    </view>
+
+    
+    <view class="invite-code-section" wx:if="{{yaoqingma}}">
+      <text class="code-label">邀请码：</text>
+      <text class="code-value">{{yaoqingma}}</text>
+      <view class="copy-btn" bindtap="copyInviteCode">
+        <text class="copy-icon">📋</text>
+        <text class="copy-text">复制</text>
+      </view>
+    </view>
+
+    
+    <view class="button-section">
+      <view class="btn-group">
+        <view class="btn save-btn" bindtap="saveToAlbum" wx:if="{{qrcodeUrl}}">
+          <text class="btn-icon">📥</text>
+          <text class="btn-text">保存二维码</text>
+        </view>
+        <view class="btn refresh-btn" bindtap="refreshQRCode" wx:if="{{!isLoading}}">
+          <text class="btn-icon">⟳</text>
+          <text class="btn-text">{{qrcodeUrl ? '重新获取' : '获取二维码'}}</text>
+        </view>
+        <view class="btn loading-btn" wx:else>
+          <view class="loading-spinner-small"></view>
+          <text class="btn-text">生成中...</text>
+        </view>
+        
+        <view class="btn poster-btn" bindtap="generateMyPoster" wx:if="{{qrcodeUrl && !showPosterCanvas}}">
+          <text class="btn-icon">🎨</text>
+          <text class="btn-text">生成专属海报</text>
+        </view>
+      </view>
+    </view>
+
+    
+    <view class="poster-section" wx:if="{{showPosterCanvas}}">
+      <canvas canvas-id="posterCanvas" class="poster-canvas"></canvas>
+      <view class="poster-actions">
+        <view class="btn save-poster-btn" bindtap="savePoster">
+          <text class="btn-icon">📥</text>
+          <text class="btn-text">保存海报</text>
+        </view>
+        <view class="btn back-btn" bindtap="hidePoster">
+          <text class="btn-icon">↩️</text>
+          <text class="btn-text">返回</text>
+        </view>
+      </view>
+    </view>
+
+    
+    <view class="instruction">
+      <text class="instruction-text">* 管事扫码后自动进入注册页面，邀请码将自动填充</text>
+    </view>
+  </view>
+
+  <global-notification id="global-notification" />
+</view>
\ No newline at end of file
diff --git a/pages/yqguanshi/yqguanshi.wxss b/pages/yqguanshi/yqguanshi.wxss
new file mode 100644
index 0000000..b271fb5
--- /dev/null
+++ b/pages/yqguanshi/yqguanshi.wxss
@@ -0,0 +1,315 @@
+/* pages/zuzhanghaibao/zuzhanghaibao.wxss - 金黄色机甲风格 */
+
+page {
+    background: #0a0e17;  /* 深色背景，与管事页面一致，但高亮色改为金黄色 */
+    min-height: 100vh;
+    font-family: 'Avenir', 'PingFang SC', 'Helvetica Neue', sans-serif;
+    color: #fff;
+  }
+  
+  /* 背景网格（颜色调为金黄色调） */
+  .grid-bg {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-image: 
+      linear-gradient(rgba(255, 200, 0, 0.05) 1px, transparent 1px),
+      linear-gradient(90deg, rgba(255, 200, 0, 0.05) 1px, transparent 1px);
+    background-size: 50rpx 50rpx;
+    pointer-events: none;
+    z-index: 0;
+  }
+  
+  .page-container {
+    position: relative;
+    z-index: 2;
+    min-height: 100vh;
+    padding: 30rpx 25rpx;
+    box-sizing: border-box;
+  }
+  
+  /* 机械装饰线条（金黄色） */
+  .mech-line {
+    position: absolute;
+    pointer-events: none;
+    z-index: 1;
+  }
+  .line-h {
+    top: 200rpx;
+    left: 0;
+    width: 100%;
+    height: 2rpx;
+    background: linear-gradient(90deg, transparent, #ffaa00, transparent);
+  }
+  .line-v {
+    right: 50rpx;
+    top: 100rpx;
+    width: 2rpx;
+    height: 300rpx;
+    background: linear-gradient(180deg, transparent, #ffaa00, transparent);
+  }
+  
+  .content {
+    position: relative;
+    z-index: 3;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    min-height: 100vh;
+    padding: 40rpx 0;
+  }
+  
+  /* 标题区域（金黄色光效） */
+  .title-section {
+    text-align: center;
+    margin-bottom: 60rpx;
+  }
+  .title {
+    font-size: 44rpx;
+    font-weight: bold;
+    color: #fff;
+    text-shadow: 0 0 30rpx #ffaa00;
+    letter-spacing: 2rpx;
+    display: block;
+    margin-bottom: 20rpx;
+  }
+  .subtitle {
+    font-size: 28rpx;
+    color: #ffd966;
+    opacity: 0.9;
+    letter-spacing: 1rpx;
+  }
+  
+  /* 二维码区域（金黄色边框） */
+  .qrcode-section {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-bottom: 40rpx; /* 给邀请码留出空间 */
+  }
+  .qrcode-wrapper {
+    position: relative;
+    width: 400rpx;
+    height: 400rpx;
+    background: rgba(20, 20, 20, 0.8);
+    border: 4rpx solid #ffaa00;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-shadow: 0 0 80rpx rgba(255, 170, 0, 0.4);
+    animation: qrcodePulse 2s infinite alternate;
+  }
+  .qrcode-img {
+    width: 90%;
+    height: 90%;
+    object-fit: contain;
+  }
+  .qrcode-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: radial-gradient(circle at 30% 30%, rgba(255, 170, 0, 0.2), transparent 70%);
+    pointer-events: none;
+  }
+  .empty-qrcode {
+    width: 400rpx;
+    height: 400rpx;
+    background: rgba(20, 20, 20, 0.8);
+    border: 4rpx dashed #ffaa00;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+  .empty-icon {
+    font-size: 80rpx;
+    color: #ffaa00;
+    margin-bottom: 20rpx;
+    opacity: 0.5;
+  }
+  .empty-text {
+    font-size: 26rpx;
+    color: #ffd966;
+    text-align: center;
+    padding: 0 40rpx;
+  }
+  
+  /* 邀请码展示区域 */
+  .invite-code-section {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: rgba(0, 0, 0, 0.5);
+    padding: 20rpx 30rpx;
+    border-radius: 60rpx;
+    border: 2rpx solid #ffaa00;
+    margin-bottom: 30rpx;
+    width: 90%;
+    box-sizing: border-box;
+  }
+  .code-label {
+    font-size: 28rpx;
+    color: #ffd966;
+    margin-right: 10rpx;
+  }
+  .code-value {
+    font-size: 32rpx;
+    color: #fff;
+    font-weight: bold;
+    letter-spacing: 2rpx;
+    flex: 1;
+    text-align: center;
+  }
+  .copy-btn {
+    display: flex;
+    align-items: center;
+    background: rgba(255, 170, 0, 0.2);
+    padding: 10rpx 20rpx;
+    border-radius: 40rpx;
+    margin-left: 20rpx;
+    border: 2rpx solid #ffaa00;
+  }
+  .copy-icon {
+    font-size: 28rpx;
+    color: #ffaa00;
+    margin-right: 6rpx;
+  }
+  .copy-text {
+    font-size: 24rpx;
+    color: #ffaa00;
+  }
+  .copy-btn:active {
+    background: rgba(255, 170, 0, 0.4);
+    transform: scale(0.96);
+  }
+  
+  /* 按钮区域（金黄色斜切风格） */
+  .button-section {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    margin-bottom: 40rpx;
+  }
+  .btn-group {
+    display: flex;
+    gap: 20rpx;
+    flex-wrap: wrap;
+    justify-content: center;
+  }
+  .btn {
+    width: 220rpx;
+    height: 80rpx;
+    background: rgba(20, 20, 20, 0.8);
+    border: 2rpx solid #ffaa00;
+    border-right: none;
+    border-bottom: none;
+    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    transition: 0.2s;
+    cursor: pointer;
+  }
+  .btn:active {
+    transform: scale(0.96);
+    box-shadow: 0 0 40rpx #ffaa00;
+  }
+  .save-btn {
+    border-color: #ffaa00;
+  }
+  .refresh-btn {
+    border-color: #ffaa00;
+  }
+  .refresh-btn .btn-icon {
+    color: #ffaa00;
+  }
+  .poster-btn {
+    border-color: #ffaa00;
+  }
+  .poster-btn .btn-icon {
+    color: #ffaa00;
+  }
+  .loading-btn {
+    opacity: 0.7;
+    pointer-events: none;
+  }
+  .btn-icon {
+    font-size: 36rpx;
+    margin-right: 8rpx;
+    color: #fff;
+  }
+  .btn-text {
+    font-size: 26rpx;
+    font-weight: 500;
+    color: #fff;
+  }
+  .loading-spinner-small {
+    width: 30rpx;
+    height: 30rpx;
+    border: 4rpx solid rgba(255,255,255,0.2);
+    border-top: 4rpx solid #ffaa00;
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+    margin-right: 10rpx;
+  }
+  
+  /* 专属海报展示区 */
+  .poster-section {
+    margin-top: 40rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 100%;
+  }
+  .poster-canvas {
+    width: 600rpx;
+    height: 900rpx;
+    background: #1a1f2e;
+    border: 4rpx solid #ffaa00;
+    box-shadow: 0 0 60rpx #ffaa00;
+  }
+  .poster-actions {
+    display: flex;
+    gap: 30rpx;
+    margin-top: 30rpx;
+    justify-content: center;
+  }
+  .save-poster-btn {
+    background: linear-gradient(45deg, #cc8400, #ffaa00);
+    border-color: #ffaa00;
+  }
+  .back-btn {
+    background: rgba(20, 20, 20, 0.8);
+    border-color: #ffaa00;
+  }
+  
+  /* 使用说明 */
+  .instruction {
+    margin-top: 30rpx;
+    padding: 20rpx 40rpx;
+    background: rgba(20, 20, 20, 0.5);
+    border-left: 4rpx solid #ffaa00;
+    clip-path: polygon(0 0, 100% 0, 98% 100%, 0 100%);
+  }
+  .instruction-text {
+    font-size: 24rpx;
+    color: #ffd966;
+    line-height: 1.6;
+  }
+  
+  /* 动画 */
+  @keyframes qrcodePulse {
+    0% { box-shadow: 0 0 40rpx rgba(255, 170, 0, 0.3); }
+    100% { box-shadow: 0 0 100rpx rgba(255, 170, 0, 0.6); }
+  }
+  @keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+  }
\ No newline at end of file
diff --git a/pages/zuzhangduan/zuzhangduan.js b/pages/zuzhangduan/zuzhangduan.js
new file mode 100644
index 0000000..addc538
--- /dev/null
+++ b/pages/zuzhangduan/zuzhangduan.js
@@ -0,0 +1,201 @@
+// pages/zuzhangduan/zuzhangduan.js
+import request from '../../utils/request.js'
+
+Page({
+  data: {
+    // 页面状态
+    isZuzhang: false,
+    isLoading: false,
+    
+    // 邀请码相关
+    inviteCode: '',
+    
+    // 用户信息
+    uid: '',
+    nicheng: '',
+    avatarUrl: '',
+    
+    // 组长信息
+    ketixian: '0.00',        // 可提现金额
+    guanshiCount: 0,         // 邀请的管事数量
+    fenhongZonge: '0.00',    // 分红总额
+  },
+
+  onLoad() {
+    this.checkLoginStatus()
+  },
+
+  onShow() {
+    this.registerNotificationComponent()
+    if (this.data.isZuzhang) {
+      this.getZuzhangInfo()
+    }
+  },
+
+  // 检查登录状态
+  checkLoginStatus() {
+    const token = wx.getStorageSync('token')
+    if (!token) {
+      wx.showModal({
+        title: '提示',
+        content: '您尚未登录，请先登录',
+        confirmText: '去登录',
+        success: (res) => {
+          if (res.confirm) {
+            wx.reLaunch({ url: '/pages/gerenzhongxin/gerenzhongxin' })
+          }
+        }
+      })
+      return false
+    }
+    this.checkZuzhangStatus()
+    return true
+  },
+
+  // 检查组长状态
+  checkZuzhangStatus() {
+    try {
+      const zuzhangstatus = wx.getStorageSync('zuzhangstatus')
+      if (zuzhangstatus === 1) {
+        this.setData({ isZuzhang: true })
+        this.loadUserInfo()
+        this.getZuzhangInfo()
+      } else {
+        this.setData({ isZuzhang: false })
+      }
+    } catch (error) {
+      console.error('读取缓存失败:', error)
+      this.setData({ isZuzhang: false })
+    }
+  },
+
+  // 加载用户信息
+  loadUserInfo() {
+    const app = getApp()
+    const globalData = app.globalData || {}
+    
+    const touxiang = wx.getStorageSync('touxiang')
+    const ossImageUrl = globalData.ossImageUrl || ''
+    const morentouxiang = globalData.morentouxiang || 'avatar/default.jpg'
+    
+    let avatarUrl = ''
+    if (touxiang) {
+      avatarUrl = ossImageUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang)
+    } else {
+      avatarUrl = ossImageUrl + (morentouxiang.startsWith('/') ? morentouxiang : '/' + morentouxiang)
+    }
+    
+    const uid = wx.getStorageSync('uid') || ''
+    const nicheng = wx.getStorageSync('nicheng') || globalData.nicheng || ''
+    
+    this.setData({ avatarUrl, uid, nicheng })
+  },
+
+  // 注册通知组件
+  registerNotificationComponent() {
+    const app = getApp()
+    const notificationComp = this.selectComponent('#global-notification')
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      }
+    }
+  },
+
+  // 获取组长信息（刷新）
+  async getZuzhangInfo() {
+    this.setData({ isLoading: true })
+    try {
+      const res = await request({
+        url: '/yonghu/zuzhangxinxi',
+        method: 'POST'
+      })
+      if (res && res.data.code === 200) {
+        const data = res.data.data
+        this.setData({
+          ketixian: data.ketixian || '0.00',
+          guanshiCount: data.guanshiCount || 0,
+          fenhongZonge: data.fenhongZonge || '0.00',
+          isLoading: false
+        })
+        wx.showToast({ title: '刷新成功', icon: 'success', duration: 1500 })
+      } else {
+        throw new Error(res?.data?.msg || '获取信息失败')
+      }
+    } catch (error) {
+      console.error('获取组长信息失败:', error)
+      this.setData({ isLoading: false })
+      wx.showToast({ title: error.message || '刷新失败', icon: 'none' })
+    }
+  },
+
+  // 刷新按钮点击
+  refreshZuzhangInfo() {
+    this.getZuzhangInfo()
+  },
+
+  // 邀请码输入
+  onInviteCodeInput(e) {
+    this.setData({ inviteCode: e.detail.value.trim() })
+  },
+
+  // 注册组长
+  async onRegister() {
+    const { inviteCode } = this.data
+    if (!inviteCode) {
+      wx.showToast({ title: '请输入邀请码', icon: 'none', duration: 2000 })
+      return
+    }
+    if (inviteCode.length > 100) {
+      wx.showToast({ title: '邀请码不能超过100字符', icon: 'none', duration: 2000 })
+      return
+    }
+
+    this.setData({ isLoading: true })
+    try {
+      const res = await request({
+        url: '/yonghu/zuzhangzhuce',
+        method: 'POST',
+        data: { inviteCode }
+      })
+      if (res && res.data.code === 200) {
+        wx.setStorageSync('zuzhangstatus', 1)
+        const data = res.data.data
+        this.setData({
+          isZuzhang: true,
+          ketixian: data.ketixian || '0.00',
+          guanshiCount: data.guanshiCount || 0,
+          fenhongZonge: data.fenhongZonge || '0.00',
+          isLoading: false
+        })
+        this.loadUserInfo()
+        wx.showToast({ title: '注册成功！', icon: 'success', duration: 2000 })
+      } else {
+        throw new Error(res?.data?.msg || '注册失败')
+      }
+    } catch (error) {
+      console.error('注册失败:', error)
+      this.setData({ isLoading: false })
+      wx.showToast({ title: error.message || '注册失败', icon: 'error' })
+    }
+  },
+
+  // 🔥【修改】跳转到提现页面，传递from=zuzhang参数
+  goToWithdraw() {
+    const { ketixian } = this.data
+    wx.navigateTo({
+      url: `/pages/tixian/tixian?from=zuzhang&amount=${ketixian}`
+    })
+  },
+
+  // 跳转到分红记录页面
+  goToFenhongJilu() {
+    wx.navigateTo({ url: '/pages/zzfhjilu/zzfhjilu' })
+  },
+
+  // 跳转到邀请管事页面
+  goToYaoqingGuanshi() {
+    wx.navigateTo({ url: '/pages/yqguanshi/yqguanshi' })
+  }
+})
\ No newline at end of file
diff --git a/pages/zuzhangduan/zuzhangduan.json b/pages/zuzhangduan/zuzhangduan.json
new file mode 100644
index 0000000..29241d1
--- /dev/null
+++ b/pages/zuzhangduan/zuzhangduan.json
@@ -0,0 +1,10 @@
+{
+    "navigationBarBackgroundColor": "#0b0f1c",
+    "navigationBarTextStyle": "white",
+    "navigationBarTitleText": "组长驾驶舱",
+    "backgroundColor": "#0b0f1c",
+    "backgroundTextStyle": "light",
+    "usingComponents": {
+      "global-notification": "/components/global-notification/global-notification"
+    }
+  }
\ No newline at end of file
diff --git a/pages/zuzhangduan/zuzhangduan.wxml b/pages/zuzhangduan/zuzhangduan.wxml
new file mode 100644
index 0000000..e9fa248
--- /dev/null
+++ b/pages/zuzhangduan/zuzhangduan.wxml
@@ -0,0 +1,108 @@
+
+
+
+<view class="page-container unregistered-page" wx:if="{{!isZuzhang}}">
+  <view class="glitch-title">⚡ 组长认证 ⚡</view>
+  <view class="input-area">
+    <input 
+      class="glitch-input" 
+      type="text" 
+      placeholder="输入邀请码激活权限" 
+      maxlength="100"
+      value="{{inviteCode}}"
+      bindinput="onInviteCodeInput"
+      placeholder-class="placeholder"
+    />
+  </view>
+  <view class="glitch-button" bindtap="onRegister">
+    <text class="button-text">立即激活</text>
+    <view class="button-glow"></view>
+  </view>
+</view>
+
+
+<view class="page-container registered-page" wx:else>
+  
+  <view class="cyber-grid"></view>
+  <view class="scan-line"></view>
+  
+  
+  <view class="refresh-core" bindtap="refreshZuzhangInfo">
+    <view class="core-spinner"></view>
+  </view>
+  
+  
+  <view class="cyber-header">
+    <view class="avatar-container">
+      <image class="avatar" src="{{avatarUrl}}" mode="aspectFill"></image>
+      <view class="avatar-ring"></view>
+      <view class="avatar-glow"></view>
+    </view>
+    <view class="user-info">
+      <text class="nickname">{{nicheng || '组长'}}</text>
+      <view class="uid-tag">
+        <text>UID: {{uid || '--'}}</text>
+      </view>
+    </view>
+  </view>
+  
+  
+  <view class="asset-card">
+    <view class="card-glow"></view>
+    <view class="asset-title">💰 可提现余额</view>
+    <view class="asset-value">
+      <text class="value-number">{{ketixian}}</text>
+      <text class="value-unit">元</text>
+    </view>
+    
+    <view class="asset-beam"></view>
+  </view>
+  
+  
+  <view class="stats-row">
+    <view class="stat-card">
+      <view class="stat-icon">👥</view>
+      <view class="stat-content">
+        <text class="stat-label">邀请管事</text>
+        <text class="stat-number">{{guanshiCount}}</text>
+      </view>
+      <view class="stat-glow"></view>
+    </view>
+    <view class="stat-card">
+      <view class="stat-icon">📊</view>
+      <view class="stat-content">
+        <text class="stat-label">分红总额</text>
+        <text class="stat-number">{{fenhongZonge}}</text>
+      </view>
+      <view class="stat-glow"></view>
+    </view>
+  </view>
+  
+  
+  <view class="withdraw-btn-wrapper">
+    <view class="withdraw-btn" bindtap="goToWithdraw">
+      <text class="btn-text">⚡ 立即提现 ⚡</text>
+      <view class="btn-glow"></view>
+    </view>
+  </view>
+  
+  
+  <view class="function-panel">
+    <view class="function-btn" bindtap="goToFenhongJilu">
+      <text class="btn-icon">📈</text>
+      <text class="btn-label">分红记录</text>
+    </view>
+    <view class="function-btn" bindtap="goToYaoqingGuanshi">
+      <text class="btn-icon">👥</text>
+      <text class="btn-label">邀请管事</text>
+    </view>
+  </view>
+  
+  <global-notification id="global-notification" />
+  <custom-tab-bar />
+</view>
+
+
+<view class="loading-mask" wx:if="{{isLoading}}">
+  <view class="loader"></view>
+</view>
\ No newline at end of file
diff --git a/pages/zuzhangduan/zuzhangduan.wxss b/pages/zuzhangduan/zuzhangduan.wxss
new file mode 100644
index 0000000..f3e3aa8
--- /dev/null
+++ b/pages/zuzhangduan/zuzhangduan.wxss
@@ -0,0 +1,562 @@
+/* pages/zuzhangduan/zuzhangduan.wxss - 重设计，更饱满科技感 */
+
+/* ===== 全局变量 ===== */
+page {
+    background: #0a0c14;
+    min-height: 100vh;
+    font-family: 'Avenir', 'PingFang SC', 'Helvetica Neue', sans-serif;
+    color: #fff;
+  }
+  
+  /* 背景网格（增强） */
+  page::before {
+    content: '';
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-image: 
+      linear-gradient(rgba(0, 255, 255, 0.03) 1px, transparent 1px),
+      linear-gradient(90deg, rgba(0, 255, 255, 0.03) 1px, transparent 1px);
+    background-size: 50rpx 50rpx;
+    pointer-events: none;
+    z-index: 0;
+  }
+  
+  .page-container {
+    position: relative;
+    z-index: 2;
+    min-height: 100vh;
+    padding: 40rpx 30rpx;
+    box-sizing: border-box;
+  }
+  
+  /* ===== 未注册状态（保持原样，稍作调整） ===== */
+  .unregistered-page {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    min-height: 100vh;
+    background: rgba(0, 10, 20, 0.9);
+    backdrop-filter: blur(20px);
+    -webkit-backdrop-filter: blur(20px);
+    border: 2rpx solid #0ff;
+    box-shadow: 0 0 150rpx rgba(0, 255, 255, 0.4);
+    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
+    margin: 20rpx;
+    padding: 60rpx 40rpx;
+  }
+  
+  .glitch-title {
+    font-size: 40rpx;
+    color: #0ff;
+    text-transform: uppercase;
+    letter-spacing: 8rpx;
+    text-shadow: 0 0 20rpx #0ff, 0 0 40rpx #0ff, 0 0 60rpx #0ff;
+    margin-bottom: 80rpx;
+    border-bottom: 2rpx solid #0ff;
+    padding-bottom: 20rpx;
+    animation: glitch 3s infinite;
+  }
+  
+  @keyframes glitch {
+    0%,100% { transform: skew(0deg); }
+    95% { transform: skew(2deg); }
+    96% { transform: skew(-2deg); }
+    97% { transform: skew(0deg); }
+  }
+  
+  .input-area {
+    width: 100%;
+    margin-bottom: 80rpx;
+  }
+  
+  .glitch-input {
+    width: 100%;
+    height: 100rpx;
+    background: transparent;
+    border: 2rpx solid #0ff;
+    border-right: none;
+    border-bottom: none;
+    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
+    padding: 0 40rpx;
+    font-size: 30rpx;
+    color: #fff;
+    caret-color: #0ff;
+    box-sizing: border-box;
+  }
+  
+  .glitch-input:focus {
+    box-shadow: inset 0 0 40rpx rgba(0, 255, 255, 0.3);
+  }
+  
+  .placeholder {
+    color: rgba(255, 255, 255, 0.2);
+  }
+  
+  .glitch-button {
+    width: 100%;
+    height: 100rpx;
+    background: linear-gradient(45deg, #00cccc, #0066ff);
+    clip-path: polygon(0 0, 100% 0, 85% 100%, 0 100%);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 0 60rpx #0ff;
+  }
+  
+  .button-text {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #fff;
+    letter-spacing: 4rpx;
+    z-index: 2;
+  }
+  
+  .button-glow {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.3), transparent);
+    animation: scan 3s infinite;
+  }
+  
+  /* ===== 已注册状态（重设计） ===== */
+  .registered-page {
+    position: relative;
+    padding: 30rpx 20rpx;
+  }
+  
+  /* 增强网格背景 */
+  .cyber-grid {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-image: 
+      linear-gradient(rgba(0, 255, 255, 0.05) 1px, transparent 1px),
+      linear-gradient(90deg, rgba(0, 255, 255, 0.05) 1px, transparent 1px);
+    background-size: 80rpx 80rpx;
+    pointer-events: none;
+    z-index: 0;
+  }
+  
+  /* 扫描线效果（调快） */
+  .scan-line {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 8rpx;
+    background: rgba(0, 255, 255, 0.25);
+    box-shadow: 0 0 60rpx #0ff;
+    animation: scanMove 3s linear infinite;
+    pointer-events: none;
+    z-index: 10;
+  }
+  
+  @keyframes scanMove {
+    0% { top: 0; }
+    100% { top: 100%; }
+  }
+  
+  /* 刷新按钮（能量核心）保持不变 */
+  .refresh-core {
+    position: absolute;
+    top: 20rpx;
+    right: 20rpx;
+    width: 80rpx;
+    height: 80rpx;
+    background: rgba(0, 20, 40, 0.9);
+    border: 2rpx solid #0ff;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 30;
+    box-shadow: 0 0 30rpx #0ff;
+  }
+  
+  .core-spinner {
+    width: 40rpx;
+    height: 40rpx;
+    border: 4rpx solid #0ff;
+    border-top-color: transparent;
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+  }
+  
+  .refresh-core:active {
+    box-shadow: 0 0 80rpx #0ff;
+    transform: scale(0.95);
+  }
+  
+  /* 头部（增强） */
+  .cyber-header {
+    display: flex;
+    align-items: center;
+    margin: 80rpx 0 60rpx;
+    position: relative;
+    z-index: 20;
+  }
+  
+  .avatar-container {
+    width: 140rpx;
+    height: 140rpx;
+    position: relative;
+    margin-right: 30rpx;
+  }
+  
+  .avatar {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    border: 4rpx solid #0ff;
+    box-shadow: 0 0 60rpx #0ff;
+    object-fit: cover;
+    position: relative;
+    z-index: 2;
+  }
+  
+  .avatar-ring {
+    position: absolute;
+    top: -10rpx;
+    left: -10rpx;
+    right: -10rpx;
+    bottom: -10rpx;
+    border: 2rpx solid #0ff;
+    border-radius: 50%;
+    opacity: 0.6;
+    animation: pulse 2s infinite;
+    z-index: 1;
+  }
+  
+  .avatar-glow {
+    position: absolute;
+    top: -20rpx;
+    left: -20rpx;
+    right: -20rpx;
+    bottom: -20rpx;
+    background: radial-gradient(circle, rgba(0, 255, 255, 0.4) 0%, transparent 70%);
+    border-radius: 50%;
+    z-index: 0;
+    animation: glowPulse 3s infinite alternate;
+  }
+  
+  .user-info {
+    flex: 1;
+  }
+  
+  .nickname {
+    font-size: 48rpx;
+    font-weight: bold;
+    color: #fff;
+    text-shadow: 0 0 30rpx #0ff, 0 0 60rpx #0ff;
+    margin-bottom: 10rpx;
+    display: block;
+  }
+  
+  .uid-tag {
+    display: inline-block;
+    background: rgba(0, 30, 50, 0.8);
+    border-left: 4rpx solid #0ff;
+    padding: 10rpx 40rpx;
+    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
+    font-size: 28rpx;
+    color: #9cf;
+    box-shadow: 0 0 20rpx rgba(0, 255, 255, 0.2);
+  }
+  
+  /* 资产总览卡片 */
+  .asset-card {
+    background: rgba(0, 20, 30, 0.7);
+    backdrop-filter: blur(15px);
+    -webkit-backdrop-filter: blur(15px);
+    border: 2rpx solid #0ff;
+    border-radius: 40rpx;
+    padding: 40rpx 30rpx;
+    margin-bottom: 40rpx;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 0 100rpx rgba(0, 255, 255, 0.3);
+    z-index: 20;
+  }
+  
+  .card-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: radial-gradient(circle at 70% 30%, rgba(0, 255, 255, 0.2), transparent 70%);
+    pointer-events: none;
+  }
+  
+  .asset-title {
+    font-size: 32rpx;
+    color: #9cf;
+    text-transform: uppercase;
+    letter-spacing: 4rpx;
+    margin-bottom: 20rpx;
+    display: flex;
+    align-items: center;
+  }
+  
+  .asset-title::before {
+    content: '⚡';
+    margin-right: 10rpx;
+    font-size: 40rpx;
+    color: #0ff;
+  }
+  
+  .asset-value {
+    display: flex;
+    align-items: baseline;
+    margin-bottom: 10rpx;
+  }
+  
+  .value-number {
+    font-size: 120rpx;
+    font-weight: 800;
+    color: #fff;
+    text-shadow: 0 0 40rpx #0ff, 0 0 80rpx #0ff, 0 0 120rpx #0ff;
+    margin-right: 15rpx;
+    line-height: 1;
+  }
+  
+  .value-unit {
+    font-size: 40rpx;
+    color: #0ff;
+    text-shadow: 0 0 20rpx #0ff;
+  }
+  
+  .asset-beam {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 4rpx;
+    background: linear-gradient(90deg, transparent, #0ff, #00f, #0ff, transparent);
+    animation: beamMove 4s linear infinite;
+  }
+  
+  @keyframes beamMove {
+    0% { transform: translateX(-100%); }
+    100% { transform: translateX(100%); }
+  }
+  
+  /* 双数据卡片 */
+  .stats-row {
+    display: flex;
+    gap: 30rpx;
+    margin-bottom: 50rpx;
+    z-index: 20;
+    position: relative;
+  }
+  
+  .stat-card {
+    flex: 1;
+    background: rgba(0, 20, 30, 0.7);
+    backdrop-filter: blur(10px);
+    -webkit-backdrop-filter: blur(10px);
+    border: 2rpx solid #0ff;
+    border-radius: 30rpx;
+    padding: 30rpx 20rpx;
+    display: flex;
+    align-items: center;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 0 50rpx rgba(0, 255, 255, 0.2);
+  }
+  
+  .stat-icon {
+    font-size: 70rpx;
+    margin-right: 20rpx;
+    filter: drop-shadow(0 0 15rpx #0ff);
+  }
+  
+  .stat-content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .stat-label {
+    font-size: 28rpx;
+    color: #9cf;
+    margin-bottom: 10rpx;
+  }
+  
+  .stat-number {
+    font-size: 48rpx;
+    font-weight: bold;
+    color: #fff;
+    text-shadow: 0 0 20rpx #0ff;
+  }
+  
+  .stat-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: radial-gradient(circle at 30% 30%, rgba(0, 255, 255, 0.15), transparent 70%);
+    pointer-events: none;
+  }
+  
+  .stat-card:active {
+    transform: scale(0.98);
+    box-shadow: 0 0 80rpx #0ff;
+  }
+  
+  /* 立即提现按钮（无图标，大尺寸） */
+  .withdraw-btn-wrapper {
+    display: flex;
+    justify-content: center;
+    margin: 30rpx 0 50rpx;
+    z-index: 20;
+    position: relative;
+  }
+  
+  .withdraw-btn {
+    width: 80%;
+    height: 100rpx;
+    background: linear-gradient(45deg, #00cccc, #0066ff);
+    border-radius: 60rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 0 80rpx #0ff, 0 0 150rpx rgba(0, 255, 255, 0.3);
+    border: 2rpx solid rgba(255, 255, 255, 0.3);
+  }
+  
+  .btn-text {
+    font-size: 40rpx;
+    font-weight: bold;
+    color: #fff;
+    letter-spacing: 6rpx;
+    z-index: 2;
+    text-shadow: 0 0 20rpx #fff;
+  }
+  
+  .btn-glow {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.4), transparent);
+    animation: scan 2s infinite;
+  }
+  
+  .withdraw-btn:active {
+    transform: scale(0.96);
+    box-shadow: 0 0 120rpx #0ff;
+  }
+  
+  /* 底部功能按钮（调整间距） */
+  .function-panel {
+    display: flex;
+    justify-content: space-around;
+    gap: 30rpx;
+    margin-top: 20rpx;
+    z-index: 20;
+    position: relative;
+  }
+  
+  .function-btn {
+    flex: 1;
+    background: rgba(0, 20, 30, 0.8);
+    border: 2rpx solid #0ff;
+    border-radius: 40rpx;
+    padding: 30rpx 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 0 40rpx rgba(0, 255, 255, 0.1);
+  }
+  
+  .function-btn::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 4rpx;
+    background: linear-gradient(90deg, transparent, #0ff, transparent);
+  }
+  
+  .function-btn:active {
+    transform: translateY(-8rpx);
+    box-shadow: 0 20rpx 80rpx #0ff;
+  }
+  
+  .btn-icon {
+    font-size: 80rpx;
+    margin-bottom: 15rpx;
+    filter: drop-shadow(0 0 20rpx #0ff);
+  }
+  
+  .btn-label {
+    font-size: 30rpx;
+    color: #fff;
+    font-weight: 500;
+    text-shadow: 0 0 10rpx #0ff;
+  }
+  
+  /* 动画 */
+  @keyframes scan {
+    0% { left: -100%; }
+    100% { left: 100%; }
+  }
+  
+  @keyframes pulse {
+    0%,100% { opacity: 0.5; transform: scale(1); }
+    50% { opacity: 1; transform: scale(1.1); }
+  }
+  
+  @keyframes glowPulse {
+    0% { opacity: 0.3; transform: scale(0.9); }
+    100% { opacity: 0.6; transform: scale(1.2); }
+  }
+  
+  @keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+  }
+  
+  /* ===== 加载遮罩（保持不变） ===== */
+  .loading-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(2, 6, 12, 0.95);
+    backdrop-filter: blur(20px);
+    -webkit-backdrop-filter: blur(20px);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 9999;
+  }
+  
+  .loader {
+    width: 200rpx;
+    height: 200rpx;
+    border: 4rpx solid #0ff;
+    border-radius: 50%;
+    border-top-color: transparent;
+    animation: spin 1s linear infinite;
+  }
\ No newline at end of file
diff --git a/pages/zzfhjilu/zzfhjilu.js b/pages/zzfhjilu/zzfhjilu.js
new file mode 100644
index 0000000..ecc3363
--- /dev/null
+++ b/pages/zzfhjilu/zzfhjilu.js
@@ -0,0 +1,216 @@
+// pages/zuzhangfenhongjilu/zuzhangfenhongjilu.js
+import request from '../../utils/request.js';
+
+const PAGE_SIZE = 5;               // 每页数据条数
+const REFRESH_COOLDOWN = 2000;      // 刷新冷却时间 (ms)
+
+const app = getApp();
+
+Page({
+  data: {
+    // 统计数据
+    fenhongZonge: '0.00',           // 分红总额
+    yaoqingGuanshi: 0,              // 邀请管事数
+    fenhongCishu: 0,                // 分红次数
+
+    // 列表数据
+    jiluList: [],                    // 分红记录列表
+    totalCount: 0,                   // 总记录数（后端返回）
+    currentPage: 1,                  // 当前页码
+    hasMore: true,                   // 是否还有更多数据
+    loading: false,                   // 首次加载中
+    loadingMore: false,               // 加载更多中
+    refreshDisabled: false,           // 刷新按钮是否冷却
+
+    // 错误状态
+    errorMsg: '',                     // 错误提示信息
+  },
+
+  onLoad() {
+    this.loadFirstPage();
+  },
+
+  onShow() {
+    this.registerNotification();
+  },
+
+  // 注册全局通知组件
+  registerNotification() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  // 加载第一页数据
+  loadFirstPage() {
+    this.setData({
+      currentPage: 1,
+      hasMore: true,
+      jiluList: [],
+      errorMsg: ''
+    });
+    this.fetchData(true);
+  },
+
+  // 刷新数据（点击刷新按钮）
+  onRefresh() {
+    if (this.data.refreshDisabled) {
+      wx.showToast({
+        title: `请稍后重试`,
+        icon: 'none',
+        duration: 1000
+      });
+      return;
+    }
+
+    // 启用冷却
+    this.setData({ refreshDisabled: true });
+    setTimeout(() => {
+      this.setData({ refreshDisabled: false });
+    }, REFRESH_COOLDOWN);
+
+    // 显示刷新动画（让按钮旋转）
+    // 执行刷新
+    this.loadFirstPage();
+  },
+
+  // 上拉加载更多
+  onLoadMore() {
+    const { hasMore, loading, loadingMore, currentPage } = this.data;
+    if (!hasMore || loading || loadingMore) return;
+
+    this.setData({ loadingMore: true });
+    this.fetchData(false, currentPage + 1);
+  },
+
+  // 核心数据获取方法
+  async fetchData(reset = false, page = 1) {
+    const url = '/shangpin/zuzhangfenhong'; // 假设后端接口地址
+
+    if (reset) {
+      this.setData({ loading: true, errorMsg: '' });
+    }
+
+    try {
+      const res = await request({
+        url,
+        method: 'POST',
+        data: {
+          page: page,
+          page_size: PAGE_SIZE
+        }
+      });
+
+      if (res.data.code === 200) {
+        const data = res.data.data || {};
+        // 更新统计数据
+        this.setData({
+          fenhongZonge: data.fenhong_zonge || '0.00',
+          yaoqingGuanshi: data.yaoqing_guanshi || 0,
+          fenhongCishu: data.fenhong_cishu || 0,
+          totalCount: data.total || 0
+        });
+
+        // 处理列表数据（拼接头像）
+        const rawList = data.list || [];
+        const processedList = this.processList(rawList);
+
+        if (reset) {
+          // 第一页
+          this.setData({
+            jiluList: processedList,
+            currentPage: page,
+            hasMore: processedList.length === PAGE_SIZE, // 如果等于页大小，认为可能还有更多
+          });
+        } else {
+          // 加载更多
+          const newList = [...this.data.jiluList, ...processedList];
+          this.setData({
+            jiluList: newList,
+            currentPage: page,
+            hasMore: processedList.length === PAGE_SIZE,
+          });
+        }
+
+        // 如果加载后数据为空且是第一页，可以给出提示
+        if (reset && processedList.length === 0) {
+          // 空状态已在 wxml 处理
+        }
+      } else {
+        // 业务错误
+        this.setData({
+          errorMsg: res.data.msg || '数据加载失败'
+        });
+        this.showNotification('error', res.data.msg || '数据加载失败');
+      }
+    } catch (err) {
+      console.error('获取分红记录失败', err);
+      this.setData({
+        errorMsg: '网络异常，请检查网络'
+      });
+      this.showNotification('error', '网络异常');
+    } finally {
+      if (reset) {
+        this.setData({ loading: false });
+      } else {
+        this.setData({ loadingMore: false });
+      }
+    }
+  },
+
+  // 处理列表项：拼接头像、格式化金额和时间
+  processList(list) {
+    const ossUrl = app.globalData.ossImageUrl || '';
+    const defaultAvatar = ossUrl + (app.globalData.morentouxiang || 'avatar/default.jpg');
+
+    return list.map(item => ({
+      // 打手信息
+      dashouAvatar: this.getFullUrl(item.dashou_avatar, ossUrl, defaultAvatar),
+      dashouNicheng: item.dashou_nicheng || '打手',
+      dashouYonghuid: item.dashou_yonghuid || '',
+      // 管事信息
+      guanshiAvatar: this.getFullUrl(item.guanshi_avatar, ossUrl, defaultAvatar),
+      guanshiNicheng: item.guanshi_nicheng || '管事',
+      guanshiYonghuid: item.guanshi_yonghuid || '',
+      // 分红信息
+      fenhong: parseFloat(item.fenhong || 0).toFixed(2),
+      shijian: this.formatTime(item.create_time)
+    }));
+  },
+
+  // 拼接完整图片URL
+  getFullUrl(relativePath, ossUrl, defaultUrl) {
+    if (!relativePath) return defaultUrl;
+    if (relativePath.startsWith('http')) return relativePath;
+    const full = ossUrl + (relativePath.startsWith('/') ? relativePath : '/' + relativePath);
+    return full || defaultUrl;
+  },
+
+  // 格式化时间（根据实际后端返回调整）
+  formatTime(timestamp) {
+    if (!timestamp) return '';
+    try {
+      const date = new Date(timestamp);
+      return `${date.getMonth() + 1}月${date.getDate()}日 ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`;
+    } catch {
+      return timestamp.substring(0, 10) || '';
+    }
+  },
+
+  // 重试加载（当错误提示出现时）
+  onRetry() {
+    this.loadFirstPage();
+  },
+
+  // 显示通知（可选）
+  showNotification(type, msg) {
+    const noti = app.globalData.globalNotification;
+    if (noti && noti.show) {
+      noti.show({ type, message: msg });
+    }
+  }
+});
\ No newline at end of file
diff --git a/pages/zzfhjilu/zzfhjilu.json b/pages/zzfhjilu/zzfhjilu.json
new file mode 100644
index 0000000..1dc2ad2
--- /dev/null
+++ b/pages/zzfhjilu/zzfhjilu.json
@@ -0,0 +1,10 @@
+{
+    "navigationBarTitleText": "组长分红记录",
+    "navigationBarBackgroundColor": "#0A0C12",
+    "navigationBarTextStyle": "white",
+    "backgroundColor": "#0A0C12",
+    "backgroundTextStyle": "light",
+    "usingComponents": {
+      "global-notification": "/components/global-notification/global-notification"
+    }
+  }
\ No newline at end of file
diff --git a/pages/zzfhjilu/zzfhjilu.wxml b/pages/zzfhjilu/zzfhjilu.wxml
new file mode 100644
index 0000000..65b8ae8
--- /dev/null
+++ b/pages/zzfhjilu/zzfhjilu.wxml
@@ -0,0 +1,119 @@
+
+<view class="page">
+
+
+<view class="fixed-header">
+  <view class="header-content">
+    <view class="stat-row">
+      <view class="stat-cell">
+        <text class="stat-label">分红总额</text>
+        <text class="stat-number blue">¥{{fenhongZonge}}</text>
+      </view>
+      <view class="stat-divider"></view>
+      <view class="stat-cell">
+        <text class="stat-label">邀请管事</text>
+        <text class="stat-number">{{yaoqingGuanshi}}</text>
+      </view>
+      <view class="stat-divider"></view>
+      <view class="stat-cell">
+        <text class="stat-label">分红次数</text>
+        <text class="stat-number">{{fenhongCishu}}</text>
+      </view>
+    </view>
+    
+    <view class="refresh-btn" bindtap="onRefresh">
+      <text class="refresh-icon {{refreshDisabled ? 'spin' : ''}}">↻</text>
+    </view>
+  </view>
+</view>
+
+
+<scroll-view
+  class="scroll-area"
+  scroll-y
+  enhanced
+  show-scrollbar="{{false}}"
+  bindscrolltolower="onLoadMore"
+  lower-threshold="100"
+>
+  <view class="list-content">
+    
+    <view wx:if="{{loading && jiluList.length === 0}}" class="loading-state">
+      <view class="spinner"></view>
+      <text>加载中...</text>
+    </view>
+
+    
+    <view wx:elif="{{!loading && jiluList.length === 0}}" class="empty-state">
+      <text class="empty-icon">📭</text>
+      <text class="empty-title">暂无分红记录</text>
+      <text class="empty-tip">邀请管事并让打手充值即可获得分红</text>
+      <view class="empty-btn" bindtap="onRefresh">刷新</view>
+    </view>
+
+    
+    <block wx:if="{{jiluList.length > 0}}">
+      
+      <view class="list-header">
+        <text class="list-title">分红明细</text>
+        <text class="list-count">{{jiluList.length}} / {{totalCount}}</text>
+      </view>
+
+      
+      <view class="card-list">
+        <view wx:for="{{jiluList}}" wx:key="index" class="card">
+          
+          <view class="card-left">
+            <image class="avatar" src="{{item.dashouAvatar}}" mode="aspectFill"></image>
+            <view class="info">
+              <text class="name">{{item.dashouNicheng}}</text>
+              <text class="uid">ID: {{item.dashouYonghuid}}</text>
+            </view>
+          </view>
+
+          
+          <view class="card-middle">
+            <text class="tag">所属管事</text>
+            <text class="arrow">→</text>
+          </view>
+
+          
+          <view class="card-right">
+            <image class="avatar small" src="{{item.guanshiAvatar}}" mode="aspectFill"></image>
+            <view class="info">
+              <text class="name">{{item.guanshiNicheng}}</text>
+              <text class="uid">ID: {{item.guanshiYonghuid}}</text>
+            </view>
+            <view class="amount">
+              <text class="num blue">+¥{{item.fenhong}}</text>
+              <text class="time">{{item.shijian}}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      
+      <view wx:if="{{loadingMore}}" class="more-state">
+        <view class="spinner small"></view>
+        <text>加载更多...</text>
+      </view>
+
+      
+      <view wx:if="{{!hasMore && jiluList.length > 0}}" class="no-more">
+        <text>—— 没有更多了 ——</text>
+      </view>
+    </block>
+  </view>
+</scroll-view>
+
+
+<view wx:if="{{errorMsg}}" class="error-mask">
+  <view class="error-dialog">
+    <text class="error-icon">⚠️</text>
+    <text class="error-msg">{{errorMsg}}</text>
+    <view class="error-btn" bindtap="onRetry">重试</view>
+  </view>
+</view>
+
+<global-notification id="global-notification" />
+</view>
\ No newline at end of file
diff --git a/pages/zzfhjilu/zzfhjilu.wxss b/pages/zzfhjilu/zzfhjilu.wxss
new file mode 100644
index 0000000..07221e3
--- /dev/null
+++ b/pages/zzfhjilu/zzfhjilu.wxss
@@ -0,0 +1,728 @@
+/* pages/zuzhangfenhongjilu/zuzhangfenhongjilu.wxss - 超时空战士机甲风格 */
+
+/* ==================== 全局变量与动画 ==================== */
+page {
+    height: 100%;
+    background: #0A0C12;
+    font-family: 'PingFang SC', 'Helvetica Neue', 'Arial', sans-serif;
+    color: #E0E6F0;
+  }
+  
+  /* 全局动画定义 */
+  @keyframes scanMove {
+    0% { transform: translateX(-100%); }
+    100% { transform: translateX(100%); }
+  }
+  
+  @keyframes pulse {
+    0%,100% { opacity: 0.4; }
+    50% { opacity: 1; }
+  }
+  
+  @keyframes spin {
+    from { transform: rotate(0deg); }
+    to { transform: rotate(360deg); }
+  }
+  
+  @keyframes energyFlow {
+    0% { background-position: -200% 0; }
+    100% { background-position: 200% 0; }
+  }
+  
+  @keyframes glitch {
+    0% { transform: translate(0); }
+    20% { transform: translate(-2px, 2px); }
+    40% { transform: translate(2px, -2px); }
+    60% { transform: translate(-2px, 0); }
+    80% { transform: translate(2px, 0); }
+    100% { transform: translate(0); }
+  }
+  
+  /* ==================== 页面容器 ==================== */
+  .page {
+    height: 100%;
+    position: relative;
+    background: radial-gradient(ellipse at 50% 30%, #1A2635, #0A0C12);
+  }
+  
+  /* 背景机甲网格（使用伪元素） */
+  .page::before {
+    content: '';
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-image: 
+      linear-gradient(rgba(0, 180, 255, 0.03) 1px, transparent 1px),
+      linear-gradient(90deg, rgba(0, 180, 255, 0.03) 1px, transparent 1px);
+    background-size: 60rpx 60rpx;
+    pointer-events: none;
+    z-index: 0;
+  }
+  
+  /* 顶部扫描线（固定） */
+  .page::after {
+    content: '';
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 4rpx;
+    background: linear-gradient(90deg, transparent, #00B4FF, #7A2EFF, transparent);
+    box-shadow: 0 0 30rpx #00B4FF;
+    animation: scanMove 4s linear infinite;
+    z-index: 10;
+  }
+  
+  /* ==================== 固定头部 ==================== */
+  .fixed-header {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 100;
+    /* 半透明金属质感 */
+    background: rgba(16, 24, 36, 0.85);
+    backdrop-filter: blur(20px);
+    -webkit-backdrop-filter: blur(20px);
+    border-bottom: 2rpx solid #00B4FF;
+    box-shadow: 0 10rpx 40rpx rgba(0, 180, 255, 0.2);
+  }
+  
+  .header-content {
+    padding: 30rpx 30rpx 20rpx; /* 缩小上下间距 */
+    width: 100%;
+    box-sizing: border-box;
+    position: relative;
+  }
+  
+  /* 统计行 - 机甲风格面板 */
+  .stat-row {
+    display: flex;
+    align-items: center;
+    background: rgba(0, 20, 40, 0.6);
+    border: 2rpx solid #00B4FF;
+    border-radius: 30rpx;
+    padding: 25rpx 15rpx;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 0 30rpx rgba(0, 180, 255, 0.3), inset 0 0 20rpx rgba(0, 180, 255, 0.2);
+  }
+  
+  /* 面板内部光效 */
+  .stat-row::before {
+    content: '';
+    position: absolute;
+    top: -50%;
+    left: -50%;
+    width: 200%;
+    height: 200%;
+    background: radial-gradient(circle at 30% 30%, rgba(0, 180, 255, 0.2), transparent 70%);
+    animation: pulse 4s infinite;
+    pointer-events: none;
+  }
+  
+  .stat-cell {
+    flex: 1;
+    text-align: center;
+    position: relative;
+    z-index: 2;
+  }
+  
+  .stat-divider {
+    width: 2rpx;
+    height: 40rpx;
+    background: linear-gradient(to bottom, transparent, #00B4FF, #7A2EFF, transparent);
+    box-shadow: 0 0 10rpx #00B4FF;
+  }
+  
+  .stat-label {
+    font-size: 24rpx;
+    color: #A0B8D0;
+    letter-spacing: 2rpx;
+    margin-bottom: 6rpx;
+    display: block;
+    text-transform: uppercase;
+  }
+  
+  .stat-number {
+    font-size: 42rpx;
+    font-weight: 800;
+    color: #E0F0FF;
+    line-height: 1.2;
+    display: block;
+    text-shadow: 0 0 15rpx #00B4FF, 0 0 30rpx #7A2EFF;
+  }
+  
+  .stat-number.blue {
+    color: #fff;
+    text-shadow: 0 0 20rpx #00B4FF, 0 0 40rpx #7A2EFF;
+  }
+  
+  /* 刷新按钮 - 机甲能量环 */
+  .refresh-btn {
+    position: absolute;
+    top: 35rpx;
+    right: 45rpx;
+    width: 80rpx;
+    height: 80rpx;
+    background: rgba(0, 20, 40, 0.8);
+    border: 2rpx solid #00B4FF;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-shadow: 0 0 30rpx #00B4FF;
+    transition: all 0.2s;
+    z-index: 20;
+  }
+  
+  .refresh-btn::before {
+    content: '';
+    position: absolute;
+    top: -4rpx;
+    left: -4rpx;
+    right: -4rpx;
+    bottom: -4rpx;
+    border: 2rpx solid rgba(0, 180, 255, 0.5);
+    border-radius: 50%;
+    animation: pulse 2s infinite;
+  }
+  
+  .refresh-btn:active {
+    transform: scale(0.9);
+    box-shadow: 0 0 50rpx #7A2EFF;
+  }
+  
+  .refresh-icon {
+    font-size: 40rpx;
+    color: #00B4FF;
+    transition: transform 0.3s;
+    z-index: 2;
+  }
+  
+  .refresh-icon.spin {
+    animation: spin 1s linear infinite;
+  }
+  
+  /* ==================== 滚动区域 ==================== */
+  .scroll-area {
+    position: fixed;
+    top: 240rpx; /* 根据新头部高度调整，更紧凑 */
+    left: 0;
+    width: 100%;
+    bottom: 0;
+    overflow-y: auto;
+    z-index: 50;
+  }
+  
+  .list-content {
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    min-height: 100%;
+  }
+  
+  /* ==================== 加载中状态 ==================== */
+  .loading-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    min-height: 700rpx;
+    color: #A0B8D0;
+    font-size: 28rpx;
+    letter-spacing: 2rpx;
+  }
+  
+  .spinner {
+    width: 80rpx;
+    height: 80rpx;
+    border: 6rpx solid rgba(0, 180, 255, 0.2);
+    border-top: 6rpx solid #00B4FF;
+    border-right: 6rpx solid #7A2EFF;
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+    margin-bottom: 30rpx;
+    box-shadow: 0 0 30rpx rgba(0, 180, 255, 0.3);
+  }
+  
+  .spinner.small {
+    width: 50rpx;
+    height: 50rpx;
+    border-width: 4rpx;
+  }
+  
+  /* ==================== 空状态 ==================== */
+  .empty-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    min-height: 750rpx;
+    background: rgba(0, 20, 40, 0.4);
+    border: 2rpx solid #00B4FF;
+    border-radius: 50rpx;
+    padding: 100rpx 40rpx;
+    margin-top: 30rpx;
+    backdrop-filter: blur(10px);
+    -webkit-backdrop-filter: blur(10px);
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 0 60rpx rgba(0, 180, 255, 0.2);
+  }
+  
+  .empty-state::before {
+    content: '';
+    position: absolute;
+    top: -50%;
+    left: -50%;
+    width: 200%;
+    height: 200%;
+    background: radial-gradient(circle at 30% 30%, rgba(0, 180, 255, 0.1), transparent 70%);
+    animation: pulse 3s infinite;
+  }
+  
+  .empty-icon {
+    font-size: 110rpx;
+    color: #00B4FF;
+    margin-bottom: 30rpx;
+    filter: drop-shadow(0 0 30rpx #00B4FF);
+  }
+  
+  .empty-title {
+    font-size: 36rpx;
+    font-weight: 700;
+    color: #E0F0FF;
+    margin-bottom: 20rpx;
+    text-shadow: 0 0 15rpx #00B4FF;
+  }
+  
+  .empty-tip {
+    font-size: 26rpx;
+    color: #A0B8D0;
+    margin-bottom: 60rpx;
+    text-align: center;
+    max-width: 450rpx;
+    line-height: 1.5;
+  }
+  
+  .empty-btn {
+    padding: 20rpx 80rpx;
+    background: linear-gradient(135deg, #00B4FF, #7A2EFF);
+    border-radius: 60rpx;
+    color: #fff;
+    font-size: 30rpx;
+    font-weight: 600;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 10rpx 40rpx rgba(0, 180, 255, 0.4);
+    border: none;
+    letter-spacing: 2rpx;
+  }
+  
+  .empty-btn::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent);
+    animation: scanMove 2s infinite;
+  }
+  
+  .empty-btn:active {
+    transform: scale(0.96);
+    box-shadow: 0 10rpx 50rpx #7A2EFF;
+  }
+  
+  /* ==================== 列表标题 ==================== */
+  .list-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: baseline;
+    margin: 20rpx 0 20rpx; /* 减小上边距 */
+    padding: 0 10rpx;
+  }
+  
+  .list-title {
+    font-size: 32rpx;
+    font-weight: 700;
+    color: #00B4FF;
+    text-shadow: 0 0 15rpx #00B4FF;
+    letter-spacing: 2rpx;
+    position: relative;
+  }
+  
+  .list-title::after {
+    content: '';
+    position: absolute;
+    bottom: -6rpx;
+    left: 0;
+    width: 100%;
+    height: 2rpx;
+    background: linear-gradient(90deg, transparent, #00B4FF, #7A2EFF, transparent);
+  }
+  
+  .list-count {
+    font-size: 24rpx;
+    color: #7A8FAA;
+    background: rgba(0, 180, 255, 0.1);
+    padding: 4rpx 20rpx;
+    border-radius: 30rpx;
+    border: 1rpx solid rgba(0, 180, 255, 0.3);
+  }
+  
+  /* ==================== 卡片列表 ==================== */
+  .card-list {
+    display: flex;
+    flex-direction: column;
+    gap: 30rpx;
+    padding-bottom: 50rpx;
+  }
+  
+  /* 卡片主体 - 装甲玻璃 */
+  .card {
+    background: rgba(0, 20, 40, 0.5);
+    backdrop-filter: blur(15px);
+    -webkit-backdrop-filter: blur(15px);
+    border: 2rpx solid rgba(0, 180, 255, 0.4);
+    border-radius: 40rpx;
+    padding: 30rpx 20rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 20rpx 50rpx rgba(0,0,0,0.8), inset 0 0 30rpx rgba(0, 180, 255, 0.2);
+    transition: all 0.2s;
+    width: 100%;
+    box-sizing: border-box;
+  }
+  
+  /* 卡片内部光晕 */
+  .card::before {
+    content: '';
+    position: absolute;
+    top: -50%;
+    left: -50%;
+    width: 200%;
+    height: 200%;
+    background: radial-gradient(circle at 30% 30%, rgba(0, 180, 255, 0.1), transparent 70%);
+    opacity: 0.5;
+    z-index: 0;
+  }
+  
+  /* 卡片边框动态流光 */
+  .card::after {
+    content: '';
+    position: absolute;
+    top: -2rpx;
+    left: -2rpx;
+    right: -2rpx;
+    bottom: -2rpx;
+    border-radius: 42rpx;
+    background: linear-gradient(135deg, #00B4FF, #7A2EFF, #00B4FF);
+    z-index: -1;
+    opacity: 0;
+    transition: opacity 0.3s;
+  }
+  
+  .card:active::after {
+    opacity: 0.6;
+  }
+  
+  .card:active {
+    transform: translateY(-6rpx);
+    box-shadow: 0 30rpx 70rpx rgba(0, 180, 255, 0.3);
+  }
+  
+  /* 左侧打手信息 */
+  .card-left {
+    display: flex;
+    align-items: center;
+    flex: 2;
+    min-width: 0;
+    z-index: 2;
+  }
+  
+  .avatar {
+    width: 90rpx;
+    height: 90rpx;
+    border-radius: 50%;
+    border: 2rpx solid #00B4FF;
+    background: #1A2A3A;
+    margin-right: 20rpx;
+    flex-shrink: 0;
+    box-shadow: 0 0 30rpx rgba(0, 180, 255, 0.3);
+    position: relative;
+  }
+  
+  .avatar.small {
+    width: 70rpx;
+    height: 70rpx;
+  }
+  
+  .avatar::after {
+    content: '';
+    position: absolute;
+    top: -4rpx;
+    left: -4rpx;
+    right: -4rpx;
+    bottom: -4rpx;
+    border: 1px solid rgba(0, 180, 255, 0.4);
+    border-radius: 50%;
+    animation: pulse 3s infinite;
+  }
+  
+  .info {
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+  }
+  
+  .name {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #E0F0FF;
+    margin-bottom: 4rpx;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    text-shadow: 0 0 10rpx rgba(0, 180, 255, 0.3);
+  }
+  
+  .uid {
+    font-size: 22rpx;
+    color: #A0B8D0;
+    white-space: nowrap;
+  }
+  
+  /* 中间机甲箭头 */
+  .card-middle {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin: 0 10rpx;
+    flex-shrink: 0;
+    z-index: 2;
+  }
+  
+  .tag {
+    font-size: 20rpx;
+    color: #00B4FF;
+    background: rgba(0, 180, 255, 0.1);
+    padding: 4rpx 16rpx;
+    border-radius: 30rpx;
+    border: 1rpx solid rgba(0, 180, 255, 0.3);
+    margin-bottom: 4rpx;
+    white-space: nowrap;
+    letter-spacing: 1rpx;
+  }
+  
+  .arrow {
+    font-size: 40rpx;
+    color: #00B4FF;
+    line-height: 1;
+    transform: scaleX(1.5);
+    filter: drop-shadow(0 0 10rpx #00B4FF);
+    position: relative;
+  }
+  
+  .arrow::before {
+    content: '';
+    position: absolute;
+    top: 50%;
+    left: -10rpx;
+    width: 20rpx;
+    height: 2rpx;
+    background: #00B4FF;
+    box-shadow: 0 0 10rpx #00B4FF;
+  }
+  
+  /* 右侧管事信息 + 金额 */
+  .card-right {
+    display: flex;
+    align-items: center;
+    flex: 3;
+    min-width: 0;
+    justify-content: flex-end;
+    z-index: 2;
+  }
+  
+  .amount {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    margin-left: 15rpx;
+    flex-shrink: 0;
+  }
+  
+  .num {
+    font-size: 34rpx;
+    font-weight: 800;
+    line-height: 1.2;
+    white-space: nowrap;
+  }
+  
+  .num.blue {
+    color: #00B4FF;
+    text-shadow: 0 0 15rpx #00B4FF, 0 0 30rpx #7A2EFF;
+  }
+  
+  .time {
+    font-size: 20rpx;
+    color: #7A8FAA;
+    margin-top: 4rpx;
+  }
+  
+  /* 卡片底部能量条 */
+  .card-energy {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 2rpx;
+    background: linear-gradient(90deg, 
+      transparent 0%, 
+      #00B4FF 20%, 
+      #7A2EFF 50%, 
+      #00B4FF 80%, 
+      transparent 100%);
+    background-size: 200% 100%;
+    animation: energyFlow 3s linear infinite;
+    opacity: 0.6;
+    z-index: 3;
+  }
+  
+  /* 为每个卡片添加能量条（通过伪元素或额外元素，这里用绝对定位的块，需要在WXML中添加，但我们可以在样式里用::after，但需要修改WXML添加类） */
+  /* 由于不修改WXML，我们使用.card::after已经用于边框，所以另建一个伪元素？不行，只能用额外元素。 */
+  /* 为了不修改WXML，我们利用.card的::before用于光晕，::after用于边框，无法再加。所以建议在WXML中添加一个空view作为能量条，但用户不提供WXML，我们可以暂时不加。但为了效果更好，我们可以利用.card的box-shadow模拟？但动态效果有限。暂时不加，等待用户反馈。 */
+  
+  /* ==================== 加载更多 ==================== */
+  .more-state {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 40rpx 0;
+    color: #A0B8D0;
+    font-size: 26rpx;
+    letter-spacing: 2rpx;
+  }
+  
+  /* ==================== 没有更多 ==================== */
+  .no-more {
+    text-align: center;
+    padding: 50rpx 0;
+    color: #5A6F8A;
+    font-size: 24rpx;
+    letter-spacing: 2rpx;
+    position: relative;
+  }
+  
+  .no-more::before,
+  .no-more::after {
+    content: '';
+    position: absolute;
+    top: 50%;
+    width: 100rpx;
+    height: 2rpx;
+    background: linear-gradient(90deg, transparent, #00B4FF, #7A2EFF, transparent);
+  }
+  
+  .no-more::before {
+    left: 20rpx;
+  }
+  
+  .no-more::after {
+    right: 20rpx;
+  }
+  
+  /* ==================== 错误遮罩 ==================== */
+  .error-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(10, 12, 20, 0.95);
+    backdrop-filter: blur(15px);
+    -webkit-backdrop-filter: blur(15px);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 200;
+  }
+  
+  .error-glitch {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: repeating-linear-gradient(
+      0deg,
+      rgba(255, 0, 0, 0.05) 0px,
+      rgba(0, 255, 0, 0.05) 2px,
+      rgba(0, 0, 255, 0.05) 4px
+    );
+    mix-blend-mode: screen;
+    pointer-events: none;
+    animation: glitch 0.1s infinite;
+  }
+  
+  .error-dialog {
+    background: rgba(0, 20, 40, 0.8);
+    border: 2rpx solid #FF4444;
+    border-radius: 50rpx;
+    padding: 60rpx 80rpx;
+    text-align: center;
+    backdrop-filter: blur(10px);
+    -webkit-backdrop-filter: blur(10px);
+    box-shadow: 0 0 100rpx rgba(255, 68, 68, 0.3);
+    z-index: 2;
+    max-width: 600rpx;
+  }
+  
+  .error-icon {
+    font-size: 90rpx;
+    color: #FF4444;
+    margin-bottom: 30rpx;
+    filter: drop-shadow(0 0 30rpx #FF4444);
+  }
+  
+  .error-msg {
+    font-size: 30rpx;
+    color: #E0E6F0;
+    margin-bottom: 40rpx;
+    line-height: 1.5;
+  }
+  
+  .error-btn {
+    padding: 20rpx 70rpx;
+    background: linear-gradient(135deg, #FF4444, #FF8866);
+    border-radius: 60rpx;
+    color: #fff;
+    font-size: 28rpx;
+    font-weight: 600;
+    display: inline-block;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 10rpx 40rpx rgba(255, 68, 68, 0.4);
+  }
+  
+  .error-btn::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent);
+    animation: scanMove 2s infinite;
+  }
+  
+  .error-btn:active {
+    transform: scale(0.96);
+  }
\ No newline at end of file
diff --git a/peizhi/__init__.py b/peizhi/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/peizhi/__pycache__/__init__.cpython-313.pyc b/peizhi/__pycache__/__init__.cpython-313.pyc
new file mode 100644
index 0000000..c120b31
Binary files /dev/null and b/peizhi/__pycache__/__init__.cpython-313.pyc differ
diff --git a/peizhi/__pycache__/admin.cpython-313.pyc b/peizhi/__pycache__/admin.cpython-313.pyc
new file mode 100644
index 0000000..9af44ba
Binary files /dev/null and b/peizhi/__pycache__/admin.cpython-313.pyc differ
diff --git a/peizhi/__pycache__/apps.cpython-313.pyc b/peizhi/__pycache__/apps.cpython-313.pyc
new file mode 100644
index 0000000..f624cd2
Binary files /dev/null and b/peizhi/__pycache__/apps.cpython-313.pyc differ
diff --git a/peizhi/__pycache__/models.cpython-313.pyc b/peizhi/__pycache__/models.cpython-313.pyc
new file mode 100644
index 0000000..d8e86c6
Binary files /dev/null and b/peizhi/__pycache__/models.cpython-313.pyc differ
diff --git a/peizhi/__pycache__/serializers.cpython-313.pyc b/peizhi/__pycache__/serializers.cpython-313.pyc
new file mode 100644
index 0000000..c133b69
Binary files /dev/null and b/peizhi/__pycache__/serializers.cpython-313.pyc differ
diff --git a/peizhi/__pycache__/urls.cpython-313.pyc b/peizhi/__pycache__/urls.cpython-313.pyc
new file mode 100644
index 0000000..f2dc19b
Binary files /dev/null and b/peizhi/__pycache__/urls.cpython-313.pyc differ
diff --git a/peizhi/__pycache__/views.cpython-313.pyc b/peizhi/__pycache__/views.cpython-313.pyc
new file mode 100644
index 0000000..1246ba9
Binary files /dev/null and b/peizhi/__pycache__/views.cpython-313.pyc differ
diff --git a/peizhi/admin.py b/peizhi/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/peizhi/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/peizhi/apps.py b/peizhi/apps.py
new file mode 100644
index 0000000..f012e26
--- /dev/null
+++ b/peizhi/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class PeizhiConfig(AppConfig):
+    name = "peizhi"
diff --git a/peizhi/migrations/0001_initial.py b/peizhi/migrations/0001_initial.py
new file mode 100644
index 0000000..e6924b5
--- /dev/null
+++ b/peizhi/migrations/0001_initial.py
@@ -0,0 +1,92 @@
+# Generated by Django 6.0 on 2025-12-21 20:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="Gonggao",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "leixing",
+                    models.IntegerField(blank=True, null=True, verbose_name="公告类型"),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更改时间"),
+                ),
+                (
+                    "jieshao",
+                    models.TextField(blank=True, null=True, verbose_name="公告介绍"),
+                ),
+            ],
+            options={
+                "verbose_name": "公告",
+                "verbose_name_plural": "公告",
+                "db_table": "gonggao",
+            },
+        ),
+        migrations.CreateModel(
+            name="Lunbo",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "tupian_url",
+                    models.CharField(
+                        blank=True,
+                        max_length=500,
+                        null=True,
+                        verbose_name="轮播图片URL",
+                    ),
+                ),
+                (
+                    "leixing",
+                    models.IntegerField(
+                        blank=True,
+                        null=True,
+                        verbose_name="图片类型:1：轮播2：个人中心背景",
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更改时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "轮播",
+                "verbose_name_plural": "轮播",
+                "db_table": "lunbo",
+            },
+        ),
+    ]
diff --git a/peizhi/migrations/0002_qunpeizhi.py b/peizhi/migrations/0002_qunpeizhi.py
new file mode 100644
index 0000000..a55493f
--- /dev/null
+++ b/peizhi/migrations/0002_qunpeizhi.py
@@ -0,0 +1,62 @@
+# Generated by Django 6.0 on 2025-12-24 23:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Qunpeizhi",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "peizhiid",
+                    models.IntegerField(
+                        blank=True, null=True, verbose_name="群类型:1.打手 2.管事"
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更改时间"),
+                ),
+                (
+                    "neirong",
+                    models.CharField(
+                        blank=True, max_length=200, null=True, verbose_name="群介绍"
+                    ),
+                ),
+                (
+                    "qunid",
+                    models.CharField(
+                        blank=True, max_length=100, null=True, verbose_name="群id"
+                    ),
+                ),
+                (
+                    "jieshao",
+                    models.CharField(
+                        blank=True, max_length=200, null=True, verbose_name="介绍"
+                    ),
+                ),
+            ],
+            options={
+                "db_table": "qunpeizhi",
+            },
+        ),
+    ]
diff --git a/peizhi/migrations/0003_szjilu.py b/peizhi/migrations/0003_szjilu.py
new file mode 100644
index 0000000..41367e8
--- /dev/null
+++ b/peizhi/migrations/0003_szjilu.py
@@ -0,0 +1,82 @@
+# Generated by Django 6.0 on 2026-01-09 12:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0002_qunpeizhi"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Szjilu",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True, serialize=False, verbose_name="记录ID"
+                    ),
+                ),
+                (
+                    "zongsy",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="总收益",
+                    ),
+                ),
+                (
+                    "zongls",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="总流水",
+                    ),
+                ),
+                (
+                    "zongzc",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="总支出",
+                    ),
+                ),
+                (
+                    "jrzc",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="今日支出",
+                    ),
+                ),
+                (
+                    "jrls",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="今日流水",
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更改时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "收支记录",
+                "verbose_name_plural": "收支记录",
+                "db_table": "szjilu",
+            },
+        ),
+    ]
diff --git a/peizhi/migrations/0004_tupianpeizhi.py b/peizhi/migrations/0004_tupianpeizhi.py
new file mode 100644
index 0000000..7b7d4bf
--- /dev/null
+++ b/peizhi/migrations/0004_tupianpeizhi.py
@@ -0,0 +1,57 @@
+# Generated by Django 6.0 on 2026-01-13 00:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0003_szjilu"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Tupianpeizhi",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "tupian",
+                    models.CharField(
+                        blank=True,
+                        max_length=500,
+                        null=True,
+                        verbose_name="配置图片URL",
+                    ),
+                ),
+                (
+                    "leixing",
+                    models.PositiveIntegerField(
+                        blank=True,
+                        null=True,
+                        verbose_name="提现类型1:打手规则图片2：默认头像图片",
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更改时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "配置图片",
+                "verbose_name_plural": "配置图片",
+                "db_table": "tupianpeizhi",
+            },
+        ),
+    ]
diff --git a/peizhi/migrations/0005_shangjiamoban_shangjialianjie.py b/peizhi/migrations/0005_shangjiamoban_shangjialianjie.py
new file mode 100644
index 0000000..f6764d3
--- /dev/null
+++ b/peizhi/migrations/0005_shangjiamoban_shangjialianjie.py
@@ -0,0 +1,160 @@
+# Generated by Django 4.2.27 on 2026-01-25 20:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0004_tupianpeizhi"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="ShangjiaMoban",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True, serialize=False, verbose_name="模板ID"
+                    ),
+                ),
+                (
+                    "yonghu_id",
+                    models.CharField(
+                        db_index=True, max_length=7, verbose_name="用户ID"
+                    ),
+                ),
+                (
+                    "leixing_id",
+                    models.PositiveIntegerField(
+                        db_index=True, verbose_name="商品类型ID"
+                    ),
+                ),
+                (
+                    "moban_jieshao",
+                    models.CharField(max_length=500, verbose_name="模板介绍"),
+                ),
+                (
+                    "jiage",
+                    models.DecimalField(
+                        decimal_places=2,
+                        help_text="单位：元",
+                        max_digits=10,
+                        verbose_name="模板价格",
+                    ),
+                ),
+                (
+                    "fabu_shuliang",
+                    models.PositiveIntegerField(default=0, verbose_name="发布数量"),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "商家订单模板",
+                "verbose_name_plural": "商家订单模板",
+                "db_table": "shangjia_moban",
+                "indexes": [
+                    models.Index(
+                        fields=["yonghu_id", "leixing_id"],
+                        name="shangjia_mo_yonghu__bb287d_idx",
+                    ),
+                    models.Index(
+                        fields=["yonghu_id", "leixing_id", "id"],
+                        name="shangjia_mo_yonghu__4240d0_idx",
+                    ),
+                ],
+                "unique_together": {("yonghu_id", "leixing_id", "moban_jieshao")},
+            },
+        ),
+        migrations.CreateModel(
+            name="ShangjiaLianjie",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True, serialize=False, verbose_name="链接ID"
+                    ),
+                ),
+                (
+                    "yonghu_id",
+                    models.CharField(
+                        db_index=True, max_length=7, verbose_name="用户ID"
+                    ),
+                ),
+                (
+                    "leixing_id",
+                    models.PositiveIntegerField(
+                        db_index=True, verbose_name="商品类型ID"
+                    ),
+                ),
+                (
+                    "moban_id",
+                    models.PositiveIntegerField(db_index=True, verbose_name="模板ID"),
+                ),
+                (
+                    "lianjie",
+                    models.CharField(
+                        max_length=500, unique=True, verbose_name="链接地址"
+                    ),
+                ),
+                (
+                    "dingdan_id",
+                    models.CharField(
+                        blank=True,
+                        db_index=True,
+                        max_length=32,
+                        null=True,
+                        verbose_name="订单ID",
+                    ),
+                ),
+                (
+                    "is_used",
+                    models.BooleanField(
+                        db_index=True, default=False, verbose_name="是否已使用"
+                    ),
+                ),
+                (
+                    "shiyongzhe_ip",
+                    models.CharField(
+                        blank=True, max_length=50, null=True, verbose_name="使用者IP"
+                    ),
+                ),
+                (
+                    "youxiao_shijian",
+                    models.DateTimeField(
+                        blank=True, null=True, verbose_name="有效截止时间"
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "商家链接",
+                "verbose_name_plural": "商家链接",
+                "db_table": "shangjia_lianjie",
+                "indexes": [
+                    models.Index(
+                        fields=["yonghu_id", "moban_id", "leixing_id"],
+                        name="shangjia_li_yonghu__9f2b25_idx",
+                    ),
+                    models.Index(
+                        fields=["dingdan_id"], name="shangjia_li_dingdan_95b682_idx"
+                    ),
+                ],
+            },
+        ),
+    ]
diff --git a/peizhi/migrations/0006_shangjialianjie_lianjie_token_and_more.py b/peizhi/migrations/0006_shangjialianjie_lianjie_token_and_more.py
new file mode 100644
index 0000000..2c142e4
--- /dev/null
+++ b/peizhi/migrations/0006_shangjialianjie_lianjie_token_and_more.py
@@ -0,0 +1,31 @@
+# Generated by Django 4.2.27 on 2026-01-26 13:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0005_shangjiamoban_shangjialianjie"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="shangjialianjie",
+            name="lianjie_token",
+            field=models.CharField(
+                blank=True,
+                db_index=True,
+                max_length=32,
+                null=True,
+                unique=True,
+                verbose_name="链接Token",
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="shangjialianjie",
+            index=models.Index(
+                fields=["lianjie_token"], name="shangjia_li_lianjie_99014c_idx"
+            ),
+        ),
+    ]
diff --git a/peizhi/migrations/0007_tixianquotadefault.py b/peizhi/migrations/0007_tixianquotadefault.py
new file mode 100644
index 0000000..a551ea9
--- /dev/null
+++ b/peizhi/migrations/0007_tixianquotadefault.py
@@ -0,0 +1,49 @@
+# Generated by Django 4.2.27 on 2026-03-09 15:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0006_shangjialianjie_lianjie_token_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="TixianQuotaDefault",
+            fields=[
+                ("id", models.AutoField(primary_key=True, serialize=False)),
+                (
+                    "leixing",
+                    models.IntegerField(
+                        choices=[(1, "打手"), (2, "管事")],
+                        unique=True,
+                        verbose_name="用户类型",
+                    ),
+                ),
+                (
+                    "default_quota",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=20.0,
+                        max_digits=10,
+                        verbose_name="默认每日提现限额(元)",
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "默认提现限额",
+                "verbose_name_plural": "默认提现限额",
+                "db_table": "tixian_quota_default",
+            },
+        ),
+    ]
diff --git a/peizhi/migrations/0008_tupianpeizhi_fangwen_cishu_and_more.py b/peizhi/migrations/0008_tupianpeizhi_fangwen_cishu_and_more.py
new file mode 100644
index 0000000..28b6748
--- /dev/null
+++ b/peizhi/migrations/0008_tupianpeizhi_fangwen_cishu_and_more.py
@@ -0,0 +1,27 @@
+# Generated by Django 4.2.27 on 2026-03-17 13:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0007_tixianquotadefault"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="tupianpeizhi",
+            name="fangwen_cishu",
+            field=models.PositiveIntegerField(default=0, verbose_name="访问次数"),
+        ),
+        migrations.AlterField(
+            model_name="tupianpeizhi",
+            name="leixing",
+            field=models.PositiveIntegerField(
+                blank=True,
+                null=True,
+                verbose_name="图片类型1:打手规则图片2：默认头像图片,3:关注快手图片",
+            ),
+        ),
+    ]
diff --git a/peizhi/migrations/0009_ordertypemapping_dailydispatchstat_club.py b/peizhi/migrations/0009_ordertypemapping_dailydispatchstat_club.py
new file mode 100644
index 0000000..73a3f2c
--- /dev/null
+++ b/peizhi/migrations/0009_ordertypemapping_dailydispatchstat_club.py
@@ -0,0 +1,208 @@
+# Generated by Django 4.2.27 on 2026-03-30 12:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0008_tupianpeizhi_fangwen_cishu_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="OrderTypeMapping",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "partner_club_id",
+                    models.CharField(
+                        db_index=True, max_length=6, verbose_name="对方俱乐部ID"
+                    ),
+                ),
+                (
+                    "partner_type_id",
+                    models.PositiveIntegerField(verbose_name="对方订单类型ID"),
+                ),
+                (
+                    "partner_type_name",
+                    models.CharField(max_length=100, verbose_name="对方订单类型名称"),
+                ),
+                (
+                    "our_type_id",
+                    models.PositiveIntegerField(verbose_name="我方订单类型ID"),
+                ),
+                (
+                    "our_type_name",
+                    models.CharField(max_length=100, verbose_name="我方订单类型名称"),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "订单类型映射",
+                "verbose_name_plural": "订单类型映射",
+                "db_table": "order_type_mapping",
+                "unique_together": {("partner_club_id", "partner_type_id")},
+            },
+        ),
+        migrations.CreateModel(
+            name="DailyDispatchStat",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("date", models.DateField(db_index=True, verbose_name="统计日期")),
+                ("year", models.PositiveSmallIntegerField(verbose_name="年份")),
+                ("month", models.PositiveSmallIntegerField(verbose_name="月份")),
+                ("day", models.PositiveSmallIntegerField(verbose_name="日期")),
+                (
+                    "direction",
+                    models.PositiveSmallIntegerField(
+                        choices=[(1, "我方派单"), (2, "对方派单")],
+                        verbose_name="派单方向",
+                    ),
+                ),
+                (
+                    "partner_club_id",
+                    models.CharField(
+                        db_index=True, max_length=6, verbose_name="对方俱乐部ID"
+                    ),
+                ),
+                (
+                    "dispatch_count",
+                    models.PositiveIntegerField(default=0, verbose_name="派单数"),
+                ),
+                (
+                    "dispatch_amount",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="派单总额",
+                    ),
+                ),
+                (
+                    "success_count",
+                    models.PositiveIntegerField(default=0, verbose_name="成交订单数"),
+                ),
+                (
+                    "success_amount",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="成交总额",
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "每日派单统计",
+                "verbose_name_plural": "每日派单统计",
+                "db_table": "daily_dispatch_stat",
+                "indexes": [
+                    models.Index(
+                        fields=["year", "month", "day", "direction", "partner_club_id"],
+                        name="daily_dispa_year_f98f91_idx",
+                    ),
+                    models.Index(fields=["date"], name="daily_dispa_date_9ac7fe_idx"),
+                ],
+            },
+        ),
+        migrations.CreateModel(
+            name="Club",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "club_id",
+                    models.CharField(
+                        db_index=True, max_length=6, verbose_name="本俱乐部ID"
+                    ),
+                ),
+                (
+                    "partner_club_id",
+                    models.CharField(
+                        max_length=6, unique=True, verbose_name="对方俱乐部ID"
+                    ),
+                ),
+                (
+                    "is_interop_enabled",
+                    models.BooleanField(default=False, verbose_name="是否开启平台互通"),
+                ),
+                (
+                    "is_receive_enabled",
+                    models.BooleanField(
+                        default=False, verbose_name="是否同意接收对方订单"
+                    ),
+                ),
+                (
+                    "dashou_rate",
+                    models.DecimalField(
+                        decimal_places=4,
+                        default=1.0,
+                        max_digits=5,
+                        verbose_name="打手分红费率",
+                    ),
+                ),
+                (
+                    "partner_domain",
+                    models.URLField(blank=True, verbose_name="对方服务器域名"),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "俱乐部",
+                "verbose_name_plural": "俱乐部",
+                "db_table": "club",
+                "indexes": [
+                    models.Index(fields=["club_id"], name="club_club_id_e75636_idx"),
+                    models.Index(
+                        fields=["partner_club_id"], name="club_partner_b76039_idx"
+                    ),
+                ],
+            },
+        ),
+    ]
diff --git a/peizhi/migrations/0010_clubconfig_accountpermission.py b/peizhi/migrations/0010_clubconfig_accountpermission.py
new file mode 100644
index 0000000..e871165
--- /dev/null
+++ b/peizhi/migrations/0010_clubconfig_accountpermission.py
@@ -0,0 +1,135 @@
+# Generated by Django 4.2.27 on 2026-03-30 23:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0009_ordertypemapping_dailydispatchstat_club"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="ClubConfig",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "club_id",
+                    models.CharField(
+                        db_index=True, max_length=6, verbose_name="俱乐部ID"
+                    ),
+                ),
+                (
+                    "club_nickname",
+                    models.CharField(
+                        blank=True, default="", max_length=50, verbose_name="俱乐部昵称"
+                    ),
+                ),
+                (
+                    "club_avatar",
+                    models.CharField(
+                        blank=True,
+                        default="",
+                        max_length=500,
+                        verbose_name="俱乐部头像地址",
+                    ),
+                ),
+                (
+                    "backend_domain",
+                    models.CharField(
+                        blank=True, default="", max_length=200, verbose_name="后台域名"
+                    ),
+                ),
+                (
+                    "chat_api_key",
+                    models.CharField(
+                        blank=True,
+                        default="",
+                        max_length=200,
+                        verbose_name="聊天API密钥",
+                    ),
+                ),
+                (
+                    "chat_api_id",
+                    models.CharField(
+                        blank=True,
+                        default="",
+                        max_length=200,
+                        verbose_name="聊天API ID",
+                    ),
+                ),
+                (
+                    "storage_bucket_domain",
+                    models.CharField(
+                        blank=True,
+                        default="",
+                        max_length=500,
+                        verbose_name="存储桶域名",
+                    ),
+                ),
+                (
+                    "is_self",
+                    models.SmallIntegerField(
+                        choices=[(0, "对方"), (1, "我方")],
+                        db_index=True,
+                        default=0,
+                        verbose_name="是否我方俱乐部",
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "俱乐部配置",
+                "verbose_name_plural": "俱乐部配置",
+                "db_table": "club_config",
+                "unique_together": {("club_id",)},
+            },
+        ),
+        migrations.CreateModel(
+            name="AccountPermission",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "account_id",
+                    models.CharField(
+                        db_index=True, max_length=11, verbose_name="账号ID"
+                    ),
+                ),
+                ("permission_code", models.IntegerField(verbose_name="权限代码")),
+                (
+                    "is_enabled",
+                    models.BooleanField(default=False, verbose_name="是否开启"),
+                ),
+            ],
+            options={
+                "verbose_name": "账号权限",
+                "verbose_name_plural": "账号权限",
+                "db_table": "account_permission",
+                "unique_together": {("account_id", "permission_code")},
+            },
+        ),
+    ]
diff --git a/peizhi/migrations/0011_clubconfig_customer_service_api_url_and_more.py b/peizhi/migrations/0011_clubconfig_customer_service_api_url_and_more.py
new file mode 100644
index 0000000..06639e4
--- /dev/null
+++ b/peizhi/migrations/0011_clubconfig_customer_service_api_url_and_more.py
@@ -0,0 +1,27 @@
+# Generated by Django 4.2.27 on 2026-04-01 00:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0010_clubconfig_accountpermission"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="clubconfig",
+            name="customer_service_api_url",
+            field=models.CharField(
+                blank=True, default="", max_length=200, verbose_name="客服API URL"
+            ),
+        ),
+        migrations.AddField(
+            model_name="clubconfig",
+            name="customer_service_corp_id",
+            field=models.CharField(
+                blank=True, default="", max_length=100, verbose_name="客服企业ID"
+            ),
+        ),
+    ]
diff --git a/peizhi/migrations/0012_club_receive_rate_clubconfig_storage_bucket_name_and_more.py b/peizhi/migrations/0012_club_receive_rate_clubconfig_storage_bucket_name_and_more.py
new file mode 100644
index 0000000..cd343b3
--- /dev/null
+++ b/peizhi/migrations/0012_club_receive_rate_clubconfig_storage_bucket_name_and_more.py
@@ -0,0 +1,154 @@
+# Generated by Django 4.2.27 on 2026-04-06 23:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0011_clubconfig_customer_service_api_url_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="club",
+            name="receive_rate",
+            field=models.DecimalField(
+                decimal_places=4,
+                default=1.0,
+                max_digits=5,
+                verbose_name="接收打手分红费率",
+            ),
+        ),
+        migrations.AddField(
+            model_name="clubconfig",
+            name="storage_bucket_name",
+            field=models.CharField(
+                blank=True, default="", max_length=100, verbose_name="存储桶名称"
+            ),
+        ),
+        migrations.AddField(
+            model_name="dailydispatchstat",
+            name="claimed_amount",
+            field=models.DecimalField(
+                decimal_places=2, default=0.0, max_digits=12, verbose_name="抢单总额"
+            ),
+        ),
+        migrations.AddField(
+            model_name="dailydispatchstat",
+            name="claimed_count",
+            field=models.PositiveIntegerField(default=0, verbose_name="抢单数"),
+        ),
+        migrations.CreateModel(
+            name="DailyPayoutStat",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "date",
+                    models.DateField(
+                        db_index=True, unique=True, verbose_name="统计日期"
+                    ),
+                ),
+                ("year", models.PositiveSmallIntegerField(verbose_name="年份")),
+                ("month", models.PositiveSmallIntegerField(verbose_name="月份")),
+                ("day", models.PositiveSmallIntegerField(verbose_name="日期")),
+                (
+                    "total_amount",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="出款总额",
+                    ),
+                ),
+                (
+                    "total_count",
+                    models.PositiveIntegerField(default=0, verbose_name="出款总笔数"),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "每日出款统计",
+                "verbose_name_plural": "每日出款统计",
+                "db_table": "daily_payout_stat",
+                "indexes": [
+                    models.Index(fields=["date"], name="daily_payou_date_b534ec_idx"),
+                    models.Index(
+                        fields=["year", "month", "day"],
+                        name="daily_payou_year_6376ca_idx",
+                    ),
+                ],
+            },
+        ),
+        migrations.CreateModel(
+            name="DailyIncomeStat",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "date",
+                    models.DateField(
+                        db_index=True, unique=True, verbose_name="统计日期"
+                    ),
+                ),
+                ("year", models.PositiveSmallIntegerField(verbose_name="年份")),
+                ("month", models.PositiveSmallIntegerField(verbose_name="月份")),
+                ("day", models.PositiveSmallIntegerField(verbose_name="日期")),
+                (
+                    "total_amount",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="总收入金额",
+                    ),
+                ),
+                (
+                    "total_count",
+                    models.PositiveIntegerField(default=0, verbose_name="总收入笔数"),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "每日收入统计",
+                "verbose_name_plural": "每日收入统计",
+                "db_table": "daily_income_stat",
+                "indexes": [
+                    models.Index(fields=["date"], name="daily_incom_date_75e6df_idx"),
+                    models.Index(
+                        fields=["year", "month", "day"],
+                        name="daily_incom_year_d85d10_idx",
+                    ),
+                ],
+            },
+        ),
+    ]
diff --git a/peizhi/migrations/0013_alter_tixianquotadefault_leixing.py b/peizhi/migrations/0013_alter_tixianquotadefault_leixing.py
new file mode 100644
index 0000000..3154552
--- /dev/null
+++ b/peizhi/migrations/0013_alter_tixianquotadefault_leixing.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.27 on 2026-04-10 18:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0012_club_receive_rate_clubconfig_storage_bucket_name_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="tixianquotadefault",
+            name="leixing",
+            field=models.IntegerField(
+                choices=[(1, "打手"), (2, "管事"), (3, "组长")],
+                unique=True,
+                verbose_name="用户类型",
+            ),
+        ),
+    ]
diff --git a/peizhi/migrations/0014_popupconfig_popuppage_popupimage_popupconfig_page_and_more.py b/peizhi/migrations/0014_popupconfig_popuppage_popupimage_popupconfig_page_and_more.py
new file mode 100644
index 0000000..760545c
--- /dev/null
+++ b/peizhi/migrations/0014_popupconfig_popuppage_popupimage_popupconfig_page_and_more.py
@@ -0,0 +1,205 @@
+# Generated by Django 4.2.27 on 2026-04-19 12:06
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0013_alter_tixianquotadefault_leixing"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="PopupConfig",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "popup_id",
+                    models.CharField(max_length=50, verbose_name="弹窗唯一ID"),
+                ),
+                (
+                    "title",
+                    models.CharField(
+                        blank=True, max_length=200, verbose_name="标题（后台用）"
+                    ),
+                ),
+                (
+                    "description",
+                    models.TextField(blank=True, verbose_name="描述（后台用）"),
+                ),
+                (
+                    "strategy_type",
+                    models.CharField(
+                        choices=[
+                            ("once", "仅一次"),
+                            ("daily", "每日"),
+                            ("weekly", "每周"),
+                            ("monthly", "每月"),
+                            ("yearly", "每年"),
+                            ("always", "始终"),
+                            ("count", "周期内次数限制"),
+                        ],
+                        default="once",
+                        max_length=20,
+                    ),
+                ),
+                (
+                    "max_count",
+                    models.PositiveIntegerField(
+                        default=1, verbose_name="周期内最大展示次数"
+                    ),
+                ),
+                (
+                    "reset_interval",
+                    models.CharField(
+                        blank=True,
+                        choices=[
+                            ("day", "天"),
+                            ("week", "周"),
+                            ("month", "月"),
+                            ("year", "年"),
+                        ],
+                        max_length=20,
+                        verbose_name="重置周期（count类型时使用）",
+                    ),
+                ),
+                (
+                    "duration",
+                    models.PositiveIntegerField(
+                        default=0, verbose_name="强制阅读秒数（0=无强制）"
+                    ),
+                ),
+                (
+                    "force_even_muted",
+                    models.BooleanField(
+                        default=False, verbose_name="强制弹出（忽略用户今日屏蔽）"
+                    ),
+                ),
+                (
+                    "sort_order",
+                    models.PositiveIntegerField(default=0, verbose_name="展示顺序"),
+                ),
+                (
+                    "is_active",
+                    models.BooleanField(default=True, verbose_name="是否启用"),
+                ),
+                (
+                    "start_time",
+                    models.DateTimeField(
+                        blank=True, null=True, verbose_name="生效开始时间"
+                    ),
+                ),
+                (
+                    "end_time",
+                    models.DateTimeField(
+                        blank=True, null=True, verbose_name="生效结束时间"
+                    ),
+                ),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+            ],
+            options={
+                "verbose_name": "弹窗配置",
+                "verbose_name_plural": "弹窗配置",
+                "db_table": "popup_config",
+                "ordering": ["sort_order", "id"],
+            },
+        ),
+        migrations.CreateModel(
+            name="PopupPage",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "page_key",
+                    models.CharField(
+                        db_index=True,
+                        max_length=50,
+                        unique=True,
+                        verbose_name="页面标识",
+                    ),
+                ),
+                ("name", models.CharField(max_length=100, verbose_name="页面名称")),
+                ("description", models.TextField(blank=True, verbose_name="描述")),
+                (
+                    "is_active",
+                    models.BooleanField(default=True, verbose_name="是否启用"),
+                ),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+            ],
+            options={
+                "verbose_name": "弹窗页面",
+                "verbose_name_plural": "弹窗页面",
+                "db_table": "popup_page",
+            },
+        ),
+        migrations.CreateModel(
+            name="PopupImage",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "image_url",
+                    models.CharField(max_length=500, verbose_name="图片相对路径"),
+                ),
+                ("text", models.TextField(blank=True, verbose_name="图片上方文字")),
+                (
+                    "sort_order",
+                    models.PositiveIntegerField(default=0, verbose_name="展示顺序"),
+                ),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                (
+                    "popup_config",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="images",
+                        to="peizhi.popupconfig",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "弹窗图片",
+                "verbose_name_plural": "弹窗图片",
+                "db_table": "popup_image",
+                "ordering": ["sort_order", "id"],
+            },
+        ),
+        migrations.AddField(
+            model_name="popupconfig",
+            name="page",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="popups",
+                to="peizhi.popuppage",
+            ),
+        ),
+        migrations.AlterUniqueTogether(
+            name="popupconfig",
+            unique_together={("page", "popup_id")},
+        ),
+    ]
diff --git a/peizhi/migrations/0015_popuppage_ignore_user_mute.py b/peizhi/migrations/0015_popuppage_ignore_user_mute.py
new file mode 100644
index 0000000..1ae3946
--- /dev/null
+++ b/peizhi/migrations/0015_popuppage_ignore_user_mute.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.27 on 2026-04-19 15:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0014_popupconfig_popuppage_popupimage_popupconfig_page_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="popuppage",
+            name="ignore_user_mute",
+            field=models.BooleanField(default=False, verbose_name="忽略用户今日屏蔽"),
+        ),
+    ]
diff --git a/peizhi/migrations/0016_alter_tixianquotadefault_leixing.py b/peizhi/migrations/0016_alter_tixianquotadefault_leixing.py
new file mode 100644
index 0000000..f744ced
--- /dev/null
+++ b/peizhi/migrations/0016_alter_tixianquotadefault_leixing.py
@@ -0,0 +1,32 @@
+# Generated by Django 4.2.27 on 2026-06-12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peizhi", "0015_popuppage_ignore_user_mute"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="tixianquotadefault",
+            name="leixing",
+            field=models.IntegerField(
+                choices=[
+                    (1, "打手"),
+                    (2, "管事"),
+                    (3, "组长"),
+                    (4, "打手总额"),
+                    (5, "管事总额"),
+                    (6, "组长总额"),
+                    (7, "考核官总额"),
+                    (8, "打手押金总额"),
+                    (9, "商家余额总额"),
+                ],
+                unique=True,
+                verbose_name="用户类型",
+            ),
+        ),
+    ]
diff --git a/peizhi/migrations/__init__.py b/peizhi/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/peizhi/migrations/__pycache__/0001_initial.cpython-313.pyc b/peizhi/migrations/__pycache__/0001_initial.cpython-313.pyc
new file mode 100644
index 0000000..cbb0929
Binary files /dev/null and b/peizhi/migrations/__pycache__/0001_initial.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/0002_qunpeizhi.cpython-313.pyc b/peizhi/migrations/__pycache__/0002_qunpeizhi.cpython-313.pyc
new file mode 100644
index 0000000..96e939a
Binary files /dev/null and b/peizhi/migrations/__pycache__/0002_qunpeizhi.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/0003_szjilu.cpython-313.pyc b/peizhi/migrations/__pycache__/0003_szjilu.cpython-313.pyc
new file mode 100644
index 0000000..9b334c3
Binary files /dev/null and b/peizhi/migrations/__pycache__/0003_szjilu.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/0004_tupianpeizhi.cpython-313.pyc b/peizhi/migrations/__pycache__/0004_tupianpeizhi.cpython-313.pyc
new file mode 100644
index 0000000..b6fc43c
Binary files /dev/null and b/peizhi/migrations/__pycache__/0004_tupianpeizhi.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/0005_shangjiamoban_shangjialianjie.cpython-313.pyc b/peizhi/migrations/__pycache__/0005_shangjiamoban_shangjialianjie.cpython-313.pyc
new file mode 100644
index 0000000..ae4cfa2
Binary files /dev/null and b/peizhi/migrations/__pycache__/0005_shangjiamoban_shangjialianjie.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/0006_shangjialianjie_lianjie_token_and_more.cpython-313.pyc b/peizhi/migrations/__pycache__/0006_shangjialianjie_lianjie_token_and_more.cpython-313.pyc
new file mode 100644
index 0000000..6c66d21
Binary files /dev/null and b/peizhi/migrations/__pycache__/0006_shangjialianjie_lianjie_token_and_more.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/0007_tixianquotadefault.cpython-313.pyc b/peizhi/migrations/__pycache__/0007_tixianquotadefault.cpython-313.pyc
new file mode 100644
index 0000000..2d42702
Binary files /dev/null and b/peizhi/migrations/__pycache__/0007_tixianquotadefault.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/0008_tupianpeizhi_fangwen_cishu_and_more.cpython-313.pyc b/peizhi/migrations/__pycache__/0008_tupianpeizhi_fangwen_cishu_and_more.cpython-313.pyc
new file mode 100644
index 0000000..0712464
Binary files /dev/null and b/peizhi/migrations/__pycache__/0008_tupianpeizhi_fangwen_cishu_and_more.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/0009_ordertypemapping_dailydispatchstat_club.cpython-313.pyc b/peizhi/migrations/__pycache__/0009_ordertypemapping_dailydispatchstat_club.cpython-313.pyc
new file mode 100644
index 0000000..79cf926
Binary files /dev/null and b/peizhi/migrations/__pycache__/0009_ordertypemapping_dailydispatchstat_club.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/0010_clubconfig_accountpermission.cpython-313.pyc b/peizhi/migrations/__pycache__/0010_clubconfig_accountpermission.cpython-313.pyc
new file mode 100644
index 0000000..fbbd6c4
Binary files /dev/null and b/peizhi/migrations/__pycache__/0010_clubconfig_accountpermission.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/0011_clubconfig_customer_service_api_url_and_more.cpython-313.pyc b/peizhi/migrations/__pycache__/0011_clubconfig_customer_service_api_url_and_more.cpython-313.pyc
new file mode 100644
index 0000000..8066305
Binary files /dev/null and b/peizhi/migrations/__pycache__/0011_clubconfig_customer_service_api_url_and_more.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/0012_club_receive_rate_clubconfig_storage_bucket_name_and_more.cpython-313.pyc b/peizhi/migrations/__pycache__/0012_club_receive_rate_clubconfig_storage_bucket_name_and_more.cpython-313.pyc
new file mode 100644
index 0000000..06700f2
Binary files /dev/null and b/peizhi/migrations/__pycache__/0012_club_receive_rate_clubconfig_storage_bucket_name_and_more.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/0013_alter_tixianquotadefault_leixing.cpython-313.pyc b/peizhi/migrations/__pycache__/0013_alter_tixianquotadefault_leixing.cpython-313.pyc
new file mode 100644
index 0000000..083da6a
Binary files /dev/null and b/peizhi/migrations/__pycache__/0013_alter_tixianquotadefault_leixing.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/0014_popupconfig_popuppage_popupimage_popupconfig_page_and_more.cpython-313.pyc b/peizhi/migrations/__pycache__/0014_popupconfig_popuppage_popupimage_popupconfig_page_and_more.cpython-313.pyc
new file mode 100644
index 0000000..93599c6
Binary files /dev/null and b/peizhi/migrations/__pycache__/0014_popupconfig_popuppage_popupimage_popupconfig_page_and_more.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/0015_popuppage_ignore_user_mute.cpython-313.pyc b/peizhi/migrations/__pycache__/0015_popuppage_ignore_user_mute.cpython-313.pyc
new file mode 100644
index 0000000..0d3bfea
Binary files /dev/null and b/peizhi/migrations/__pycache__/0015_popuppage_ignore_user_mute.cpython-313.pyc differ
diff --git a/peizhi/migrations/__pycache__/__init__.cpython-313.pyc b/peizhi/migrations/__pycache__/__init__.cpython-313.pyc
new file mode 100644
index 0000000..f6e52ec
Binary files /dev/null and b/peizhi/migrations/__pycache__/__init__.cpython-313.pyc differ
diff --git a/peizhi/models.py b/peizhi/models.py
new file mode 100644
index 0000000..a97d96b
--- /dev/null
+++ b/peizhi/models.py
@@ -0,0 +1,593 @@
+from django.db import models
+
+class Lunbo(models.Model):
+    tupian_url = models.CharField(max_length=500, null=True, blank=True, verbose_name='轮播图片URL')
+    leixing = models.IntegerField(null=True, blank=True, verbose_name='图片类型:1：轮播2：个人中心背景')
+
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更改时间')
+    class Meta:
+        db_table = 'lunbo'
+        verbose_name = '轮播'
+        verbose_name_plural = '轮播'
+        # 不要索引！数据量太小
+
+
+class Gonggao(models.Model):
+    leixing = models.IntegerField(null=True, blank=True, verbose_name='公告类型')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更改时间')
+    jieshao = models.TextField(null=True, blank=True, verbose_name='公告介绍')
+    class Meta:
+        db_table = 'gonggao'
+        verbose_name = '公告'
+        verbose_name_plural = '公告'
+        # 不要索引！数据量太小
+
+class Qunpeizhi(models.Model):
+    peizhiid = models.IntegerField(null=True, blank=True, verbose_name='群类型:1.打手 2.管事')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更改时间')
+    neirong = models.CharField(max_length=200, null=True, blank=True, verbose_name='群介绍')
+    qunid = models.CharField(max_length=100, null=True, blank=True, verbose_name='群id')
+    jieshao = models.CharField(max_length=200, null=True, blank=True, verbose_name='介绍')
+    class Meta:
+        db_table = 'qunpeizhi'
+
+class Tupianpeizhi(models.Model):
+    tupian = models.CharField(max_length=500, null=True, blank=True, verbose_name='配置图片URL')
+    leixing = models.PositiveIntegerField(null=True, blank=True, verbose_name='图片类型1:打手规则图片2：默认头像图片,3:关注快手图片')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更改时间')
+    fangwen_cishu = models.PositiveIntegerField(default=0, verbose_name='访问次数')  # 新增字段
+    class Meta:
+        db_table = 'tupianpeizhi'
+        verbose_name = '配置图片'
+        verbose_name_plural = '配置图片'
+
+
+class Szjilu(models.Model):
+    id = models.AutoField(primary_key=True, verbose_name='记录ID')
+    zongsy = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='总收益')
+    zongls = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='总流水')
+    zongzc = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='总支出')
+    jrzc = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='今日支出')
+    jrls = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='今日流水')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更改时间')
+    class Meta:
+        db_table = 'szjilu'
+        verbose_name = '收支记录'
+        verbose_name_plural = '收支记录'
+
+
+
+
+# models/shangjia_moban.py
+from django.db import models
+
+
+class ShangjiaMoban(models.Model):
+    """商家订单模板表 - 存储商家创建的订单模板"""
+
+    # 主键ID（自动递增）
+    id = models.AutoField(primary_key=True, verbose_name='模板ID')
+
+    # 关联字段
+    yonghu_id = models.CharField(max_length=7, db_index=True, verbose_name='用户ID')
+    leixing_id = models.PositiveIntegerField(db_index=True, verbose_name='商品类型ID')
+
+    # 模板内容
+
+    moban_jieshao = models.CharField(max_length=500, verbose_name='模板介绍')
+    jiage = models.DecimalField(
+        max_digits=10,
+        decimal_places=2,
+        verbose_name='模板价格',
+        help_text='单位：元'
+    )
+
+    # 统计字段
+    fabu_shuliang = models.PositiveIntegerField(default=0, verbose_name='发布数量')
+
+
+    # 时间字段
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+    yongjin_qiangdan = models.BooleanField(default=False, verbose_name='是否开启佣金抢单')
+    yongjin_jiage = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='佣金价格')
+    chenghao_id = models.IntegerField(null=True, blank=True, verbose_name='关联称号ID')
+
+    class Meta:
+        db_table = 'shangjia_moban'
+        verbose_name = '商家订单模板'
+        verbose_name_plural = verbose_name
+        indexes = [
+            # 高频查询组合索引
+            models.Index(fields=['yonghu_id', 'leixing_id']),
+            models.Index(fields=['yonghu_id', 'leixing_id','id']),
+
+        ]
+        # 同一个商家同一类型下模板介绍不能重复（允许修改）
+        unique_together = ['yonghu_id', 'leixing_id', 'moban_jieshao']
+
+    def __str__(self):
+        return f"模板{self.id}-{self.yonghu_id}"
+
+
+# models/shangjia_lianjie.py
+from django.db import models
+
+
+class ShangjiaLianjie(models.Model):
+    """商家链接存储表 - 存储生成的派单链接"""
+
+    # 主键ID（自动递增）
+    id = models.AutoField(primary_key=True, verbose_name='链接ID')
+
+    # 关联字段
+    yonghu_id = models.CharField(max_length=7, db_index=True, verbose_name='用户ID')
+    leixing_id = models.PositiveIntegerField(db_index=True, verbose_name='商品类型ID')
+    moban_id = models.PositiveIntegerField(db_index=True, verbose_name='模板ID')
+
+    # 链接核心数据
+    lianjie = models.CharField(max_length=500, unique=True, verbose_name='链接地址')
+    #lianjie_token = models.CharField(max_length=32, unique=True, db_index=True, verbose_name='链接Token')
+
+    # 订单关联（生成订单后更新）
+    dingdan_id = models.CharField(max_length=32, null=True, blank=True, db_index=True, verbose_name='订单ID')
+
+    # 使用状态
+    is_used = models.BooleanField(default=False, verbose_name='是否已使用', db_index=True)
+    #shiyong_time = models.DateTimeField(null=True, blank=True, verbose_name='使用时间')
+
+    # 使用者信息
+    shiyongzhe_ip = models.CharField(max_length=50, null=True, blank=True, verbose_name='使用者IP')
+    #shiyongzhe_info = models.TextField(null=True, blank=True, verbose_name='使用者信息')
+
+    # 链接控制
+    #shiyong_cishu = models.PositiveIntegerField(default=1, verbose_name='可使用次数')
+    #yixiang_cishu = models.PositiveIntegerField(default=0, verbose_name='已使用次数')
+    youxiao_shijian = models.DateTimeField(null=True, blank=True, verbose_name='有效截止时间')
+
+    # 安全字段
+    #anquan_ma = models.CharField(max_length=100, null=True, blank=True, verbose_name='安全码')
+    # 新增 Token 字段
+    lianjie_token = models.CharField(
+        max_length=32,
+        unique=True,
+        db_index=True,
+        verbose_name='链接Token',
+        null=True,
+        blank=True  # 先设置为可选，后面再设为必填
+    )
+
+    # 时间字段
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    # 在 ShangjiaLianjie 类中添加
+
+    # 上一个链接的ID（可选，记录订单被更换前的链接）
+    previous_lianjie_id = models.PositiveIntegerField(
+        null=True,
+        blank=True,
+        db_index=True,
+        verbose_name='上一个链接ID'
+    )
+
+    # 上一个订单的ID（可选，记录被更换的旧订单ID）
+    previous_dingdan_id = models.CharField(
+        max_length=32,
+        null=True,
+        blank=True,
+        db_index=True,
+        verbose_name='上一个订单ID'
+    )
+
+    class Meta:
+        db_table = 'shangjia_lianjie'
+        verbose_name = '商家链接'
+        verbose_name_plural = verbose_name
+        indexes = [
+            # 高频查询组合索引
+            models.Index(fields=['yonghu_id', 'moban_id','leixing_id']),
+            models.Index(fields=['lianjie_token']),
+            #models.Index(fields=['lianjie_token']),
+            models.Index(fields=['dingdan_id']),
+            #models.Index(fields=['moban_id']),
+            #models.Index(fields=['create_time']),
+            #models.Index(fields=['youxiao_shijian', 'is_used']),
+        ]
+        #ordering = ['-create_time']
+
+    def __str__(self):
+        return f"链接{self.id}-{self.yonghu_id}"
+
+
+
+
+class TixianQuotaDefault(models.Model):
+    """
+    默认每日提现限额表
+    """
+    id = models.AutoField(primary_key=True)
+    leixing = models.IntegerField(
+        choices=[
+            (1, '打手'), (2, '管事'), (3, '组长'),
+            (4, '打手总额'), (5, '管事总额'), (6, '组长总额'),
+            (7, '考核官总额'), (8, '打手押金总额'), (9, '商家余额总额'),
+        ],
+        unique=True,
+        verbose_name='用户类型'
+    )
+    default_quota = models.DecimalField(
+        max_digits=10,
+        decimal_places=2,
+        default=20.00,
+        verbose_name='默认每日提现限额(元)'
+    )
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'tixian_quota_default'
+        verbose_name = '默认提现限额'
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        return f"{self.get_leixing_display()} 默认限额: {self.default_quota}"
+
+
+from django.db import models
+
+class WithdrawConfig(models.Model):
+    """
+    提现模式配置表
+    - mode = 1: 自动提现（前端展示收款码模式）
+    - mode = 2: 手动提现（前端展示微信零钱模式）
+    默认值为 2（手动打款），没有记录时前端也按默认 2 处理
+    """
+    MODE_CHOICES = (
+        (1, '自动提现'),   # 对应前端模式一
+        (2, '手动提现'),   # 对应前端模式二
+    )
+
+    mode = models.IntegerField(
+        choices=MODE_CHOICES,
+        default=2,
+        verbose_name='提现模式'
+    )
+    created_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    updated_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'withdraw_config'
+        verbose_name = '提现模式配置'
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        return f'提现模式: {"自动" if self.mode == 1 else "手动"}'
+
+
+
+# apps/club/models.py
+from django.db import models
+
+class Club(models.Model):
+    """合作俱乐部/平台信息表"""
+    # 自己的俱乐部ID（6位字符）
+    club_id = models.CharField(max_length=6, db_index=True, verbose_name='本俱乐部ID')
+    # 对方的俱乐部ID（6位字符）
+    partner_club_id = models.CharField(max_length=6, unique= True,verbose_name='对方俱乐部ID')
+    # 是否开启平台互通（双方互相同意才可传递订单）
+    is_interop_enabled = models.BooleanField(default=False, verbose_name='是否开启平台互通')
+    # 是否同意接收对方订单（对方同意我方发单，但接收订单需我方同意）
+    is_receive_enabled = models.BooleanField(default=False, verbose_name='是否同意接收对方订单')
+    # 打手分红费率（默认100%，即原金额，对方平台打手分成 = 我方打手分成 × 费率）
+    dashou_rate = models.DecimalField(max_digits=5, decimal_places=4, default=1.0000, verbose_name='打手分红费率')
+
+
+    # 对方服务器域名（完整 URL，如 https://api.partner.com）
+    partner_domain = models.URLField(max_length=200, blank=True, verbose_name='对方服务器域名')
+    # 新增字段：接收对方订单时打手分红费率（默认100%）
+    receive_rate = models.DecimalField(max_digits=5, decimal_places=4, default=1.0000, verbose_name='接收打手分红费率')
+
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'club'
+        verbose_name = '俱乐部'
+        verbose_name_plural = '俱乐部'
+        indexes = [
+            models.Index(fields=['club_id']),
+            models.Index(fields=['partner_club_id']),
+        ]
+
+
+class OrderTypeMapping(models.Model):
+    """对方订单类型 → 我方订单类型 映射表"""
+    partner_club_id = models.CharField(max_length=6, db_index=True, verbose_name='对方俱乐部ID')
+    partner_type_id = models.PositiveIntegerField(verbose_name='对方订单类型ID')
+    partner_type_name = models.CharField(max_length=100, verbose_name='对方订单类型名称')
+    our_type_id = models.PositiveIntegerField(verbose_name='我方订单类型ID')
+    our_type_name = models.CharField(max_length=100, verbose_name='我方订单类型名称')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'order_type_mapping'
+        verbose_name = '订单类型映射'
+        verbose_name_plural = '订单类型映射'
+        unique_together = (('partner_club_id', 'partner_type_id'),)
+
+
+class ClubConfig(models.Model):
+    """
+    俱乐部配置信息表
+    存储俱乐部（我方或对方）的详细配置，如昵称、头像、API密钥等
+    """
+    # 俱乐部ID（6位字符，与 Club 表中的 club_id 或 partner_club_id 对应）
+    club_id = models.CharField(max_length=6, db_index=True, verbose_name='俱乐部ID')
+
+    # 俱乐部昵称
+    club_nickname = models.CharField(max_length=50, blank=True, default='', verbose_name='俱乐部昵称')
+
+    # 俱乐部头像地址（URL）
+    club_avatar = models.CharField(max_length=500, blank=True, default='', verbose_name='俱乐部头像地址')
+
+    # 俱乐部后台域名（用于API请求）
+    backend_domain = models.CharField(max_length=200, blank=True, default='', verbose_name='后台域名')
+
+    # 聊天API密钥
+    chat_api_key = models.CharField(max_length=200, blank=True, default='', verbose_name='聊天API密钥')
+
+    # 聊天API ID
+    chat_api_id = models.CharField(max_length=200, blank=True, default='', verbose_name='聊天API ID')
+
+    # 客服路径
+    customer_service_api_url = models.CharField(max_length=200, blank=True, default='', verbose_name='客服API URL')
+    customer_service_corp_id = models.CharField(max_length=100, blank=True, default='', verbose_name='客服企业ID')
+
+    # 存储桶域名（如腾讯云COS、阿里云OSS的访问域名）
+    storage_bucket_domain = models.CharField(max_length=500, blank=True, default='', verbose_name='存储桶域名')
+    storage_bucket_name = models.CharField(max_length=100, blank=True, default='', verbose_name='存储桶名称')
+
+    # 标识是我方还是对方俱乐部：1=我方，0=对方（默认0）
+    is_self = models.SmallIntegerField(
+        choices=((0, '对方'), (1, '我方')),
+        default=0,
+        db_index=True,
+        verbose_name='是否我方俱乐部'
+    )
+
+    # 创建时间
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+
+    # 更新时间
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'club_config'
+        verbose_name = '俱乐部配置'
+        verbose_name_plural = '俱乐部配置'
+        # 联合唯一约束：同一个俱乐部ID只能有一条记录（无论我方对方），若需要分开则可不加
+        # 但通常一个俱乐部只会存在一种身份，所以加联合唯一约束更安全
+        unique_together = [['club_id']]  # 确保每个club_id只有一条配置记录
+
+    def __str__(self):
+        return f"{self.club_nickname or self.club_id} ({'我方' if self.is_self else '对方'})"
+
+
+from django.db import models
+
+class AccountPermission(models.Model):
+    """账号权限表：记录每个账号拥有的权限及开关状态"""
+    account_id = models.CharField(max_length=11, db_index=True, verbose_name='账号ID')
+    permission_code = models.IntegerField(verbose_name='权限代码')
+    is_enabled = models.BooleanField(default=False, verbose_name='是否开启')
+
+    class Meta:
+        db_table = 'account_permission'
+        verbose_name = '账号权限'
+        verbose_name_plural = '账号权限'
+        unique_together = [['account_id', 'permission_code']]  # 一个账号的同一权限只能有一条记录
+
+    def __str__(self):
+        return f"{self.account_id} 权限{self.permission_code}: {'开启' if self.is_enabled else '关闭'}"
+
+
+# apps/dingdan/models.py (添加新模型)
+class DailyDispatchStat(models.Model):
+    """
+    每日派单统计表
+    记录每天向各合作俱乐部派单的数据，用于替代俱乐部表中的累计字段。
+    """
+    # 日期相关字段（便于快速筛选）
+    date = models.DateField(verbose_name='统计日期', db_index=True)
+    year = models.PositiveSmallIntegerField(verbose_name='年份')
+    month = models.PositiveSmallIntegerField(verbose_name='月份')
+    day = models.PositiveSmallIntegerField(verbose_name='日期')
+    # 派单方向：1=我方派单（我方订单被对方抢单），2=对方派单（对方订单被我方抢单）
+    direction = models.PositiveSmallIntegerField(choices=[(1, '我方派单'), (2, '对方派单')], verbose_name='派单方向')
+    # 对方俱乐部ID
+    partner_club_id = models.CharField(max_length=6, db_index=True, verbose_name='对方俱乐部ID')
+    # 派单数
+    dispatch_count = models.PositiveIntegerField(default=0, verbose_name='派单数')
+    # 派单总额（打手分成 * 费率）
+    dispatch_amount = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='派单总额')
+
+    # 抢单统计（我方实际抢到的对方派单数/金额）
+    claimed_count = models.PositiveIntegerField(default=0, verbose_name='抢单数')
+    claimed_amount = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='抢单总额')
+    # 成交订单数（预留，当前暂不更新）
+    success_count = models.PositiveIntegerField(default=0, verbose_name='成交订单数')
+    # 成交总额（预留）
+    success_amount = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='成交总额')
+    # 时间戳
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'daily_dispatch_stat'
+        verbose_name = '每日派单统计'
+        verbose_name_plural = verbose_name
+        indexes = [
+            models.Index(fields=['year', 'month', 'day', 'direction', 'partner_club_id']),
+            models.Index(fields=['date']),
+        ]
+
+    def __str__(self):
+        return f"{self.date} - 方向{self.direction} - 俱乐部{self.partner_club_id} - 派单{self.dispatch_count}次"
+
+
+
+
+# apps/dingdan/models.py (新增模型)
+
+class DailyIncomeStat(models.Model):
+    """
+    每日收入统计表
+    记录平台每天通过微信支付获得的总收入和总笔数
+    """
+    # 日期相关字段（便于快速筛选和分组）
+    date = models.DateField(verbose_name='统计日期', db_index=True, unique=True)
+    year = models.PositiveSmallIntegerField(verbose_name='年份')
+    month = models.PositiveSmallIntegerField(verbose_name='月份')
+    day = models.PositiveSmallIntegerField(verbose_name='日期')
+
+    # 收入统计
+    total_amount = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='总收入金额')
+    total_count = models.PositiveIntegerField(default=0, verbose_name='总收入笔数')
+
+    # 时间戳
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'daily_income_stat'
+        verbose_name = '每日收入统计'
+        verbose_name_plural = verbose_name
+        indexes = [
+            models.Index(fields=['date']),
+            models.Index(fields=['year', 'month', 'day']),
+        ]
+
+    def __str__(self):
+        return f"{self.date} - 收入{self.total_amount}元 - {self.total_count}笔"
+
+
+# apps/dingdan/models.py
+
+class DailyPayoutStat(models.Model):
+    """
+    每日出款统计表
+    记录平台每天通过提现/结算等方式的出款总额和总笔数
+    """
+    date = models.DateField(verbose_name='统计日期', db_index=True, unique=True)
+    year = models.PositiveSmallIntegerField(verbose_name='年份')
+    month = models.PositiveSmallIntegerField(verbose_name='月份')
+    day = models.PositiveSmallIntegerField(verbose_name='日期')
+
+    total_amount = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='出款总额')
+    total_count = models.PositiveIntegerField(default=0, verbose_name='出款总笔数')
+
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'daily_payout_stat'
+        verbose_name = '每日出款统计'
+        verbose_name_plural = verbose_name
+        indexes = [
+            models.Index(fields=['date']),
+            models.Index(fields=['year', 'month', 'day']),
+        ]
+
+    def __str__(self):
+        return f"{self.date} - 出款{self.total_amount}元 - {self.total_count}笔"
+
+
+
+
+
+
+
+
+
+
+from django.db import models
+
+class PopupPage(models.Model):
+    page_key = models.CharField(max_length=50, unique=True, db_index=True, verbose_name='页面标识')
+    name = models.CharField(max_length=100, verbose_name='页面名称')
+    description = models.TextField(blank=True, verbose_name='描述')
+    is_active = models.BooleanField(default=True, verbose_name='是否启用')
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+    ignore_user_mute = models.BooleanField(default=False, verbose_name='忽略用户今日屏蔽')
+
+    class Meta:
+        db_table = 'popup_page'
+        verbose_name = '弹窗页面'
+        verbose_name_plural = '弹窗页面'
+
+    def __str__(self):
+        return f'{self.name} ({self.page_key})'
+
+
+class PopupConfig(models.Model):
+    STRATEGY_CHOICES = (
+        ('once', '仅一次'),
+        ('daily', '每日'),
+        ('weekly', '每周'),
+        ('monthly', '每月'),
+        ('yearly', '每年'),
+        ('always', '始终'),
+        ('count', '周期内次数限制'),
+    )
+    page = models.ForeignKey(PopupPage, on_delete=models.CASCADE, related_name='popups')
+    popup_id = models.CharField(max_length=50, verbose_name='弹窗唯一ID')
+    title = models.CharField(max_length=200, blank=True, verbose_name='标题（后台用）')
+    description = models.TextField(blank=True, verbose_name='描述（后台用）')
+    strategy_type = models.CharField(max_length=20, choices=STRATEGY_CHOICES, default='once')
+    max_count = models.PositiveIntegerField(default=1, verbose_name='周期内最大展示次数')
+    reset_interval = models.CharField(max_length=20, blank=True,
+                                      choices=(('day','天'),('week','周'),('month','月'),('year','年')),
+                                      verbose_name='重置周期（count类型时使用）')
+    duration = models.PositiveIntegerField(default=0, verbose_name='强制阅读秒数（0=无强制）')
+    force_even_muted = models.BooleanField(default=False, verbose_name='强制弹出（忽略用户今日屏蔽）')
+    sort_order = models.PositiveIntegerField(default=0, verbose_name='展示顺序')
+    is_active = models.BooleanField(default=True, verbose_name='是否启用')
+    start_time = models.DateTimeField(null=True, blank=True, verbose_name='生效开始时间')
+    end_time = models.DateTimeField(null=True, blank=True, verbose_name='生效结束时间')
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        db_table = 'popup_config'
+        verbose_name = '弹窗配置'
+        verbose_name_plural = '弹窗配置'
+        unique_together = ('page', 'popup_id')
+        ordering = ['sort_order', 'id']
+
+    def __str__(self):
+        return f'{self.page.name} - {self.popup_id}'
+
+
+class PopupImage(models.Model):
+    popup_config = models.ForeignKey(PopupConfig, on_delete=models.CASCADE, related_name='images')
+    image_url = models.CharField(max_length=500, verbose_name='图片相对路径')
+    text = models.TextField(blank=True, verbose_name='图片上方文字')
+    sort_order = models.PositiveIntegerField(default=0, verbose_name='展示顺序')
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        db_table = 'popup_image'
+        verbose_name = '弹窗图片'
+        verbose_name_plural = '弹窗图片'
+        ordering = ['sort_order', 'id']
+
+    def __str__(self):
+        return f'{self.popup_config.popup_id} - 图片{self.sort_order}'
\ No newline at end of file
diff --git a/peizhi/serializers.py b/peizhi/serializers.py
new file mode 100644
index 0000000..b53a33a
--- /dev/null
+++ b/peizhi/serializers.py
@@ -0,0 +1,32 @@
+#微信小程序弹窗组件
+from rest_framework import serializers
+from .models import PopupImage, PopupConfig
+
+
+class PopupImageSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = PopupImage
+        fields = ['url', 'text']  # 注意：前端需要 url 字段，我们序列化时映射 image_url -> url
+        # 手动处理字段名映射
+
+    url = serializers.CharField(source='image_url')
+
+
+class PopupConfigSerializer(serializers.ModelSerializer):
+    images = PopupImageSerializer(many=True, read_only=True)
+    strategy = serializers.SerializerMethodField()
+
+    class Meta:
+        model = PopupConfig
+        fields = ['popup_id', 'title', 'duration', 'force_even_muted', 'images', 'strategy']
+
+
+    def get_strategy(self, obj):
+        # 组装前端需要的 strategy 对象
+        strategy = {
+            'type': obj.strategy_type,
+            'maxCount': obj.max_count,
+        }
+        if obj.reset_interval:
+            strategy['resetInterval'] = obj.reset_interval
+        return strategy
\ No newline at end of file
diff --git a/peizhi/tasks.py b/peizhi/tasks.py
new file mode 100644
index 0000000..f49f474
--- /dev/null
+++ b/peizhi/tasks.py
@@ -0,0 +1,86 @@
+"""
+阿龙电竞 - 收支记录定时任务
+处理收支记录表的每日清零
+固定使用ID=1的记录
+"""
+
+from celery import shared_task
+from django.db import transaction
+from django.utils import timezone
+from datetime import datetime
+from decimal import Decimal
+import logging
+
+# 导入模型
+from peizhi.models import Szjilu
+from utils.celery_utils import log_task_execution, rollback_on_failure
+
+logger = logging.getLogger(__name__)
+
+@shared_task
+@rollback_on_failure("收支记录每日清零")
+def daily_sz_reset_task():
+    """
+    收支记录每日清零 - 每天凌晨0点5分执行
+    清零收支记录表的今日相关字段，固定使用ID=1的记录
+    """
+    try:
+        with transaction.atomic():
+            # 获取今天的日期
+            today = datetime.now().strftime('%Y-%m-%d')
+
+            logger.info(f"开始执行收支记录清零任务，日期: {today}")
+
+            # 查询ID=1的收支记录，如果不存在则创建
+            try:
+                szjilu = Szjilu.objects.get(id=1)
+                logger.info(f"找到ID=1的收支记录")
+            except Szjilu.DoesNotExist:
+                # 创建ID=1的初始记录
+                szjilu = Szjilu.objects.create(
+                    id=1,
+                    zongsy=Decimal('0.00'),
+                    zongls=Decimal('0.00'),
+                    zongzc=Decimal('0.00'),
+                    jrzc=Decimal('0.00'),
+                    jrls=Decimal('0.00')
+                )
+                logger.info(f"创建ID=1的收支记录")
+
+            # 记录清零前的值（用于日志）
+            old_jrzc = szjilu.jrzc
+            old_jrls = szjilu.jrls
+
+            # 清零今日字段
+            szjilu.jrzc = Decimal('0.00')
+            szjilu.jrls = Decimal('0.00')
+            szjilu.save(update_fields=['jrzc', 'jrls', 'update_time'])
+
+            logger.info(f"收支记录清零完成，今日支出原值: {old_jrzc}，今日流水原值: {old_jrls}")
+
+            result_msg = f"收支记录清零完成 - 日期: {today}, 记录ID: {szjilu.id}"
+
+            log_task_execution("收支记录每日清零", True, result_msg)
+
+            return {
+                "success": True,
+                "date": today,
+                "record_id": szjilu.id,
+                "jrzc_cleared": True,
+                "jrls_cleared": True,
+                "old_jrzc": str(old_jrzc),
+                "old_jrls": str(old_jrls),
+                "message": result_msg
+            }
+
+    except Exception as e:
+        error_msg = f"收支记录每日清零失败: {str(e)}"
+        logger.error(error_msg)
+        log_task_execution("收支记录每日清零", False, error_msg)
+
+        return {
+            "success": False,
+            "error": str(e),
+            "date": datetime.now().strftime('%Y-%m-%d'),
+            "message": error_msg
+        }
\ No newline at end of file
diff --git a/peizhi/tests.py b/peizhi/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/peizhi/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/peizhi/urls.py b/peizhi/urls.py
new file mode 100644
index 0000000..641c84e
--- /dev/null
+++ b/peizhi/urls.py
@@ -0,0 +1,42 @@
+# peizhi/urls.py
+from django.urls import path
+from .views import ShangpinGonggaoView, AdminUpdateConfigView, AdminUploadImageView, AdminConfigQueryView, \
+    DashouPaihangView, GetAdminZhanghaoView, GetXiugaiJiluView, ShangjiaTianjiaMobanView, ShangjiaMobanListView, \
+    ShangjiaGengxinMobanView, ShangjiaShanchuMobanView, ShangjiaGenerateLinkView, KehuGetDingdanLianjieView, \
+    KehuTianxieDingdanView, AdminSelfBatchGenerateLinkView, ShangjiaMobanListViewpl, GuanshiQRCodeView, \
+    GuanZhuAListView, ZuzhangHaibaoView, GetDynamicConfigView, PopupConfigView, GetWithdrawModeView, CheckPhoneAuthView, \
+    ShangjiaLianjieListView
+
+urlpatterns = [
+    path('shangpingonggao/', ShangpinGonggaoView.as_view(), name='商品公告轮播获取'),
+    path('adpzhq', AdminConfigQueryView.as_view(), name='管理员获取配置'),
+    path('adxgtp', AdminUploadImageView.as_view(), name='管理员更新配置图片'),
+    path('adupdate', AdminUpdateConfigView.as_view(), name='管理员更新群和利禄'),
+    path('dsph', DashouPaihangView.as_view(), name='排行数据获取'),
+    path('adzhhq', GetAdminZhanghaoView.as_view(), name='管理员查询操作记录 账号'),
+    path('adhqxg', GetXiugaiJiluView.as_view(), name='管理员铲鲟操作记录数据'),
+    path('sjtjddmb', ShangjiaTianjiaMobanView.as_view(), name='商家添加订单模板'),
+    path('sjddmblb', ShangjiaMobanListView.as_view(), name='商家获取订单模板'),
+    path('sjddmbgx', ShangjiaGengxinMobanView.as_view(), name='商家修改订单模板'),
+    path('sjddmbsc', ShangjiaShanchuMobanView.as_view(), name='商家删除订单模板'),
+    # 商家生成链接接口
+    path('sjljhq', ShangjiaGenerateLinkView.as_view(), name='商家生成链接'),
+    # 客户获取订单链接信息
+    path('khhqddlj', KehuGetDingdanLianjieView.as_view(), name='客户获取订单链接数据'),
+
+    # 客户填写订单信息
+    path('kehutx', KehuTianxieDingdanView.as_view(), name='客户修改订单链接'),
+    path('batch-generate-link', AdminSelfBatchGenerateLinkView.as_view(),name='生成一百个链接'),
+    path('adhqmb', ShangjiaMobanListViewpl.as_view(), name='一百个连接接口获取模板'),
+    path('guanshiewm', GuanshiQRCodeView.as_view(), name='管事生成二维码'),
+    path('gzal', GuanZhuAListView.as_view(), name='关注阿龙'),
+    path('zuzhanghb', ZuzhangHaibaoView.as_view(), name='组长二维码'),
+    path('qdpzhq', GetDynamicConfigView.as_view(), name='小程序获取配置'),
+
+    path('tanchuang', PopupConfigView.as_view(), name='微信小程序获取弹窗数据'),
+
+   path('hqtxzsym', GetWithdrawModeView.as_view(), name='小程序获取提现方式'),
+   path('yhbdsjh', CheckPhoneAuthView.as_view(), name='判断是否需要手机号绑定'),
+   path('hqsjlslj', ShangjiaLianjieListView.as_view(), name='商家获取生成链接'),
+
+]
\ No newline at end of file
diff --git a/peizhi/views.py b/peizhi/views.py
new file mode 100644
index 0000000..f611a6a
--- /dev/null
+++ b/peizhi/views.py
@@ -0,0 +1,5776 @@
+# peizhi/views.py
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.throttling import AnonRateThrottle
+from django.db import models
+
+from houtai.utils import update_shangjia_daily
+from peizhi.models import Gonggao, Lunbo
+import logging
+from rest_framework.permissions import AllowAny  # 新增这行
+
+# 配置日志
+logger = logging.getLogger(__name__)
+
+
+
+
+
+
+# peizhi/views.py 或新建 views_config.py
+import logging
+from rest_framework.views import APIView
+
+from rest_framework.permissions import AllowAny
+from rest_framework.parsers import JSONParser
+from .models import ClubConfig
+
+
+class GetDynamicConfigView(APIView):
+
+
+    permission_classes = [AllowAny]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        try:
+            # 查询我方俱乐部配置（is_self=1），取第一条（通常只有一条）
+            club_config = ClubConfig.objects.filter(is_self=1).only(
+                'storage_bucket_domain',
+                'storage_bucket_name',
+                'chat_api_key',
+                'customer_service_api_url',
+                'customer_service_corp_id'
+            ).first()
+
+            # 默认值（防止空数据导致前端报错）
+            cos_bucket = ''
+            cos_region = 'ap-shanghai'
+            cos_oss_url = ''
+            goeasy_host = 'hangzhou.goeasy.io'
+            goeasy_appkey = ''
+            kefu_link = ''
+            kefu_enterprise_id = ''
+            morentouxiang = 'a_long/morentouxiang.jpg'
+            dashouguize = 'a_long/dashouguize.jpg'
+
+            if club_config:
+                # 存储桶配置
+                bucket = club_config.storage_bucket_name or ''
+                region = 'ap-shanghai'  # 若需要动态，可单独存储
+                cos_oss_url = club_config.storage_bucket_domain or ''
+                if cos_oss_url and not cos_oss_url.endswith('/'):
+                    cos_oss_url += '/'
+                cos_bucket = bucket
+                cos_region = region
+
+                # GoEasy 配置
+                if club_config.chat_api_key:
+                    goeasy_appkey = club_config.chat_api_key
+                # host 如果需要可动态，这里固定或从其他字段获取
+
+                # 客服配置
+                if club_config.customer_service_api_url:
+                    kefu_link = club_config.customer_service_api_url
+                if club_config.customer_service_corp_id:
+                    kefu_enterprise_id = club_config.customer_service_corp_id
+
+                # 其他配置可在此扩展
+
+            # 构造返回数据
+            data = {
+                "code": 0,
+                "data": {
+                    "cos": {
+                        "bucket": cos_bucket,
+                        "region": cos_region,
+                        "ossImageUrl": cos_oss_url,
+                        "uploadPathPrefix": "order/"
+                    },
+                    "goEasy": {
+                        "host": goeasy_host,
+                        "appkey": goeasy_appkey
+                    },
+                    "otherConfig": {
+                        "morentouxiang": morentouxiang,
+                        "dashouguize": dashouguize
+                    },
+                    "kefu": {
+                        "link": kefu_link,
+                        "enterpriseId": kefu_enterprise_id
+                    }
+                }
+            }
+            return Response(data)
+
+        except Exception as e:
+            logger.error(f"获取动态配置失败: {str(e)}", exc_info=True)
+            return Response({"code": 500, "msg": "服务器内部错误"}, status=500)
+
+
+
+
+class ShangpinGonggaoView(APIView):
+    """
+    商品公告和轮播图接口
+    获取类型为1的公告和轮播图
+    """
+
+    # 应用节流（限制频率）
+    throttle_classes = [AnonRateThrottle]
+    # 新增：允许所有用户访问（不需要认证）
+    permission_classes = [AllowAny]
+
+    def post(self, request):
+        """
+        处理POST请求，返回公告和轮播图数据
+
+        请求: POST /api/peizhi/shangpingonggao/
+        返回: {
+            "shangpingonggao": "公告内容字符串",
+            "shangpinlunbo": ["轮播图URL1", "轮播图URL2"]
+        }
+        """
+        try:
+            logger.info("收到商品公告和轮播图请求")
+
+            # 1. 查询公告（类型为1）
+            gonggao_obj = Gonggao.objects.filter(leixing=1).first()
+
+            # 获取公告内容，如果没有则返回空字符串
+            gonggao_content = gonggao_obj.jieshao if gonggao_obj else ""
+
+            # 2. 查询轮播图（类型为1，按显示顺序排序）
+            lunbo_queryset = Lunbo.objects.filter(leixing=1)
+
+            # 提取轮播图URL列表
+            lunbo_urls = [lunbo.tupian_url for lunbo in lunbo_queryset]
+
+            # 3. 构建返回数据
+            response_data = {
+                "shangpingonggao": gonggao_content,
+                "shangpinlunbo": lunbo_urls
+            }
+
+            logger.info(f"返回数据：公告长度{len(gonggao_content)}，轮播图数量{len(lunbo_urls)}")
+
+            # 4. 返回响应
+            return Response(response_data, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            # 记录异常
+            logger.error(f"获取商品公告和轮播图时发生错误：{str(e)}")
+
+            # 返回错误响应
+            error_data = {
+                "error": "服务器内部错误",
+                "detail": "获取数据失败，请稍后重试"
+            }
+            return Response(error_data, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+
+
+# peizhi/views.py
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status, permissions
+from rest_framework.parsers import MultiPartParser, FormParser
+from django.db import transaction
+from yonghu.models import UserMain, AdminProfile
+from .models import Tupianpeizhi, Qunpeizhi
+from dingdan.models import Lilubiao
+import json
+import os
+import uuid
+from utils.oss_utils import upload_to_oss, delete_from_oss, validate_image
+
+class AdminConfigQueryView(APIView):
+    """
+    管理员获取系统配置接口
+    URL: /peizhi/adpzhq
+    方法: POST
+    权限: JWT Token认证 + 管理员权限
+    参数: zhanghao (管理员账号)
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 获取前端传递的账号
+            zhanghao = request.data.get('zhanghao')
+            if not zhanghao:
+                return Response({
+                    'code': 1,
+                    'msg': '账号不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 获取当前用户（UserMain实例）
+            user_main = request.user
+
+            # 验证账号：比较user_main的phone与前端传递的zhanghao
+            if user_main.phone != zhanghao:
+                return Response({
+                    'code': 1,
+                    'msg': '账号不匹配',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            # 验证用户类型是否为管理员
+            if user_main.user_type != 'admin':
+                return Response({
+                    'code': 1,
+                    'msg': '无权限',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            # 验证管理员扩展表是否存在
+            try:
+                admin_profile = user_main.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response({
+                    'code': 1,
+                    'msg': '无权限',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            # 查询图片配置
+            rule_image = Tupianpeizhi.objects.filter(leixing=1).first()
+            default_avatar = Tupianpeizhi.objects.filter(leixing=2).first()
+
+            # 查询群配置
+            qun_configs = Qunpeizhi.objects.all()
+            qq_groups = []
+            for config in qun_configs:
+                qq_groups.append({
+                    'peizhiid': config.peizhiid,
+                    'neirong': config.neirong if config.neirong else '',
+                    'qunid': config.qunid if config.qunid else '',
+                    'jieshao': config.jieshao if config.jieshao else ''
+                })
+
+            # 查询利率配置
+            platform_rate_obj = Lilubiao.objects.filter(fadanpingtai='1').first()
+            shop_rate_obj = Lilubiao.objects.filter(fadanpingtai='3').first()
+            # 🔴【新增】打手提现抽成利率（字符5）
+            dashou_withdraw_obj = Lilubiao.objects.filter(fadanpingtai='5').first()
+            # 🔴【新增】管事提现抽成利率（字符6）
+            guanshi_withdraw_obj = Lilubiao.objects.filter(fadanpingtai='6').first()
+
+            # 构建返回数据
+            data = {
+                'images': {
+                    'rule_image': rule_image.tupian if rule_image and rule_image.tupian else '',
+                    'default_avatar': default_avatar.tupian if default_avatar and default_avatar.tupian else ''
+                },
+                'qq_groups': qq_groups,
+                'rates': {
+                    'platform_rate': float(platform_rate_obj.lilu) if platform_rate_obj and platform_rate_obj.lilu else 0.0,
+                    'shop_rate': float(shop_rate_obj.lilu) if shop_rate_obj and shop_rate_obj.lilu else 0.0,
+                    # 🔴【新增】打手提现抽成利率
+                    'dashou_withdraw_rate': float(
+                        dashou_withdraw_obj.lilu) if dashou_withdraw_obj and dashou_withdraw_obj.lilu else 0.0,
+                    # 🔴【新增】管事提现抽成利率
+                    'guanshi_withdraw_rate': float(
+                        guanshi_withdraw_obj.lilu) if guanshi_withdraw_obj and guanshi_withdraw_obj.lilu else 0.0
+                }
+            }
+
+            return Response({
+                'code': 0,
+                'msg': 'success',
+                'data': data
+            })
+
+        except Exception as e:
+            return Response({
+                'code': 99,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+class AdminUploadImageView(APIView):
+    """
+    管理员上传配置图片接口
+    URL: /peizhi/adxgtp
+    方法: POST
+    权限: JWT Token认证 + 管理员权限
+    参数: zhanghao, leixing (1:打手规则图片, 2:默认头像图片), image (文件)
+    """
+    permission_classes = [permissions.IsAuthenticated]
+    parser_classes = (MultiPartParser, FormParser)
+
+    def post(self, request):
+        try:
+            zhanghao = request.data.get('zhanghao')
+            leixing = request.data.get('leixing')
+            image_file = request.FILES.get('image')
+
+            if not zhanghao:
+                return Response({
+                    'code': 1,
+                    'msg': '账号不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            if not leixing:
+                return Response({
+                    'code': 2,
+                    'msg': '图片类型不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            if not image_file:
+                return Response({
+                    'code': 3,
+                    'msg': '请选择图片文件',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 验证用户权限
+            user_main = request.user
+            if user_main.phone != zhanghao:
+                return Response({
+                    'code': 1,
+                    'msg': '账号不匹配',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            if user_main.user_type != 'admin':
+                return Response({
+                    'code': 1,
+                    'msg': '无权限',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            try:
+                admin_profile = user_main.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response({
+                    'code': 1,
+                    'msg': '无权限',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            # 验证图片类型
+            if leixing not in ['1', '2']:
+                return Response({
+                    'code': 4,
+                    'msg': '图片类型错误',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 验证图片文件
+            is_valid, error_msg = validate_image(image_file)
+            if not is_valid:
+                return Response({
+                    'code': 5,
+                    'msg': f'图片验证失败: {error_msg}',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 根据类型确定固定相对URL和文件名
+            if leixing == '1':
+                # 打手规则图片
+                fixed_relative_url = 'a_long/dashouguize.jpg'
+                oss_file_name = 'dashouguize.jpg'
+            else:
+                # 默认头像图片
+                fixed_relative_url = 'a_long/morentouxiang.jpg'
+                oss_file_name = 'morentouxiang.jpg'
+
+            # 构建OSS文件路径
+            oss_file_path = fixed_relative_url  # a_long/dashouguize.jpg 或 a_long/morentouxiang.jpg
+
+            # 上传到OSS（覆盖原有文件）
+            image_file.seek(0)  # 重置文件指针
+            full_url = upload_to_oss(image_file, oss_file_path)
+
+            if not full_url:
+                return Response({
+                    'code': 6,
+                    'msg': '图片上传到存储桶失败',
+                    'data': None
+                }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            # 更新数据库
+            with transaction.atomic():
+                # 获取或创建图片配置记录
+                tupian_peizhi, created = Tupianpeizhi.objects.get_or_create(leixing=int(leixing))
+                tupian_peizhi.tupian = fixed_relative_url
+                tupian_peizhi.save()
+
+            return Response({
+                'code': 0,
+                'msg': '图片上传成功',
+                'data': {
+                    'image_url': fixed_relative_url
+                }
+            })
+
+        except Exception as e:
+            return Response({
+                'code': 99,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+class AdminUpdateConfigView(APIView):
+    """
+    管理员更新系统配置接口（QQ群、利率）- 已修复
+    URL: /peizhi/adupdate
+    方法: POST
+    权限: JWT Token认证 + 管理员权限
+    参数:
+        - zhanghao: 管理员账号
+        - qq_groups: [{"peizhiid": 1, "neirong": "", "qunid": "", "jieshao": ""}, ...] (可选)
+        - rates: {"platform_rate": 0.1, "shop_rate": 0.2} (可选)
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        try:
+            zhanghao = request.data.get('zhanghao')
+            if not zhanghao:
+                return Response({
+                    'code': 1,
+                    'msg': '账号不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 验证用户权限
+            user_main = request.user
+            if user_main.phone != zhanghao:
+                return Response({
+                    'code': 1,
+                    'msg': '账号不匹配',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            if user_main.user_type != 'admin':
+                return Response({
+                    'code': 1,
+                    'msg': '无权限',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            try:
+                admin_profile = user_main.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response({
+                    'code': 1,
+                    'msg': '无权限',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            response_data = {}
+
+            # 🔴 修复：更新QQ群配置 - 确保根据peizhiid正确更新对应的记录
+            qq_groups = request.data.get('qq_groups')
+            if qq_groups and isinstance(qq_groups, list):
+                updated_groups = []
+                for group_data in qq_groups:
+                    peizhiid = group_data.get('peizhiid')
+                    if not peizhiid:
+                        continue
+
+                    # 🔴 修复：使用filter()确保查询到正确的记录
+                    qun_configs = Qunpeizhi.objects.filter(peizhiid=peizhiid)
+
+                    if qun_configs.exists():
+                        # 如果存在多个相同peizhiid的记录，取第一个（应该只有一个）
+                        qun_config = qun_configs.first()
+
+                        # 更新字段
+                        neirong = group_data.get('neirong')
+                        qunid = group_data.get('qunid')
+                        jieshao = group_data.get('jieshao')
+
+                        if neirong is not None:
+                            qun_config.neirong = neirong or ''
+                        if qunid is not None:
+                            qun_config.qunid = qunid or ''
+                        if jieshao is not None:
+                            qun_config.jieshao = jieshao or ''
+
+                        qun_config.save()
+                    else:
+                        # 如果不存在，创建新的（使用提供的peizhiid）
+                        qun_config = Qunpeizhi.objects.create(
+                            peizhiid=peizhiid,
+                            neirong=group_data.get('neirong', '') or '',
+                            qunid=group_data.get('qunid', '') or '',
+                            jieshao=group_data.get('jieshao', '') or ''
+                        )
+
+                    updated_groups.append({
+                        'peizhiid': qun_config.peizhiid,
+                        'neirong': qun_config.neirong,
+                        'qunid': qun_config.qunid,
+                        'jieshao': qun_config.jieshao
+                    })
+
+                if updated_groups:
+                    response_data['qq_groups'] = updated_groups
+
+            # 🔴 修复：更新利率配置 - 确保更新现有记录而不是创建新记录
+            rates = request.data.get('rates')
+            if rates and isinstance(rates, dict):
+                updated_rates = {}
+
+                # 平台发单利率（类型1，fadanpingtai='1'）
+                platform_rate = rates.get('platform_rate')
+                if platform_rate is not None:
+                    try:
+                        platform_rate_float = float(platform_rate)
+                        if 0 <= platform_rate_float <= 1:
+                            # 🔴 修复：查询现有记录，如果不存在则创建
+                            platform_rate_obj = Lilubiao.objects.filter(fadanpingtai='1').first()
+
+                            if platform_rate_obj:
+                                # 更新现有记录
+                                platform_rate_obj.lilu = platform_rate_float
+                                platform_rate_obj.save()
+                            else:
+                                # 创建新记录
+                                platform_rate_obj = Lilubiao.objects.create(
+                                    lilu=platform_rate_float,
+                                    fadanpingtai='1'
+                                )
+
+                            updated_rates['platform_rate'] = platform_rate_float
+                        else:
+                            return Response({
+                                'code': 3,
+                                'msg': '平台发单利率必须在0-1之间',
+                                'data': None
+                            }, status=status.HTTP_400_BAD_REQUEST)
+                    except ValueError:
+                        return Response({
+                            'code': 4,
+                            'msg': '平台发单利率格式错误',
+                            'data': None
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 商家发单利率（类型2，fadanpingtai='2'）
+                shop_rate = rates.get('shop_rate')
+                if shop_rate is not None:
+                    try:
+                        shop_rate_float = float(shop_rate)
+                        if 0 <= shop_rate_float <= 1:
+                            # 🔴 修复：查询现有记录，如果不存在则创建
+                            shop_rate_obj = Lilubiao.objects.filter(fadanpingtai='3').first()
+
+                            if shop_rate_obj:
+                                # 更新现有记录
+                                shop_rate_obj.lilu = shop_rate_float
+                                shop_rate_obj.save()
+                            else:
+                                # 创建新记录
+                                shop_rate_obj = Lilubiao.objects.create(
+                                    lilu=shop_rate_float,
+                                    fadanpingtai='3'
+                                )
+
+                            updated_rates['shop_rate'] = shop_rate_float
+                        else:
+                            return Response({
+                                'code': 5,
+                                'msg': '商家发单利率必须在0-1之间',
+                                'data': None
+                            }, status=status.HTTP_400_BAD_REQUEST)
+                    except ValueError:
+                        return Response({
+                            'code': 6,
+                            'msg': '商家发单利率格式错误',
+                            'data': None
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                # AdminUpdateConfigView 类中的 post 方法，在 rates 部分
+
+                # 🔴【新增】打手提现抽成利率（类型5，fadanpingtai='5'）
+                dashou_withdraw_rate = rates.get('dashou_withdraw_rate')
+                if dashou_withdraw_rate is not None:
+                    try:
+                        dashou_withdraw_rate_float = float(dashou_withdraw_rate)
+                        if 0 <= dashou_withdraw_rate_float <= 1:
+                            # 查询现有记录，如果不存在则创建
+                            dashou_withdraw_obj = Lilubiao.objects.filter(fadanpingtai='5').first()
+
+                            if dashou_withdraw_obj:
+                                # 更新现有记录
+                                dashou_withdraw_obj.lilu = dashou_withdraw_rate_float
+                                dashou_withdraw_obj.save()
+                            else:
+                                # 创建新记录
+                                dashou_withdraw_obj = Lilubiao.objects.create(
+                                    lilu=dashou_withdraw_rate_float,
+                                    fadanpingtai='5'
+                                )
+
+                            updated_rates['dashou_withdraw_rate'] = dashou_withdraw_rate_float
+                        else:
+                            return Response({
+                                'code': 7,  # 注意：这里需要调整错误码，不要重复
+                                'msg': '打手提现抽成利率必须在0-1之间',
+                                'data': None
+                            }, status=status.HTTP_400_BAD_REQUEST)
+                    except ValueError:
+                        return Response({
+                            'code': 8,
+                            'msg': '打手提现抽成利率格式错误',
+                            'data': None
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 🔴【新增】管事提现抽成利率（类型6，fadanpingtai='6'）
+                guanshi_withdraw_rate = rates.get('guanshi_withdraw_rate')
+                if guanshi_withdraw_rate is not None:
+                    try:
+                        guanshi_withdraw_rate_float = float(guanshi_withdraw_rate)
+                        if 0 <= guanshi_withdraw_rate_float <= 1:
+                            # 查询现有记录，如果不存在则创建
+                            guanshi_withdraw_obj = Lilubiao.objects.filter(fadanpingtai='6').first()
+
+                            if guanshi_withdraw_obj:
+                                # 更新现有记录
+                                guanshi_withdraw_obj.lilu = guanshi_withdraw_rate_float
+                                guanshi_withdraw_obj.save()
+                            else:
+                                # 创建新记录
+                                guanshi_withdraw_obj = Lilubiao.objects.create(
+                                    lilu=guanshi_withdraw_rate_float,
+                                    fadanpingtai='6'
+                                )
+
+                            updated_rates['guanshi_withdraw_rate'] = guanshi_withdraw_rate_float
+                        else:
+                            return Response({
+                                'code': 9,
+                                'msg': '管事提现抽成利率必须在0-1之间',
+                                'data': None
+                            }, status=status.HTTP_400_BAD_REQUEST)
+                    except ValueError:
+                        return Response({
+                            'code': 10,
+                            'msg': '管事提现抽成利率格式错误',
+                            'data': None
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                if updated_rates:
+                    response_data['rates'] = updated_rates
+
+            # 如果没有任何更新
+            if not response_data:
+                return Response({
+                    'code': 7,
+                    'msg': '没有需要更新的数据',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            return Response({
+                'code': 0,
+                'msg': '更新成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            return Response({
+                'code': 99,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+'''class AdminUpdateConfigView(APIView):
+    """
+    管理员更新系统配置接口（QQ群、利率）
+    URL: /peizhi/adupdate
+    方法: POST
+    权限: JWT Token认证 + 管理员权限
+    参数:
+        - zhanghao: 管理员账号
+        - qq_groups: [{"peizhiid": 1, "neirong": "", "qunid": "", "jieshao": ""}, ...] (可选)
+        - rates: {"platform_rate": 0.1, "shop_rate": 0.2} (可选)
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        try:
+            zhanghao = request.data.get('zhanghao')
+            if not zhanghao:
+                return Response({
+                    'code': 1,
+                    'msg': '账号不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 验证用户权限
+            user_main = request.user
+            if user_main.phone != zhanghao:
+                return Response({
+                    'code': 1,
+                    'msg': '账号不匹配',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            if user_main.user_type != 'admin':
+                return Response({
+                    'code': 1,
+                    'msg': '无权限',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            try:
+                admin_profile = user_main.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response({
+                    'code': 1,
+                    'msg': '无权限',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            response_data = {}
+
+            # 更新QQ群配置
+            qq_groups = request.data.get('qq_groups')
+            if qq_groups and isinstance(qq_groups, list):
+                updated_groups = []
+                for group_data in qq_groups:
+                    peizhiid = group_data.get('peizhiid')
+                    if not peizhiid:
+                        continue
+
+                    # 查找配置
+                    qun_config = Qunpeizhi.objects.filter(peizhiid=peizhiid).first()
+                    if not qun_config:
+                        # 如果不存在，创建新的
+                        qun_config = Qunpeizhi(peizhiid=peizhiid)
+
+                    # 更新字段（peizhiid不可改）
+                    qun_config.neirong = group_data.get('neirong', qun_config.neirong) or ''
+                    qun_config.qunid = group_data.get('qunid', qun_config.qunid) or ''
+                    qun_config.jieshao = group_data.get('jieshao', qun_config.jieshao) or ''
+                    qun_config.save()
+
+                    updated_groups.append({
+                        'peizhiid': qun_config.peizhiid,
+                        'neirong': qun_config.neirong,
+                        'qunid': qun_config.qunid,
+                        'jieshao': qun_config.jieshao
+                    })
+
+                if updated_groups:
+                    response_data['qq_groups'] = updated_groups
+
+            # 更新利率配置
+            rates = request.data.get('rates')
+            if rates and isinstance(rates, dict):
+                updated_rates = {}
+
+                # 平台发单利率（类型1）
+                platform_rate = rates.get('platform_rate')
+                if platform_rate is not None:
+                    try:
+                        platform_rate_float = float(platform_rate)
+                        if 0 <= platform_rate_float <= 1:
+                            platform_rate_obj = Lilubiao.objects.filter(fadanpingtai='1').first()
+                            if not platform_rate_obj:
+                                platform_rate_obj = Lilubiao.objects.create(
+                                    lilu=platform_rate_float,
+                                    fadanpingtai='1'
+                                )
+                            else:
+                                platform_rate_obj.lilu = platform_rate_float
+                                platform_rate_obj.save()
+
+                            updated_rates['platform_rate'] = platform_rate_float
+                        else:
+                            return Response({
+                                'code': 3,
+                                'msg': '平台发单利率必须在0-1之间',
+                                'data': None
+                            }, status=status.HTTP_400_BAD_REQUEST)
+                    except ValueError:
+                        return Response({
+                            'code': 4,
+                            'msg': '平台发单利率格式错误',
+                            'data': None
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 商家发单利率（类型2）
+                shop_rate = rates.get('shop_rate')
+                if shop_rate is not None:
+                    try:
+                        shop_rate_float = float(shop_rate)
+                        if 0 <= shop_rate_float <= 1:
+                            shop_rate_obj = Lilubiao.objects.filter(fadanpingtai='2').first()
+                            if not shop_rate_obj:
+                                shop_rate_obj = Lilubiao.objects.create(
+                                    lilu=shop_rate_float,
+                                    fadanpingtai='3'
+                                )
+                            else:
+                                shop_rate_obj.lilu = shop_rate_float
+                                shop_rate_obj.save()
+
+                            updated_rates['shop_rate'] = shop_rate_float
+                        else:
+                            return Response({
+                                'code': 5,
+                                'msg': '商家发单利率必须在0-1之间',
+                                'data': None
+                            }, status=status.HTTP_400_BAD_REQUEST)
+                    except ValueError:
+                        return Response({
+                            'code': 6,
+                            'msg': '商家发单利率格式错误',
+                            'data': None
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                if updated_rates:
+                    response_data['rates'] = updated_rates
+
+            # 如果没有任何更新
+            if not response_data:
+                return Response({
+                    'code': 7,
+                    'msg': '没有需要更新的数据',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            return Response({
+                'code': 0,
+                'msg': '更新成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            return Response({
+                'code': 99,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)'''
+
+from rest_framework.views import APIView
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from django.db.models import Q
+from decimal import Decimal
+import logging
+
+from yonghu.models import UserMain, UserDashou, UserBoss, UserShangjia, UserGuanshi
+
+logger = logging.getLogger(__name__)
+
+
+class DashouPaihangView(APIView):
+    """
+    排行榜接口
+    路径：/peizhi/dsph
+    方法：POST
+    认证：JWT Token认证
+
+    请求参数：
+    - leixing: 1=今日收入，2=今月收入
+    - yonghu_leixing: 1=打手，2=管事，3=商家
+
+    返回数据：
+    - code: 0=成功，其他=失败
+    - msg: 提示信息
+    - data: {
+        xianshi: True/False,  # 是否展示真实数据
+        paihang_list: [  # 排行榜列表
+          {
+            uid: '用户ID',
+            touxiang: '头像相对URL',
+            nicheng: '用户昵称',
+            jine: 收入金额,
+            mingci: 排名
+          },
+          ...
+        ]
+      }
+    """
+
+    # =============== 可配置参数 ===============
+    # 每次查询返回的最大记录数（可修改）
+    ZUI_DAO_CHA_XUN_SHU_LIANG = 50
+
+    # 最少需要多少人才能展示（可修改）
+    ZUI_SHAO_REN_SHU_YAO_QIU = 1
+
+    # 第一名最低金额要求（单位：元）（可修改）
+    DI_YI_MING_ZUI_DI_JIN_E = Decimal('10.00')
+
+    # 管事第一名最低数量要求（可修改）
+    DI_YI_MING_ZUI_DI_SHU_LIANG = 1
+    # =============== 可配置参数结束 ===============
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 获取请求参数 - 修复参数类型问题
+            leixing_str = request.data.get('leixing', '1')
+            yonghu_leixing_str = request.data.get('yonghu_leixing', '1')
+
+            # 转换为整数
+            try:
+                leixing = int(leixing_str)
+            except (ValueError, TypeError):
+                leixing = 1
+
+            try:
+                yonghu_leixing = int(yonghu_leixing_str)
+            except (ValueError, TypeError):
+                yonghu_leixing = 1
+
+            # 参数验证
+            if leixing not in [1, 2]:
+                return Response({
+                    'code': 400,
+                    'msg': '参数错误：leixing必须为1(今日)或2(今月)',
+                    'data': {'xianshi': False}
+                })
+
+            if yonghu_leixing not in [1, 2, 3]:
+                return Response({
+                    'code': 400,
+                    'msg': '参数错误：yonghu_leixing必须为1(打手)、2(管事)或3(商家)',
+                    'data': {'xianshi': False}
+                })
+
+            # 根据用户类型调用不同的查询方法
+            if yonghu_leixing == 1:
+                # 打手排行榜
+                paihang_list, xianshi_flag = self.chaxun_dashou_paihang(leixing)
+            elif yonghu_leixing == 2:
+                # 管事排行榜
+                paihang_list, xianshi_flag = self.chaxun_guanshi_paihang(leixing)
+            else:
+                # 商家排行榜
+                paihang_list, xianshi_flag = self.chaxun_shangjia_paihang(leixing)
+
+            # 返回结果
+            return Response({
+                'code': 0,
+                'msg': '获取成功',
+                'data': {
+                    'xianshi': xianshi_flag,
+                    'paihang_list': paihang_list
+                }
+            })
+
+        except Exception as e:
+            logger.error(f"排行榜查询失败: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'msg': '服务器内部错误',
+                'data': {'xianshi': False}
+            })
+
+    def chaxun_dashou_paihang(self, leixing):
+        """
+        查询打手排行榜
+        :param leixing: 1=今日收入，2=今月收入
+        :return: (排行榜列表, 是否展示标志)
+        """
+        # 确定查询的字段
+        if leixing == 1:
+            # 今日收入
+            shouyi_ziduan = 'jinrishouyi'
+        else:
+            # 今月收入
+            shouyi_ziduan = 'jinyueshouyi'
+
+        # 查询条件：收入大于0，打手账号状态正常（1=正常）
+        # 注意：打手表中的zhanghaozhuangtai字段
+        chaxun_tiaojian = Q(**{f'{shouyi_ziduan}__gt': 0}) & Q(zhanghaozhuangtai=1)
+
+        # 查询打手扩展表，并关联用户主表
+        dashou_list = UserDashou.objects.select_related('user').filter(
+            chaxun_tiaojian
+        ).order_by(f'-{shouyi_ziduan}')[:self.ZUI_DAO_CHA_XUN_SHU_LIANG]
+
+        # 检查是否满足展示条件
+        if len(dashou_list) < self.ZUI_SHAO_REN_SHU_YAO_QIU:
+            # 人数不足，不展示
+            return [], False
+
+        # 检查第一名金额是否达到最低要求
+        if leixing == 1:
+            di_yi_ming_jine = dashou_list[0].jinrishouyi
+        else:
+            di_yi_ming_jine = dashou_list[0].jinyueshouyi
+
+        if di_yi_ming_jine < self.DI_YI_MING_ZUI_DI_JIN_E:
+            # 第一名金额不足，不展示
+            return [], False
+
+        # 构建返回数据
+        paihang_list = []
+        for index, dashou in enumerate(dashou_list):
+            # 获取用户主表信息
+            user_main = dashou.user
+
+            # 打手的昵称直接使用打手扩展表的nicheng字段
+            dashou_nicheng = dashou.nicheng or '未设置昵称'
+
+            # 获取头像（相对URL）
+            touxiang_url = user_main.avatar or ''
+
+            # 获取收入金额
+            if leixing == 1:
+                shouyi_jine = dashou.jinrishouyi
+            else:
+                shouyi_jine = dashou.jinyueshouyi
+
+            paihang_list.append({
+                'uid': user_main.yonghuid,
+                'touxiang': touxiang_url,
+                'nicheng': dashou_nicheng,
+                'jine': float(shouyi_jine),  # 转换为float方便前端处理
+                'mingci': index + 1
+            })
+
+        return paihang_list, True
+
+    def chaxun_guanshi_paihang(self, leixing):
+        """
+        查询管事排行榜
+        :param leixing: 1=今日，2=今月
+        :return: (排行榜列表, 是否展示标志)
+        """
+        # 确定查询的字段
+        if leixing == 1:
+            # 今日充值打手数量
+            chaxun_ziduan = 'jinrichongzhi'
+        else:
+            # 今月充值打手数量
+            chaxun_ziduan = 'jinyuechongzhi'
+
+        # 查询条件：数量大于0，管事状态正常（状态1为正常）
+        # 注意：管手表中的zhuangtai字段
+        chaxun_tiaojian = Q(**{f'{chaxun_ziduan}__gt': 0}) & Q(zhuangtai=1)
+
+        # 查询管事扩展表，并关联用户主表
+        guanshi_list = UserGuanshi.objects.select_related('user').filter(
+            chaxun_tiaojian
+        ).order_by(f'-{chaxun_ziduan}')[:self.ZUI_DAO_CHA_XUN_SHU_LIANG]
+
+        # 检查是否满足展示条件
+        if len(guanshi_list) < self.ZUI_SHAO_REN_SHU_YAO_QIU:
+            # 人数不足，不展示
+            return [], False
+
+        # 检查第一名数量是否达到最低要求
+        if leixing == 1:
+            di_yi_ming_shuliang = guanshi_list[0].jinrichongzhi
+        else:
+            di_yi_ming_shuliang = guanshi_list[0].jinyuechongzhi
+
+        if di_yi_ming_shuliang < self.DI_YI_MING_ZUI_DI_SHU_LIANG:
+            # 第一名数量不足，不展示
+            return [], False
+
+        # 构建返回数据
+        paihang_list = []
+        for index, guanshi in enumerate(guanshi_list):
+            # 获取用户主表信息
+            user_main = guanshi.user
+
+            # 管事的昵称需要查询老板扩展表
+            boss_profile = UserBoss.objects.filter(user=user_main).first()
+            guanshi_nicheng = boss_profile.nickname if boss_profile else '未设置昵称'
+
+            # 获取头像（相对URL）
+            touxiang_url = user_main.avatar or ''
+
+            # 获取数量
+            if leixing == 1:
+                chongzhi_shuliang = guanshi.jinrichongzhi
+            else:
+                chongzhi_shuliang = guanshi.jinyuechongzhi
+
+            paihang_list.append({
+                'uid': user_main.yonghuid,
+                'touxiang': touxiang_url,
+                'nicheng': guanshi_nicheng,
+                'jine': float(chongzhi_shuliang),  # 这里jine字段实际存储的是数量
+                'mingci': index + 1
+            })
+
+        return paihang_list, True
+
+    def chaxun_shangjia_paihang(self, leixing):
+        """
+        查询商家排行榜
+        :param leixing: 1=今日流水，2=今月流水
+        :return: (排行榜列表, 是否展示标志)
+        """
+        # 确定查询的字段
+        if leixing == 1:
+            # 今日流水
+            liushui_ziduan = 'jinriliushui'
+        else:
+            # 今月流水
+            liushui_ziduan = 'jinyueliushui'
+
+        # 查询条件：流水大于0，商家状态正常（状态1为正常）
+        # 注意：商家表中的zhuangtai字段
+        chaxun_tiaojian = Q(**{f'{liushui_ziduan}__gt': 0}) & Q(zhuangtai=1)
+
+        # 查询商家扩展表，并关联用户主表
+        shangjia_list = UserShangjia.objects.select_related('user').filter(
+            chaxun_tiaojian
+        ).order_by(f'-{liushui_ziduan}')[:self.ZUI_DAO_CHA_XUN_SHU_LIANG]
+
+        # 检查是否满足展示条件
+        if len(shangjia_list) < self.ZUI_SHAO_REN_SHU_YAO_QIU:
+            # 人数不足，不展示
+            return [], False
+
+        # 检查第一名金额是否达到最低要求
+        if leixing == 1:
+            di_yi_ming_liushui = shangjia_list[0].jinriliushui
+        else:
+            di_yi_ming_liushui = shangjia_list[0].jinyueliushui
+
+        if di_yi_ming_liushui < self.DI_YI_MING_ZUI_DI_JIN_E:
+            # 第一名流水不足，不展示
+            return [], False
+
+        # 构建返回数据
+        paihang_list = []
+        for index, shangjia in enumerate(shangjia_list):
+            # 获取用户主表信息
+            user_main = shangjia.user
+
+            # 商家的昵称需要查询老板扩展表
+            boss_profile = UserBoss.objects.filter(user=user_main).first()
+            shangjia_nicheng = boss_profile.nickname if boss_profile else '未设置昵称'
+
+            # 获取头像（相对URL）
+            touxiang_url = user_main.avatar or ''
+
+            # 获取流水金额
+            if leixing == 1:
+                liushui_jine = shangjia.jinriliushui
+            else:
+                liushui_jine = shangjia.jinyueliushui
+
+            paihang_list.append({
+                'uid': user_main.yonghuid,
+                'touxiang': touxiang_url,
+                'nicheng': shangjia_nicheng,
+                'jine': float(liushui_jine),
+                'mingci': index + 1
+            })
+
+        return paihang_list, True
+
+
+
+
+# views.py
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from django.db import connection
+from django.db.models import Q
+import time
+
+# views.py
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from django.db import connection
+from django.db.models import Count
+import time
+
+# views.py
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from django.db import connection
+import time
+
+# views.py
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from django.db import connection
+from django.db.models import Q
+import time
+
+
+class GetAdminZhanghaoView(APIView):
+    """
+    获取管理员账号列表接口
+    路径：/peizhi/adzhhq
+    方法：POST
+    权限：JWT Token + 管理员验证
+    参数：
+        - zhanghao: 当前登录的管理员账号（字符串）
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 🔥 1. 身份验证（100%按表模型）
+            user = request.user
+
+            # 获取当前用户的手机号（CharField，字符串类型）
+            current_phone = getattr(user, 'phone', '')
+            if not current_phone:
+                return Response({
+                    'code': 401,
+                    'message': '用户手机号信息不完整',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            # 检查前端传递的账号是否匹配（都是字符串）
+            frontend_zhanghao = request.data.get('zhanghao', '').strip()
+            if frontend_zhanghao != current_phone:
+                return Response({
+                    'code': 403,
+                    'message': '账号不匹配，无权限访问',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+
+            # 🔥 2. 验证是否为管理员（user_type是CharField，值是'admin'字符串）
+            user_type = getattr(user, 'user_type', '')
+            if user_type != 'admin':
+                # 检查是否有管理员扩展表
+                if not hasattr(user, 'admin_profile'):
+                    return Response({
+                        'code': 403,
+                        'message': '无管理员权限',
+                        'data': None
+                    }, status=status.HTTP_403_FORBIDDEN)
+
+            # 🔥 3. 查询管理员账号列表（全部按字符串查询）
+            with connection.cursor() as cursor:
+                # 🔥 查询所有管理员账号（user_type='admin' 字符串）
+                # 🔥 phone和yonghuid都是CharField，xiugaiid也是CharField
+                sql = """
+                    SELECT 
+                        um.id,
+                        um.phone,
+                        um.yonghuid,
+                        um.user_type,
+                        COALESCE(COUNT(xjl.id), 0) as jilushuliang
+                    FROM user_main um
+                    LEFT JOIN xiugaijilu xjl ON um.phone = xjl.xiugaiid
+                    WHERE um.user_type = 'admin'
+                    GROUP BY um.id, um.phone, um.yonghuid, um.user_type
+                    ORDER BY um.create_time DESC
+                """
+
+                cursor.execute(sql)
+                results = cursor.fetchall()
+
+            # 🔥 4. 处理查询结果（全部保持字符串类型）
+            zhanghao_list = []
+            for row in results:
+                zhanghao_list.append({
+                    #'id': row[0],
+                    'id': str(row[1]) if row[1] else str(row[2]),  # 🔥 保持字符串
+                    'zhanghao':str(row[1]) if row[1] else str(row[2]),  # 🔥 保持字符串
+                    'yonghuid': str(row[2]) if row[2] else '',  # 🔥 保持字符串
+                    'user_type': str(row[3]) if row[3] else '',  # 🔥 保持字符串
+                    'jilushuliang': int(row[4])  # 只有这个是数字
+                })
+
+            return Response({
+                'code': 0,
+                'message': '获取成功',
+                'data': zhanghao_list
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            print(f"获取管理员账号列表失败: {str(e)}")
+            import traceback
+            traceback.print_exc()
+            return Response({
+                'code': 500,
+                'message': '系统错误',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+class GetXiugaiJiluView(APIView):
+    """
+    获取修改记录列表接口
+    路径：/peizhi/adhqxg
+    方法：POST
+    权限：JWT Token + 管理员验证
+    参数：
+        - zhanghao: 当前登录的管理员账号（字符串）
+        - xiugaizhe_zhanghaoid: 选中的管理员账号ID（字符串，对应phone或yonghuid）
+        - page: 页码（整数）
+        - pagesize: 每页条数（整数）
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 🔥 1. 身份验证（100%按表模型）
+            user = request.user
+
+            # 获取当前用户的手机号（CharField，字符串）
+            current_phone = getattr(user, 'phone', '')
+            if not current_phone:
+                return Response({
+                    'code': 401,
+                    'message': '用户手机号信息不完整',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            # 检查前端传递的账号是否匹配（字符串比较）
+            frontend_zhanghao = request.data.get('zhanghao', '')
+            if not isinstance(frontend_zhanghao, str):
+                frontend_zhanghao = str(frontend_zhanghao)
+            frontend_zhanghao = frontend_zhanghao.strip()
+
+            if frontend_zhanghao != current_phone:
+                return Response({
+                    'code': 403,
+                    'message': '账号不匹配，无权限访问',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+
+            # 🔥 2. 验证是否为管理员（user_type='admin'字符串）
+            user_type = getattr(user, 'user_type', '')
+            if user_type != 'admin':
+                if not hasattr(user, 'admin_profile'):
+                    return Response({
+                        'code': 403,
+                        'message': '无管理员权限',
+                        'data': None
+                    }, status=status.HTTP_403_FORBIDDEN)
+
+            # 🔥 3. 获取参数（100%按实际类型）
+            # 🔥 xiugaizhe_zhanghaoid 是字符串（对应xiugaiid字段，CharField）
+            xiugaizhe_zhanghaoid_param = request.data.get('xiugaizhe_zhanghaoid', '')
+
+
+            # 🔥 强制转为字符串（因为数据库是CharField）
+            if xiugaizhe_zhanghaoid_param is None:
+                xiugaizhe_zhanghaoid = ''
+            else:
+                # 无论如何都转为字符串
+                xiugaizhe_zhanghaoid = str(xiugaizhe_zhanghaoid_param).strip()
+
+
+            # 🔥 分页参数转为整数
+            try:
+                page = int(request.data.get('page', 1))
+            except:
+                page = 1
+
+            try:
+                pagesize = int(request.data.get('pagesize', 10))
+            except:
+                pagesize = 10
+
+            # 🔥 4. 参数验证
+            if not xiugaizhe_zhanghaoid:
+                return Response({
+                    'code': 400,
+                    'message': '修改者账号ID不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            if page < 1:
+                page = 1
+            if pagesize < 1 or pagesize > 50:
+                pagesize = 10
+
+            # 🔥 5. 高效查询（100%按表字段类型）
+            with connection.cursor() as cursor:
+                # 🔥 5.1 查询总记录数（xiugaiid是CharField，用字符串查询）
+                count_sql = """
+                    SELECT COUNT(*) 
+                    FROM xiugaijilu 
+                    WHERE xiugaiid = %s
+                """
+                cursor.execute(count_sql, [xiugaizhe_zhanghaoid])
+                total_count = cursor.fetchone()[0]
+
+                # 🔥 5.2 计算分页
+                offset = (page - 1) * pagesize
+
+                # 🔥 5.3 查询当前页数据（使用参数化查询，防止SQL注入）
+                data_sql = """
+                    SELECT 
+                        xjl.id,
+                        xjl.yonghuid,           -- CharField
+                        xjl.xiugaiid,           -- CharField
+                        xjl.leixing,            -- IntegerField
+                        xjl.xiugaitijiao,       -- DecimalField
+                        xjl.xiugaitijiaoq,      -- DecimalField
+                        xjl.jifen,              -- IntegerField
+                        xjl.yjifen,             -- IntegerField
+                        xjl.yajin,              -- DecimalField
+                        xjl.yyajin,             -- DecimalField
+                        xjl.shangjiayue,        -- DecimalField
+                        xjl.shangjiayueq,       -- DecimalField
+                        xjl.guanshiyue,         -- DecimalField
+                        xjl.guanshiyueq,        -- DecimalField
+                        xjl.huiyuants,          -- IntegerField
+                        xjl.huiyuan_id,         -- CharField
+                        xjl.qitashuoming,       -- TextField
+                        xjl.create_time,        -- DateTimeField
+                        um.avatar               -- CharField
+                    FROM xiugaijilu xjl
+                    LEFT JOIN user_main um ON xjl.yonghuid = um.yonghuid
+                    WHERE xjl.xiugaiid = %s
+                    ORDER BY xjl.create_time DESC
+                    LIMIT %s OFFSET %s
+                """
+
+                cursor.execute(data_sql, [xiugaizhe_zhanghaoid, pagesize, offset])
+                records = cursor.fetchall()
+
+            # 🔥 6. 处理查询结果（严格按照字段类型处理）
+            jilu_list = []
+            for record in records:
+                # 获取修改者账号信息（都是字符串）
+                xiugaizhe_zhanghao = ''
+                with connection.cursor() as cursor2:
+                    # 🔥 phone和yonghuid都是CharField，用字符串查询
+                    cursor2.execute(
+                        "SELECT phone, yonghuid FROM user_main WHERE phone = %s OR yonghuid = %s LIMIT 1",
+                        [xiugaizhe_zhanghaoid, xiugaizhe_zhanghaoid]
+                    )
+                    xiugaizhe_info = cursor2.fetchone()
+                    if xiugaizhe_info:
+                        # 🔥 都是字符串
+                        xiugaizhe_zhanghao = str(xiugaizhe_info[0]) if xiugaizhe_info[0] else str(xiugaizhe_info[1]) if \
+                        xiugaizhe_info[1] else xiugaizhe_zhanghaoid
+
+                # 获取会员名称（如果有）
+                huiyuan_mingzi = ''
+                if record[15]:  # huiyuan_id是CharField
+                    with connection.cursor() as cursor3:
+                        cursor3.execute(
+                            "SELECT jieshao FROM huiyuan WHERE huiyuan_id = %s LIMIT 1",
+                            [str(record[15])]  # 🔥 转为字符串查询
+                        )
+                        huiyuan_info = cursor3.fetchone()
+                        if huiyuan_info:
+                            huiyuan_mingzi = str(huiyuan_info[0]) if huiyuan_info[0] else ''
+
+                # 🔥 严格按照前端字段名映射，保持正确类型
+                jilu_data = {
+                    # 基础字段（字符串）
+                    'id': record[0],
+                    'beixiugai_yonghuid': str(record[1]) if record[1] else '',  # yonghuid
+                    'xiugaizhe_id': str(record[2]) if record[2] else '',  # xiugaiid
+                    'xiugaizhe_zhanghao': xiugaizhe_zhanghao,  # 字符串
+                    'beixiugai_yonghuleixing': record[3],  # leixing是整数
+
+                    # 打手字段（Decimal转float，Integer转int）
+                    'xiugaihou_dashoutixianjine': float(record[4]) if record[4] is not None else 0.00,
+                    'xiugaiqian_dashoutixianjine': float(record[5]) if record[5] is not None else 0.00,
+                    'xiugaihou_dashoujifen': int(record[6]) if record[6] is not None else 0,
+                    'xiugaiqian_dashoujifen': int(record[7]) if record[7] is not None else 0,
+                    'xiugaihou_dashouyajin': float(record[8]) if record[8] is not None else 0.00,
+                    'xiugaiqian_dashouyajin': float(record[9]) if record[9] is not None else 0.00,
+
+                    # 商家字段
+                    'xiugaihou_shangjiayue': float(record[10]) if record[10] is not None else 0.00,
+                    'xiugaiqian_shangjiayue': float(record[11]) if record[11] is not None else 0.00,
+
+                    # 管事字段
+                    'xiugaihou_guanshiyue': float(record[12]) if record[12] is not None else 0.00,
+                    'xiugaiqian_guanshiyue': float(record[13]) if record[13] is not None else 0.00,
+
+                    # 会员字段
+                    'tianjia_huiyuantianshu': int(record[14]) if record[14] is not None else 0,
+                    'huiyuan_id': str(record[15]) if record[15] else '',  # 字符串
+                    'huiyuan_mingzi': huiyuan_mingzi,  # 字符串
+
+                    # 其他字段
+                    'qita_shuoming': str(record[16]) if record[16] else '',  # 字符串
+                    'xiugai_time': record[17].strftime('%Y-%m-%d %H:%M:%S') if record[17] else None,
+                    'touxiang': str(record[18]) if record[18] else ''  # avatar是字符串
+                }
+
+                jilu_list.append(jilu_data)
+
+            # 🔥 7. 分页控制
+            queried_records = len(jilu_list)
+            has_more = False
+
+            if queried_records == pagesize:
+                total_queried = (page - 1) * pagesize + queried_records
+                has_more = total_queried < total_count
+
+            return Response({
+                'code': 0,
+                'message': '获取成功',
+                'data': {
+                    'list': jilu_list,
+                    'zongshuliang': total_count,
+                    'dangqian_page': page,
+                    'page_size': pagesize,
+                    'has_more': has_more,
+                    'shijichaxundediaoshuliang': queried_records
+                }
+            }, status=status.HTTP_200_OK)
+
+        except ValueError as e:
+            print(f"参数错误: {str(e)}")
+            return Response({
+                'code': 400,
+                'message': '参数错误',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        except Exception as e:
+            print(f"获取修改记录失败: {str(e)}")
+            import traceback
+            traceback.print_exc()
+            return Response({
+                'code': 500,
+                'message': '系统错误',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+
+
+
+
+# views/shangjia_moban.py
+from rest_framework.views import APIView
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from django.db import transaction
+from decimal import Decimal
+import re
+
+from .models import ShangjiaMoban
+from shangpin.models import ShangpinLeixing  # 假设商品模型路径
+
+
+'''class ShangjiaTianjiaMobanView(APIView):
+    """
+    商家添加订单模板接口
+    POST /peizhi/sjtjddmb
+    权限: JWT认证用户
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取用户ID
+            user = request.user
+            yonghu_id = user.yonghuid
+
+            # 2. 验证并获取请求数据
+            leixing_id = request.data.get('shangpinTypeId')
+            jieshao = request.data.get('jieshao', '').strip()
+            jiage = request.data.get('jiage', '')
+
+            # 3. 验证必填字段
+            if not all([leixing_id, jieshao, jiage]):
+                return Response({
+                    'code': 400,
+                    'msg': '缺少必填字段',
+                    'data': {}
+                }, status=400)
+
+            # 4. 验证价格格式
+            try:
+                jiage_decimal = Decimal(jiage)
+                if jiage_decimal <= 0 or jiage_decimal > 10000:
+                    return Response({
+                        'code': 400,
+                        'msg': '价格必须在0.1-10000元之间',
+                        'data': {}
+                    }, status=400)
+            except (ValueError, TypeError):
+                return Response({
+                    'code': 400,
+                    'msg': '价格格式错误',
+                    'data': {}
+                }, status=400)
+
+            # 5. 验证介绍长度
+            if len(jieshao) > 100:
+                return Response({
+                    'code': 400,
+                    'msg': '订单介绍不能超过100字',
+                    'data': {}
+                }, status=400)
+
+            # 6. 验证商品类型是否存在且可用
+            try:
+                # 使用select_related优化查询，只获取需要的字段
+                shangpin_obj = ShangpinLeixing.objects.filter(
+                    id=leixing_id,
+                    yaoqiuleixing=1  # 假设1为正常状态
+                ).only('id', 'yaoqiuleixing').first()
+
+                if not shangpin_obj:
+                    return Response({
+                        'code': 404,
+                        'msg': '商品类型不存在或已禁用',
+                        'data': {}
+                    }, status=404)
+
+                # 检查抢单要求类型
+                if shangpin_obj.yaoqiuleixing != 1:
+                    return Response({
+                        'code': 400,
+                        'msg': '该商品类型不支持创建模板',
+                        'data': {}
+                    }, status=400)
+
+            except ShangpinLeixing.DoesNotExist:
+                return Response({
+                    'code': 404,
+                    'msg': '商品类型不存在',
+                    'data': {}
+                }, status=404)
+
+            # 7. 创建模板（使用事务保证数据一致性）
+            with transaction.atomic():
+                # 检查是否已存在相同介绍（根据unique_together约束）
+                existing_moban = ShangjiaMoban.objects.filter(
+                    yonghu_id=yonghu_id,
+                    leixing_id=leixing_id,
+                    moban_jieshao=jieshao,
+                    #zhuangtai=1  # 只检查正常状态的模板
+                ).exists()
+
+                if existing_moban:
+                    return Response({
+                        'code': 400,
+                        'msg': '已存在相同介绍的模板',
+                        'data': {}
+                    }, status=400)
+
+                # 创建新模板
+                moban = ShangjiaMoban.objects.create(
+                    yonghu_id=yonghu_id,
+                    leixing_id=leixing_id,
+                    moban_jieshao=jieshao,
+                    jiage=jiage_decimal,
+                    fabu_shuliang=0,
+                    #zhuangtai=1
+                )
+
+            # 8. 返回成功响应（与前端字段对应）
+            return Response({
+                'code': 200,
+                'msg': '模板创建成功',
+                'data': {
+                    'mobanId': moban.id,  # 模板ID
+                    'shangpinTypeId': leixing_id,  # 商品类型ID
+                    'jieshao': moban.moban_jieshao,  # 模板介绍
+                    'jiage': str(moban.jiage),  # 价格（转为字符串）
+                    'fabushuliang': moban.fabu_shuliang,  # 发布数量
+                    'createTime': moban.create_time.strftime('%Y-%m-%d %H:%M:%S')  # 创建时间
+                }
+            })
+
+        except Exception as e:
+            # 记录错误日志
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.error(f"创建商家模板失败: {str(e)}", exc_info=True)
+
+            return Response({
+                'code': 500,
+                'msg': '服务器内部错误',
+                'data': {}
+            }, status=500)
+
+
+# views/shangjia_moban.py
+from django.core.paginator import Paginator
+from django.db.models import Q
+
+
+class ShangjiaMobanListView(APIView):
+    """
+    商家订单模板列表接口
+    POST /peizhi/sjddmblb
+    权限: JWT认证用户
+    功能: 支持普通分页获取和搜索两种模式
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取用户ID和基础参数
+            user = request.user
+            yonghu_id = user.yonghuid
+
+            # 2. 获取请求参数
+            leixing_id = request.data.get('shangpinTypeId')
+            get_type = request.data.get('getType', 2)  # 1=搜索，2=普通获取
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('pageSize', 50))
+            search_keyword = request.data.get('searchKeyword', '').strip()
+
+            # 3. 验证必填字段
+            if not leixing_id:
+                return Response({
+                    'code': 400,
+                    'msg': '商品类型ID不能为空',
+                    'data': {}
+                }, status=400)
+
+            if get_type not in [1, 2]:
+                return Response({
+                    'code': 400,
+                    'msg': '获取类型参数错误',
+                    'data': {}
+                }, status=400)
+
+            # 4. 构建查询条件
+            query_conditions = Q(
+                yonghu_id=yonghu_id,
+                leixing_id=leixing_id,
+                #zhuangtai=1  # 只查询正常状态的模板
+            )
+
+            # 5. 搜索模式处理
+            if get_type == 1 and search_keyword:
+                # 搜索模式：按模板ID搜索
+                try:
+                    moban_id = int(search_keyword)
+                    query_conditions &= Q(id=moban_id)
+                except ValueError:
+                    return Response({
+                        'code': 400,
+                        'msg': '搜索关键词必须是有效的模板ID',
+                        'data': {}
+                    }, status=400)
+
+            # 6. 执行查询（使用values优化性能）
+            queryset = ShangjiaMoban.objects.filter(query_conditions)
+
+            # 7. 计算总数和分页
+            total_count = queryset.count()
+
+            # 搜索模式不进行分页，直接返回所有匹配结果
+            if get_type == 1:
+                moban_list = queryset.values(
+                    'id',  # 模板ID
+                    'leixing_id',  # 商品类型ID
+                    'moban_jieshao',  # 模板介绍
+                    'jiage',  # 价格
+                    'fabu_shuliang',  # 发布数量
+                    'create_time'  # 创建时间
+                )
+
+                # 格式化数据（与前端字段对应）
+                formatted_list = []
+                for item in moban_list:
+                    formatted_list.append({
+                        'mobanId': item['id'],
+                        'shangpinTypeId': item['leixing_id'],
+                        'jieshao': item['moban_jieshao'],
+                        'jiage': str(item['jiage']),  # 转为字符串
+                        'fabushuliang': item['fabu_shuliang'],
+                        'createTime': item['create_time'].strftime('%Y-%m-%d %H:%M:%S') if item['create_time'] else ''
+                    })
+
+                return Response({
+                    'code': 200,
+                    'msg': '搜索成功',
+                    'data': {
+                        'list': formatted_list,
+                        'total': len(formatted_list),
+                        'hasMore': False,  # 搜索模式不分页，没有更多数据
+                        'currentPage': 1,
+                        'pageSize': len(formatted_list)
+                    }
+                })
+
+            # 8. 普通获取模式：分页处理
+            else:
+                # 使用Django分页器
+                paginator = Paginator(queryset, page_size)
+
+                # 检查页码是否有效
+                if page < 1 or page > paginator.num_pages:
+                    return Response({
+                        'code': 400,
+                        'msg': '页码超出范围',
+                        'data': {}
+                    }, status=400)
+
+                # 获取当前页数据
+                current_page = paginator.page(page)
+
+                # 获取数据并格式化
+                moban_list = current_page.object_list.values(
+                    'id',  # 模板ID
+                    'leixing_id',  # 商品类型ID
+                    'moban_jieshao',  # 模板介绍
+                    'jiage',  # 价格
+                    'fabu_shuliang',  # 发布数量
+                    'create_time'  # 创建时间
+                )
+
+                # 格式化数据（与前端字段对应）
+                formatted_list = []
+                for item in moban_list:
+                    formatted_list.append({
+                        'mobanId': item['id'],
+                        'shangpinTypeId': item['leixing_id'],
+                        'jieshao': item['moban_jieshao'],
+                        'jiage': str(item['jiage']),  # 转为字符串
+                        'fabushuliang': item['fabu_shuliang'],
+                        'createTime': item['create_time'].strftime('%Y-%m-%d %H:%M:%S') if item['create_time'] else ''
+                    })
+
+                # 判断是否有更多数据
+                has_more = current_page.has_next()
+
+                # 特殊逻辑：如果当前页数据量不足page_size，说明没有更多数据
+                if len(formatted_list) < page_size:
+                    has_more = False
+
+                return Response({
+                    'code': 200,
+                    'msg': '获取成功',
+                    'data': {
+                        'list': formatted_list,
+                        'total': total_count,
+                        'hasMore': has_more,  # 是否允许上拉刷新
+                        'currentPage': page,
+                        'pageSize': page_size,
+                        'totalPages': paginator.num_pages
+                    }
+                })
+
+        except Exception as e:
+            # 记录错误日志
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.error(f"获取商家模板列表失败: {str(e)}", exc_info=True)
+
+            return Response({
+                'code': 500,
+                'msg': '服务器内部错误',
+                'data': {}
+            }, status=500)
+
+
+# views/shangjia_moban.py
+class ShangjiaGengxinMobanView(APIView):
+    """
+    商家更新订单模板接口
+    POST /peizhi/sjddmbgx
+    权限: JWT认证用户
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取用户ID
+            user = request.user
+            yonghu_id = user.yonghuid
+
+            # 2. 获取请求参数
+            moban_id = request.data.get('mobanId')
+            leixing_id = request.data.get('shangpinTypeId')
+            new_jieshao = request.data.get('jieshao', '').strip()
+            new_jiage = request.data.get('jiage', '')
+
+            # 3. 验证必填字段
+            if not all([moban_id, leixing_id]):
+                return Response({
+                    'code': 400,
+                    'msg': '模板ID和商品类型ID不能为空',
+                    'data': {}
+                }, status=400)
+
+            # 4. 检查是否有修改内容
+            if not new_jieshao and not new_jiage:
+                return Response({
+                    'code': 400,
+                    'msg': '没有修改内容',
+                    'data': {}
+                }, status=400)
+
+            # 5. 验证修改内容
+            update_fields = {}
+
+            # 验证介绍
+            if new_jieshao:
+                if len(new_jieshao) > 100:
+                    return Response({
+                        'code': 400,
+                        'msg': '订单介绍不能超过100字',
+                        'data': {}
+                    }, status=400)
+                update_fields['moban_jieshao'] = new_jieshao
+
+            # 验证价格
+            if new_jiage:
+                try:
+                    jiage_decimal = Decimal(new_jiage)
+                    if jiage_decimal <= 0 or jiage_decimal > 10000:
+                        return Response({
+                            'code': 400,
+                            'msg': '价格必须在0.1-10000元之间',
+                            'data': {}
+                        }, status=400)
+                    update_fields['jiage'] = jiage_decimal
+                except (ValueError, TypeError):
+                    return Response({
+                        'code': 400,
+                        'msg': '价格格式错误',
+                        'data': {}
+                    }, status=400)
+
+            # 6. 查询模板是否存在且属于当前用户
+            try:
+                moban = ShangjiaMoban.objects.get(
+                    id=moban_id,
+                    yonghu_id=yonghu_id,
+                    leixing_id=leixing_id,
+                    #zhuangtai=1  # 只修改正常状态的模板
+                )
+            except ShangjiaMoban.DoesNotExist:
+                return Response({
+                    'code': 404,
+                    'msg': '模板不存在或无权修改',
+                    'data': {}
+                }, status=404)
+
+            # 7. 检查介绍是否重复（如果修改了介绍）
+            if 'moban_jieshao' in update_fields:
+                existing_moban = ShangjiaMoban.objects.filter(
+                    yonghu_id=yonghu_id,
+                    leixing_id=leixing_id,
+                    moban_jieshao=update_fields['moban_jieshao'],
+                    #zhuangtai=1
+                ).exclude(id=moban_id).exists()  # 排除自身
+
+                if existing_moban:
+                    return Response({
+                        'code': 400,
+                        'msg': '已存在相同介绍的模板',
+                        'data': {}
+                    }, status=400)
+
+            # 8. 更新模板（使用update_fields优化，只更新修改的字段）
+            with transaction.atomic():
+                for field, value in update_fields.items():
+                    setattr(moban, field, value)
+                moban.save(update_fields=list(update_fields.keys()))
+
+            # 9. 获取更新后的数据
+            updated_moban = ShangjiaMoban.objects.filter(id=moban_id).values(
+                'id', 'leixing_id', 'moban_jieshao', 'jiage', 'fabu_shuliang', 'update_time'
+            ).first()
+
+            # 10. 返回成功响应
+            return Response({
+                'code': 200,
+                'msg': '模板修改成功',
+                'data': {
+                    'mobanId': updated_moban['id'],
+                    'shangpinTypeId': updated_moban['leixing_id'],
+                    'jieshao': updated_moban['moban_jieshao'],
+                    'jiage': str(updated_moban['jiage']),
+                    'fabushuliang': updated_moban['fabu_shuliang'],
+                    'updateTime': updated_moban['update_time'].strftime('%Y-%m-%d %H:%M:%S') if updated_moban[
+                        'update_time'] else ''
+                }
+            })
+
+        except Exception as e:
+            # 记录错误日志
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.error(f"修改商家模板失败: {str(e)}", exc_info=True)
+
+            return Response({
+                'code': 500,
+                'msg': '服务器内部错误',
+                'data': {}
+            }, status=500)
+
+
+# views/shangjia_moban.py
+class ShangjiaShanchuMobanView(APIView):
+    """
+    商家删除订单模板接口
+    POST /peizhi/sjddmbsc
+    权限: JWT认证用户
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取用户ID
+            user = request.user
+            yonghu_id = user.yonghuid
+
+            # 2. 获取请求参数
+            moban_id = request.data.get('mobanId')
+            leixing_id = request.data.get('shangpinTypeId')
+
+            # 3. 验证必填字段
+            if not all([moban_id, leixing_id]):
+                return Response({
+                    'code': 400,
+                    'msg': '模板ID和商品类型ID不能为空',
+                    'data': {}
+                }, status=400)
+
+            # 4. 查询模板是否存在且属于当前用户
+            try:
+                moban = ShangjiaMoban.objects.get(
+                    id=moban_id,
+                    yonghu_id=yonghu_id,
+                    leixing_id=leixing_id,
+                    #zhuangtai=1  # 只删除正常状态的模板
+                )
+            except ShangjiaMoban.DoesNotExist:
+                return Response({
+                    'code': 404,
+                    'msg': '模板不存在或无权删除',
+                    'data': {}
+                }, status=404)
+
+            # 5. 检查模板是否已被使用（有发布数量）
+            if moban.fabu_shuliang > 0:
+                # 可以选择软删除，将状态改为已删除
+                moban.zhuangtai = 4  # 4=已删除状态
+                moban.save()
+                delete_type = 'soft'
+            else:
+                # 硬删除
+                moban.delete()
+                delete_type = 'hard'
+
+            # 6. 返回成功响应
+            return Response({
+                'code': 200,
+                'msg': '模板删除成功',
+                'data': {
+                    'mobanId': moban_id,
+                    'deleteType': delete_type,
+                    'shangpinTypeId': leixing_id
+                }
+            })
+
+        except Exception as e:
+            # 记录错误日志
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.error(f"删除商家模板失败: {str(e)}", exc_info=True)
+
+            return Response({
+                'code': 500,
+                'msg': '服务器内部错误',
+                'data': {}
+            }, status=500)'''
+
+
+
+
+from django.core.paginator import Paginator
+from django.db.models import Q, Prefetch
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from peizhi.models import ShangjiaMoban
+from dengji.models import Chenghao
+
+class ShangjiaMobanListView(APIView):
+    """
+    商家订单模板列表接口
+    POST /peizhi/sjddmblb
+    权限: JWT认证
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            user = request.user
+            yonghu_id = user.yonghuid
+
+            leixing_id = request.data.get('shangpinTypeId')
+            if not leixing_id:
+                return Response({'code': 400, 'msg': '商品类型ID不能为空', 'data': {}}, status=400)
+
+            get_type = int(request.data.get('getType', 2))
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('pageSize', 50))
+
+            keyword = request.data.get('keyword', '')
+            min_price = request.data.get('minPrice', '')
+            label_id = request.data.get('labelId', None)
+            if label_id is not None:
+                try:
+                    label_id = int(label_id)
+                except (ValueError, TypeError):
+                    label_id = None
+
+            query = Q(yonghu_id=yonghu_id, leixing_id=leixing_id)
+
+            if get_type == 1:  # 搜索模式
+                if keyword:
+                    keyword = str(keyword).strip()
+                    try:
+                        mid = int(keyword)
+                        query &= Q(id=mid) | Q(moban_jieshao__icontains=keyword)
+                    except ValueError:
+                        query &= Q(moban_jieshao__icontains=keyword)
+                if min_price:
+                    try:
+                        query &= Q(jiage__gte=Decimal(str(min_price)))
+                    except:
+                        pass
+                if label_id:
+                    query &= Q(chenghao_id=label_id)
+
+                mobans = ShangjiaMoban.objects.filter(query).order_by('-id')
+                formatted = []
+                for moban in mobans:
+                    texiao_json = ''
+                    label_name = ''
+                    if moban.chenghao_id:
+                        try:
+                            ch = Chenghao.objects.get(id=moban.chenghao_id)
+                            label_name = ch.mingcheng
+                            texiao_json = ch.texiao_miaoshu or ''
+                        except Chenghao.DoesNotExist:
+                            pass
+                    formatted.append({
+                        'mobanId': moban.id,
+                        'shangpinTypeId': moban.leixing_id,
+                        'jieshao': moban.moban_jieshao,
+                        'jiage': str(moban.jiage),
+                        'fabushuliang': moban.fabu_shuliang,
+                        'commissionEnabled': moban.yongjin_qiangdan,
+                        'commissionValue': str(moban.yongjin_jiage) if moban.yongjin_jiage is not None else None,
+                        'labelId': moban.chenghao_id,
+                        'labelName': label_name,
+                        'texiaoJson': texiao_json,
+                        'createTime': moban.create_time.strftime('%Y-%m-%d %H:%M:%S') if moban.create_time else ''
+                    })
+                return Response({'code': 200, 'msg': '搜索成功', 'data': {'list': formatted, 'total': len(formatted), 'hasMore': False}})
+
+            # 分页模式
+            queryset = ShangjiaMoban.objects.filter(query).order_by('-id')
+            paginator = Paginator(queryset, page_size)
+            if page < 1 or page > paginator.num_pages:
+                return Response({'code': 400, 'msg': '页码超出范围', 'data': {}}, status=400)
+
+            current_page = paginator.page(page)
+            formatted = []
+            for moban in current_page.object_list:
+                texiao_json = ''
+                label_name = ''
+                if moban.chenghao_id:
+                    try:
+                        ch = Chenghao.objects.get(id=moban.chenghao_id)
+                        label_name = ch.mingcheng
+                        texiao_json = ch.texiao_miaoshu or ''
+                    except Chenghao.DoesNotExist:
+                        pass
+                formatted.append({
+                    'mobanId': moban.id,
+                    'shangpinTypeId': moban.leixing_id,
+                    'jieshao': moban.moban_jieshao,
+                    'jiage': str(moban.jiage),
+                    'fabushuliang': moban.fabu_shuliang,
+                    'commissionEnabled': moban.yongjin_qiangdan,
+                    'commissionValue': str(moban.yongjin_jiage) if moban.yongjin_jiage is not None else None,
+                    'labelId': moban.chenghao_id,
+                    'labelName': label_name,
+                    'texiaoJson': texiao_json,
+                    'createTime': moban.create_time.strftime('%Y-%m-%d %H:%M:%S') if moban.create_time else ''
+                })
+
+            has_more = current_page.has_next()
+            if len(formatted) < page_size:
+                has_more = False
+
+            return Response({
+                'code': 200,
+                'msg': '获取成功',
+                'data': {
+                    'list': formatted,
+                    'total': paginator.count,
+                    'hasMore': has_more,
+                    'currentPage': page,
+                    'pageSize': page_size,
+                    'totalPages': paginator.num_pages
+                }
+            })
+
+        except Exception as e:
+            logger.error(f"获取模板列表失败: {str(e)}", exc_info=True)
+            return Response({'code': 500, 'msg': '服务器内部错误', 'data': {}}, status=500)
+
+from dengji.models import  Chenghao
+
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from django.db.models import Prefetch
+class ShangjiaTianjiaMobanView(APIView):
+    """
+    商家添加订单模板接口
+    POST /peizhi/sjtjddmb
+    权限: JWT认证
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取当前商家用户ID
+            user = request.user
+            yonghu_id = user.yonghuid
+
+            # 2. 接收并清洗参数，避免类型错误
+            leixing_id = request.data.get('shangpinTypeId')
+            jieshao = request.data.get('jieshao', '').strip() if request.data.get('jieshao') else ''
+            jiage = request.data.get('jiage', '')
+            # 佣金相关
+            commission_enabled = request.data.get('commissionEnabled', False)
+            commission_value = request.data.get('commissionValue', None)
+            # 标签ID（称号ID）
+            label_id = request.data.get('labelId', None)
+
+            # 3. 必填验证
+            if not leixing_id or not jieshao or not jiage:
+                logger.warning(f"参数缺失 - leixing_id:{leixing_id}, jieshao:{jieshao}, jiage:{jiage}")
+                return Response({
+                    'code': 400,
+                    'msg': '缺少必填字段（订单类型、介绍、价格）',
+                    'data': {}
+                }, status=400)
+
+            # 4. 价格格式验证
+            try:
+                jiage_decimal = Decimal(str(jiage))
+                if jiage_decimal <= 0:
+                    return Response({'code': 400, 'msg': '价格必须大于0', 'data': {}}, status=400)
+                if jiage_decimal > 10000:
+                    return Response({'code': 400, 'msg': '价格不能超过10000元', 'data': {}}, status=400)
+            except (InvalidOperation, ValueError, TypeError):
+                return Response({'code': 400, 'msg': '价格格式错误', 'data': {}}, status=400)
+
+            # 5. 介绍长度验证
+            if len(jieshao) > 100:
+                return Response({'code': 400, 'msg': '订单介绍不能超过100字', 'data': {}}, status=400)
+
+            # 6. 佣金验证（若启用）
+            yongjin_qiangdan = False
+            yongjin_jiage = None
+            if commission_enabled:
+                yongjin_qiangdan = True
+                if not commission_value:
+                    return Response({'code': 400, 'msg': '开启佣金时，佣金金额不能为空', 'data': {}}, status=400)
+                try:
+                    comm_decimal = Decimal(str(commission_value))
+                    if comm_decimal <= 0:
+                        return Response({'code': 400, 'msg': '佣金必须大于0', 'data': {}}, status=400)
+                    yongjin_jiage = comm_decimal
+                except (InvalidOperation, ValueError, TypeError):
+                    return Response({'code': 400, 'msg': '佣金格式错误', 'data': {}}, status=400)
+
+            # 7. 标签ID清洗（前端可能传数字或字符串）
+            cleaned_label_id = None
+            if label_id is not None and str(label_id).strip():
+                try:
+                    cleaned_label_id = int(label_id)
+                except (ValueError, TypeError):
+                    return Response({'code': 400, 'msg': '标签ID格式错误', 'data': {}}, status=400)
+
+            # 8. 验证商品类型是否存在且可用
+            try:
+                shangpin_obj = ShangpinLeixing.objects.get(
+                    id=leixing_id,
+                    shenhezhuangtai=1        # 审核通过
+                )
+            except ShangpinLeixing.DoesNotExist:
+                return Response({'code': 404, 'msg': '商品类型不存在或已禁用', 'data': {}}, status=404)
+
+            # 9. 检查同一用户、同一类型下是否已存在相同介绍的模板
+            if ShangjiaMoban.objects.filter(
+                yonghu_id=yonghu_id,
+                leixing_id=leixing_id,
+                moban_jieshao=jieshao
+            ).exists():
+                return Response({'code': 400, 'msg': '已存在相同介绍的模板', 'data': {}}, status=400)
+
+            # 10. 执行数据库创建（事务）
+            with transaction.atomic():
+                moban = ShangjiaMoban.objects.create(
+                    yonghu_id=yonghu_id,
+                    leixing_id=leixing_id,
+                    moban_jieshao=jieshao,
+                    jiage=jiage_decimal,
+                    fabu_shuliang=0,
+                    yongjin_qiangdan=yongjin_qiangdan,
+                    yongjin_jiage=yongjin_jiage,
+                    chenghao_id=cleaned_label_id
+                )
+
+            # 11. 返回成功数据（字段与前端对齐）
+            return Response({
+                'code': 200,
+                'msg': '模板创建成功',
+                'data': {
+                    'mobanId': moban.id,
+                    'shangpinTypeId': leixing_id,
+                    'jieshao': moban.moban_jieshao,
+                    'jiage': str(moban.jiage),
+                    'fabushuliang': moban.fabu_shuliang,
+                    'createTime': moban.create_time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'commissionEnabled': moban.yongjin_qiangdan,
+                    'commissionValue': str(moban.yongjin_jiage) if moban.yongjin_jiage is not None else None,
+                    'labelId': moban.chenghao_id
+                }
+            })
+
+        except Exception as e:
+            # 打印完整错误堆栈到日志
+            logger.error(f"添加模板失败: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'msg': '服务器内部错误，添加模板失败，请联系管理员',
+                'data': {}
+            }, status=500)
+
+
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from peizhi.models import ShangjiaMoban
+
+class ShangjiaShanchuMobanView(APIView):
+    """
+    删除模板
+    POST /peizhi/sjddmbsc
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            user = request.user
+            yonghu_id = user.yonghuid
+
+            moban_id = request.data.get('mobanId')
+            leixing_id = request.data.get('shangpinTypeId')
+
+            if not all([moban_id, leixing_id]):
+                return Response({'code': 400, 'msg': '参数缺失', 'data': {}}, status=400)
+
+            try:
+                moban = ShangjiaMoban.objects.get(id=moban_id, yonghu_id=yonghu_id, leixing_id=leixing_id)
+            except ShangjiaMoban.DoesNotExist:
+                return Response({'code': 404, 'msg': '模板不存在', 'data': {}}, status=404)
+
+            # 强制硬删除
+            moban.delete()
+
+            return Response({'code': 200, 'msg': '删除成功', 'data': {'mobanId': moban_id, 'shangpinTypeId': leixing_id}})
+        except Exception as e:
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.error(f"删除模板失败: {str(e)}", exc_info=True)
+            return Response({'code': 500, 'msg': '服务器内部错误', 'data': {}}, status=500)
+
+
+
+
+from decimal import Decimal, InvalidOperation
+from django.db import transaction
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from peizhi.models import ShangjiaMoban
+
+class ShangjiaGengxinMobanView(APIView):
+    """
+    商家更新订单模板接口
+    POST /peizhi/sjddmbgx
+    权限: JWT认证
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            user = request.user
+            yonghu_id = user.yonghuid
+
+            moban_id = request.data.get('mobanId')
+            leixing_id = request.data.get('shangpinTypeId')
+            new_jieshao = request.data.get('jieshao', '').strip()
+            new_jiage = request.data.get('jiage', '').strip()
+            # 新增字段
+            commission_enabled = request.data.get('commissionEnabled')
+            commission_value = request.data.get('commissionValue')
+            label_id = request.data.get('labelId')
+
+            if not all([moban_id, leixing_id]):
+                return Response({'code': 400, 'msg': '模板ID和商品类型ID不能为空', 'data': {}}, status=400)
+
+            # 查询模板
+            try:
+                moban = ShangjiaMoban.objects.get(
+                    id=moban_id,
+                    yonghu_id=yonghu_id,
+                    leixing_id=leixing_id
+                )
+            except ShangjiaMoban.DoesNotExist:
+                return Response({'code': 404, 'msg': '模板不存在或无权修改', 'data': {}}, status=404)
+
+            update_fields = []
+
+            # 修改介绍
+            if new_jieshao:
+                if len(new_jieshao) > 100:
+                    return Response({'code': 400, 'msg': '订单介绍不能超过100字', 'data': {}}, status=400)
+                if new_jieshao != moban.moban_jieshao:
+                    moban.moban_jieshao = new_jieshao
+                    update_fields.append('moban_jieshao')
+
+            # 修改价格
+            if new_jiage:
+                try:
+                    jiage_decimal = Decimal(new_jiage)
+                    if jiage_decimal <= 0 or jiage_decimal > 10000:
+                        return Response({'code': 400, 'msg': '价格必须在0.1-10000元之间', 'data': {}}, status=400)
+                    if jiage_decimal != moban.jiage:
+                        moban.jiage = jiage_decimal
+                        update_fields.append('jiage')
+                except (InvalidOperation, ValueError, TypeError):
+                    return Response({'code': 400, 'msg': '价格格式错误', 'data': {}}, status=400)
+
+            # 修改标签
+            if label_id is not None:  # 允许传空字符串或不传，传0表示清空
+                new_label = int(label_id) if label_id else None
+                if new_label != moban.chenghao_id:
+                    moban.chenghao_id = new_label
+                    update_fields.append('chenghao_id')
+
+            # 修改佣金设置
+            if commission_enabled is not None:
+                enabled = bool(commission_enabled)
+                if enabled:
+                    if not commission_value:
+                        return Response({'code': 400, 'msg': '佣金价格不能为空', 'data': {}}, status=400)
+                    try:
+                        comm_decimal = Decimal(commission_value)
+                        if comm_decimal < 0.1 or comm_decimal > 50:
+                            return Response({'code': 400, 'msg': '佣金需在0.1-50元之间', 'data': {}}, status=400)
+                        if moban.yongjin_qiangdan != True or moban.yongjin_jiage != comm_decimal:
+                            moban.yongjin_qiangdan = True
+                            moban.yongjin_jiage = comm_decimal
+                            update_fields.extend(['yongjin_qiangdan', 'yongjin_jiage'])
+                    except (InvalidOperation, ValueError, TypeError):
+                        return Response({'code': 400, 'msg': '佣金格式错误', 'data': {}}, status=400)
+                else:
+                    if moban.yongjin_qiangdan != False or moban.yongjin_jiage is not None:
+                        moban.yongjin_qiangdan = False
+                        moban.yongjin_jiage = None
+                        update_fields.extend(['yongjin_qiangdan', 'yongjin_jiage'])
+
+            if not update_fields:
+                return Response({'code': 400, 'msg': '没有修改内容', 'data': {}}, status=400)
+
+            # 检查介绍唯一性
+            if 'moban_jieshao' in update_fields:
+                if ShangjiaMoban.objects.filter(
+                    yonghu_id=yonghu_id,
+                    leixing_id=leixing_id,
+                    moban_jieshao=moban.moban_jieshao
+                ).exclude(id=moban_id).exists():
+                    return Response({'code': 400, 'msg': '已存在相同介绍的模板', 'data': {}}, status=400)
+
+            with transaction.atomic():
+                moban.save(update_fields=update_fields)
+
+            # 返回最新数据
+            return Response({
+                'code': 200,
+                'msg': '模板修改成功',
+                'data': {
+                    'mobanId': moban.id,
+                    'shangpinTypeId': moban.leixing_id,
+                    'jieshao': moban.moban_jieshao,
+                    'jiage': str(moban.jiage),
+                    'fabushuliang': moban.fabu_shuliang,
+                    'commissionEnabled': moban.yongjin_qiangdan,
+                    'commissionValue': str(moban.yongjin_jiage) if moban.yongjin_jiage else None,
+                    'labelId': moban.chenghao_id,
+                    'updateTime': moban.update_time.strftime('%Y-%m-%d %H:%M:%S')
+                }
+            })
+
+        except Exception as e:
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.error(f"修改商家模板失败: {str(e)}", exc_info=True)
+            return Response({'code': 500, 'msg': '服务器内部错误', 'data': {}}, status=500)
+
+
+
+from dengji.models import  DingdanBiaoqian
+
+
+
+import random          # 必须导入
+import secrets
+
+import os
+import time
+import random          # 必须导入
+import hashlib
+import secrets
+import logging
+from decimal import Decimal
+from django.conf import settings
+from django.db import transaction
+from django.db.models import F
+from django.utils import timezone
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from rest_framework import status
+from yonghu.models import UserShangjia
+
+from shangpin.models import ShangpinLeixing
+
+from dengji.models import Chenghao
+
+logger = logging.getLogger(__name__)
+
+class ShangjiaGenerateLinkView(APIView):
+    """商家生成发单链接接口（支持模板佣金/标签）"""
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            user = request.user
+            # 获取参数
+            shangpin_type_id = request.data.get('shangpinTypeId')
+            moban_id = request.data.get('mobanId')
+            if not all([shangpin_type_id, moban_id]):
+                return Response({'code': 400, 'msg': '缺少参数', 'data': {}}, status=400)
+
+            try:
+                shangpin_type_id = int(shangpin_type_id)
+                moban_id = int(moban_id)
+            except ValueError:
+                return Response({'code': 400, 'msg': '参数格式错误', 'data': {}}, status=400)
+
+            # 商家信息
+            try:
+                shangjia = user.shop_profile
+            except UserShangjia.DoesNotExist:
+                return Response({'code': 403, 'msg': '商家信息未完善', 'data': {}}, status=403)
+            if shangjia.zhuangtai != 1:
+                return Response({'code': 403, 'msg': '商家状态异常', 'data': {}}, status=403)
+
+            # 商品类型
+            try:
+                shangpin_leixing = ShangpinLeixing.objects.get(id=shangpin_type_id, shenhezhuangtai=1)
+            except ShangpinLeixing.DoesNotExist:
+                return Response({'code': 400, 'msg': '商品类型不存在或已禁用', 'data': {}}, status=400)
+
+            # 查询模板
+            try:
+                moban = ShangjiaMoban.objects.get(id=moban_id, yonghu_id=user.yonghuid, leixing_id=shangpin_type_id)
+            except ShangjiaMoban.DoesNotExist:
+                return Response({'code': 400, 'msg': '模板不存在', 'data': {}}, status=400)
+
+            jiage = moban.jiage
+            if jiage > shangjia.yue:
+                return Response({'code': 400, 'msg': f'余额不足，当前余额{shangjia.yue}元', 'data': {}}, status=400)
+
+            # 利率
+            try:
+                lilu = float(Lilubiao.objects.get(fadanpingtai='3').lilu) or 1.0
+            except Lilubiao.DoesNotExist:
+                lilu = 1.0
+            dashou_fencheng = Decimal(str(round(float(jiage) * lilu, 2)))
+
+            # 抢单要求：根据模板是否启用佣金
+            chenghao_id = moban.chenghao_id
+            if moban.yongjin_qiangdan and moban.yongjin_jiage is not None:
+                final_yaoqiuleixing = 2          # 佣金模式
+                final_yongjin = moban.yongjin_jiage
+                final_huiyuan_id = ''
+            else:
+                final_yaoqiuleixing = shangpin_leixing.yaoqiuleixing or 1
+                final_yongjin = None
+                final_huiyuan_id = shangpin_leixing.huiyuan_id or ''
+
+            # 获取标签名称
+            label_name = ''
+            if chenghao_id:
+                try:
+                    label_name = Chenghao.objects.get(id=chenghao_id).mingcheng
+                except Chenghao.DoesNotExist:
+                    pass
+
+            # 生成ID和Token
+            def generate_dingdan_id():
+                timestamp = int(time.time() * 1000)
+                process_id = os.getpid() % 1000
+                random_num = random.randint(1000, 9999)   # 注意需要 import random
+                return f"SJ{timestamp}{process_id:03d}{random_num}"
+
+            def generate_secure_token(dd_id, uid):
+                timestamp = int(time.time() * 1_000_000)
+                salt = secrets.token_hex(8)
+                raw = f"{timestamp}:{dd_id}:{uid}:{salt}"
+                token = hashlib.sha256(raw.encode()).hexdigest()[:24]
+                # 确保唯一性（极小概率重复再试一次）
+                if ShangjiaLianjie.objects.filter(lianjie_token=token).exists():
+                    return generate_secure_token(dd_id, uid)
+                return token
+
+            def generate_link_url(token):
+                base = getattr(settings, 'H5_DOMAIN', 'https://h5.yourdomain.com').rstrip('/')
+                return f"{base}/order/{token}"
+
+            with transaction.atomic():
+                dingdan_id = generate_dingdan_id()
+                secure_token = generate_secure_token(dingdan_id, user.yonghuid)
+
+                # 创建订单主表
+                dingdan = Dingdan.objects.create(
+                    dingdan_id=dingdan_id,
+                    zhuangtai=13,
+                    fadan_pingtai=2,
+                    jine=jiage,
+                    dashou_fencheng=dashou_fencheng,
+                    leixing_id=shangpin_type_id,
+                    yaoqiuleixing=final_yaoqiuleixing,
+                    huiyuan_id=final_huiyuan_id,
+                    yongjin=final_yongjin,
+                    jieshao=moban.moban_jieshao[:2000],
+                    user1_id=f"Sj{user.yonghuid}",
+                    tupian=user.avatar or '',
+                )
+
+                # 商家扩展表
+                DingdanShangjia.objects.create(
+                    dingdan=dingdan,
+                    shangjia_id=user.yonghuid,
+                    sjnicheng=shangjia.nicheng or f"商家{user.yonghuid}",
+                )
+
+                # 关联标签
+                if chenghao_id:
+                    try:
+                        ch = Chenghao.objects.get(id=chenghao_id)
+                        DingdanBiaoqian.objects.create(dingdan=dingdan, chenghao=ch)
+                    except Chenghao.DoesNotExist:
+                        logger.warning(f"称号{chenghao_id}不存在，跳过关联")
+
+                # 更新商家余额和统计
+                UserShangjia.objects.filter(id=shangjia.id).update(
+                    fabu=F('fabu') + 1,
+                    yue=F('yue') - jiage,
+                    jinridingdan=F('jinridingdan') + 1,
+                    jinriliushui=F('jinriliushui') + jiage,
+                    jinyuedingdan=F('jinyuedingdan') + 1,
+                    jinyueliushui=F('jinyueliushui') + jiage,
+                )
+
+                # 生成链接并保存
+                link_url = generate_link_url(secure_token)
+                lianjie_obj = ShangjiaLianjie.objects.create(
+                    yonghu_id=user.yonghuid,
+                    leixing_id=shangpin_type_id,
+                    moban_id=moban_id,
+                    lianjie=link_url,
+                    lianjie_token=secure_token,
+                    dingdan_id=dingdan_id,
+                    is_used=False,
+                    youxiao_shijian=timezone.now() + timezone.timedelta(days=1)
+                )
+
+                # 更新模板发布数量
+                ShangjiaMoban.objects.filter(id=moban_id).update(fabu_shuliang=F('fabu_shuliang') + 1)
+                shangjia.refresh_from_db()
+
+                logger.info(f"链接生成成功 - 订单ID: {dingdan_id}, 标签: {label_name}")
+
+                return Response({
+                    'code': 200,
+                    'msg': '链接生成成功',
+                    'data': {
+                        'linkUrl': link_url,
+                        'newBalance': str(shangjia.yue),
+                        'dingdanId': dingdan_id,
+                        'dingdanJieshao': moban.moban_jieshao,
+                        'jiage': str(jiage),
+                        'labelId': chenghao_id,
+                        'labelName': label_name,
+                        'youxiaoShijian': lianjie_obj.youxiao_shijian.strftime('%Y-%m-%d %H:%M:%S'),
+                    }
+                })
+
+        except Exception as e:
+            logger.error(f"生成链接事务失败: {str(e)}", exc_info=True)
+            return Response({'code': 500, 'msg': '系统错误，生成链接失败', 'data': {}}, status=500)
+
+
+from django.core.paginator import Paginator
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from peizhi.models import ShangjiaLianjie
+
+class ShangjiaLianjieListView(APIView):
+    """获取已生成的链接列表（支持筛选是否使用）"""
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            user = request.user
+            yonghu_id = user.yonghuid
+
+            moban_id = request.data.get('mobanId')
+            used = int(request.data.get('used', 0))          # 0未使用，1已使用
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('pageSize', 5))
+            page_size = min(page_size, 50)
+
+            if not moban_id:
+                return Response({'code': 400, 'msg': '模板ID不能为空', 'data': {}}, status=400)
+
+            # 校验模板归属
+            try:
+                moban = ShangjiaMoban.objects.get(id=moban_id, yonghu_id=yonghu_id)
+            except ShangjiaMoban.DoesNotExist:
+                return Response({'code': 404, 'msg': '模板不存在或无权查看', 'data': {}}, status=404)
+
+            links = ShangjiaLianjie.objects.filter(
+                yonghu_id=yonghu_id,
+                moban_id=moban_id,
+                is_used=(used == 1)
+            ).order_by('-create_time')
+
+            paginator = Paginator(links, page_size)
+            if page < 1 or page > paginator.num_pages:
+                return Response({'code': 400, 'msg': '页码超出范围', 'data': {}}, status=400)
+
+            current_page = paginator.page(page)
+            data_list = []
+            for link in current_page.object_list:
+                data_list.append({
+                    'id': link.id,
+                    'lianjie': link.lianjie,
+                    'lianjie_token': link.lianjie_token,
+                    'is_used': link.is_used,
+                    'dingdan_id': link.dingdan_id,
+                    'youxiao_shijian': link.youxiao_shijian.strftime('%Y-%m-%d %H:%M:%S') if link.youxiao_shijian else '',
+                    'create_time': link.create_time.strftime('%Y-%m-%d %H:%M:%S')
+                })
+
+            return Response({
+                'code': 200,
+                'msg': '获取成功',
+                'data': {
+                    'list': data_list,
+                    'total': paginator.count,
+                    'hasMore': current_page.has_next(),
+                    'currentPage': page,
+                    'pageSize': page_size
+                }
+            })
+
+        except Exception as e:
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.error(f"获取链接列表失败: {str(e)}", exc_info=True)
+            return Response({'code': 500, 'msg': '服务器内部错误', 'data': {}}, status=500)
+
+
+
+import logging
+
+from peizhi.models import ShangjiaMoban, ShangjiaLianjie
+from shangpin.models import ShangpinLeixing
+from dingdan.models import Dingdan, DingdanShangjia
+# 假设利率表模型路径（根据你的项目结构调整）
+from dingdan.models import Lilubiao
+
+logger = logging.getLogger(__name__)
+
+# views/peizhi/sjljhq.py
+from rest_framework.views import APIView
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework import status
+from django.db import transaction
+from django.db.models import F
+from django.conf import settings
+from django.utils import timezone
+import time
+import random
+import os
+import logging
+import hashlib
+import secrets
+from decimal import Decimal
+
+logger = logging.getLogger(__name__)
+
+
+'''class ShangjiaGenerateLinkView(APIView):
+    """商家生成发单链接接口"""
+    permission_classes = [IsAuthenticated]  # JWT Token认证
+
+    def post(self, request):
+        # 1. 记录请求日志
+        logger.info(f"商家生成链接请求 - 用户ID: {request.user.yonghuid}, 数据: {request.data}")
+
+        # 2. 获取前端参数
+        data = request.data
+        shangpin_type_id = data.get('shangpinTypeId')  # 商品类型ID
+        moban_id = data.get('mobanId')  # 模板ID
+
+        # 3. 基本参数验证
+        if not all([shangpin_type_id, moban_id]):
+            logger.warning(f"参数缺失 - shangpin_type_id: {shangpin_type_id}, moban_id: {moban_id}")
+            return Response({
+                'code': 400,
+                'msg': '缺少必填参数：订单类型ID和模板ID',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        try:
+            shangpin_type_id = int(shangpin_type_id)
+            moban_id = int(moban_id)
+        except ValueError:
+            return Response({
+                'code': 400,
+                'msg': '参数格式错误，必须是数字',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 4. 获取商家扩展信息（使用反向查询，最高效的方式）
+        try:
+            shangjia = request.user.shop_profile
+        except UserShangjia.DoesNotExist:
+            logger.error(f"商家扩展信息不存在 - 用户ID: {request.user.yonghuid}")
+            return Response({
+                'code': 403,
+                'msg': '您不是商家或商家信息未完善',
+                'data': None
+            }, status=status.HTTP_403_FORBIDDEN)
+
+        # 5. 验证商家状态
+        if shangjia.zhuangtai != 1:
+            logger.warning(f"商家状态异常 - 用户ID: {request.user.yonghuid}, 状态: {shangjia.zhuangtai}")
+            return Response({
+                'code': 403,
+                'msg': '商家账号状态异常，请联系管理员',
+                'data': None
+            }, status=status.HTTP_403_FORBIDDEN)
+
+        # 6. 查询商品类型信息
+        try:
+            shangpin_leixing = ShangpinLeixing.objects.get(id=shangpin_type_id)
+        except ShangpinLeixing.DoesNotExist:
+            logger.error(f"商品类型不存在 - 类型ID: {shangpin_type_id}")
+            return Response({
+                'code': 400,
+                'msg': '商品类型不存在',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 提取商品类型信息
+        yaoqiuleixing = shangpin_leixing.yaoqiuleixing
+        huiyuan_id = shangpin_leixing.huiyuan_id if shangpin_leixing.huiyuan_id else ''
+        # yongjin 字段暂时不需要用到
+
+        # 7. 查询商家订单模板（使用组合查询，最高效）
+        try:
+            moban = ShangjiaMoban.objects.get(
+                yonghu_id=request.user.yonghuid,
+                leixing_id=shangpin_type_id,
+                id=moban_id
+            )
+        except ShangjiaMoban.DoesNotExist:
+            logger.error(
+                f"商家模板不存在 - 用户ID: {request.user.yonghuid}, 类型ID: {shangpin_type_id}, 模板ID: {moban_id}")
+            return Response({
+                'code': 400,
+                'msg': '订单模板不存在',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 获取模板价格和介绍
+        jiage = moban.jiage
+        dingdan_jieshao = moban.moban_jieshao
+
+        # 8. 验证商家余额
+        if jiage > shangjia.yue:
+            logger.warning(f"商家余额不足 - 用户ID: {request.user.yonghuid}, 余额: {shangjia.yue}, 价格: {jiage}")
+            return Response({
+                'code': 400,
+                'msg': f'余额不足，当前余额{shangjia.yue}元',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 9. 查询利率（复用商家派单接口逻辑）
+        try:
+            lilu_obj = Lilubiao.objects.get(fadanpingtai='3')
+            lilu = float(lilu_obj.lilu)
+            if lilu <= 0:
+                lilu = 1  # 默认值
+            logger.info(f"获取到利率 - 平台: 3, 利率: {lilu}")
+        except Lilubiao.DoesNotExist:
+            logger.warning("利率表不存在，使用默认利率1")
+            lilu = 1
+
+        # 10. 计算打手分成
+        # 方法1：最安全的方式，兼容所有情况
+        dashou_fencheng = Decimal(str(round(float(jiage) * lilu, 2)))
+        logger.info(f"计算打手分成 - 价格: {jiage}, 利率: {lilu}, 分成: {dashou_fencheng}")
+
+        # 11. 生成订单ID（复用商家派单接口的逻辑）
+        def generate_dingdan_id():
+            """生成唯一订单ID"""
+            timestamp = int(time.time() * 1000)
+            process_id = os.getpid() % 1000
+            random_num = random.randint(1000, 9999)
+            return f"SJ{timestamp}{process_id:03d}{random_num}"
+
+        # 🔴🆕【新增】生成安全Token的函数
+        def generate_secure_token(dingdan_id, shangjia_id):
+            """
+            生成安全的Token
+            算法：时间戳 + 订单ID + 商家ID + 随机数 → SHA256 → 截取前24位
+            """
+            timestamp = int(time.time() * 1_000_000)  # 纳秒级精度
+            random_salt = secrets.token_hex(8)  # 16位随机盐值
+
+            # 组合原始字符串
+            raw_string = f"{timestamp}:{dingdan_id}:{shangjia_id}:{random_salt}"
+
+            # 使用SHA256哈希
+            hash_obj = hashlib.sha256(raw_string.encode('utf-8'))
+            token = hash_obj.hexdigest()[:24]  # 取前24位作为Token
+
+            # 确保唯一性（理论上极小概率重复，但还是要检查）
+            try:
+                if ShangjiaLianjie.objects.filter(lianjie_token=token).exists():
+                    # 如果重复，重新生成（极低概率）
+                    return generate_secure_token(dingdan_id, shangjia_id)
+            except:
+                pass
+
+            return token
+
+        # 🔴🆕【修改】生成链接函数 - 使用Token而不是订单ID
+        def generate_link_url(token):
+            """生成安全的H5页面链接 - 使用Token而不是订单ID"""
+            base_url = getattr(settings, 'H5_DOMAIN', 'https://h5.yourdomain.com')
+            # 确保base_url以/结尾
+            if not base_url.endswith('/'):
+                base_url += '/'
+            # 🔴🆕【关键修改】生成使用Token的链接
+            return f"{base_url}order/{token}"
+
+        # 13. 使用事务确保数据一致性（这是最关键的步骤！）
+        try:
+            with transaction.atomic():
+                # 生成订单ID
+                dingdan_id = generate_dingdan_id()
+
+                # 🔴🆕【新增】生成安全Token
+                secure_token = generate_secure_token(dingdan_id, request.user.yonghuid)
+
+                # 创建订单主表（状态为13：灰度状态，等待老板填写）
+                dingdan = Dingdan.objects.create(
+                    dingdan_id=dingdan_id,
+                    zhuangtai=13,  # 🔴 核心：状态13表示灰度状态，等待老板填写
+                    fadan_pingtai=2,  # 商家发单
+                    jine=jiage,
+                    dashou_fencheng=dashou_fencheng,
+                    # 以下字段留空，等待老板填写
+                    jiedan_dashou_id='',
+                    dashou_liuyan='',
+                    zhiding_id='',
+                    shangpin_id=0,  # 暂时设为0
+                    leixing_id=shangpin_type_id,
+                    yaoqiuleixing=yaoqiuleixing if yaoqiuleixing else 1,
+                    huiyuan_id=huiyuan_id,
+                    yongjin=None,  # 暂时不需要
+                    jieshao=dingdan_jieshao[:2000],  # 限制长度
+                    beizhu='',  # 备注为空，等待老板填写
+                    nicheng='',  # 🔴 游戏昵称为空，等待老板填写
+                    tupian=request.user.avatar if request.user.avatar else '',
+                    user1_id=f"Sj{request.user.yonghuid}",  # 商家标识
+                    user2_id='',  # 打手标识为空
+                )
+                logger.info(f"创建订单成功 - 订单ID: {dingdan_id}")
+
+                # 创建商家订单扩展表
+                DingdanShangjia.objects.create(
+                    dingdan=dingdan,
+                    shangjia_id=request.user.yonghuid,
+                    sjnicheng=shangjia.nicheng if shangjia.nicheng else f"商家{request.user.yonghuid}",
+                    shangjia_pingjia='',
+                    cfliyou='',
+                    sqzhuangtai=0,
+                    bhliyou=''
+                )
+                logger.info(f"创建商家订单扩展表成功 - 订单ID: {dingdan_id}")
+
+                # 🔴 核心：更新商家统计信息和余额（使用F表达式，避免并发问题）
+                UserShangjia.objects.filter(id=shangjia.id).update(
+                    fabu=F('fabu') + 1,
+                    yue=F('yue') - jiage,  # 🔴 扣除余额
+                    jinridingdan=F('jinridingdan') + 1,
+                    jinriliushui=F('jinriliushui') + jiage,
+                    jinyuedingdan=F('jinyuedingdan') + 1,
+                    jinyueliushui=F('jinyueliushui') + jiage,
+                )
+                logger.info(f"更新商家统计信息成功 - 用户ID: {request.user.yonghuid}, 扣除金额: {jiage}")
+
+                # 🔴🆕【修改】生成链接 - 使用Token而不是订单ID
+                link_url = generate_link_url(secure_token)
+                logger.info(f"生成链接 - Token: {secure_token}, 链接: {link_url}")
+
+                # 🔴🆕【修改】保存链接到商家链接表 - 添加Token字段
+                lianjie_obj = ShangjiaLianjie.objects.create(
+                    yonghu_id=request.user.yonghuid,
+                    leixing_id=shangpin_type_id,
+                    moban_id=moban_id,
+                    lianjie=link_url,
+                    lianjie_token=secure_token,  # 🔴🆕【新增】保存Token
+                    dingdan_id=dingdan_id,
+                    is_used=False,  # 未使用
+                    youxiao_shijian=timezone.now() + timezone.timedelta(days=1)  # 24小时有效
+                )
+                logger.info(f"保存链接到数据库成功 - 链接ID: {lianjie_obj.id}, Token: {secure_token}")
+
+                # 更新模板发布数量
+                ShangjiaMoban.objects.filter(id=moban_id).update(
+                    fabu_shuliang=F('fabu_shuliang') + 1,
+                )
+                logger.info(f"更新模板发布数量成功 - 模板ID: {moban_id}")
+
+                # 重新获取商家最新数据（因为余额已更新）
+                shangjia.refresh_from_db()
+
+                # 记录成功日志
+                logger.info(
+                    f"商家生成链接成功 - 用户ID: {request.user.yonghuid}, 订单ID: {dingdan_id}, Token: {secure_token}, 链接: {link_url}")
+
+                # 14. 返回成功响应（字段必须与前端对应）
+                return Response({
+                    'code': 200,
+                    'msg': '链接生成成功',
+                    'data': {
+                        'linkUrl': link_url,  # 🔴 前端需要这个字段
+                        'newBalance': str(shangjia.yue),  # 🔴 返回新的余额给前端更新
+                        'dingdanId': dingdan_id,
+                        'dingdanJieshao': dingdan_jieshao,
+                        'jiage': str(jiage),
+                        'youxiaoShijian': lianjie_obj.youxiao_shijian.strftime(
+                            '%Y-%m-%d %H:%M:%S') if lianjie_obj.youxiao_shijian else '',
+                        # 以下字段可根据前端需要添加
+                        'jinriliushui': str(shangjia.jinriliushui),
+                        'jinyueliushui': str(shangjia.jinyueliushui),
+                        'jinridingdan': shangjia.jinridingdan,
+                        'jinyuedingdan': shangjia.jinyuedingdan
+                    }
+                }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            logger.error(f"生成链接失败 - 用户ID: {request.user.yonghuid}, 错误: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'msg': '系统错误，生成链接失败',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)'''
+
+
+# utils/ip_security.py
+import logging
+import re
+from django.utils import timezone
+from django.core.cache import cache
+from rest_framework.throttling import SimpleRateThrottle
+
+logger = logging.getLogger(__name__)
+
+
+class IPUtils:
+    """IP工具类"""
+
+    @staticmethod
+    def get_client_ip(request):
+        """
+        获取客户端真实IP，处理代理情况
+        优先级: X-Real-IP > X-Forwarded-For > remote_addr
+        """
+        ip = None
+
+        try:
+            # 1. 尝试从 X-Real-IP 获取
+            x_real_ip = request.META.get('HTTP_X_REAL_IP')
+            if x_real_ip:
+                ip = x_real_ip.strip()
+                logger.info(f"从 X-Real-IP 获取IP: {ip}")
+                return ip
+
+            # 2. 尝试从 X-Forwarded-For 获取（处理代理链）
+            x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+            if x_forwarded_for:
+                # 可能有多个代理IP，第一个是真实IP
+                ips = x_forwarded_for.split(',')
+                for possible_ip in ips:
+                    possible_ip = possible_ip.strip()
+                    if possible_ip and possible_ip.lower() != 'unknown':
+                        ip = possible_ip
+                        logger.info(f"从 X-Forwarded-For 获取IP: {ip}")
+                        return ip
+
+            # 3. 使用 remote_addr
+            ip = request.META.get('REMOTE_ADDR', '')
+            logger.info(f"从 REMOTE_ADDR 获取IP: {ip}")
+
+        except Exception as e:
+            logger.error(f"获取IP失败: {str(e)}", exc_info=True)
+            ip = '0.0.0.0'
+
+        return ip
+
+    @staticmethod
+    def validate_ip(ip):
+        """验证IP格式是否合法"""
+        if not ip:
+            return False
+
+        # IPv4正则
+        ipv4_pattern = r'^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$'
+
+        # IPv6正则（简化版）
+        ipv6_pattern = r'^(?:[A-F0-9]{1,4}:){7}[A-F0-9]{1,4}$'
+
+        return bool(re.match(ipv4_pattern, ip) or re.match(ipv6_pattern, ip))
+
+    @staticmethod
+    def is_private_ip(ip):
+        """判断是否为内网IP"""
+        if not ip:
+            return False
+
+        # 内网IP段
+        private_ranges = [
+            ('10.0.0.0', '10.255.255.255'),
+            ('172.16.0.0', '172.31.255.255'),
+            ('192.168.0.0', '192.168.255.255'),
+            ('127.0.0.0', '127.255.255.255'),
+        ]
+
+        try:
+            # 将IP转换为整数比较
+            def ip_to_int(ip):
+                parts = ip.split('.')
+                return (int(parts[0]) << 24) + (int(parts[1]) << 16) + (int(parts[2]) << 8) + int(parts[3])
+
+            ip_num = ip_to_int(ip)
+            for start, end in private_ranges:
+                if ip_to_int(start) <= ip_num <= ip_to_int(end):
+                    return True
+        except:
+            pass
+
+        return False
+
+
+class OrderLinkThrottle(SimpleRateThrottle):
+    """订单链接访问频率限制"""
+
+    scope = 'order_link'
+    rate = '10/minute'  # 每分钟最多10次
+
+    def get_cache_key(self, request, view):
+        # 基于IP和接口路径进行限制
+        ip = IPUtils.get_client_ip(request)
+        if not ip or IPUtils.is_private_ip(ip):
+            # 内网IP或不合法IP，使用默认
+            ip = 'default'
+
+        return f'throttle_{view.__class__.__name__}_{ip}'
+
+
+# views/peizhi/khhqddlj.py
+import logging
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from django.utils import timezone
+from django.db.models import Q
+from .models import ShangjiaLianjie
+from dingdan.models import Dingdan, DingdanShangjia
+from yonghu.models import UserMain, UserShangjia
+
+
+
+
+from peizhi.models import ClubConfig
+'''class KehuGetDingdanLianjieView(APIView):
+    """
+    客户获取订单链接信息接口
+    路径：GET /peizhi/khhqddlj?token=xxx
+    返回字段包括：订单信息、打手标识、商家标识、俱乐部配置（客服链接、存储桶、GoEasy AppKey等）
+    """
+
+    throttle_classes = [OrderLinkThrottle]
+    permission_classes = []  # 无需认证，任何人都可访问
+
+    def get(self, request):
+        """
+        处理GET请求，获取订单链接信息
+        """
+        # 1. 记录请求开始
+        logger.info("=== 客户获取订单链接信息接口开始 ===")
+
+        # 2. 获取客户端真实IP
+        client_ip = IPUtils.get_client_ip(request)
+        logger.info(f"客户端IP: {client_ip}")
+
+        # 3. 验证IP合法性
+        if not IPUtils.validate_ip(client_ip):
+            logger.warning(f"IP格式不合法: {client_ip}")
+            return Response({
+                'code': 400,
+                'msg': '网络连接异常',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 4. 获取Token参数
+        token = request.query_params.get('token', '')
+        if not token:
+            logger.warning(f"Token参数缺失 - IP: {client_ip}")
+            return Response({
+                'code': 400,
+                'msg': '缺少链接参数',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        logger.info(f"接收到Token: {token[:8]}...")
+
+        # 5. 查询链接记录
+        try:
+            lianjie_obj = ShangjiaLianjie.objects.select_related().get(lianjie_token=token)
+            logger.info(f"找到链接记录 - 链接ID: {lianjie_obj.id}, 商家ID: {lianjie_obj.yonghu_id}")
+        except ShangjiaLianjie.DoesNotExist:
+            logger.warning(f"链接不存在 - Token: {token[:8]}..., IP: {client_ip}")
+            return Response({
+                'code': 404,
+                'msg': '链接不存在或已失效',
+                'data': None
+            }, status=status.HTTP_404_NOT_FOUND)
+        except Exception as e:
+            logger.error(f"查询链接异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'msg': '系统错误，请稍后重试',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 6. 更新访问者IP（无论是否已使用，都记录最新访问IP）
+        try:
+            lianjie_obj.shiyongzhe_ip = client_ip
+            lianjie_obj.save(update_fields=['shiyongzhe_ip'])
+            logger.info(f"更新访问者IP成功: {client_ip}")
+        except Exception as e:
+            logger.warning(f"更新IP失败: {str(e)}")
+            # 继续处理，不影响主要逻辑
+
+        # 7. 检查链接有效期
+        """now = timezone.now()
+        if lianjie_obj.youxiao_shijian and lianjie_obj.youxiao_shijian < now:
+            logger.warning(f"链接已过期 - 过期时间: {lianjie_obj.youxiao_shijian}, 当前: {now}")
+            return Response({
+                'code': 400,
+                'msg': '链接已过期',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)"""
+
+        # 8. 准备返回数据
+        response_data = {
+            'is_used': lianjie_obj.is_used,
+            'dingdan_id': lianjie_obj.dingdan_id or '',
+            'youxiao_shijian': lianjie_obj.youxiao_shijian.strftime(
+                '%Y-%m-%d %H:%M:%S') if lianjie_obj.youxiao_shijian else '',
+        }
+
+        # 9. 获取订单信息
+        if lianjie_obj.dingdan_id:
+            try:
+                # 查询订单主表
+                dingdan_obj = Dingdan.objects.get(dingdan_id=lianjie_obj.dingdan_id)
+
+                # 获取商家昵称
+                shangjia_nicheng = ''
+                try:
+                    user_main = UserMain.objects.get(yonghuid=lianjie_obj.yonghu_id)
+                    shangjia_obj = user_main.shop_profile
+                    shangjia_nicheng = shangjia_obj.nicheng
+                except (UserMain.DoesNotExist, UserShangjia.DoesNotExist):
+                    logger.warning(f"商家信息不存在 - 用户ID: {lianjie_obj.yonghu_id}")
+
+                # ========== 新增：确定俱乐部配置 ==========
+                # 默认头像（相对路径）
+                default_avatar = 'a_long/morentouxiang.jpg'
+                # 初始化配置字段默认值
+                kefu_link = ''
+                oss_url = ''
+                goeasy_appkey = ''
+
+                # 判断是否为跨平台订单
+                is_cross = dingdan_obj.is_cross if hasattr(dingdan_obj, 'is_cross') else 0
+
+                # 默认使用我方配置
+                use_self_config = True
+                target_club_id = None
+
+                if is_cross == 1:
+                    # 跨平台订单
+                    # 优先使用 partner_club_id
+                    if dingdan_obj.partner_club_id:
+                        target_club_id = dingdan_obj.partner_club_id
+                        use_self_config = False
+                        logger.info(f"跨平台订单，使用对方俱乐部ID: {target_club_id}")
+                    # 其次，如果有对方订单ID但没有俱乐部ID，使用默认俱乐部ID 000001
+                    elif dingdan_obj.partner_order_id:
+                        target_club_id = '000001'
+                        use_self_config = False
+                        logger.info(f"跨平台订单有对方订单ID但无俱乐部ID，使用默认俱乐部ID: {target_club_id}")
+                    else:
+                        # 无任何对方信息，降级为我方配置
+                        use_self_config = True
+                        logger.warning(f"订单标记跨平台但无对方俱乐部ID和对方订单ID，使用我方配置")
+                else:
+                    # 非跨平台订单
+                    use_self_config = True
+
+                # 获取俱乐部配置
+                club_config = None
+                if use_self_config:
+                    # 查询我方俱乐部配置 (is_self=1)
+                    try:
+                        club_config = ClubConfig.objects.filter(is_self=1).first()
+                        if club_config:
+                            logger.info(f"使用我方俱乐部配置，club_id={club_config.club_id}")
+                        else:
+                            logger.warning("未找到我方俱乐部配置（is_self=1）")
+                    except Exception as e:
+                        logger.error(f"查询我方俱乐部配置异常: {str(e)}", exc_info=True)
+                else:
+                    # 使用确定的俱乐部ID查询对方配置
+                    if target_club_id:
+                        try:
+                            club_config = ClubConfig.objects.filter(club_id=target_club_id).first()
+                            if club_config:
+                                logger.info(f"使用对方俱乐部配置，club_id={target_club_id}")
+                            else:
+                                logger.warning(f"未找到对方俱乐部配置，club_id={target_club_id}")
+                        except Exception as e:
+                            logger.error(f"查询对方俱乐部配置异常: {str(e)}", exc_info=True)
+
+                if club_config:
+                    kefu_link = club_config.customer_service_api_url or ''
+                    oss_url = club_config.storage_bucket_domain or ''
+                    goeasy_appkey = club_config.chat_api_key or ''
+
+                # ========== 构建订单信息 ==========
+                dingdan_info = {
+                    'jieshao': dingdan_obj.jieshao or '',
+                    'jiage': str(dingdan_obj.jine) if dingdan_obj.jine is not None else '0.00',  # 金额字段名是 jine
+                    'shangjia_mingcheng': shangjia_nicheng,
+                    'zhuangtai': dingdan_obj.zhuangtai,
+                    'is_cross': is_cross,
+                    # 新增配置字段
+                    'kefu_link': kefu_link,
+                    'oss_url': oss_url,
+                    'default_avatar': default_avatar,
+                    'goeasy_appkey': goeasy_appkey,
+                }
+
+                # 如果已使用，返回已填写的信息
+                if lianjie_obj.is_used:
+                    dingdan_info.update({
+                        'youxi_nicheng': dingdan_obj.nicheng or '',
+                        'zhiding_dashou': dingdan_obj.zhiding_id or '',
+                        'beizhu': dingdan_obj.beizhu or '',
+                    })
+
+                # 获取聊天相关标识
+                # 9.1 获取接单打手ID
+                jiedan_dashou_id = dingdan_obj.jiedan_dashou_id
+                dashou_biaoshi = f'Ds{jiedan_dashou_id}' if jiedan_dashou_id else ''
+
+                # 9.2 获取商家标识
+                shangjia_biaoshi = ''
+                try:
+                    shangjia_kuozhan = DingdanShangjia.objects.select_related('dingdan').filter(
+                        dingdan__dingdan_id=lianjie_obj.dingdan_id
+                    ).first()
+
+                    if shangjia_kuozhan and shangjia_kuozhan.shangjia_id:
+                        shangjia_biaoshi = f'Sj{shangjia_kuozhan.shangjia_id}'
+                        logger.info(f"生成商家标识: {shangjia_biaoshi}")
+                    else:
+                        logger.info(f"订单 {lianjie_obj.dingdan_id} 没有商家订单扩展信息")
+                except Exception as e:
+                    logger.error(f"查询商家订单扩展异常: {str(e)}", exc_info=True)
+
+                # 添加聊天标识
+                dingdan_info.update({
+                    'dashou_biaoshi': dashou_biaoshi,
+                    'shangjia_biaoshi': shangjia_biaoshi,
+                    'you_dashou': bool(dashou_biaoshi),
+                })
+
+                response_data.update(dingdan_info)
+
+            except Dingdan.DoesNotExist:
+                logger.error(f"订单不存在 - 订单ID: {lianjie_obj.dingdan_id}")
+                response_data.update({
+                    'jieshao': '',
+                    'jiage': '0.00',
+                    'shangjia_mingcheng': '',
+                    'zhuangtai': None,
+                    'dashou_biaoshi': '',
+                    'shangjia_biaoshi': '',
+                    'you_dashou': False,
+                    'is_cross': 0,
+                    'kefu_link': '',
+                    'oss_url': '',
+                    'default_avatar': 'a_long/morentouxiang.jpg',
+                    'goeasy_appkey': '',
+                })
+            except Exception as e:
+                logger.error(f"获取订单信息异常: {str(e)}", exc_info=True)
+                response_data.update({
+                    'jieshao': '',
+                    'jiage': '0.00',
+                    'shangjia_mingcheng': '',
+                    'zhuangtai': None,
+                    'dashou_biaoshi': '',
+                    'shangjia_biaoshi': '',
+                    'you_dashou': False,
+                    'is_cross': 0,
+                    'kefu_link': '',
+                    'oss_url': '',
+                    'default_avatar': 'a_long/morentouxiang.jpg',
+                    'goeasy_appkey': '',
+                })
+        else:
+            # 如果订单ID为空
+            logger.warning(f"链接记录中订单ID为空 - 链接ID: {lianjie_obj.id}")
+            response_data.update({
+                'jieshao': '',
+                'jiage': '0.00',
+                'shangjia_mingcheng': '',
+                'zhuangtai': None,
+                'dashou_biaoshi': '',
+                'shangjia_biaoshi': '',
+                'you_dashou': False,
+                'is_cross': 0,
+                'kefu_link': '',
+                'oss_url': '',
+                'default_avatar': 'a_long/morentouxiang.jpg',
+                'goeasy_appkey': '',
+            })
+
+        # 10. 判断订单状态是否允许修改
+        if not lianjie_obj.is_used and response_data.get('zhuangtai') == 13:
+            response_data['allow_modify'] = True
+        else:
+            response_data['allow_modify'] = False
+
+        # 11. 记录成功日志并返回
+        logger.info(
+            f"返回订单信息成功 - Token: {token[:8]}..., IP: {client_ip}, "
+            f"是否允许修改: {response_data['allow_modify']}, "
+            f"是否有打手: {response_data.get('you_dashou', False)}"
+        )
+
+        return Response({
+            'code': 200,
+            'msg': '成功',
+            'data': response_data
+        }, status=status.HTTP_200_OK)'''
+
+
+
+class KehuGetDingdanLianjieView(APIView):
+    """
+    客户获取订单链接信息接口
+    路径：GET /peizhi/khhqddlj?token=xxx
+    返回字段包括：订单信息、打手标识、商家标识、俱乐部配置（客服链接、存储桶、GoEasy AppKey等）
+    """
+
+    throttle_classes = [OrderLinkThrottle]
+    permission_classes = []  # 无需认证，任何人都可访问
+
+    def get(self, request):
+        """
+        处理GET请求，获取订单链接信息
+        """
+        # 1. 记录请求开始
+        logger.info("=== 客户获取订单链接信息接口开始 ===")
+
+        # 2. 获取客户端真实IP
+        client_ip = IPUtils.get_client_ip(request)
+        logger.info(f"客户端IP: {client_ip}")
+
+        # 3. 验证IP合法性
+        if not IPUtils.validate_ip(client_ip):
+            logger.warning(f"IP格式不合法: {client_ip}")
+            return Response({
+                'code': 400,
+                'msg': '网络连接异常',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 4. 获取Token参数
+        token = request.query_params.get('token', '')
+        if not token:
+            logger.warning(f"Token参数缺失 - IP: {client_ip}")
+            return Response({
+                'code': 400,
+                'msg': '缺少链接参数',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        logger.info(f"接收到Token: {token[:8]}...")
+
+        # 5. 查询链接记录
+        try:
+            lianjie_obj = ShangjiaLianjie.objects.select_related().get(lianjie_token=token)
+            logger.info(f"找到链接记录 - 链接ID: {lianjie_obj.id}, 商家ID: {lianjie_obj.yonghu_id}")
+        except ShangjiaLianjie.DoesNotExist:
+            logger.warning(f"链接不存在 - Token: {token[:8]}..., IP: {client_ip}")
+            return Response({
+                'code': 404,
+                'msg': '链接不存在或已失效',
+                'data': None
+            }, status=status.HTTP_404_NOT_FOUND)
+        except Exception as e:
+            logger.error(f"查询链接异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'msg': '系统错误，请稍后重试',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 6. 更新访问者IP（无论是否已使用，都记录最新访问IP）
+        try:
+            lianjie_obj.shiyongzhe_ip = client_ip
+            lianjie_obj.save(update_fields=['shiyongzhe_ip'])
+            logger.info(f"更新访问者IP成功: {client_ip}")
+        except Exception as e:
+            logger.warning(f"更新IP失败: {str(e)}")
+            # 继续处理，不影响主要逻辑
+
+        # 7. 检查链接有效期
+        '''now = timezone.now()
+        if lianjie_obj.youxiao_shijian and lianjie_obj.youxiao_shijian < now:
+            logger.warning(f"链接已过期 - 过期时间: {lianjie_obj.youxiao_shijian}, 当前: {now}")
+            return Response({
+                'code': 400,
+                'msg': '链接已过期',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)'''
+
+        # 8. 准备返回数据
+        response_data = {
+            'is_used': lianjie_obj.is_used,
+            'dingdan_id': lianjie_obj.dingdan_id or '',
+            'youxiao_shijian': lianjie_obj.youxiao_shijian.strftime(
+                '%Y-%m-%d %H:%M:%S') if lianjie_obj.youxiao_shijian else '',
+        }
+
+        # 9. 获取订单信息
+        if lianjie_obj.dingdan_id:
+            try:
+                # 查询订单主表
+                dingdan_obj = Dingdan.objects.get(dingdan_id=lianjie_obj.dingdan_id)
+
+                # 获取商家昵称
+                shangjia_nicheng = ''
+                try:
+                    user_main = UserMain.objects.get(yonghuid=lianjie_obj.yonghu_id)
+                    shangjia_obj = user_main.shop_profile
+                    shangjia_nicheng = shangjia_obj.nicheng
+                except (UserMain.DoesNotExist, UserShangjia.DoesNotExist):
+                    logger.warning(f"商家信息不存在 - 用户ID: {lianjie_obj.yonghu_id}")
+
+                # ========== 新增：确定俱乐部配置 ==========
+                # 默认头像（相对路径）
+                default_avatar = 'a_long/morentouxiang.jpg'
+                # 初始化配置字段默认值
+                kefu_link = ''
+                oss_url = ''
+                goeasy_appkey = ''
+
+                # 判断是否为跨平台订单（保留，但不影响配置选择）
+                is_cross = dingdan_obj.is_cross if hasattr(dingdan_obj, 'is_cross') else 0
+
+                # 始终使用我方俱乐部配置
+                try:
+                    club_config = ClubConfig.objects.filter(is_self=1).first()
+                    if club_config:
+                        logger.info(f"使用我方俱乐部配置，club_id={club_config.club_id}")
+                        kefu_link = club_config.customer_service_api_url or ''
+                        oss_url = club_config.storage_bucket_domain or ''
+                        goeasy_appkey = club_config.chat_api_key or ''
+                    else:
+                        logger.warning("未找到我方俱乐部配置（is_self=1）")
+                except Exception as e:
+                    logger.error(f"查询我方俱乐部配置异常: {str(e)}", exc_info=True)
+
+                # ========== 构建订单信息 ==========
+                dingdan_info = {
+                    'jieshao': dingdan_obj.jieshao or '',
+                    'jiage': str(dingdan_obj.jine) if dingdan_obj.jine is not None else '0.00',  # 金额字段名是 jine
+                    'shangjia_mingcheng': shangjia_nicheng,
+                    'zhuangtai': dingdan_obj.zhuangtai,
+                    'is_cross': is_cross,
+                    # 新增配置字段
+                    'kefu_link': kefu_link,
+                    'oss_url': oss_url,
+                    'default_avatar': default_avatar,
+                    'goeasy_appkey': goeasy_appkey,
+                    # 🆕 前端用于连接GoEasy的自身用户ID（固定B前缀+商家ID）
+                    'self_user_id': f"B{lianjie_obj.yonghu_id}" if lianjie_obj.yonghu_id else '',
+                }
+
+                # 如果已使用，返回已填写的信息
+                if lianjie_obj.is_used:
+                    dingdan_info.update({
+                        'youxi_nicheng': dingdan_obj.nicheng or '',
+                        'zhiding_dashou': dingdan_obj.zhiding_id or '',
+                        'beizhu': dingdan_obj.beizhu or '',
+                    })
+
+                # 获取聊天相关标识
+                # 9.1 获取接单打手ID
+                jiedan_dashou_id = dingdan_obj.jiedan_dashou_id
+                dashou_biaoshi = f'Ds{jiedan_dashou_id}' if jiedan_dashou_id else ''
+
+                # 9.2 获取商家标识
+                shangjia_biaoshi = ''
+                try:
+                    shangjia_kuozhan = DingdanShangjia.objects.select_related('dingdan').filter(
+                        dingdan__dingdan_id=lianjie_obj.dingdan_id
+                    ).first()
+
+                    if shangjia_kuozhan and shangjia_kuozhan.shangjia_id:
+                        shangjia_biaoshi = f'Sj{shangjia_kuozhan.shangjia_id}'
+                        logger.info(f"生成商家标识: {shangjia_biaoshi}")
+                    else:
+                        logger.info(f"订单 {lianjie_obj.dingdan_id} 没有商家订单扩展信息")
+                except Exception as e:
+                    logger.error(f"查询商家订单扩展异常: {str(e)}", exc_info=True)
+
+                # 添加聊天标识
+                dingdan_info.update({
+                    'dashou_biaoshi': dashou_biaoshi,
+                    'shangjia_biaoshi': shangjia_biaoshi,
+                    'you_dashou': bool(dashou_biaoshi),
+                })
+
+                response_data.update(dingdan_info)
+
+            except Dingdan.DoesNotExist:
+                logger.error(f"订单不存在 - 订单ID: {lianjie_obj.dingdan_id}")
+                response_data.update({
+                    'jieshao': '',
+                    'jiage': '0.00',
+                    'shangjia_mingcheng': '',
+                    'zhuangtai': None,
+                    'dashou_biaoshi': '',
+                    'shangjia_biaoshi': '',
+                    'you_dashou': False,
+                    'is_cross': 0,
+                    'kefu_link': '',
+                    'oss_url': '',
+                    'default_avatar': 'a_long/morentouxiang.jpg',
+                    'goeasy_appkey': '',
+                    'self_user_id': '',
+                })
+            except Exception as e:
+                logger.error(f"获取订单信息异常: {str(e)}", exc_info=True)
+                response_data.update({
+                    'jieshao': '',
+                    'jiage': '0.00',
+                    'shangjia_mingcheng': '',
+                    'zhuangtai': None,
+                    'dashou_biaoshi': '',
+                    'shangjia_biaoshi': '',
+                    'you_dashou': False,
+                    'is_cross': 0,
+                    'kefu_link': '',
+                    'oss_url': '',
+                    'default_avatar': 'a_long/morentouxiang.jpg',
+                    'goeasy_appkey': '',
+                    'self_user_id': '',
+                })
+        else:
+            # 如果订单ID为空
+            logger.warning(f"链接记录中订单ID为空 - 链接ID: {lianjie_obj.id}")
+            response_data.update({
+                'jieshao': '',
+                'jiage': '0.00',
+                'shangjia_mingcheng': '',
+                'zhuangtai': None,
+                'dashou_biaoshi': '',
+                'shangjia_biaoshi': '',
+                'you_dashou': False,
+                'is_cross': 0,
+                'kefu_link': '',
+                'oss_url': '',
+                'default_avatar': 'a_long/morentouxiang.jpg',
+                'goeasy_appkey': '',
+                'self_user_id': '',
+            })
+
+        # 10. 判断订单状态是否允许修改
+        if not lianjie_obj.is_used and response_data.get('zhuangtai') == 13:
+            response_data['allow_modify'] = True
+        else:
+            response_data['allow_modify'] = False
+
+        # 11. 记录成功日志并返回
+        logger.info(
+            f"返回订单信息成功 - Token: {token[:8]}..., IP: {client_ip}, "
+            f"是否允许修改: {response_data['allow_modify']}, "
+            f"是否有打手: {response_data.get('you_dashou', False)}"
+        )
+
+        return Response({
+            'code': 200,
+            'msg': '成功',
+            'data': response_data
+        }, status=status.HTTP_200_OK)
+
+
+
+
+
+import threading
+from utils.weixin_broadcast import WeixinBroadcastSender
+from dingdan.utils import sync_order_to_partners
+logger = logging.getLogger(__name__)
+
+
+class KehuTianxieDingdanView(APIView):
+    """
+    客户填写订单信息接口
+    路径：POST /peizhi/kehutx
+    """
+
+    # 添加频率限制（比查询接口更严格）
+    throttle_classes = [OrderLinkThrottle]
+    permission_classes = []  # 无需认证
+
+    def post(self, request):
+        """
+        处理POST请求，填写订单信息
+        """
+        # 1. 记录请求开始
+        logger.info("=== 客户填写订单信息接口开始 ===")
+
+        # 2. 获取客户端真实IP
+        client_ip = IPUtils.get_client_ip(request)
+        logger.info(f"客户端IP: {client_ip}")
+
+        # 3. 验证IP合法性
+        if not IPUtils.validate_ip(client_ip):
+            logger.warning(f"IP格式不合法: {client_ip}")
+            return Response({
+                'code': 400,
+                'msg': '网络连接异常',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 4. 获取请求参数
+        data = request.data
+        token = data.get('token', '')
+        youxi_nicheng = data.get('youxi_nicheng', '').strip()
+        zhiding_dashou = data.get('zhiding_dashou', '').strip()  # 可选
+        beizhu = data.get('beizhu', '').strip()  # 可选
+
+        # 4.0 临时关闭指定功能（如需开启，请删除或注释掉下面两行）
+        if zhiding_dashou:
+            return Response({'code': 8, 'msg': '指定功能尚未开启，请不要填写指定打手ID', 'data': None})
+        if beizhu:
+            return Response({'code': 8, 'msg': '备注功能尚未开启，请不要填写备注', 'data': None})
+
+        logger.info(
+            f"请求参数 - Token: {token[:8]}..., 昵称: {youxi_nicheng[:10]}..., 指定打手: {zhiding_dashou}, 备注长度: {len(beizhu)}")
+
+        # 5. 验证必填参数
+        if not token:
+            logger.warning(f"Token参数缺失 - IP: {client_ip}")
+            return Response({
+                'code': 400,
+                'msg': '缺少链接参数',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        if not youxi_nicheng:
+            logger.warning(f"游戏昵称为空 - IP: {client_ip}")
+            return Response({
+                'code': 400,
+                'msg': '游戏昵称不能为空',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 6. 验证游戏昵称格式
+        if len(youxi_nicheng) > 50:
+            logger.warning(f"游戏昵称过长 - IP: {client_ip}, 长度: {len(youxi_nicheng)}")
+            return Response({
+                'code': 400,
+                'msg': '游戏昵称不能超过50个字符',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 过滤危险字符
+        danger_chars = ['<', '>', "'", '"', '&', ';', '|']
+        for char in danger_chars:
+            if char in youxi_nicheng:
+                logger.warning(f"游戏昵称包含危险字符 - IP: {client_ip}, 字符: {char}")
+                return Response({
+                    'code': 400,
+                    'msg': '昵称包含非法字符',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 7. 验证指定打手ID格式（如果提供）
+        if zhiding_dashou and len(zhiding_dashou) > 32:
+            logger.warning(f"指定打手ID过长 - IP: {client_ip}, 长度: {len(zhiding_dashou)}")
+            return Response({
+                'code': 400,
+                'msg': '指定打手ID不能超过32个字符',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 8. 验证备注长度
+        if len(beizhu) > 500:
+            logger.warning(f"备注过长 - IP: {client_ip}, 长度: {len(beizhu)}")
+            return Response({
+                'code': 400,
+                'msg': '备注不能超过500个字符',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 9. 查询链接记录
+        try:
+            lianjie_obj = ShangjiaLianjie.objects.get(lianjie_token=token)
+            logger.info(
+                f"找到链接记录 - 链接ID: {lianjie_obj.id}, 商家ID: {lianjie_obj.yonghu_id}, 是否已使用: {lianjie_obj.is_used}")
+        except ShangjiaLianjie.DoesNotExist:
+            logger.warning(f"链接不存在 - Token: {token[:8]}..., IP: {client_ip}")
+            return Response({
+                'code': 404,
+                'msg': '链接不存在或已失效',
+                'data': None
+            }, status=status.HTTP_404_NOT_FOUND)
+
+        # 10. 检查链接有效期
+        now = timezone.now()
+        if lianjie_obj.youxiao_shijian and lianjie_obj.youxiao_shijian < now:
+            logger.warning(f"链接已过期 - 过期时间: {lianjie_obj.youxiao_shijian}")
+            return Response({
+                'code': 400,
+                'msg': '链接已过期',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 11. 检查链接是否已使用
+        if lianjie_obj.is_used:
+            logger.warning(f"链接已使用 - 链接ID: {lianjie_obj.id}, IP: {client_ip}")
+            return Response({
+                'code': 400,
+                'msg': '链接已被使用，无法重复提交',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 12. 验证指定打手（如果需要）
+        zhuangtai_xin = 1  # 默认普通订单状态
+        if zhiding_dashou:
+            # 验证打手是否存在且有效
+            try:
+                # 先查询用户主表
+                dashou_user = UserMain.objects.get(yonghuid=zhiding_dashou)
+                logger.info(f"找到打手用户 - 用户ID: {zhiding_dashou}")
+
+                # 通过反向关系获取打手扩展信息
+                try:
+                    dashou_profile = dashou_user.dashou_profile
+
+                    # 检查打手状态（zhuangtai）
+                    if dashou_profile.zhuangtai != 1:
+                        logger.warning(f"打手状态异常 - 打手ID: {zhiding_dashou}, 状态: {dashou_profile.zhuangtai}")
+                        return Response({
+                            'code': 400,
+                            'msg': '指定打手当前无法接单',
+                            'data': None
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                    # 检查打手账号状态（zhanghaozhuangtai）
+                    if dashou_profile.zhanghaozhuangtai != 1:
+                        logger.warning(
+                            f"打手账号状态异常 - 打手ID: {zhiding_dashou}, 账号状态: {dashou_profile.zhanghaozhuangtai}")
+                        return Response({
+                            'code': 400,
+                            'msg': '指定打手账号异常',
+                            'data': None
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                    # 验证通过，设置为指定订单状态
+                    zhuangtai_xin = 7  # 指定打手订单状态
+                    logger.info(f"指定打手验证通过 - 打手ID: {zhiding_dashou}, 昵称: {dashou_profile.nicheng}")
+
+                except UserDashou.DoesNotExist:
+                    logger.warning(f"打手扩展信息不存在 - 用户ID: {zhiding_dashou}")
+                    return Response({
+                        'code': 400,
+                        'msg': '指定打手信息不完整',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+
+            except UserMain.DoesNotExist:
+                logger.warning(f"指定打手用户不存在 - 用户ID: {zhiding_dashou}")
+                return Response({
+                    'code': 400,
+                    'msg': '指定打手不存在',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 13. 使用事务确保数据一致性
+        try:
+            with transaction.atomic():
+                # 更新链接记录
+                lianjie_obj.shiyongzhe_ip = client_ip
+                lianjie_obj.is_used = True
+                lianjie_obj.save(update_fields=['shiyongzhe_ip', 'is_used'])
+                logger.info(f"更新链接记录成功 - 链接ID: {lianjie_obj.id}, 设置为已使用")
+
+                # 查询订单
+                if not lianjie_obj.dingdan_id:
+                    logger.error(f"链接记录中订单ID为空 - 链接ID: {lianjie_obj.id}")
+                    raise ValueError("订单ID为空")
+
+                dingdan_obj = Dingdan.objects.get(dingdan_id=lianjie_obj.dingdan_id)
+
+                # 检查订单状态是否为13（灰色状态）
+                if dingdan_obj.zhuangtai != 13:
+                    logger.warning(
+                        f"订单状态不允许修改 - 订单ID: {dingdan_obj.dingdan_id}, 当前状态: {dingdan_obj.zhuangtai}")
+                    # 回滚事务
+                    transaction.set_rollback(True)
+                    return Response({
+                        'code': 400,
+                        'msg': '订单状态异常，无法修改',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 更新订单信息
+                dingdan_obj.nicheng = youxi_nicheng  # 游戏昵称
+                dingdan_obj.beizhu = beizhu if beizhu else ''  # 备注
+                dingdan_obj.zhuangtai = zhuangtai_xin  # 新状态：1或7
+
+                # 如果是指定打手，设置zhiding_id
+                if zhiding_dashou and zhuangtai_xin == 7:
+                    dingdan_obj.zhiding_id = zhiding_dashou
+
+                dingdan_obj.save()
+                logger.info(
+                    f"更新订单成功 - 订单ID: {dingdan_obj.dingdan_id}, 新状态: {zhuangtai_xin}, 指定打手: {zhiding_dashou or '无'}")
+
+                # 🔴【添加】在订单更新成功后，异步发送微信服务号通知（原有）
+                # 🟢【7. 新增】支付成功后的广播通知（异步，不阻塞主流程）
+                from dingdan.tongzhi_tasks import dingdan_guangbo
+
+                # 构建通知数据（你的 _get_game_type_name 方法保留在视图里直接用）
+                order_info = {
+                    'dingdan_id': dingdan_obj.dingdan_id,
+                    'game_type': self._get_game_type_name(dingdan_obj.leixing_id),
+                    'amount': str(dingdan_obj.jine),
+                    'order_desc': (dingdan_obj.jieshao or '')[:50],
+                }
+                dingdan_guangbo.delay(order_info)  # 瞬间返回，不阻塞请求
+
+                # 获取商家信息用于返回
+                try:
+                    user_main = UserMain.objects.get(yonghuid=lianjie_obj.yonghu_id)
+                    shangjia_obj = user_main.shop_profile
+                    shangjia_mingcheng = shangjia_obj.nicheng
+                except:
+                    shangjia_mingcheng = f"商家{lianjie_obj.yonghu_id}"
+                    logger.warning(f"获取商家昵称失败，使用默认 - 用户ID: {lianjie_obj.yonghu_id}")
+
+                # ========== 🆕 新增：判断是否需要跨平台同步 ==========
+                # 获取商家ID（从链接记录）
+                shangjia_user_id = lianjie_obj.yonghu_id
+                # 跨平台条件：商家ID在白名单、订单为普通状态（zhuangtai=1）、要求类型为1、会员ID等于配置值
+                sync_order_to_partners(dingdan_obj.dingdan_id)
+                '''
+                if (shangjia_user_id in settings.CROSS_PLATFORM_WHITELIST and
+                    dingdan_obj.zhuangtai == 1 and  # 非指定单
+                    dingdan_obj.yaoqiuleixing == 1 and 
+                    dingdan_obj.huiyuan_id in ['VC7CTU', 'VUXP8D', 'VEX5NJ']
+                    ):
+
+                    # 异步发送通知（使用独立模块）
+                    import threading  # 若文件顶部已导入可省略，此处保留确保独立运行
+                    from dingdan.cross_platform_tasks import send_partner_sync_order
+                    thread = threading.Thread(
+                        target=send_partner_sync_order,
+                        args=(
+                            dingdan_obj.dingdan_id,
+                            str(dingdan_obj.jine),
+                            str(dingdan_obj.dashou_fencheng),
+                            dingdan_obj.jieshao,
+                            dingdan_obj.beizhu,
+                            dingdan_obj.create_time.isoformat(),
+                            dingdan_obj.nicheng
+
+                        )
+                    )
+                    thread.daemon = True
+                    thread.start()
+                    logger.info(f"跨平台客户填写订单异步任务已启动: {dingdan_obj.dingdan_id}")'''
+                # ========== 🆕 新增结束 ==========
+
+                # 14. 返回成功响应
+                response_data = {
+                    # 'dingdan_id': dingdan_obj.dingdan_id,
+                    # 'create_time': dingdan_obj.create_time.strftime('%Y-%m-%d %H:%M:%S'),
+                    # 'shangpin_mingcheng': dingdan_obj.jieshao[:50] if dingdan_obj.jieshao else '',  # 截取前50字符
+                    # 'jiage': str(dingdan_obj.jine) if dingdan_obj.jine else '0.00',
+                    'shangjia_mingcheng': shangjia_mingcheng,
+                    'youxi_nicheng': youxi_nicheng,
+                    'zhuangtai': zhuangtai_xin,
+                    'zhuangtai_text': '普通订单' if zhuangtai_xin == 1 else '指定打手订单'
+                }
+
+                logger.info(f"订单提交成功 - 订单ID: {dingdan_obj.dingdan_id}, IP: {client_ip}")
+
+                # ✅ 新方法（行为驱动，更安全）
+                from houtai.utils import update_shangjia_daily
+                update_shangjia_daily(
+                    yonghuid=lianjie_obj.yonghu_id,
+                    amount=Decimal(str(dingdan_obj.jine)),
+                    action=1  # 1 = 派发
+                )
+
+                return Response({
+                    'code': 200,
+                    'msg': '提交成功',
+                    'data': response_data
+                }, status=status.HTTP_200_OK)
+
+        except Dingdan.DoesNotExist:
+            logger.error(f"订单不存在 - 订单ID: {lianjie_obj.dingdan_id}")
+            return Response({
+                'code': 500,
+                'msg': '订单数据异常',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        except Exception as e:
+            logger.error(f"处理订单异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'msg': '系统错误，请稍后重试',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def _get_game_type_name(self, leixing_id):
+        try:
+            from shangpin.models import ShangpinLeixing
+            gt = ShangpinLeixing.objects.filter(id=leixing_id).first()
+            return gt.jieshao if gt else '游戏订单'
+        except Exception as e:
+            logger.error(f"获取游戏类型名称异常: {e}")
+            return '游戏订单'
+
+    def send_order_notification_async(self, dingdan, youxi_nicheng, zhiding_dashou, zhuangtai):
+        """异步发送订单通知（客户填写订单后）"""
+        try:
+            # 避免阻塞主线程，使用线程异步执行
+            def notification_task():
+                try:
+                    # 获取游戏类型名称
+                    try:
+                        leixing_obj = ShangpinLeixing.objects.get(id=dingdan.leixing_id)
+                        game_type = leixing_obj.jieshao
+                    except:
+                        game_type = '未知游戏'
+
+                    # 构建订单信息
+                    order_info = {
+                        'dingdan_id': dingdan.dingdan_id,
+                        'game_type': game_type,
+                        'amount': str(dingdan.jine),
+                        'order_desc': dingdan.jieshao[:50] if dingdan.jieshao else '新订单',
+                        'youxi_nicheng': youxi_nicheng,
+                        'order_type': '指定订单' if zhuangtai == 7 else '普通订单',
+                        'zhiding_dashou': zhiding_dashou or ''
+                    }
+
+                    # 调用微信广播发送器
+                    sender = WeixinBroadcastSender()
+                    result = sender.broadcast_order(order_info)
+
+                    if result['success']:
+                        logger.info(f"【客户填写订单】微信通知发送成功: {result['msg']}")
+                    else:
+                        logger.warning(f"【客户填写订单】微信通知发送失败: {result['msg']}")
+
+                except Exception as e:
+                    logger.error(f"【客户填写订单】发送通知任务异常: {str(e)}")
+
+            # 启动异步线程
+            thread = threading.Thread(target=notification_task)
+            thread.daemon = True
+            thread.start()
+
+        except Exception as e:
+            logger.error(f"【客户填写订单】启动通知线程异常: {str(e)}")
+
+
+
+
+
+
+from datetime import timedelta
+
+
+
+logger = logging.getLogger(__name__)
+
+
+
+
+class AdminSelfBatchGenerateLinkView(APIView):
+    """
+    管理员批量生成商家发单链接接口
+    POST /dingdan/admin/batch-generate-link
+    仅允许白名单中的管理员调用，为指定商家（通过 phone+user_type=lianjie 确定）批量生成链接。
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # ==================== 管理员身份验证（与之前一致）====================
+        if not request.user.is_authenticated:
+            return Response({
+                'code': 401,
+                'message': '未认证',
+                'data': None
+            }, status=status.HTTP_401_UNAUTHORIZED)
+
+        if request.user.user_type != 'admin':
+            return Response({
+                'code': 403,
+                'message': '权限不足',
+                'data': None
+            }, status=status.HTTP_403_FORBIDDEN)
+
+        admin_profile = getattr(request.user, 'admin_profile', None)
+        if not admin_profile:
+            return Response({
+                'code': 403,
+                'message': '管理员信息不完整',
+                'data': None
+            }, status=status.HTTP_403_FORBIDDEN)
+
+        zhanghao = request.data.get('zhanghao')
+        if not zhanghao or request.user.phone != zhanghao:
+            return Response({
+                'code': 401,
+                'message': '账号验证失败',
+                'data': None
+            }, status=status.HTTP_401_UNAUTHORIZED)
+
+        allowed_phones = getattr(settings, 'ADMIN_BATCH_LINK_ALLOWED_PHONES', [])
+        if not allowed_phones:
+            logger.error("白名单配置为空，禁止所有管理员操作")
+            return Response({
+                'code': 500,
+                'message': '系统未配置可操作管理员，请联系开发',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        if request.user.phone not in allowed_phones:
+            logger.warning(f"管理员 {request.user.phone} 不在白名单中")
+            return Response({
+                'code': 403,
+                'message': '您没有权限执行此操作',
+                'data': None
+            }, status=status.HTTP_403_FORBIDDEN)
+        # ==================== 管理员验证结束 ====================
+
+        # ========== 获取业务参数 ==========
+        data = request.data
+        shangpin_type_id = data.get('shangpinTypeId')
+        moban_id = data.get('mobanId')
+        count = data.get('count')
+
+        if not all([shangpin_type_id, moban_id]):
+            return Response({
+                'code': 400,
+                'msg': '缺少必填参数：商品类型ID和模板ID',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        try:
+            shangpin_type_id = int(shangpin_type_id)
+            moban_id = int(moban_id)
+        except ValueError:
+            return Response({
+                'code': 400,
+                'msg': '参数格式错误，必须是数字',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        default_count = getattr(settings, 'BATCH_LINK_DEFAULT_COUNT', 100)
+        max_count = getattr(settings, 'BATCH_LINK_MAX_COUNT', 200)
+        if count is None:
+            gen_count = default_count
+        else:
+            try:
+                gen_count = int(count)
+                if gen_count <= 0:
+                    return Response({
+                        'code': 400,
+                        'msg': '生成数量必须为正整数',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+                if gen_count > max_count:
+                    return Response({
+                        'code': 400,
+                        'msg': f'生成数量不能超过{max_count}',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+            except ValueError:
+                return Response({
+                    'code': 400,
+                    'msg': '生成数量格式错误',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+        # ========== 🔴 新增：通过 phone 和 user_type 查询真正的用户ID ==========
+        phone = request.user.phone  # 当前管理员手机号
+        target_user_type = 'lianjie'  # 目标用户类型，根据业务修改
+
+        try:
+            target_user = UserMain.objects.get(phone=phone, user_type=target_user_type)
+            real_yonghuid = target_user.yonghuid
+        except UserMain.DoesNotExist:
+            logger.error(f"未找到符合条件的用户: phone={phone}, user_type={target_user_type}")
+            return Response({
+                'code': 404,
+                'msg': '未找到符合条件的商家用户',
+                'data': None
+            }, status=status.HTTP_404_NOT_FOUND)
+        # ========== 新增结束 ==========
+
+        # ========== 使用 real_yonghuid 获取商家扩展信息 ==========
+        try:
+            # 注意：这里使用 real_yonghuid 查找对应的商家扩展表
+            shangjia = UserShangjia.objects.get(user__yonghuid=real_yonghuid)
+        except UserShangjia.DoesNotExist:
+            logger.error(f"商家扩展信息不存在 - 用户ID: {real_yonghuid}")
+            return Response({
+                'code': 403,
+                'msg': '该用户不是商家或商家信息未完善',
+                'data': None
+            }, status=status.HTTP_403_FORBIDDEN)
+
+        if shangjia.zhuangtai != 1:
+            logger.warning(f"商家状态异常 - 用户ID: {real_yonghuid}, 状态: {shangjia.zhuangtai}")
+            return Response({
+                'code': 403,
+                'msg': '商家账号状态异常，请联系管理员',
+                'data': None
+            }, status=status.HTTP_403_FORBIDDEN)
+
+        # ========== 查询商品类型与模板 ==========
+        try:
+            shangpin_leixing = ShangpinLeixing.objects.get(id=shangpin_type_id)
+        except ShangpinLeixing.DoesNotExist:
+            return Response({
+                'code': 400,
+                'msg': '商品类型不存在',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        yaoqiuleixing = shangpin_leixing.yaoqiuleixing
+        huiyuan_id = shangpin_leixing.huiyuan_id or ''
+
+        # 模板必须属于查询出的真实用户
+        try:
+            moban = ShangjiaMoban.objects.get(
+                yonghu_id=real_yonghuid,
+                leixing_id=shangpin_type_id,
+                id=moban_id
+            )
+        except ShangjiaMoban.DoesNotExist:
+            return Response({
+                'code': 400,
+                'msg': '订单模板不存在',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        jiage = moban.jiage
+        dingdan_jieshao = moban.moban_jieshao
+
+        # ========== 金额与余额 ==========
+        try:
+            price_decimal = Decimal(str(jiage))
+            total_price = price_decimal * gen_count
+        except Exception as e:
+            logger.error(f"金额计算错误: {e}")
+            return Response({
+                'code': 500,
+                'msg': '金额计算错误',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        if total_price > shangjia.yue:
+            return Response({
+                'code': 400,
+                'msg': f'余额不足，当前余额{shangjia.yue}元，需要{total_price}元',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # ========== 利率 ==========
+        try:
+            lilu_obj = Lilubiao.objects.get(fadanpingtai='3')
+            lilu = float(lilu_obj.lilu)
+            if lilu <= 0:
+                lilu = 1
+        except Lilubiao.DoesNotExist:
+            lilu = 1
+
+        dashou_fencheng = (price_decimal * Decimal(str(lilu))).quantize(Decimal('0.01'))
+
+        # ========== 事务内批量生成 ==========
+        try:
+            with transaction.atomic():
+                # 锁定商家行
+                shangjia_locked = UserShangjia.objects.select_for_update().get(id=shangjia.id)
+
+                if total_price > shangjia_locked.yue:
+                    return Response({
+                        'code': 400,
+                        'msg': '余额不足，请刷新后重试',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 生成唯一订单ID和Token
+                dingdan_ids = set()
+                tokens = set()
+                while len(dingdan_ids) < gen_count:
+                    dingdan_ids.add(self._generate_dingdan_id())
+                while len(tokens) < gen_count:
+                    tokens.add(self._generate_secure_token())
+
+                dingdan_id_list = list(dingdan_ids)
+                token_list = list(tokens)
+
+                # 构建订单对象列表
+                orders_to_create = []
+                for i in range(gen_count):
+                    orders_to_create.append(Dingdan(
+                        dingdan_id=dingdan_id_list[i],
+                        zhuangtai=13,
+                        fadan_pingtai=2,
+                        jine=jiage,
+                        dashou_fencheng=dashou_fencheng,
+                        leixing_id=shangpin_type_id,
+                        yaoqiuleixing=yaoqiuleixing or 1,
+                        huiyuan_id=huiyuan_id,
+                        jieshao=dingdan_jieshao[:2000],
+                        tupian=target_user.avatar or '',  # 使用 target_user 的头像
+                        user1_id=f"Sj{real_yonghuid}",
+                        user2_id='',
+                        zhiding_id='',
+                        dashou_liuyan='',
+                        beizhu='',
+                        nicheng='',
+                        shangpin_id=0,
+                        yongjin=None,
+                    ))
+
+                # 批量插入订单（此时 orders 获得主键 id）
+                created_orders = Dingdan.objects.bulk_create(orders_to_create)
+
+                # 构建商家扩展对象列表（使用已保存的订单）
+                extensions_to_create = []
+                # 构建商家扩展对象列表（使用循环 create，绝对安全）
+                for order in created_orders:
+                    DingdanShangjia.objects.create(
+                        dingdan=order,  # 直接使用订单对象，create 能正确处理
+                        shangjia_id=real_yonghuid,
+                        sjnicheng=shangjia.nicheng or f"商家{real_yonghuid}",
+                        shangjia_pingjia='',
+                        cfliyou='',
+                        sqzhuangtai=0,
+                        bhliyou=''
+                    )
+                '''for order in created_orders:
+                    extensions_to_create.append(DingdanShangjia(
+                        dingdan=order.id,
+                        shangjia_id=real_yonghuid,
+                        sjnicheng=shangjia.nicheng or f"商家{real_yonghuid}",
+                        shangjia_pingjia='',
+                        cfliyou='',
+                        sqzhuangtai=0,
+                        bhliyou=''
+                    ))'''
+
+                DingdanShangjia.objects.bulk_create(extensions_to_create)
+
+                # 构建链接对象列表
+                base_url = getattr(settings, 'H5_DOMAIN', 'https://h5.yourdomain.com')
+                if not base_url.endswith('/'):
+                    base_url += '/'
+                links_to_create = []
+                for i, order in enumerate(created_orders):
+                    token = token_list[i]
+                    link_url = f"{base_url}order/{token}"
+                    links_to_create.append(ShangjiaLianjie(
+                        yonghu_id=real_yonghuid,
+                        leixing_id=shangpin_type_id,
+                        moban_id=moban_id,
+                        lianjie=link_url,
+                        lianjie_token=token,
+                        dingdan_id=order.dingdan_id,
+                        is_used=False,
+                        youxiao_shijian=timezone.now() + timedelta(days=1)
+                    ))
+                ShangjiaLianjie.objects.bulk_create(links_to_create)
+
+                # 更新商家统计信息
+                UserShangjia.objects.filter(id=shangjia.id).update(
+                    fabu=F('fabu') + gen_count,
+                    yue=F('yue') - total_price,
+                    jinridingdan=F('jinridingdan') + gen_count,
+                    jinriliushui=F('jinriliushui') + total_price,
+                    jinyuedingdan=F('jinyuedingdan') + gen_count,
+                    jinyueliushui=F('jinyueliushui') + total_price,
+                )
+
+                # 更新模板发布数量
+                ShangjiaMoban.objects.filter(id=moban_id).update(
+                    fabu_shuliang=F('fabu_shuliang') + gen_count,
+                )
+
+            # ========== 返回数据 ==========
+            shangjia.refresh_from_db()
+            link_list = []
+            for link_obj in links_to_create:
+                link_list.append({
+                    'linkUrl': link_obj.lianjie,
+                    'token': link_obj.lianjie_token,
+                    'dingdanId': link_obj.dingdan_id,
+                    'youxiaoShijian': link_obj.youxiao_shijian.strftime('%Y-%m-%d %H:%M:%S') if link_obj.youxiao_shijian else '',
+                    'isUsed': link_obj.is_used,
+                })
+
+            return Response({
+                'code': 200,
+                'msg': '批量链接生成成功',
+                'data': {
+                    'totalCount': gen_count,
+                    'links': link_list,
+                    'newBalance': str(shangjia.yue),
+                    'jinriliushui': str(shangjia.jinriliushui),
+                    'jinyueliushui': str(shangjia.jinyueliushui),
+                    'jinridingdan': shangjia.jinridingdan,
+                    'jinyuedingdan': shangjia.jinyuedingdan
+                }
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            logger.error(f"批量生成链接失败 - 管理员: {request.user.yonghuid}, 错误: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'msg': '系统错误，生成链接失败',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    # ---------- 辅助函数 ----------
+    def _generate_dingdan_id(self):
+        import time
+        import os
+        import random
+        timestamp = int(time.time() * 1000)
+        process_id = os.getpid() % 1000
+        random_num = random.randint(1000, 9999)
+        return f"SJ{timestamp}{process_id:03d}{random_num}"
+
+    def _generate_secure_token(self):
+        import hashlib
+        import secrets
+        timestamp = int(time.time() * 1_000_000)
+        random_salt = secrets.token_hex(8)
+        raw_string = f"{timestamp}:{secrets.token_hex(4)}:{random_salt}"
+        hash_obj = hashlib.sha256(raw_string.encode('utf-8'))
+        return hash_obj.hexdigest()[:24]
+
+
+
+
+
+
+
+
+
+class ShangjiaMobanListViewpl(APIView):
+    """
+    商家订单模板列表接口
+    POST /peizhi/sjddmblb
+    权限: JWT认证用户
+    功能: 支持普通分页获取和搜索两种模式
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取用户ID和基础参数
+            user = request.user
+            #yonghu_id = user.yonghuid
+
+            # 2. 获取请求参数
+            leixing_id = request.data.get('shangpinTypeId')
+            get_type = request.data.get('getType', 2)  # 1=搜索，2=普通获取
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('pageSize', 50))
+            search_keyword = request.data.get('searchKeyword', '').strip()
+
+            # 3. 验证必填字段
+            if not leixing_id:
+                return Response({
+                    'code': 400,
+                    'msg': '商品类型ID不能为空',
+                    'data': {}
+                }, status=400)
+
+            if get_type not in [1, 2]:
+                return Response({
+                    'code': 400,
+                    'msg': '获取类型参数错误',
+                    'data': {}
+                }, status=400)
+            # ========== 新增：通过手机号和用户类型查询真正的用户ID ==========
+
+
+            phone = request.user.phone  # 当前登录用户的手机号
+            target_user_type = 'lianjie'  # 目标用户类型，请根据实际业务确认（例如：'admin'、'shangjia' 或固定值 'lianjie'）
+
+            try:
+                target_user = UserMain.objects.get(phone=phone, user_type=target_user_type)
+                yonghu_id = target_user.yonghuid
+            except UserMain.DoesNotExist:
+                return Response({
+                    'code': 404,
+                    'msg': '未找到符合条件的用户',
+                    'data': {}
+                }, status=404)
+            # ========== 新增结束 ==========
+
+            # 后续代码使用 yonghu_id 进行查询，而不是 request.user.yonghuid
+
+            # 4. 构建查询条件
+            query_conditions = Q(
+                yonghu_id=yonghu_id,
+                leixing_id=leixing_id,
+                #zhuangtai=1  # 只查询正常状态的模板
+            )
+
+            # 5. 搜索模式处理
+            if get_type == 1 and search_keyword:
+                # 搜索模式：按模板ID搜索
+                try:
+                    moban_id = int(search_keyword)
+                    query_conditions &= Q(id=moban_id)
+                except ValueError:
+                    return Response({
+                        'code': 400,
+                        'msg': '搜索关键词必须是有效的模板ID',
+                        'data': {}
+                    }, status=400)
+
+            # 6. 执行查询（使用values优化性能）
+            queryset = ShangjiaMoban.objects.filter(query_conditions)
+
+            # 7. 计算总数和分页
+            total_count = queryset.count()
+
+            # 搜索模式不进行分页，直接返回所有匹配结果
+            if get_type == 1:
+                moban_list = queryset.values(
+                    'id',  # 模板ID
+                    'leixing_id',  # 商品类型ID
+                    'moban_jieshao',  # 模板介绍
+                    'jiage',  # 价格
+                    'fabu_shuliang',  # 发布数量
+                    'create_time'  # 创建时间
+                )
+
+                # 格式化数据（与前端字段对应）
+                formatted_list = []
+                for item in moban_list:
+                    formatted_list.append({
+                        'mobanId': item['id'],
+                        'shangpinTypeId': item['leixing_id'],
+                        'jieshao': item['moban_jieshao'],
+                        'jiage': str(item['jiage']),  # 转为字符串
+                        'fabushuliang': item['fabu_shuliang'],
+                        'createTime': item['create_time'].strftime('%Y-%m-%d %H:%M:%S') if item['create_time'] else ''
+                    })
+
+                return Response({
+                    'code': 200,
+                    'msg': '搜索成功',
+                    'data': {
+                        'list': formatted_list,
+                        'total': len(formatted_list),
+                        'hasMore': False,  # 搜索模式不分页，没有更多数据
+                        'currentPage': 1,
+                        'pageSize': len(formatted_list)
+                    }
+                })
+
+            # 8. 普通获取模式：分页处理
+            else:
+                # 使用Django分页器
+                paginator = Paginator(queryset, page_size)
+
+                # 检查页码是否有效
+                if page < 1 or page > paginator.num_pages:
+                    return Response({
+                        'code': 400,
+                        'msg': '页码超出范围',
+                        'data': {}
+                    }, status=400)
+
+                # 获取当前页数据
+                current_page = paginator.page(page)
+
+                # 获取数据并格式化
+                moban_list = current_page.object_list.values(
+                    'id',  # 模板ID
+                    'leixing_id',  # 商品类型ID
+                    'moban_jieshao',  # 模板介绍
+                    'jiage',  # 价格
+                    'fabu_shuliang',  # 发布数量
+                    'create_time'  # 创建时间
+                )
+
+                # 格式化数据（与前端字段对应）
+                formatted_list = []
+                for item in moban_list:
+                    formatted_list.append({
+                        'mobanId': item['id'],
+                        'shangpinTypeId': item['leixing_id'],
+                        'jieshao': item['moban_jieshao'],
+                        'jiage': str(item['jiage']),  # 转为字符串
+                        'fabushuliang': item['fabu_shuliang'],
+                        'createTime': item['create_time'].strftime('%Y-%m-%d %H:%M:%S') if item['create_time'] else ''
+                    })
+
+                # 判断是否有更多数据
+                has_more = current_page.has_next()
+
+                # 特殊逻辑：如果当前页数据量不足page_size，说明没有更多数据
+                if len(formatted_list) < page_size:
+                    has_more = False
+
+                return Response({
+                    'code': 200,
+                    'msg': '获取成功',
+                    'data': {
+                        'list': formatted_list,
+                        'total': total_count,
+                        'hasMore': has_more,  # 是否允许上拉刷新
+                        'currentPage': page,
+                        'pageSize': page_size,
+                        'totalPages': paginator.num_pages
+                    }
+                })
+
+        except Exception as e:
+            # 记录错误日志
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.error(f"获取商家模板列表失败: {str(e)}", exc_info=True)
+
+            return Response({
+                'code': 500,
+                'msg': '服务器内部错误',
+                'data': {}
+            }, status=500)
+
+
+
+
+
+
+
+# views.py
+import io
+import time
+
+from yonghu.models import UserGuanshi
+from utils.oss_utils import upload_to_oss, delete_from_oss
+from utils.yaoqingma_utils import chuangjianYaoqingma, yanzhengYaoqingmaWeiyixing
+import requests
+
+logger = logging.getLogger(__name__)
+
+
+
+import urllib.parse
+
+
+#和手机号绑定冲突接口
+'''class GuanshiQRCodeView(APIView):
+    """
+    管事专属二维码生成接口
+    路径：/peizhi/guanshiewm
+    方法：POST
+    权限：JWT认证，仅限管事身份
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        # 获取当前认证用户
+        current_user = request.user
+
+        # 1. 查询管事扩展表
+        try:
+            guanshi = current_user.guanshi_profile
+        except UserGuanshi.DoesNotExist:
+            return Response({'code': 403, 'message': '当前用户不是管事身份', 'data': None},
+                            status=status.HTTP_403_FORBIDDEN)
+
+        # 2. 验证管事状态
+        if guanshi.zhuangtai != 1:
+            return Response({'code': 403, 'message': '管事账号状态异常', 'data': None},
+                            status=status.HTTP_403_FORBIDDEN)
+
+        # 3. 获取或生成邀请码
+        invite_code = guanshi.yaoqingma
+        if not invite_code:
+            invite_code = chuangjianYaoqingma(str(current_user.yonghuid))
+            if not yanzhengYaoqingmaWeiyixing(invite_code):
+                logger.error(f"邀请码生成失败，用户: {current_user.yonghuid}")
+                return Response({'code': 500, 'message': '邀请码生成失败', 'data': None},
+                                status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+            guanshi.yaoqingma = invite_code
+            guanshi.save(update_fields=['yaoqingma'])
+
+        # 4. 获取 access_token（与原来相同）
+        access_token = self.get_cached_access_token()
+        if not access_token:
+            return Response({'code': 500, 'message': '获取微信access_token失败', 'data': None},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # ========== 🔥 主要修改：使用 A接口（getwxacode） ==========
+        # 对邀请码进行URL编码，防止特殊字符破坏路径
+        encoded_invite = urllib.parse.quote(invite_code, safe='')
+        # 构造带参数的完整路径
+        page_path = f'pages/dashouduan/dashouduan?inviteCode={encoded_invite}'
+
+        wx_url = f'https://api.weixin.qq.com/wxa/getwxacode?access_token={access_token}'
+        post_data = {
+            'path': page_path,
+            'width': 430,
+            'auto_color': False,
+            'line_color': {'r': 0, 'g': 0, 'b': 0}
+        }
+
+        try:
+            wx_resp = requests.post(wx_url, json=post_data, timeout=10)
+        except Exception as e:
+            logger.error(f"请求微信接口失败: {e}")
+            return Response({'code': 500, 'message': '调用微信服务失败', 'data': None},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 处理微信返回结果
+        if wx_resp.status_code != 200:
+            # 尝试解析微信返回的错误信息
+            error_info = wx_resp.json() if wx_resp.headers.get('content-type') == 'application/json' else {}
+            errmsg = error_info.get('errmsg', '未知错误')
+            logger.error(f"微信接口返回错误 (HTTP {wx_resp.status_code}): {errmsg}")
+            return Response({'code': 500, 'message': f'生成二维码失败: {errmsg}', 'data': None},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 检查返回内容是否为图片
+        content_type = wx_resp.headers.get('content-type', '')
+        if 'image' not in content_type:
+            # 可能是 JSON 错误信息
+            try:
+                error_info = wx_resp.json()
+                errmsg = error_info.get('errmsg', '未知错误')
+                logger.error(f"微信接口返回非图片内容: {errmsg}")
+                return Response({'code': 500, 'message': f'生成二维码失败: {errmsg}', 'data': None},
+                                status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+            except:
+                logger.error("微信接口返回未知内容")
+                return Response({'code': 500, 'message': '生成二维码失败', 'data': None},
+                                status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 5. 上传到腾讯云COS（与原来相同）
+        timestamp = int(time.time())
+        filename = f"{current_user.yonghuid}_{timestamp}.png"
+        oss_path = f"erweima/guanshi/{filename}"
+        file_obj = io.BytesIO(wx_resp.content)
+
+        try:
+            full_url = upload_to_oss(file_obj, oss_path)
+        except Exception as e:
+            logger.error(f"上传到COS失败: {e}")
+            return Response({'code': 500, 'message': '图片上传失败', 'data': None},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        if not full_url:
+            return Response({'code': 500, 'message': '图片上传失败', 'data': None},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 6. 获取相对路径
+        cos_domain = getattr(settings, 'COS_DOMAIN', '')
+        if cos_domain and full_url.startswith(cos_domain):
+            relative_path = full_url[len(cos_domain):].lstrip('/')
+        else:
+            relative_path = oss_path
+
+        # 7. 删除旧二维码文件
+        old_url = guanshi.invite_qrcode_url
+        if old_url:
+            delete_from_oss(old_url)
+
+        # 8. 更新数据库
+        with transaction.atomic():
+            guanshi.invite_qrcode_url = relative_path
+            guanshi.save(update_fields=['invite_qrcode_url'])
+
+        # 9. 返回相对路径
+        return Response({'code': 0, 'message': 'success', 'data': {'url': relative_path}})
+
+    def get_cached_access_token(self):
+        """从缓存获取微信 access_token（与原来相同）"""
+        cache_key = 'wx_mini_access_token'
+        token = cache.get(cache_key)
+        if token:
+            return token
+
+        appid = getattr(settings, 'WEIXIN_APPID', '')
+        secret = getattr(settings, 'WEIXIN_SECRET', '')
+        if not appid or not secret:
+            logger.error("微信小程序配置缺失")
+            return None
+
+        url = f'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={appid}&secret={secret}'
+        try:
+            resp = requests.get(url, timeout=5)
+            data = resp.json()
+            token = data.get('access_token')
+            expires_in = data.get('expires_in', 7200)
+            if token:
+                cache.set(cache_key, token, 7000)
+            return token
+        except Exception as e:
+            logger.error(f"获取微信access_token失败: {e}")
+            return None'''
+
+
+
+
+
+
+class GuanshiQRCodeView(APIView):
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        logger.info("===== 开始生成管事二维码 =====")
+        current_user = request.user
+        logger.info(f"当前用户ID: {current_user.yonghuid}")
+
+        try:
+            try:
+                guanshi = current_user.guanshi_profile
+                logger.info(f"管事扩展表查询成功，状态: {guanshi.zhuangtai}")
+            except UserGuanshi.DoesNotExist:
+                logger.warning(f"用户 {current_user.yonghuid} 不是管事身份")
+                return Response(
+                    {'code': 403, 'message': '当前用户不是管事身份', 'data': None},
+                    status=status.HTTP_403_FORBIDDEN
+                )
+
+            if guanshi.zhuangtai != 1:
+                logger.warning(f"用户 {current_user.yonghuid} 管事状态异常: {guanshi.zhuangtai}")
+                return Response(
+                    {'code': 403, 'message': '管事账号状态异常', 'data': None},
+                    status=status.HTTP_403_FORBIDDEN
+                )
+
+            invite_code = guanshi.yaoqingma
+            if not invite_code:
+                logger.info(f"用户 {current_user.yonghuid} 无邀请码，开始生成")
+                invite_code = chuangjianYaoqingma(str(current_user.yonghuid))
+                if not yanzhengYaoqingmaWeiyixing(invite_code):
+                    logger.error(f"邀请码唯一性校验失败，用户: {current_user.yonghuid}")
+                    return Response(
+                        {'code': 500, 'message': '邀请码生成失败', 'data': None},
+                        status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                    )
+                guanshi.yaoqingma = invite_code
+                guanshi.save(update_fields=['yaoqingma'])
+                logger.info(f"邀请码生成成功: {invite_code}")
+            else:
+                logger.info(f"使用已有邀请码: {invite_code}")
+
+            access_token = self.get_cached_access_token()
+            if not access_token:
+                logger.error("获取 access_token 失败")
+                return Response(
+                    {'code': 500, 'message': '获取微信access_token失败', 'data': None},
+                    status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                )
+            logger.info(f"获取到 access_token (前10位): {access_token[:10]}...")
+
+            encoded_invite = urllib.parse.quote(invite_code, safe='')
+            page_path = f'pages/dashouduan/dashouduan?inviteCode={encoded_invite}'
+            wx_url = f'https://api.weixin.qq.com/wxa/getwxacode?access_token={access_token}'
+            post_data = {
+                'path': page_path,
+                'width': 430,
+                'auto_color': False,
+                'line_color': {'r': 0, 'g': 0, 'b': 0}
+            }
+            logger.info(f"调用微信接口生成小程序码，path: {page_path}")
+
+            try:
+                wx_resp = requests.post(wx_url, json=post_data, timeout=10)
+                logger.info(f"微信接口响应状态码: {wx_resp.status_code}")
+            except Exception as e:
+                logger.error(f"请求微信接口异常: {str(e)}", exc_info=True)
+                return Response(
+                    {'code': 500, 'message': '调用微信服务失败', 'data': None},
+                    status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                )
+
+            if wx_resp.status_code != 200:
+                error_info = {}
+                if wx_resp.headers.get('content-type') == 'application/json':
+                    try:
+                        error_info = wx_resp.json()
+                    except:
+                        pass
+                errmsg = error_info.get('errmsg', '未知错误')
+                logger.error(f"微信接口返回错误 (HTTP {wx_resp.status_code}): {errmsg}")
+                if 'errcode' in error_info:
+                    logger.error(f"微信错误码: {error_info.get('errcode')}")
+                return Response(
+                    {'code': 500, 'message': f'生成二维码失败: {errmsg}', 'data': None},
+                    status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                )
+
+            content_type = wx_resp.headers.get('content-type', '')
+            if 'image' not in content_type:
+                try:
+                    error_info = wx_resp.json()
+                    errmsg = error_info.get('errmsg', '未知错误')
+                    logger.error(f"微信接口返回非图片内容: {errmsg}")
+                    return Response(
+                        {'code': 500, 'message': f'生成二维码失败: {errmsg}', 'data': None},
+                        status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                    )
+                except:
+                    logger.error("微信接口返回未知内容，无法解析为JSON")
+                    return Response(
+                        {'code': 500, 'message': '生成二维码失败', 'data': None},
+                        status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                    )
+
+            timestamp = int(time.time())
+            filename = f"{current_user.yonghuid}_{timestamp}.png"
+            oss_path = f"erweima/guanshi/{filename}"
+            file_obj = io.BytesIO(wx_resp.content)
+            logger.info(f"开始上传图片到COS: {oss_path}")
+
+            try:
+                full_url = upload_to_oss(file_obj, oss_path)
+                logger.info(f"上传成功，完整URL: {full_url}")
+            except Exception as e:
+                logger.error(f"上传到COS异常: {str(e)}", exc_info=True)
+                return Response(
+                    {'code': 500, 'message': '图片上传失败', 'data': None},
+                    status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                )
+
+            if not full_url:
+                logger.error("upload_to_oss 返回了空 URL")
+                return Response(
+                    {'code': 500, 'message': '图片上传失败', 'data': None},
+                    status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                )
+
+            cos_domain = getattr(settings, 'COS_DOMAIN', '')
+            if cos_domain and full_url.startswith(cos_domain):
+                relative_path = full_url[len(cos_domain):].lstrip('/')
+            else:
+                relative_path = oss_path
+            logger.info(f"相对路径: {relative_path}")
+
+            old_url = guanshi.invite_qrcode_url
+            if old_url:
+                logger.info(f"删除旧二维码: {old_url}")
+                try:
+                    delete_from_oss(old_url)
+                except Exception as e:
+                    logger.warning(f"删除旧二维码失败(不影响主流程): {str(e)}")
+
+            with transaction.atomic():
+                guanshi.invite_qrcode_url = relative_path
+                guanshi.save(update_fields=['invite_qrcode_url'])
+                logger.info("数据库更新成功")
+
+            return Response({
+                'code': 0,
+                'message': 'success',
+                'data': {'url': relative_path}
+            })
+
+        except Exception as e:
+            logger.error(f"生成二维码过程中发生未捕获异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+    def get_cached_access_token(self):
+        """获取微信全局 access_token，使用 cache.add 实现互斥锁"""
+        cache_key = 'wechat_access_token'
+        lock_key = 'wechat_access_token_lock'
+        lock_timeout = 10
+
+        # 先尝试读取缓存
+        token = cache.get(cache_key)
+        if token:
+            logger.info("从缓存中读取到 access_token")
+            return token
+
+        # 尝试获取锁（原子操作）
+        lock_acquired = cache.add(lock_key, '1', timeout=lock_timeout)
+        if not lock_acquired:
+            # 未获得锁，等待其他进程刷新
+            import time
+            time.sleep(0.2)
+            token = cache.get(cache_key)
+            if token:
+                logger.info("其他进程已刷新 token，使用缓存值")
+                return token
+            # 等待几秒再试
+            for _ in range(5):
+                time.sleep(0.2)
+                token = cache.get(cache_key)
+                if token:
+                    return token
+            logger.warning("获取锁失败且缓存中无 token，返回 None")
+            return None
+
+        # 获得锁，执行刷新
+        try:
+            token = cache.get(cache_key)
+            if token:
+                logger.info("加锁后再次读取到缓存中的 token")
+                return token
+
+            appid = getattr(settings, 'WEIXIN_APPID', '')
+            secret = getattr(settings, 'WEIXIN_SECRET', '')
+            if not appid or not secret:
+                logger.error("微信小程序配置缺失: WEIXIN_APPID 或 WEIXIN_SECRET 未设置")
+                return None
+
+            url = 'https://api.weixin.qq.com/cgi-bin/token'
+            params = {
+                'grant_type': 'client_credential',
+                'appid': appid,
+                'secret': secret
+            }
+            try:
+                logger.info("正在请求微信接口获取 access_token...")
+                resp = requests.get(url, params=params, timeout=5)
+                data = resp.json()
+                new_token = data.get('access_token')
+                if new_token:
+                    cache.set(cache_key, new_token, timeout=7100)
+                    logger.info("成功获取新 access_token，已缓存")
+                    return new_token
+                else:
+                    errcode = data.get('errcode', '未知')
+                    errmsg = data.get('errmsg', '未知错误')
+                    logger.error(f"获取 access_token 失败，errcode={errcode}, errmsg={errmsg}")
+                    return None
+            except Exception as e:
+                logger.error(f"请求微信 access_token 接口异常: {str(e)}", exc_info=True)
+                return None
+        finally:
+            cache.delete(lock_key)
+    # ==================== 修改结束 ====================
+
+
+
+
+
+
+
+
+'''class GuanshiQRCodeView(APIView):
+    """
+    管事专属二维码生成接口
+    路径：/peizhi/guanshiewm
+    方法：POST
+    权限：JWT认证，仅限管事身份
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 获取当前认证用户
+        current_user = request.user
+
+        # 1. 查询管事扩展表
+        try:
+            guanshi = current_user.guanshi_profile
+        except UserGuanshi.DoesNotExist:
+            return Response({'code': 403, 'message': '当前用户不是管事身份', 'data': None},
+                            status=status.HTTP_403_FORBIDDEN)
+
+        # 2. 验证管事状态
+        if guanshi.zhuangtai != 1:
+            return Response({'code': 403, 'message': '管事账号状态异常', 'data': None},
+                            status=status.HTTP_403_FORBIDDEN)
+
+        # 3. 获取或生成邀请码
+        invite_code = guanshi.yaoqingma
+        if not invite_code:
+            invite_code = chuangjianYaoqingma(str(current_user.yonghuid))
+            if not yanzhengYaoqingmaWeiyixing(invite_code):
+                logger.error(f"邀请码生成失败，用户: {current_user.yonghuid}")
+                return Response({'code': 500, 'message': '邀请码生成失败', 'data': None},
+                                status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+            guanshi.yaoqingma = invite_code
+            guanshi.save(update_fields=['yaoqingma'])
+
+        # 4. 从缓存获取 access_token（全局唯一，不存在则自动获取并缓存）
+        access_token = self.get_cached_access_token()
+        if not access_token:
+            return Response({'code': 500, 'message': '获取微信access_token失败', 'data': None},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 5. 调用微信接口生成小程序码
+        page_path = 'pages/dashouduan/dashouduan'  # 打手注册页
+        scene = invite_code
+        wx_url = f'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token={access_token}'
+        post_data = {
+            'scene': scene,
+            'page': page_path,
+            'width': 430,
+            'auto_color': False,
+            'line_color': {'r': 0, 'g': 0, 'b': 0},
+        }
+
+        try:
+            wx_resp = requests.post(wx_url, json=post_data, timeout=10)
+        except Exception as e:
+            logger.error(f"请求微信接口失败: {e}")
+            return Response({'code': 500, 'message': '调用微信服务失败', 'data': None},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        if wx_resp.status_code != 200 or 'image' not in wx_resp.headers.get('content-type', ''):
+            error_info = wx_resp.json() if wx_resp.headers.get('content-type') == 'application/json' else {}
+            errmsg = error_info.get('errmsg', '未知错误')
+            logger.error(f"微信接口返回错误: {errmsg}")
+            return Response({'code': 500, 'message': f'生成二维码失败: {errmsg}', 'data': None},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 6. 上传到腾讯云COS
+        timestamp = int(time.time())
+        filename = f"{current_user.yonghuid}_{timestamp}.png"
+        oss_path = f"erweima/guanshi/{filename}"
+        file_obj = io.BytesIO(wx_resp.content)
+
+        try:
+            full_url = upload_to_oss(file_obj, oss_path)
+        except Exception as e:
+            logger.error(f"上传到COS失败: {e}")
+            return Response({'code': 500, 'message': '图片上传失败', 'data': None},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        if not full_url:
+            return Response({'code': 500, 'message': '图片上传失败', 'data': None},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 7. 获取相对路径
+        cos_domain = getattr(settings, 'COS_DOMAIN', '')
+        if cos_domain and full_url.startswith(cos_domain):
+            relative_path = full_url[len(cos_domain):].lstrip('/')
+        else:
+            relative_path = oss_path
+
+        # 8. 删除旧二维码文件
+        old_url = guanshi.invite_qrcode_url
+        if old_url:
+            delete_from_oss(old_url)
+
+        # 9. 更新数据库
+        with transaction.atomic():
+            guanshi.invite_qrcode_url = relative_path
+            guanshi.save(update_fields=['invite_qrcode_url'])
+
+        # 10. 返回相对路径
+        return Response({'code': 0, 'message': 'success', 'data': {'url': relative_path}})
+
+    def get_cached_access_token(self):
+        """
+        从缓存获取微信 access_token，缓存键为 'wx_mini_access_token'
+        如果缓存中不存在，则调用微信接口获取并存入缓存，有效期7000秒。
+        使用 Django 缓存框架，默认使用内存缓存，不会占用磁盘。
+        """
+        cache_key = 'wx_mini_access_token'
+        token = cache.get(cache_key)
+        if token:
+            return token
+
+        appid = getattr(settings, 'WEIXIN_APPID', '')
+        secret = getattr(settings, 'WEIXIN_SECRET', '')
+        if not appid or not secret:
+            logger.error("微信小程序配置缺失")
+            return None
+
+        url = f'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={appid}&secret={secret}'
+        try:
+            resp = requests.get(url, timeout=5)
+            data = resp.json()
+            token = data.get('access_token')
+            expires_in = data.get('expires_in', 7200)
+            if token:
+                # 缓存7000秒（小于7200秒，确保不会过期才使用）
+                cache.set(cache_key, token, 7000)
+            return token
+        except Exception as e:
+            logger.error(f"获取微信access_token失败: {e}")
+            return None'''
+
+
+
+
+
+
+from django.db.models import Max, F
+
+
+class GuanZhuAListView(APIView):
+    """
+    获取关注阿龙页面图片列表
+    POST /peizhi/gzal
+    需要JWT认证
+    返回：
+    {
+        "code": 0,
+        "msg": "success",
+        "data": {
+            "images": ["相对URL1", "相对URL2", ...],
+            "last_update": "2025-03-16 12:34:56",
+            "visit_count": 123
+        }
+    }
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 查询类型为3的所有记录
+            qs = Tupianpeizhi.objects.filter(leixing=3)
+            if not qs.exists():
+                return Response({
+                    'code': 0,
+                    'msg': 'success',
+                    'data': {
+                        'images': [],
+                        'last_update': None,
+                        'visit_count': 0
+                    }
+                }, status=status.HTTP_200_OK)
+
+            # 获取所有图片的相对URL
+            images = list(qs.values_list('tupian', flat=True))
+
+            # 获取最新更新时间（取所有记录的update_time最大值）
+            last_update = qs.aggregate(Max('update_time'))['update_time__max']
+            last_update_str = last_update.strftime('%Y-%m-%d %H:%M:%S') if last_update else None
+
+            # 原子性增加访问次数
+            # 先更新所有记录，再获取更新后的最大次数
+            qs.update(fangwen_cishu=F('fangwen_cishu') + 1)
+            visit_count = qs.aggregate(Max('fangwen_cishu'))['fangwen_cishu__max'] or 0
+
+            return Response({
+                'code': 0,
+                'msg': 'success',
+                'data': {
+                    'images': images,
+                    'last_update': last_update_str,
+                    'visit_count': visit_count
+                }
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            logger.error(f"获取关注阿龙图片列表失败: {e}", exc_info=True)
+            return Response({
+                'code': 1,
+                'msg': '服务器内部错误',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+
+
+
+
+
+
+from yonghu.models import UserZuzhang
+
+
+
+class ZuzhangHaibaoView(APIView):
+    """
+    组长专属海报二维码生成接口
+    路径：/peizhi/zuzhanghb
+    方法：POST
+    权限：JWT认证，仅限组长身份
+    返回：
+        {
+            "code": 0,
+            "message": "success",
+            "data": {
+                "url": "erweima/zuzhang/1000001_1234567890.png",  # 相对路径
+                "yaoqingma": "ABC123XYZ"                          # 组长邀请码
+            }
+        }
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        current_user = request.user
+
+        # 1. 验证组长身份
+        try:
+            zuzhang = current_user.zuzhang_profile
+        except UserZuzhang.DoesNotExist:
+            return Response({
+                'code': 403,
+                'message': '当前用户不是组长身份',
+                'data': None
+            }, status=status.HTTP_403_FORBIDDEN)
+
+        # 2. 验证组长账号状态（zhuangtai=1正常）
+        if zuzhang.zhuangtai != 1:
+            return Response({
+                'code': 403,
+                'message': '组长账号状态异常，无法生成海报',
+                'data': None
+            }, status=status.HTTP_403_FORBIDDEN)
+
+        # 3. 获取或生成邀请码（yaoqingma字段）
+        invite_code = zuzhang.yaoqingma
+        if not invite_code:
+            # 生成唯一邀请码（使用已有工具函数）
+            invite_code = chuangjianYaoqingma(str(current_user.yonghuid))
+            if not yanzhengYaoqingmaWeiyixing(invite_code):
+                logger.error(f"组长邀请码生成失败，用户: {current_user.yonghuid}")
+                return Response({
+                    'code': 500,
+                    'message': '邀请码生成失败',
+                    'data': None
+                }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+            # 更新到数据库
+            zuzhang.yaoqingma = invite_code
+            zuzhang.save(update_fields=['yaoqingma'])
+
+        # 4. 获取微信 access_token（使用缓存）
+        access_token = self.get_cached_access_token()
+        if not access_token:
+            return Response({
+                'code': 500,
+                'message': '获取微信access_token失败',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # ========== 调用微信B接口：getUnlimited ==========
+        # 页面路径：打手注册页（组长邀请打手）
+        page_path = 'pages/guanshiduan/guanshiduan'
+        # scene参数：直接放入邀请码（需确保字符符合微信要求）
+        scene = invite_code  # 假设邀请码只包含字母数字
+
+        wx_url = f'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token={access_token}'
+        post_data = {
+            'scene': scene,
+            'page': page_path,
+            'width': 430,
+            'auto_color': False,
+            'line_color': {'r': 0, 'g': 0, 'b': 0}
+        }
+
+        try:
+            wx_resp = requests.post(wx_url, json=post_data, timeout=10)
+        except Exception as e:
+            logger.error(f"请求微信接口失败: {e}")
+            return Response({
+                'code': 500,
+                'message': '调用微信服务失败',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 处理微信返回结果
+        if wx_resp.status_code != 200:
+            error_info = wx_resp.json() if wx_resp.headers.get('content-type') == 'application/json' else {}
+            errmsg = error_info.get('errmsg', '未知错误')
+            logger.error(f"微信接口返回错误 (HTTP {wx_resp.status_code}): {errmsg}")
+            return Response({
+                'code': 500,
+                'message': f'生成二维码失败: {errmsg}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        content_type = wx_resp.headers.get('content-type', '')
+        if 'image' not in content_type:
+            # 可能是JSON错误
+            try:
+                error_info = wx_resp.json()
+                errmsg = error_info.get('errmsg', '未知错误')
+                logger.error(f"微信接口返回非图片内容: {errmsg}")
+                return Response({
+                    'code': 500,
+                    'message': f'生成二维码失败: {errmsg}',
+                    'data': None
+                }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+            except:
+                logger.error("微信接口返回未知内容")
+                return Response({
+                    'code': 500,
+                    'message': '生成二维码失败',
+                    'data': None
+                }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 5. 上传二维码到腾讯云COS
+        timestamp = int(time.time())
+        filename = f"{current_user.yonghuid}_{timestamp}.png"
+        oss_path = f"erweima/zuzhang/{filename}"  # 组长专用文件夹
+        file_obj = io.BytesIO(wx_resp.content)
+
+        try:
+            full_url = upload_to_oss(file_obj, oss_path)
+        except Exception as e:
+            logger.error(f"上传到COS失败: {e}")
+            return Response({
+                'code': 500,
+                'message': '图片上传失败',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        if not full_url:
+            return Response({
+                'code': 500,
+                'message': '图片上传失败',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 6. 获取相对路径（用于前端拼接）
+        cos_domain = getattr(settings, 'COS_DOMAIN', '')
+        if cos_domain and full_url.startswith(cos_domain):
+            relative_path = full_url[len(cos_domain):].lstrip('/')
+        else:
+            relative_path = oss_path
+
+        # 7. 删除旧的二维码文件（haibao_url字段）
+        old_url = zuzhang.haibao_url
+        if old_url:
+            delete_from_oss(old_url)
+
+        # 8. 更新数据库中的haibao_url字段
+        with transaction.atomic():
+            zuzhang.haibao_url = relative_path
+            zuzhang.save(update_fields=['haibao_url'])
+
+        # 9. 返回邀请码和二维码相对路径
+        return Response({
+            'code': 0,
+            'message': 'success',
+            'data': {
+                'url': relative_path,
+                'yaoqingma': invite_code
+            }
+        })
+
+    def get_cached_access_token(self):
+        """从缓存获取微信access_token（与管事接口共用）"""
+        cache_key = 'wx_mini_access_token'
+        token = cache.get(cache_key)
+        if token:
+            return token
+
+        appid = getattr(settings, 'WEIXIN_APPID', '')
+        secret = getattr(settings, 'WEIXIN_SECRET', '')
+        if not appid or not secret:
+            logger.error("微信小程序配置缺失")
+            return None
+
+        url = f'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={appid}&secret={secret}'
+        try:
+            resp = requests.get(url, timeout=5)
+            data = resp.json()
+            token = data.get('access_token')
+            expires_in = data.get('expires_in', 7200)
+            if token:
+                cache.set(cache_key, token, 7000)
+            return token
+        except Exception as e:
+            logger.error(f"获取微信access_token失败: {e}")
+            return None
+
+
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from rest_framework import status
+from django.utils import timezone
+from django.db.models import Q
+from .models import PopupPage, PopupConfig
+from .serializers import PopupConfigSerializer
+
+
+class PopupConfigView(APIView):
+    """
+    获取指定页面的弹窗配置
+    请求格式：POST { "pageKey": "dashouzhongxin" }
+    返回格式：{ "code": 0, "data": { "serverTime": "...", "popups": [...] } }
+    """
+    permission_classes = [IsAuthenticated]  # JWT 认证
+
+    def post(self, request):
+        # 1. 获取当前用户（已通过JWT认证，可直接使用）
+        user = request.user
+        if not user or not user.id:
+            return Response({
+                'code': 401,
+                'msg': '用户未登录或认证失败'
+            }, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 获取参数 pageKey
+        page_key = request.data.get('pageKey')
+        if not page_key:
+            return Response({
+                'code': 400,
+                'msg': '缺少参数 pageKey'
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 3. 查询页面配置
+        try:
+            popup_page = PopupPage.objects.get(page_key=page_key, is_active=True)
+        except PopupPage.DoesNotExist:
+            # 该页面没有配置弹窗，返回空
+            return Response({
+                'code': 0,
+                'data': {
+                    'serverTime': timezone.now().isoformat(),
+                    'popups': []
+                }
+            })
+
+        # 4. 查询该页面下所有启用的弹窗（且在有效时间范围内）
+        now = timezone.now()
+        popups = PopupConfig.objects.filter(
+            page=popup_page,
+            is_active=True,
+            start_time__lte=now,
+            end_time__gte=now
+        ).prefetch_related('images')  # 预加载图片，避免N+1查询
+        # 按 sort_order 排序（model Meta 已定义）
+
+        # 5. 序列化
+        serializer = PopupConfigSerializer(popups, many=True)
+
+        # 6. 返回数据
+        return Response({
+            'code': 0,
+            'data': {
+                'serverTime': now.isoformat(),
+                'ignore_user_mute': popup_page.ignore_user_mute,  # 新增
+                'popups': serializer.data
+            }
+        })
+
+
+
+
+
+from .models import WithdrawConfig
+
+class GetWithdrawModeView(APIView):
+    """
+    获取提现模式配置
+    前端请求 /peizhi/hqtxzsym
+    返回格式: { "code": 0, "data": { "mode": 1 or 2 } }
+    """
+    permission_classes = [IsAuthenticated]  # JWT 认证
+
+    def post(self, request, *args, **kwargs):
+        # 尝试获取 ID=1 的记录
+        config = WithdrawConfig.objects.filter(id=1).first()
+        # 如果存在则取实际值，否则默认 2（手动提现）
+        mode = config.mode if config else 2
+
+        return Response({
+            'code': 0,
+            'data': {
+                'mode': mode
+            }
+        })
+
+
+
+
+from shangpin.models import (
+    Huiyuangoumai
+)
+
+
+class CheckPhoneAuthView(APIView):
+    """
+    判断当前登录用户是否需要强制手机号认证
+
+    规则：
+      - 已认证过手机号（shoujihao_renzheng=True） → 不需要
+      - 未认证时，检查用户角色及其业务指标是否达到阈值：
+        打手：有会员购买记录（Huiyuangoumai 中存在记录）
+        商家：发布订单总数（fabu）>= 5
+        管事：充值分佣总额（chongzhifenrun）>= 15
+        组长：分佣总额（fenyong_zonge）>= 2
+        老板：消费总额（zonge）>= 20
+      - 满足任一角色的阈值 → 需要认证
+      - 否则 → 不需要认证
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        user = request.user  # UserMain 实例
+
+        # 已经认证过手机号，直接放行
+        if user.shoujihao_renzheng:
+            return Response({'need_auth': False})
+
+        # 检查各角色是否满足阈值条件
+        if self._dashou_meets_threshold(user):
+            return Response({'need_auth': True})
+        if self._shangjia_meets_threshold(user):
+            return Response({'need_auth': True})
+        if self._guanshi_meets_threshold(user):
+            return Response({'need_auth': True})
+        if self._zuzhang_meets_threshold(user):
+            return Response({'need_auth': True})
+        if self._boss_meets_threshold(user):
+            return Response({'need_auth': True})
+
+        # 都不满足，无需认证
+        return Response({'need_auth': False})
+
+    # ==================== 各角色阈值判断方法 ====================
+
+    def _dashou_meets_threshold(self, user):
+        """
+        打手条件：存在会员购买记录（Huiyuangoumai 表中有该用户的记录）
+        """
+        try:
+            # 先确认用户是打手
+            UserDashou.objects.get(user=user)
+        except UserDashou.DoesNotExist:
+            return False
+        # 检查是否有任意会员购买记录
+        return Huiyuangoumai.objects.filter(yonghu_id=user.yonghuid).exists()
+
+    def _shangjia_meets_threshold(self, user):
+        """商家条件：发布订单总数 fabu >= 5"""
+        try:
+            shop = UserShangjia.objects.get(user=user)
+        except UserShangjia.DoesNotExist:
+            return False
+        return shop.fabu >= 5
+
+    def _guanshi_meets_threshold(self, user):
+        """管事条件：充值分佣总额 chongzhifenrun >= 15"""
+        try:
+            guanshi = UserGuanshi.objects.get(user=user)
+        except UserGuanshi.DoesNotExist:
+            return False
+        return guanshi.chongzhifenrun >= 15
+
+    def _zuzhang_meets_threshold(self, user):
+        """组长条件：分佣总额 fenyong_zonge >= 2"""
+        try:
+            zuzhang = UserZuzhang.objects.get(user=user)
+        except UserZuzhang.DoesNotExist:
+            return False
+        return zuzhang.fenyong_zonge >= 2
+
+    def _boss_meets_threshold(self, user):
+        """老板条件：消费总额 zonge >= 20"""
+        try:
+            boss = UserBoss.objects.get(user=user)
+        except UserBoss.DoesNotExist:
+            return False
+        return boss.zonge >= 20
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
new file mode 100644
index 0000000..b324978
--- /dev/null
+++ b/project.config.json
@@ -0,0 +1,28 @@
+{
+    "appid": "wx2517043ca3f39677",
+    "compileType": "miniprogram",
+    "libVersion": "3.14.3",
+    "packOptions": {
+        "ignore": [],
+        "include": []
+    },
+    "setting": {
+        "coverView": true,
+        "es6": true,
+        "postcss": true,
+        "minified": true,
+        "enhance": true,
+        "showShadowRootInWxmlPanel": true,
+        "packNpmRelationList": [],
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        }
+    },
+    "condition": {},
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 4
+    }
+}
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..5c4c6f8
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,51 @@
+# ==================== Django 核心 ====================
+Django==6.0
+
+# ==================== 数据库 ====================
+
+mysqlclient==2.2.7
+#pymysql==1.1.0
+# Windows安装mysqlclient可能失败，如果失败用：
+# pip install mysqlclient-2.2.4-cp313-cp313-win_amd64.whl
+
+# ==================== REST API & 认证 ====================
+djangorestframework==3.15.2
+djangorestframework-simplejwt==5.3.1
+
+# ==================== 跨域支持 ====================
+django-cors-headers==4.4.0
+
+# ==================== 异步任务 ====================
+
+celery==5.3.6
+redis==5.0.5
+django-celery-results==2.5.1
+django-celery-beat==2.5.0
+
+# ==================== 环境变量管理 ====================
+python-decouple==3.8
+
+# ==================== 图片处理 ====================
+Pillow>=11.0.0
+
+# ==================== 实用工具 ====================
+python-dateutil==2.9.0.post0
+hashids==1.3.1
+pycryptodome==3.20.0
+
+# ==================== 开发工具 ====================
+django-extensions==3.2.3
+
+# ==================== 代码格式化 ====================
+black==24.8.0
+
+# ==================== 微信相关 ====================
+#wechatpay-v3==0.8.8
+requests
+#腾讯云OSS存储桶插件
+cos-python-sdk-v5
+sts-0.0.1
+
+#生产环境必备插件
+gunicorn-21.2.0
+gevent-23.9.1
\ No newline at end of file
diff --git a/services/popupService.js b/services/popupService.js
new file mode 100644
index 0000000..522fe60
--- /dev/null
+++ b/services/popupService.js
@@ -0,0 +1,203 @@
+import request from '../utils/request.js'
+
+const STORAGE_RECORDS = 'popup_records'
+const STORAGE_MUTE_TODAY = 'popup_mute_today'
+
+class PopupService {
+  constructor() {
+    this.records = this.loadRecords()
+    this.muteToday = this.loadMuteToday()
+    this.currentPageKey = null
+    this.isShowing = false      // 是否正在展示弹窗队列
+    this.isFetching = false     // 是否正在请求弹窗数据
+  }
+
+  loadRecords() {
+    try {
+      return wx.getStorageSync(STORAGE_RECORDS) || {}
+    } catch (e) {
+      return {}
+    }
+  }
+
+  saveRecords() {
+    try {
+      wx.setStorageSync(STORAGE_RECORDS, this.records)
+    } catch (e) {}
+  }
+
+  loadMuteToday() {
+    try {
+      return wx.getStorageSync(STORAGE_MUTE_TODAY) || {}
+    } catch (e) {
+      return {}
+    }
+  }
+
+  saveMuteToday() {
+    try {
+      wx.setStorageSync(STORAGE_MUTE_TODAY, this.muteToday)
+    } catch (e) {}
+  }
+
+  isSamePeriod(date1, date2, interval) {
+    const d1 = new Date(date1)
+    const d2 = new Date(date2)
+    if (interval === 'day') {
+      return d1.toDateString() === d2.toDateString()
+    } else if (interval === 'week') {
+      const getWeek = (d) => {
+        const year = d.getFullYear()
+        const firstDay = new Date(year, 0, 1)
+        const week = Math.ceil((((d - firstDay) / 86400000) + firstDay.getDay() + 1) / 7)
+        return `${year}-${week}`
+      }
+      return getWeek(d1) === getWeek(d2)
+    } else if (interval === 'month') {
+      return d1.getFullYear() === d2.getFullYear() && d1.getMonth() === d2.getMonth()
+    } else if (interval === 'year') {
+      return d1.getFullYear() === d2.getFullYear()
+    }
+    return false
+  }
+
+  shouldShow(popup, pageKey, serverDate, pageIgnoreUserMute) {
+    const popupId = popup.popup_id
+    const strategy = popup.strategy
+    const force_even_muted = popup.force_even_muted || false
+
+    const todayStr = serverDate.split('T')[0]
+    const now = new Date(serverDate)
+
+    const skipMuteCheck = pageIgnoreUserMute || force_even_muted
+    if (!skipMuteCheck) {
+      const mutedDate = this.muteToday[pageKey]
+      if (mutedDate === todayStr) {
+        return false
+      }
+    }
+
+    const key = `${pageKey}_${popupId}`
+    const record = this.records[key]
+    const { type, maxCount = 1, resetInterval = 'day' } = strategy
+
+    if (type === 'once') return !record
+    if (type === 'always') return true
+    if (type === 'daily' || type === 'weekly' || type === 'monthly' || type === 'yearly') {
+      const interval = type
+      if (!record) return true
+      const lastTime = record.lastShowTime
+      if (!lastTime) return true
+      const same = this.isSamePeriod(lastTime, now, interval)
+      if (!same) return true
+      const currentCount = record.showCount || 1
+      return currentCount < maxCount
+    }
+    if (type === 'count') {
+      if (!record) return true
+      const lastTime = record.lastShowTime
+      if (!lastTime) return true
+      const same = this.isSamePeriod(lastTime, now, resetInterval)
+      if (!same) return true
+      const currentCount = record.showCount || 1
+      return currentCount < maxCount
+    }
+    return false
+  }
+
+  recordShow(popupId, pageKey, serverDate) {
+    const key = `${pageKey}_${popupId}`
+    const now = new Date(serverDate)
+    const record = this.records[key] || { showCount: 0, lastShowTime: 0, lastShowDate: '' }
+    record.showCount = (record.showCount || 0) + 1
+    record.lastShowTime = now.getTime()
+    record.lastShowDate = serverDate.split('T')[0]
+    this.records[key] = record
+    this.saveRecords()
+  }
+
+  setMuteToday(pageKey, serverDate) {
+    const todayStr = serverDate.split('T')[0]
+    this.muteToday[pageKey] = todayStr
+    this.saveMuteToday()
+  }
+
+  async checkAndShow(pageInstance, pageKey) {
+    if (this.isShowing || this.isFetching) return
+
+    this.isFetching = true
+    try {
+      const res = await request({
+        url: '/peizhi/tanchuang',
+        method: 'POST',
+        data: { pageKey }
+      })
+      if (res.statusCode !== 200 || res.data.code !== 0) return
+      const { serverTime, popups = [], ignore_user_mute = false } = res.data.data
+      if (!popups.length) return
+
+      const queue = []
+      for (const popup of popups) {
+        if (this.shouldShow(popup, pageKey, serverTime, ignore_user_mute)) {
+          queue.push(popup)
+        }
+      }
+      if (!queue.length) return
+
+      this.isShowing = true
+      this.currentPageKey = pageKey
+      await this.showQueue(pageInstance, queue, 0, serverTime, ignore_user_mute)
+    } catch (error) {
+      console.error('[弹窗] 服务错误:', error)
+    } finally {
+      this.isFetching = false
+      this.isShowing = false
+    }
+  }
+
+  showQueue(pageInstance, queue, index, serverTime, pageIgnoreUserMute) {
+    if (index >= queue.length) return Promise.resolve()
+    const popup = queue[index]
+    const isLast = index === queue.length - 1
+
+    const popupComp = pageInstance.selectComponent('#popupNotice')
+    if (!popupComp) {
+      console.error('[弹窗] 未找到组件 #popupNotice')
+      return Promise.resolve()
+    }
+
+    return new Promise((resolve) => {
+      const showCheckbox = isLast && !pageIgnoreUserMute && !popup.force_even_muted
+      const showData = {
+        popupId: popup.popup_id,
+        title: popup.title || '',
+        duration: popup.duration || 0,
+        images: popup.images || [],
+        showMuteCheckbox: showCheckbox,
+        serverTime: serverTime
+      }
+      const onClose = (result) => {
+        this.recordShow(popup.popup_id, this.currentPageKey, serverTime)
+        if (result.muteToday && showCheckbox) {
+          this.setMuteToday(this.currentPageKey, serverTime)
+          resolve()
+          return
+        }
+        this.showQueue(pageInstance, queue, index + 1, serverTime, pageIgnoreUserMute).then(resolve)
+      }
+      popupComp.show(showData, onClose)
+    })
+  }
+
+  // ========== 🆕 新增：强制重置锁状态 ==========
+  /**
+   * 当页面被隐藏（onHide）时调用，用于释放全局锁，避免影响其他页面的弹窗
+   */
+  reset() {
+    this.isShowing = false;
+    this.isFetching = false;
+    this.currentPageKey = null;
+  }
+}
+
+export default new PopupService()
\ No newline at end of file
diff --git a/shangdian/__init__.py b/shangdian/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/shangdian/__pycache__/__init__.cpython-313.pyc b/shangdian/__pycache__/__init__.cpython-313.pyc
new file mode 100644
index 0000000..2c96ef2
Binary files /dev/null and b/shangdian/__pycache__/__init__.cpython-313.pyc differ
diff --git a/shangdian/__pycache__/admin.cpython-313.pyc b/shangdian/__pycache__/admin.cpython-313.pyc
new file mode 100644
index 0000000..326cf1f
Binary files /dev/null and b/shangdian/__pycache__/admin.cpython-313.pyc differ
diff --git a/shangdian/__pycache__/apps.cpython-313.pyc b/shangdian/__pycache__/apps.cpython-313.pyc
new file mode 100644
index 0000000..f3dde2e
Binary files /dev/null and b/shangdian/__pycache__/apps.cpython-313.pyc differ
diff --git a/shangdian/__pycache__/models.cpython-313.pyc b/shangdian/__pycache__/models.cpython-313.pyc
new file mode 100644
index 0000000..8fb7a73
Binary files /dev/null and b/shangdian/__pycache__/models.cpython-313.pyc differ
diff --git a/shangdian/__pycache__/urls.cpython-313.pyc b/shangdian/__pycache__/urls.cpython-313.pyc
new file mode 100644
index 0000000..6a030d3
Binary files /dev/null and b/shangdian/__pycache__/urls.cpython-313.pyc differ
diff --git a/shangdian/__pycache__/utils.cpython-313.pyc b/shangdian/__pycache__/utils.cpython-313.pyc
new file mode 100644
index 0000000..1d01400
Binary files /dev/null and b/shangdian/__pycache__/utils.cpython-313.pyc differ
diff --git a/shangdian/__pycache__/views.cpython-313.pyc b/shangdian/__pycache__/views.cpython-313.pyc
new file mode 100644
index 0000000..4032acf
Binary files /dev/null and b/shangdian/__pycache__/views.cpython-313.pyc differ
diff --git a/shangdian/admin.py b/shangdian/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/shangdian/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/shangdian/apps.py b/shangdian/apps.py
new file mode 100644
index 0000000..98d3b64
--- /dev/null
+++ b/shangdian/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ShangdianConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "shangdian"
diff --git a/shangdian/migrations/__init__.py b/shangdian/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/shangdian/migrations/__pycache__/__init__.cpython-313.pyc b/shangdian/migrations/__pycache__/__init__.cpython-313.pyc
new file mode 100644
index 0000000..1a1c742
Binary files /dev/null and b/shangdian/migrations/__pycache__/__init__.cpython-313.pyc differ
diff --git a/shangdian/models.py b/shangdian/models.py
new file mode 100644
index 0000000..651ba5c
--- /dev/null
+++ b/shangdian/models.py
@@ -0,0 +1,228 @@
+from django.db import models
+
+# Create your models here.
+
+
+class YonghuPingzheng(models.Model):
+    id = models.AutoField(primary_key=True, verbose_name='自增主键ID')
+    yonghu = models.CharField(
+        max_length=7,
+        unique=True,  # 确保一个用户只有一条凭证记录
+        db_index=True,
+        verbose_name='关联用户ID'
+    )
+    zhanghao = models.CharField(max_length=50, unique=True, db_index=True, verbose_name='登录账号')
+    mima = models.CharField(max_length=255, verbose_name='密码')
+    is_active = models.BooleanField(default=True, verbose_name='是否启用')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'yonghu_pingzheng'
+        verbose_name = '用户认证凭证'
+        verbose_name_plural = verbose_name
+
+
+class Dianpu(models.Model):
+    id = models.AutoField(primary_key=True, verbose_name='店铺自增ID')
+    pingzheng = models.OneToOneField(
+        'shangdian.YonghuPingzheng',  # 同应用内可简写，但完整路径更清晰
+        on_delete=models.CASCADE,
+        db_index=True,
+        verbose_name='关联用户凭证'
+    )
+    dianpu_mingcheng = models.CharField(max_length=50, verbose_name='店铺名称')
+    dianpu_touxiang = models.CharField(max_length=500, null=True, blank=True, verbose_name='店铺头像URL')
+
+    lianxi_dianhua = models.CharField(max_length=20, null=True, blank=True, verbose_name='联系电话')
+    weixinhao = models.CharField(max_length=50, null=True, blank=True, verbose_name='微信号')
+    zhuangtai = models.IntegerField(choices=[(0, '封禁'), (1, '正常')], default=1, verbose_name='店铺状态')
+    bangding_yonghushu = models.PositiveIntegerField(default=0, verbose_name='绑定用户总数')
+    erweima_url = models.CharField(max_length=500, null=True, blank=True, verbose_name='店铺二维码相对URL')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    kaiqi_shouyi_choucheng = models.BooleanField(default=False, verbose_name='是否开启店铺订单收益抽成')
+    shouyi_choucheng_feilv = models.DecimalField(max_digits=5, decimal_places=4, null=True, blank=True, default=0.0000,
+                                                 verbose_name='店铺订单收益抽成费率（小数，如0.1000=10%）')
+    ketixian_yue = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='店铺可提现余额')
+    zhengqu_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='店铺赚取总额')
+    meiri_tixian_xiane = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, default=0.00,
+                                             verbose_name='店铺每日提现限额')
+    kaiqi_meiri_xiane = models.BooleanField(default=False, verbose_name='是否开启每日提现限额')
+
+
+    yaoqing_dianpu_id = models.PositiveIntegerField(null=True, blank=True, db_index=True,
+                                                    verbose_name='邀请人店铺ID(上级)')
+    fenhong_choucheng_feilv = models.DecimalField(max_digits=5, decimal_places=4, null=True, blank=True, default=0.0500,
+                                                  verbose_name='上级分红抽成费率(默认5%)')
+    shangji_fenhong_leiji = models.DecimalField(max_digits=12, decimal_places=2, default=0.00,
+                                                verbose_name='作为上级累计获得分红')
+    shangji_ketixian_fenhong = models.DecimalField(max_digits=12, decimal_places=2, default=0.00,
+                                                   verbose_name='作为上级可提现分红余额')
+
+
+    class Meta:
+        db_table = 'dianpu'
+        verbose_name = '平台商家店铺'
+        verbose_name_plural = verbose_name
+
+
+
+
+
+class DianpuMorenPeizhi(models.Model):
+    id = models.PositiveSmallIntegerField(primary_key=True, default=1, editable=False)
+    moren_choucheng_feilv = models.DecimalField(max_digits=5, decimal_places=4, default=0.1000, verbose_name='默认订单抽成费率（小数，0.1000=10%）')
+    moren_tixian_xiane = models.DecimalField(max_digits=10, decimal_places=2, default=1000.00, verbose_name='默认可提现限额')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'dianpu_moren_peizhi'
+        verbose_name = '店铺默认配置'
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        return f"默认配置 - 费率:{self.moren_choucheng_feilv} 限额:{self.moren_tixian_xiane}"
+
+    def save(self, *args, **kwargs):
+        self.id = 1
+        super().save(*args, **kwargs)
+
+
+
+
+
+class DianpuShouzhiMeiriTongji(models.Model):
+    dianpu_id = models.PositiveIntegerField(db_index=True, verbose_name='店铺ID')
+    riqi = models.DateField(db_index=True, verbose_name='统计日期')
+    nian = models.PositiveSmallIntegerField(verbose_name='年份')
+    yue = models.PositiveSmallIntegerField(verbose_name='月份')
+    ri = models.PositiveSmallIntegerField(verbose_name='日')
+    xiadan_zongliang = models.PositiveIntegerField(default=0, verbose_name='下单总量')
+    xiadan_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='下单总额')
+    chengjiao_zongliang = models.PositiveIntegerField(default=0, verbose_name='成交总量')
+    chengjiao_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='成交总额')
+    tuikuan_zongliang = models.PositiveIntegerField(default=0, verbose_name='退款总量')
+    tuikuan_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='退款总额')
+    shouyi_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='收益总额')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    shangji_fenhong_cishu = models.PositiveIntegerField(default=0, verbose_name='作为上级获得分红次数')
+    shangji_fenhong_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00,
+                                                verbose_name='作为上级获得分红总额')
+
+    # ---------- 作为下级，给上级的分红记录 ----------
+    shangji_id = models.PositiveIntegerField(null=True, blank=True, verbose_name='当天对应的上级店铺ID（若无则为空）')
+    gei_shangji_cishu = models.PositiveIntegerField(default=0, verbose_name='给上级分红次数')
+    gei_shangji_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00,
+                                            verbose_name='给上级分红总额')
+
+    class Meta:
+        db_table = 'dianpu_shouzhi_meiri_tongji'
+        verbose_name = '店铺每日收支统计'
+        verbose_name_plural = verbose_name
+        unique_together = [['dianpu_id', 'riqi']]
+        indexes = [
+            models.Index(fields=['dianpu_id', 'riqi']),
+            models.Index(fields=['nian', 'yue', 'ri']),
+        ]
+
+    def __str__(self):
+        return f"店铺ID:{self.dianpu_id} - {self.riqi}"
+
+    def clean(self):
+        if self.riqi:
+            self.nian = self.riqi.year
+            self.yue = self.riqi.month
+            self.ri = self.riqi.day
+        super().clean()
+
+    def save(self, *args, **kwargs):
+        self.clean()
+        super().save(*args, **kwargs)
+
+
+
+class YonghuDianpuBangding(models.Model):
+    id = models.AutoField(primary_key=True, verbose_name='绑定自增ID')
+    yonghu = models.ForeignKey(
+        'yonghu.UserMain',  # 🔥 完整路径
+        to_field='yonghuid',
+        on_delete=models.CASCADE,
+        db_index=True,
+        verbose_name='用户ID'
+    )
+    dianpu = models.ForeignKey('Dianpu', on_delete=models.CASCADE, db_index=True, verbose_name='关联店铺ID')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'yonghu_dianpu_bangding'
+        verbose_name = '用户店铺绑定关系'
+        verbose_name_plural = verbose_name
+        unique_together = [['yonghu', 'dianpu']]
+
+
+# shangdian/models.py
+
+class ShangpinLeixingDianpu(models.Model):
+    """
+    店铺级商品类型映射表
+    与公共商品类型表 ShangpinLeixing 强制关联，用于店铺自定义类型
+    """
+    id = models.AutoField(primary_key=True, verbose_name='类型自增ID')
+    dianpu = models.ForeignKey(
+        'shangdian.Dianpu',
+        on_delete=models.CASCADE,
+        db_index=True,
+        verbose_name='所属店铺'
+    )
+    # 🔥 强制映射到公共商品类型，不可为空
+    gonggong_leixing = models.ForeignKey(
+        'shangpin.ShangpinLeixing',
+        on_delete=models.CASCADE,
+        db_index=True,
+        verbose_name='映射的公共商品类型'
+    )
+    jieshao = models.CharField(max_length=45, verbose_name='类型介绍')
+    tupian_url = models.CharField(max_length=500, null=True, blank=True, verbose_name='类型图片URL')
+    paixu = models.IntegerField(default=0, verbose_name='排序权重')
+    shangjia_zhuangtai = models.BooleanField(default=True, verbose_name='是否上架')
+    fengjin_zhuangtai = models.BooleanField(default=False, verbose_name='是否封禁')
+    shenhe_zhuangtai = models.BooleanField(default=False, verbose_name='平台审核状态',help_text='True=审核通过，False=未审核')
+
+    class Meta:
+        db_table = 'shangdian_shangpin_leixing'
+        verbose_name = '店铺商品类型映射'
+        verbose_name_plural = verbose_name
+        indexes = [
+            models.Index(fields=['dianpu']),
+            models.Index(fields=['gonggong_leixing']),
+        ]
+
+    def __str__(self):
+        return f"{self.dianpu.dianpu_mingcheng} - {self.jieshao}"
+
+
+
+# shangdian/models.py 或独立应用 models.py
+class DianpuShangpinShenheShezhi(models.Model):
+    """店铺商品审核模式全局配置（仅一条记录）"""
+    kaiqi_shenhe = models.BooleanField(default=False, verbose_name='是否开启商品审核模式')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'dianpu_shangpin_shenhe_shezhi'
+        verbose_name = '商品审核模式配置'
+        verbose_name_plural = verbose_name
+
+    def save(self, *args, **kwargs):
+        self.pk = 1  # 强制使用 ID=1 保证唯一
+        super().save(*args, **kwargs)
+
+
+
diff --git a/shangdian/tests.py b/shangdian/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/shangdian/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/shangdian/urls.py b/shangdian/urls.py
new file mode 100644
index 0000000..a4460ea
--- /dev/null
+++ b/shangdian/urls.py
@@ -0,0 +1,38 @@
+from django.urls import path
+
+from shangdian.views import BindDianpuView, ShopGoodsView, ShangdianLoginView, ShopOverviewView, ShopQrcodeView, \
+    ShopProductConfigView, ShopProductModifyView, ShopProductListView, ShopProductModifyView1, MemberListView, \
+    DianpuShouzhiTongjiView, QrcodeDownloadView, SubShopListView, SubShopModifyView, ShopOrderManageView, \
+    ShopOrderStatisticsView, ShopRefundView, ShopForceCompleteView, ShopTransferHallView, ShopFineApplyView
+
+urlpatterns = [
+    path('bdsd', BindDianpuView.as_view(), name='绑定或更新商家店铺'),
+    path('hqsp', ShopGoodsView.as_view(), name='获取商品数据'),
+
+   path('login', ShangdianLoginView.as_view(), name='商家登录'),
+   path('sjdpgl', ShopOverviewView.as_view(), name='商家获取店铺信息'),
+    path('sdscdpm', ShopQrcodeView.as_view(), name='生成或更新店铺二维码'),
+
+    path('dphqspxx', ShopProductConfigView.as_view(), name='商店获取商品类型专区'),
+    path('xgdpsplx', ShopProductModifyView.as_view(), name='商店修改添加修改商品类型专区'),
+
+    path('sdhqspsj', ShopProductListView.as_view(), name='商店获取商品数据'),
+    path('xgdpsplx', ShopProductModifyView1.as_view(), name='商店增删改商品数据'),
+
+   path('hqhy', MemberListView.as_view(), name='商店获取会员'),
+   path('dpsztj', DianpuShouzhiTongjiView.as_view(), name='获取店铺数据统计'),
+
+   path('xzewm', QrcodeDownloadView.as_view(), name='下载店铺二维码'),
+
+    path('wdxjdp', SubShopListView.as_view(), name='获取下级店铺列表'),      # 获取下级店铺列表
+    path('xjdpbj', SubShopModifyView.as_view(), name='添加/修改下级店铺'),  # 添加/修改下级店铺
+
+    path('ddlbhq', ShopOrderManageView.as_view(), name='店铺订单数据统计与获取'),
+    # 稍后添加具体路由
+    path('ddltj', ShopOrderStatisticsView.as_view(), name='店铺订单数量统计接口'),
+    path('tk', ShopRefundView.as_view(), name='店铺退款'),
+    path('qzjd', ShopForceCompleteView.as_view(), name='店铺强制结算'),
+    path('zydt', ShopTransferHallView.as_view(), name='店铺转移大厅'),
+    path('fksq', ShopFineApplyView.as_view(), name='店铺开罚单'),
+
+]
\ No newline at end of file
diff --git a/shangdian/utils.py b/shangdian/utils.py
new file mode 100644
index 0000000..1ff0aa7
--- /dev/null
+++ b/shangdian/utils.py
@@ -0,0 +1,634 @@
+
+from rest_framework.response import Response
+
+from .models import Dianpu, YonghuPingzheng
+
+
+from shangpin.models import Shangpin
+from shangdian.models import Dianpu, DianpuMorenPeizhi
+
+# shangdian/utils.py 或 tongji/utils.py
+
+import logging
+from datetime import date
+from decimal import Decimal
+from django.db import transaction
+from django.db.models import F
+from shangdian.models import Dianpu, DianpuShouzhiMeiriTongji
+
+
+logger = logging.getLogger(__name__)
+
+
+def verify_shop_permission(request, frontend_user_id=None):
+    """
+    验证商家后台用户身份及店铺状态
+
+    参数:
+        request: DRF request 对象
+        frontend_user_id: 前端传递的用户ID（用于防越权校验，可选）
+
+    返回:
+        (dianpu_obj, None)          # 验证成功，返回店铺对象
+        (None, Response)            # 验证失败，返回错误响应
+    """
+    current_user = request.user
+
+    # 1. 从 request.user 获取当前认证用户的 yonghuid
+    # 注意：您的用户模型可能通过 JWT 的 sub 或其他字段标识，此处假设 request.user.yonghuid 存在
+    if not hasattr(current_user, 'yonghuid'):
+        logger.error(f"用户对象缺少 yonghuid 属性: {current_user}")
+        return None, Response(
+            {'code': 500, 'msg': '用户身份信息异常'}
+        )
+
+    auth_user_id = current_user.yonghuid
+
+    # 2. 越权检测：如果前端传了用户ID，必须与当前登录用户一致
+    if frontend_user_id is not None and str(frontend_user_id) != str(auth_user_id):
+        logger.warning(
+            f"越权尝试: 登录用户 {auth_user_id} 尝试操作 {frontend_user_id} 的数据"
+        )
+        return None, Response(
+            {'code': 403, 'msg': '无权操作其他用户数据'}
+        )
+
+    # 3. 查询用户凭证表，验证账号是否存在且状态正常
+    try:
+        pingzheng = YonghuPingzheng.objects.get(yonghu=auth_user_id)
+        if not pingzheng.is_active:
+            return None, Response(
+                {'code': 403, 'msg': '用户账号已被禁用'}
+            )
+    except YonghuPingzheng.DoesNotExist:
+        return None, Response(
+            {'code': 404, 'msg': '用户凭证不存在'}
+        )
+
+    # 4. 查询关联的店铺信息，验证店铺状态
+    try:
+        dianpu = Dianpu.objects.get(pingzheng=pingzheng)
+        if dianpu.zhuangtai != 1:  # 1 表示正常
+            return None, Response(
+                {'code': 403, 'msg': '店铺已被封禁'}
+            )
+    except Dianpu.DoesNotExist:
+        return None, Response(
+            {'code': 404, 'msg': '店铺信息不存在'}
+        )
+
+    # 验证通过，返回店铺对象
+    return dianpu, None
+
+
+
+
+
+
+
+
+
+
+
+
+
+'''def update_dianpu_daily_stat(
+    dianpu_id,
+    caozuo_leixing,
+    dingdan_jiage=Decimal('0.00'),
+    dianpu_shouyi=Decimal('0.00')
+):
+    """
+    原子更新店铺每日统计数据，并根据结算操作更新店铺余额与总额（高并发安全）
+
+    参数:
+        dianpu_id: 店铺ID (int)
+        caozuo_leixing: 操作类型
+                        1 = 下单
+                        2 = 结算（成交）
+                        3 = 退款
+        dingdan_jiage: 订单金额（商品价格），默认0.00
+        dianpu_shouyi: 店铺本次收益金额，默认0.00
+
+    注意:
+        - 金额若小于0则自动设为0
+        - 日期自动取当天
+        - 使用 select_for_update 配合事务，保证并发时数据绝对准确
+        - 若店铺不存在，仅记录日志不中断主流程
+        - 结算操作会同步更新 Dianpu 表的 ketixian_yue 和 zhengqu_zonge
+    """
+    # 参数归一化与合法性处理
+    dingdan_jiage = Decimal(str(dingdan_jiage)) if dingdan_jiage else Decimal('0.00')
+    dianpu_shouyi = Decimal(str(dianpu_shouyi)) if dianpu_shouyi else Decimal('0.00')
+
+    if dingdan_jiage < 0:
+        dingdan_jiage = Decimal('0.00')
+    if dianpu_shouyi < 0:
+        dianpu_shouyi = Decimal('0.00')
+
+    today = date.today()
+
+    # 校验店铺是否存在（不加锁，仅校验）
+    if not Dianpu.objects.filter(id=dianpu_id).exists():
+        logger.error(f"店铺ID {dianpu_id} 不存在，统计更新失败")
+        return
+
+    # 开启事务，使用行锁确保并发安全
+    with transaction.atomic():
+        # 1. 获取或创建统计记录，并锁定该行
+        tongji, created = DianpuShouzhiMeiriTongji.objects.select_for_update().get_or_create(
+            dianpu_id=dianpu_id,
+            riqi=today,
+            defaults={
+                'nian': today.year,
+                'yue': today.month,
+                'ri': today.day,
+                'xiadan_zongliang': 0,
+                'xiadan_zonge': Decimal('0.00'),
+                'chengjiao_zongliang': 0,
+                'chengjiao_zonge': Decimal('0.00'),
+                'tuikuan_zongliang': 0,
+                'tuikuan_zonge': Decimal('0.00'),
+                'shouyi_zonge': Decimal('0.00'),
+            }
+        )
+
+        # 根据操作类型构建统计更新字段
+        update_fields = {}
+
+        if caozuo_leixing == 1:  # 下单
+            update_fields['xiadan_zongliang'] = F('xiadan_zongliang') + 1
+            update_fields['xiadan_zonge'] = F('xiadan_zonge') + dingdan_jiage
+
+        elif caozuo_leixing == 2:  # 结算（成交）
+            update_fields['chengjiao_zongliang'] = F('chengjiao_zongliang') + 1
+            update_fields['chengjiao_zonge'] = F('chengjiao_zonge') + dingdan_jiage
+            update_fields['shouyi_zonge'] = F('shouyi_zonge') + dianpu_shouyi
+
+            # 结算时同步更新店铺表的可提现余额和赚取总额（需加锁店铺行）
+            try:
+                dianpu = Dianpu.objects.select_for_update().get(id=dianpu_id)
+                dianpu.ketixian_yue = F('ketixian_yue') + dianpu_shouyi
+                dianpu.zhengqu_zonge = F('zhengqu_zonge') + dianpu_shouyi
+                dianpu.save(update_fields=['ketixian_yue', 'zhengqu_zonge', 'update_time'])
+            except Dianpu.DoesNotExist:
+                logger.error(f"结算时店铺ID {dianpu_id} 不存在，但已校验过，此处不应发生")
+                raise
+
+        elif caozuo_leixing == 3:  # 退款
+            update_fields['tuikuan_zongliang'] = F('tuikuan_zongliang') + 1
+            update_fields['tuikuan_zonge'] = F('tuikuan_zonge') + dingdan_jiage
+            # 退款是否扣减收益需根据业务决定，此处只累加退款统计
+
+        else:
+            logger.warning(f"未知的操作类型: {caozuo_leixing}")
+            return
+
+        # 原子更新统计字段
+        if update_fields:
+            for field, value in update_fields.items():
+                setattr(tongji, field, value)
+            tongji.save(update_fields=list(update_fields.keys()))
+
+        logger.info(
+            f"店铺统计更新: 店铺ID={dianpu_id}, 操作类型={caozuo_leixing}, "
+            f"订单金额={dingdan_jiage}, 店铺收益={dianpu_shouyi}, 日期={today}"
+        )
+
+
+
+
+
+def calculate_pingtai_and_dianpu_shouyi(shangpin_id, dingdan_jiage, dashou_fencheng):
+    """
+    根据商品价格和打手分成计算平台收益和店铺收益
+
+    逻辑：
+        总收益 = 订单金额 - 打手分成
+        1. 从商品表获取所属店铺ID
+        2. 若商品无店铺ID：平台收益 = 总收益，店铺收益 = 0
+        3. 若有店铺ID：
+           - 查询店铺配置：
+             * 若店铺开启抽成，则费率 = 店铺表.shouyi_choucheng_feilv
+             * 否则从店铺默认配置表(ID=1)获取默认费率，若记录不存在则自动创建
+           - 平台收益 = 总收益 * 费率
+           - 店铺收益 = 总收益 - 平台收益
+
+    参数:
+        shangpin_id: 商品ID (int)
+        dingdan_jiage: 订单金额（商品价格）(Decimal 或 数字)
+        dashou_fencheng: 打手分成金额 (Decimal 或 数字)
+
+    返回:
+        (dianpu_id, pingtai_shouyi, dianpu_shouyi) 三元组
+        dianpu_id 可能为 None
+        pingtai_shouyi 必定有值
+        dianpu_shouyi 必定有值
+    """
+    # 类型转换与安全处理
+    dingdan_jiage = Decimal(str(dingdan_jiage)) if dingdan_jiage else Decimal('0.00')
+    dashou_fencheng = Decimal(str(dashou_fencheng)) if dashou_fencheng else Decimal('0.00')
+    if dingdan_jiage < 0:
+        dingdan_jiage = Decimal('0.00')
+    if dashou_fencheng < 0:
+        dashou_fencheng = Decimal('0.00')
+
+    # 计算总收益（可用于抽成的基础）
+    zong_shouyi = dingdan_jiage - dashou_fencheng
+    if zong_shouyi < 0:
+        zong_shouyi = Decimal('0.00')
+
+    # 获取商品信息及所属店铺
+    try:
+        shangpin = Shangpin.objects.select_related('dianpu').only('id', 'dianpu').get(id=shangpin_id)
+    except Shangpin.DoesNotExist:
+        logger.error(f"计算收益失败：商品ID {shangpin_id} 不存在")
+        return None, zong_shouyi, Decimal('0.00')  # 无商品时平台收益为总收益，店铺0
+
+    dianpu_id = shangpin.dianpu_id
+
+    # 无店铺ID：平台拿走全部总收益，店铺收益为0
+    if dianpu_id is None:
+        logger.info(f"商品 {shangpin_id} 未关联店铺，平台收益 = 总收益 {zong_shouyi}")
+        return None, zong_shouyi, Decimal('0.00')
+
+    # 有店铺ID：查询店铺抽成配置
+    try:
+        dianpu = Dianpu.objects.only(
+            'id', 'kaiqi_shouyi_choucheng', 'shouyi_choucheng_feilv'
+        ).get(id=dianpu_id)
+    except Dianpu.DoesNotExist:
+        logger.error(f"计算收益失败：店铺ID {dianpu_id} 不存在")
+        return dianpu_id, zong_shouyi, Decimal('0.00')  # 店铺不存在时平台收益也为总收益
+
+    if dianpu.kaiqi_shouyi_choucheng and dianpu.shouyi_choucheng_feilv is not None:
+        feilv = dianpu.shouyi_choucheng_feilv
+    else:
+        # 从默认配置表获取或创建
+        moren_peizhi, created = DianpuMorenPeizhi.objects.get_or_create(
+            id=1,
+            defaults={
+                'moren_choucheng_feilv': Decimal('0.1000'),  # 默认10%
+                'moren_tixian_xiane': Decimal('1000.00')
+            }
+        )
+        feilv = moren_peizhi.moren_choucheng_feilv
+
+    # 确保费率在合法范围内
+    if feilv is None or feilv < 0:
+        feilv = Decimal('0.0000')
+    if feilv > 1:
+        feilv = Decimal('1.0000')
+
+    # 计算平台收益（费率 * 总收益）
+    pingtai_shouyi = zong_shouyi * feilv
+    # 店铺收益 = 总收益 - 平台收益
+    dianpu_shouyi = zong_shouyi - pingtai_shouyi
+
+    logger.info(
+        f"收益计算: 商品ID={shangpin_id}, 订单金额={dingdan_jiage}, "
+        f"打手分成={dashou_fencheng}, 总收益={zong_shouyi}, 费率={feilv}, "
+        f"平台收益={pingtai_shouyi}, 店铺收益={dianpu_shouyi}"
+    )
+
+    return dianpu_id, pingtai_shouyi, dianpu_shouyi'''
+
+
+
+def update_dianpu_daily_stat(
+    dianpu_id,
+    caozuo_leixing,
+    dingdan_jiage=Decimal('0.00'),
+    dianpu_shouyi=Decimal('0.00'),
+    shangji_dianpu_id=None,          # 新增：上级店铺ID
+    shangji_fenhong=Decimal('0.00')  # 新增：该笔订单给上级的分红
+):
+    """
+    原子更新店铺每日统计数据，结算时同步更新店铺余额，并安全处理上级分红统计。
+
+    参数:
+        dianpu_id: 本店铺ID
+        caozuo_leixing: 1=下单, 2=结算, 3=退款
+        dingdan_jiage: 订单金额
+        dianpu_shouyi: 店铺自身收益
+        shangji_dianpu_id: 上级店铺ID（可选）
+        shangji_fenhong: 给上级的分红金额（可选）
+
+    注意:
+        - 金额自动归一化，负数取0
+        - 使用 select_for_update 行锁保证并发安全
+        - 结算时，本店余额和统计先落定，上级分红统计放在 try 块内，失败不影响本店
+        - 新增字段均包含在统计表中：给上级次数/总额/上级ID，以及作为上级获得次数/总额
+    """
+    # 金额安全处理
+    dingdan_jiage = Decimal(str(dingdan_jiage)) if dingdan_jiage else Decimal('0.00')
+    dianpu_shouyi = Decimal(str(dianpu_shouyi)) if dianpu_shouyi else Decimal('0.00')
+    shangji_fenhong = Decimal(str(shangji_fenhong)) if shangji_fenhong else Decimal('0.00')
+    if dingdan_jiage < 0: dingdan_jiage = Decimal('0.00')
+    if dianpu_shouyi < 0: dianpu_shouyi = Decimal('0.00')
+    if shangji_fenhong < 0: shangji_fenhong = Decimal('0.00')
+
+    today = date.today()
+
+    # 轻量校验店铺存在性
+    if not Dianpu.objects.filter(id=dianpu_id).exists():
+        logger.error(f"店铺ID {dianpu_id} 不存在，统计更新失败")
+        return
+
+    # 开启事务，全部使用行锁
+    with transaction.atomic():
+        # 1. 获取或创建本店今日统计记录并锁定
+        tongji, created = DianpuShouzhiMeiriTongji.objects.select_for_update().get_or_create(
+            dianpu_id=dianpu_id,
+            riqi=today,
+            defaults={
+                'nian': today.year,
+                'yue': today.month,
+                'ri': today.day,
+                'xiadan_zongliang': 0,
+                'xiadan_zonge': Decimal('0.00'),
+                'chengjiao_zongliang': 0,
+                'chengjiao_zonge': Decimal('0.00'),
+                'tuikuan_zongliang': 0,
+                'tuikuan_zonge': Decimal('0.00'),
+                'shouyi_zonge': Decimal('0.00'),
+                # 新增字段默认值
+                'shangji_fenhong_cishu': 0,
+                'shangji_fenhong_zonge': Decimal('0.00'),
+                'gei_shangji_cishu': 0,
+                'gei_shangji_zonge': Decimal('0.00'),
+                'shangji_id': None,
+            }
+        )
+
+        # 构建更新字段字典
+        update_fields_dict = {}
+
+        if caozuo_leixing == 1:  # 下单
+            update_fields_dict['xiadan_zongliang'] = F('xiadan_zongliang') + 1
+            update_fields_dict['xiadan_zonge'] = F('xiadan_zonge') + dingdan_jiage
+
+        elif caozuo_leixing == 2:  # 结算
+            # --- 本店成交统计 ---
+            update_fields_dict['chengjiao_zongliang'] = F('chengjiao_zongliang') + 1
+            update_fields_dict['chengjiao_zonge'] = F('chengjiao_zonge') + dingdan_jiage
+            update_fields_dict['shouyi_zonge'] = F('shouyi_zonge') + dianpu_shouyi
+
+            # --- 更新本店主表余额（加锁） ---
+            try:
+                dianpu_locked = Dianpu.objects.select_for_update().get(id=dianpu_id)
+                dianpu_locked.ketixian_yue = F('ketixian_yue') + dianpu_shouyi
+                dianpu_locked.zhengqu_zonge = F('zhengqu_zonge') + dianpu_shouyi
+                dianpu_locked.save(update_fields=['ketixian_yue', 'zhengqu_zonge', 'update_time'])
+            except Dianpu.DoesNotExist:
+                logger.error(f"结算时店铺 {dianpu_id} 不存在")
+                raise
+
+            # --- 处理给上级的分红（本店作为下级）---
+            if shangji_dianpu_id and shangji_fenhong > 0:
+                # 更新本店统计的“给上级”字段
+                update_fields_dict['gei_shangji_cishu'] = F('gei_shangji_cishu') + 1
+                update_fields_dict['gei_shangji_zonge'] = F('gei_shangji_zonge') + shangji_fenhong
+
+                # 设置当天上级店铺ID（仅当天第一次结算时写入，后续保持不变）
+                current_shangji_id = tongji.shangji_id
+                if current_shangji_id is None:
+                    update_fields_dict['shangji_id'] = shangji_dianpu_id
+                elif current_shangji_id != shangji_dianpu_id:
+                    logger.warning(
+                        f"店铺 {dianpu_id} 当天上级ID不一致，已有 {current_shangji_id}，"
+                        f"新上级 {shangji_dianpu_id}，保持原上级ID"
+                    )
+
+                # --- 更新上级店铺的“作为上级获得”统计（完全隔离保护） ---
+                try:
+                    _update_shangji_gain_stat_within_tx(shangji_dianpu_id, shangji_fenhong)
+                except Exception as e:
+                    logger.error(
+                        f"更新上级店铺 {shangji_dianpu_id} 统计失败，不影响本店: {e}"
+                    )
+
+        elif caozuo_leixing == 3:  # 退款
+            update_fields_dict['tuikuan_zongliang'] = F('tuikuan_zongliang') + 1
+            update_fields_dict['tuikuan_zonge'] = F('tuikuan_zonge') + dingdan_jiage
+        else:
+            logger.warning(f"未知操作类型: {caozuo_leixing}")
+            return
+
+        # 原子更新本店统计字段
+        if update_fields_dict:
+            for field, value in update_fields_dict.items():
+                setattr(tongji, field, value)
+            tongji.save(update_fields=list(update_fields_dict.keys()))
+
+        logger.info(
+            f"店铺统计更新完成: dianpu={dianpu_id}, 操作={caozuo_leixing}, "
+            f"金额={dingdan_jiage}, 店铺收益={dianpu_shouyi}, "
+            f"上级ID={shangji_dianpu_id}, 上级分红={shangji_fenhong}"
+        )
+
+
+def _update_shangji_gain_stat_within_tx(shangji_dianpu_id, fenhong_jine):
+    """
+    在事务内更新上级店铺的“作为上级获得”统计及主表余额。
+    注意：本函数必须由处于同一事务中的 update_dianpu_daily_stat 调用，
+    并且调用方已获取必要的行锁，这里再次加锁不会死锁（按相同顺序加锁）。
+    """
+    today = date.today()
+
+    # 获取或创建上级店铺的今日统计记录并加锁
+    tongji_shangji, _ = DianpuShouzhiMeiriTongji.objects.select_for_update().get_or_create(
+        dianpu_id=shangji_dianpu_id,
+        riqi=today,
+        defaults={
+            'nian': today.year,
+            'yue': today.month,
+            'ri': today.day,
+            'xiadan_zongliang': 0,
+            'xiadan_zonge': Decimal('0.00'),
+            'chengjiao_zongliang': 0,
+            'chengjiao_zonge': Decimal('0.00'),
+            'tuikuan_zongliang': 0,
+            'tuikuan_zonge': Decimal('0.00'),
+            'shouyi_zonge': Decimal('0.00'),
+            'shangji_fenhong_cishu': 0,
+            'shangji_fenhong_zonge': Decimal('0.00'),
+            'gei_shangji_cishu': 0,
+            'gei_shangji_zonge': Decimal('0.00'),
+            'shangji_id': None,
+        }
+    )
+
+    # 更新上级店铺的“作为上级获得”字段
+    tongji_shangji.shangji_fenhong_cishu = F('shangji_fenhong_cishu') + 1
+    tongji_shangji.shangji_fenhong_zonge = F('shangji_fenhong_zonge') + fenhong_jine
+    tongji_shangji.save(update_fields=['shangji_fenhong_cishu', 'shangji_fenhong_zonge', 'update_time'])
+
+    # 更新上级店铺主表的分红余额和累计分红
+    shangji = Dianpu.objects.select_for_update().get(id=shangji_dianpu_id)
+    shangji.shangji_fenhong_leiji = F('shangji_fenhong_leiji') + fenhong_jine
+    shangji.shangji_ketixian_fenhong = F('shangji_ketixian_fenhong') + fenhong_jine
+    shangji.save(update_fields=['shangji_fenhong_leiji', 'shangji_ketixian_fenhong', 'update_time'])
+
+    logger.info(f"上级店铺 {shangji_dianpu_id} 获得分红 +{fenhong_jine}")
+
+
+
+def calculate_pingtai_and_dianpu_shouyi(shangpin_id, dingdan_jiage, dashou_fencheng):
+    """
+    计算平台收益、店铺收益、上级分红
+
+    分配链路（上级分红完全隔离，不影响平台及店铺核心计算）：
+        总收益 = 订单金额 - 打手分成
+        平台抽成 = 总收益 * (店铺开启则用店铺费率，否则用平台默认费率)
+        剩余收益 = 总收益 - 平台抽成
+        上级分红 = 剩余收益 * 本店设置的上级分红费率（若有上级且满足条件）
+        店铺收益 = 剩余收益 - 上级分红
+
+    参数:
+        shangpin_id: 商品ID
+        dingdan_jiage: 订单金额
+        dashou_fencheng: 打手分成金额
+
+    返回:
+        五元组 (dianpu_id, pingtai_shouyi, dianpu_shouyi, shangji_dianpu_id, shangji_fenhong)
+        - dianpu_id: 店铺ID，可能为None
+        - pingtai_shouyi: 平台收益
+        - dianpu_shouyi: 店铺最终收益
+        - shangji_dianpu_id: 上级店铺ID，可能为None
+        - shangji_fenhong: 上级分红金额，默认0.00
+    """
+    # ==================== 金额安全处理 ====================
+    dingdan_jiage = Decimal(str(dingdan_jiage)) if dingdan_jiage else Decimal('0.00')
+    dashou_fencheng = Decimal(str(dashou_fencheng)) if dashou_fencheng else Decimal('0.00')
+    if dingdan_jiage < 0:
+        dingdan_jiage = Decimal('0.00')
+    if dashou_fencheng < 0:
+        dashou_fencheng = Decimal('0.00')
+
+    zong_shouyi = dingdan_jiage - dashou_fencheng
+    if zong_shouyi < 0:
+        zong_shouyi = Decimal('0.00')
+
+    # ==================== 获取商品及店铺 ====================
+    try:
+        shangpin = Shangpin.objects.select_related('dianpu').only('id', 'dianpu').get(id=shangpin_id)
+    except Shangpin.DoesNotExist:
+        logger.error(f"收益计算失败：商品ID {shangpin_id} 不存在")
+        return None, zong_shouyi, Decimal('0.00'), None, Decimal('0.00')
+
+    dianpu_id = shangpin.dianpu_id
+    if dianpu_id is None:
+        logger.info(f"商品 {shangpin_id} 未关联店铺，平台收益={zong_shouyi}")
+        return None, zong_shouyi, Decimal('0.00'), None, Decimal('0.00')
+
+    # ==================== 获取店铺配置 ====================
+    try:
+        dianpu = Dianpu.objects.only(
+            'id', 'kaiqi_shouyi_choucheng', 'shouyi_choucheng_feilv',
+            'yaoqing_dianpu_id', 'fenhong_choucheng_feilv'
+        ).get(id=dianpu_id)
+    except Dianpu.DoesNotExist:
+        logger.error(f"收益计算失败：店铺ID {dianpu_id} 不存在")
+        return dianpu_id, zong_shouyi, Decimal('0.00'), None, Decimal('0.00')
+
+    # ==================== 平台抽成 ====================
+    if dianpu.kaiqi_shouyi_choucheng and dianpu.shouyi_choucheng_feilv is not None:
+        feilv = dianpu.shouyi_choucheng_feilv
+    else:
+        moren_peizhi, created = DianpuMorenPeizhi.objects.get_or_create(
+            id=1,
+            defaults={
+                'moren_choucheng_feilv': Decimal('0.1000'),
+                'moren_tixian_xiane': Decimal('1000.00')
+            }
+        )
+        feilv = moren_peizhi.moren_choucheng_feilv
+    if feilv is None or feilv < 0:
+        feilv = Decimal('0.0000')
+    if feilv > 1:
+        feilv = Decimal('1.0000')
+
+    pingtai_shouyi = zong_shouyi * feilv
+    shengyu = zong_shouyi - pingtai_shouyi
+
+    # ==================== 上级分红（完全隔离，不影响店铺收益） ====================
+    shangji_dianpu_id = dianpu.yaoqing_dianpu_id
+    shangji_fenhong = Decimal('0.00')
+
+    if shangji_dianpu_id and dianpu.fenhong_choucheng_feilv:
+        try:
+            # 检查上级店铺状态
+            shangji = Dianpu.objects.filter(id=shangji_dianpu_id).only('id', 'zhuangtai').first()
+            if shangji and shangji.zhuangtai == 1:
+                fz_rate = dianpu.fenhong_choucheng_feilv
+                if fz_rate and fz_rate > 0:
+                    shangji_fenhong = shengyu * fz_rate
+                    if shangji_fenhong < 0:
+                        shangji_fenhong = Decimal('0.00')
+                    if shangji_fenhong > shengyu:
+                        shangji_fenhong = shengyu
+                    shengyu -= shangji_fenhong
+            else:
+                if shangji:
+                    logger.info(f"上级店铺 {shangji_dianpu_id} 状态非正常，不参与分红")
+                else:
+                    logger.warning(f"上级店铺ID {shangji_dianpu_id} 不存在，不参与分红")
+        except Exception as e:
+            logger.exception(f"上级分红计算异常，忽略: {e}")
+            shangji_fenhong = Decimal('0.00')
+            # 注意：shengyu 未被修改，店铺收益不变
+
+    dianpu_shouyi = shengyu
+
+    logger.info(
+        f"收益计算完成: 商品={shangpin_id}, 总收益={zong_shouyi}, 平台={pingtai_shouyi}, "
+        f"上级ID={shangji_dianpu_id}, 上级分红={shangji_fenhong}, 店铺={dianpu_shouyi}"
+    )
+
+    return dianpu_id, pingtai_shouyi, dianpu_shouyi, shangji_dianpu_id, shangji_fenhong
+
+
+
+
+
+
+
+
+def validate_shangpin_and_dianpu(shangpin_id):
+    """
+    校验商品及关联店铺（区分有无店铺）
+
+    无店铺：仅校验商品是否上架
+    有店铺：校验商品审核、封禁、上架，以及店铺是否封禁
+
+    返回:
+        (True, None, shangpin_obj)   # 通过
+        (False, "错误信息", None)    # 失败
+    """
+    try:
+        shangpin = Shangpin.objects.select_related('dianpu').get(id=shangpin_id)
+    except Shangpin.DoesNotExist:
+        return False, "商品不存在", None
+
+    # 无店铺：只检查上架
+    if not shangpin.dianpu_id:
+        if not shangpin.shangjia_zhuangtai:
+            return False, "商品已下架", None
+        return True, None, shangpin
+
+    # 有店铺：完整校验
+    if not shangpin.shenhe_zhuangtai:
+        return False, "商品未通过平台审核", None
+    if shangpin.fengjin_zhuangtai:
+        return False, "商品已被封禁", None
+    if not shangpin.shangjia_zhuangtai:
+        return False, "商品已下架", None
+
+    try:
+        if shangpin.dianpu.zhuangtai != 1:
+            return False, "店铺已被封禁", None
+    except Exception:
+        return False, "关联店铺异常", None
+
+    return True, None, shangpin
\ No newline at end of file
diff --git a/shangdian/views.py b/shangdian/views.py
new file mode 100644
index 0000000..3c14593
--- /dev/null
+++ b/shangdian/views.py
@@ -0,0 +1,3369 @@
+
+from django.db import models
+
+from utils.oss_utils import upload_to_oss, delete_from_oss
+from yonghu.models import UserMain, UserDashou, UserShangjia, UserGuanshi, UserZuzhang
+from shangdian.models import Dianpu, YonghuDianpuBangding, ShangpinLeixingDianpu, DianpuShangpinShenheShezhi
+from shangpin.models import ShangpinLeixing, ShangpinZhuanqu, Shangpin
+
+
+from rest_framework.permissions import AllowAny
+
+from django.utils import timezone
+from rest_framework_simplejwt.tokens import RefreshToken
+
+
+from yonghu.models import UserMain
+from .models import YonghuPingzheng, Dianpu
+
+
+import logging
+
+# shangdian/views.py 继续添加
+import io
+import time
+import requests
+from django.conf import settings
+from django.core.cache import cache
+from django.db import transaction
+from rest_framework.views import APIView
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework import status
+from .utils import verify_shop_permission
+from .models import Dianpu
+from django.db.models import F
+logger = logging.getLogger(__name__)
+
+
+class BindDianpuView(APIView):
+    """
+    店铺绑定接口
+    接收前端传入的店铺ID，更新用户与店铺的绑定关系
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        dianpu_id = request.data.get('dianpu_id')
+        if not dianpu_id:
+            return Response({'code': 400, 'msg': '店铺ID不能为空'})
+
+        user = request.user
+        if not hasattr(user, 'yonghuid'):
+            return Response({'code': 500, 'msg': '用户身份信息异常'})
+
+        # 先获取 UserMain 对象（不加锁，仅用于校验存在性）
+        try:
+            user_main = UserMain.objects.get(yonghuid=user.yonghuid)
+        except UserMain.DoesNotExist:
+            return Response({'code': 404, 'msg': '用户不存在'})
+
+        # 校验店铺是否存在且状态正常（不加锁）
+        try:
+            dianpu = Dianpu.objects.get(id=dianpu_id)
+        except Dianpu.DoesNotExist:
+            return Response({'code': 404, 'msg': '店铺不存在'})
+
+        if dianpu.zhuangtai != 1:
+            return Response({'code': 200, 'msg': '店铺已被封禁，无法绑定'})
+
+        # 在事务内部进行加锁操作
+        try:
+            with transaction.atomic():
+                # 重新获取加锁的用户对象（确保并发安全）
+                user_main_locked = UserMain.objects.select_for_update().get(yonghuid=user.yonghuid)
+                dianpu_locked = Dianpu.objects.select_for_update().get(id=dianpu_id)
+
+                # 再次校验店铺状态（防止事务期间被修改）
+                if dianpu_locked.zhuangtai != 1:
+                    return Response({'code': 200, 'msg': '店铺已被封禁，无法绑定'})
+
+                # 处理绑定关系
+                try:
+                    existing_binding = YonghuDianpuBangding.objects.select_for_update().get(yonghu=user_main_locked)
+                    old_dianpu = existing_binding.dianpu
+                    if old_dianpu.id == dianpu_locked.id:
+                        return Response({'code': 200, 'msg': '已绑定该店铺'})
+
+                    # 旧店铺绑定人数减1
+                    old_dianpu.bangding_yonghushu = F('bangding_yonghushu') - 1
+                    old_dianpu.save(update_fields=['bangding_yonghushu'])
+
+                    # 更新绑定关系
+                    existing_binding.dianpu = dianpu_locked
+                    existing_binding.save()
+
+                except YonghuDianpuBangding.DoesNotExist:
+                    YonghuDianpuBangding.objects.create(yonghu=user_main_locked, dianpu=dianpu_locked)
+
+                # 新店铺绑定人数加1
+                dianpu_locked.bangding_yonghushu = F('bangding_yonghushu') + 1
+                dianpu_locked.save(update_fields=['bangding_yonghushu'])
+
+            logger.info(f"用户 {user.yonghuid} 绑定店铺 {dianpu_id} 成功")
+            return Response({'code': 200, 'msg': '绑定成功'})
+
+        except Exception as e:
+            logger.exception(f"绑定店铺失败: {e}")
+            return Response({'code': 500, 'msg': '绑定失败，服务器内部错误'})
+
+
+
+
+
+
+
+class ShopGoodsView(APIView):
+    """
+    获取店铺商品数据（类型、专区、商品列表）
+    根据用户绑定店铺状态及身份，返回店铺专属或公共商品
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        user = request.user
+        try:
+            user_main = UserMain.objects.get(yonghuid=user.yonghuid)
+        except UserMain.DoesNotExist:
+            return Response({'code': 404, 'msg': '用户不存在'})
+
+        # 1. 查询用户店铺绑定关系
+        binding = YonghuDianpuBangding.objects.filter(
+            yonghu=user_main
+        ).select_related('dianpu').first()
+
+        # 2. 判断用户是否拥有特殊身份
+        has_special = self._has_special_identity(user_main)
+
+        # 3. 根据绑定关系及店铺状态决定数据获取策略
+        if binding:
+            dianpu = binding.dianpu
+            if dianpu.zhuangtai == 1:
+                # 店铺正常 -> 返回店铺专属商品（需通过平台审核）
+                data = self._get_shop_goods(dianpu)
+            else:
+                # 店铺被封 -> 返回公共商品，有特殊身份则返回审核状态为1的，否则返回2的
+                data = self._get_public_goods(True)
+        else:
+            # 无绑定店铺，根据身份决定返回公共商品的审核状态
+            data = self._get_public_goods(has_special)
+
+        return Response({'code': 200, 'data': data})
+
+    def _has_special_identity(self, user_main):
+        """判断用户是否拥有打手/商家/管事/组长任一身份"""
+        return (UserDashou.objects.filter(user=user_main).exists() or
+                UserShangjia.objects.filter(user=user_main).exists() or
+                UserGuanshi.objects.filter(user=user_main).exists() or
+                UserZuzhang.objects.filter(user=user_main).exists())
+
+    def _get_shop_goods(self, dianpu):
+        """
+        获取店铺专属商品
+        类型、专区、商品均从店铺相关表中获取，且需通过平台审核（shenhe_zhuangtai=True）
+        """
+        # 1. 店铺商品类型：未封禁、已上架、平台审核通过
+        leixing_queryset = ShangpinLeixingDianpu.objects.filter(
+            dianpu=dianpu,
+            fengjin_zhuangtai=False,
+            shangjia_zhuangtai=True,
+            shenhe_zhuangtai=True          # 🔥 必须通过平台审核
+        ).select_related('gonggong_leixing').order_by('-paixu', 'id')
+
+        leixing_data = []
+        for lx in leixing_queryset:
+            leixing_data.append({
+                'id': lx.id,                # 店铺类型ID，前端归类用
+                'jieshao': lx.jieshao,
+                'tupian_url': lx.tupian_url,
+                'paixu': lx.paixu
+            })
+
+        leixing_ids = [lx['id'] for lx in leixing_data]
+
+        # 2. 专区：根据店铺和店铺类型ID，未封禁、已上架
+        if leixing_ids:
+            zhuanqu_queryset = ShangpinZhuanqu.objects.filter(
+                dianpu=dianpu,
+                dianpu_leixing_id__in=leixing_ids,
+                fengjin_zhuangtai=False,
+                shangjia_zhuangtai=True
+            ).order_by('-paixu', 'id')
+        else:
+            zhuanqu_queryset = ShangpinZhuanqu.objects.none()
+
+        zhuanqu_data = []
+        for zq in zhuanqu_queryset:
+            zhuanqu_data.append({
+                'id': zq.id,
+                'mingzi': zq.mingzi,
+                'leixing_id': zq.dianpu_leixing_id,   # 对应店铺类型ID
+                'paixu': zq.paixu
+            })
+
+        # 3. 商品：根据店铺、店铺类型、专区，未封禁、已上架、平台审核通过、原有审核状态为正常
+        zhuanqu_ids = [zq['id'] for zq in zhuanqu_data]
+        if zhuanqu_ids:
+            shangpin_queryset = Shangpin.objects.filter(
+                dianpu=dianpu,
+                dianpu_leixing_id__in=leixing_ids,
+                zhuanqu_id__in=zhuanqu_ids,
+                fengjin_zhuangtai=False,
+                shangjia_zhuangtai=True,
+                shenhe_zhuangtai=True,      # 🔥 平台审核通过
+                shenhezhuangtai=1           # 原有审核状态：正常
+            ).values(
+                'id', 'biaoqian', 'jiage', 'tupian_url', 'duiwai_xiaoliang', 'paixu',
+                'dianpu_leixing_id', 'zhuanqu_id'
+            ).order_by('-paixu', 'id')
+
+            shangpin_data = list(shangpin_queryset)
+            # 字段映射：前端统一使用 leixing_id
+            for sp in shangpin_data:
+                sp['leixing_id'] = sp.pop('dianpu_leixing_id')
+        else:
+            shangpin_data = []
+
+        return {
+            'shangpinleixing': leixing_data,
+            'shangpinzhuanqu': zhuanqu_data,
+            'shangpinliebiao': shangpin_data
+        }
+
+    def _get_public_goods(self, use_audit_status_one=True):
+        """
+        获取公共商品
+        类型、专区、商品均从公共表获取。
+        - 必须满足 dianpu 为空且 dianpu_leixing 为空（即纯公共数据）。
+        - 审核状态：若 use_audit_status_one=True，则返回 shenhezhuangtai=1 的数据；
+          否则返回 shenhezhuangtai=2 的数据（审核专用）。
+        """
+        target_shenhe = 1 if use_audit_status_one else 2
+
+        # 1. 公共商品类型：原有审核状态为 target_shenhe
+        leixing_queryset = ShangpinLeixing.objects.filter(
+            shenhezhuangtai=target_shenhe
+        ).order_by('-paixu', 'id')
+
+        leixing_data = []
+        for lx in leixing_queryset:
+            leixing_data.append({
+                'id': lx.id,
+                'jieshao': lx.jieshao,
+                'tupian_url': lx.tupian_url,
+                'paixu': lx.paixu
+            })
+
+        visible_leixing_ids = [lx['id'] for lx in leixing_data]
+
+        # 2. 专区：dianpu 为空，且 dianpu_leixing 为空，leixing_id 在可见范围内，原有审核状态为 target_shenhe
+        if visible_leixing_ids:
+            zhuanqu_queryset = ShangpinZhuanqu.objects.filter(
+                dianpu__isnull=True,
+                dianpu_leixing__isnull=True,        # 🔥 必须为空
+                leixing_id__in=visible_leixing_ids,
+                shenhezhuangtai=target_shenhe
+            ).order_by('-paixu', 'id')
+        else:
+            zhuanqu_queryset = ShangpinZhuanqu.objects.none()
+
+        zhuanqu_data = []
+        for zq in zhuanqu_queryset:
+            zhuanqu_data.append({
+                'id': zq.id,
+                'mingzi': zq.mingzi,
+                'leixing_id': zq.leixing_id,
+                'paixu': zq.paixu
+            })
+
+        # 3. 商品：dianpu 为空，dianpu_leixing 为空，专区在可见范围内，原有审核状态为 target_shenhe
+        zhuanqu_ids = [zq['id'] for zq in zhuanqu_data]
+        if zhuanqu_ids:
+            shangpin_queryset = Shangpin.objects.filter(
+                dianpu__isnull=True,
+                dianpu_leixing__isnull=True,        # 🔥 必须为空
+                leixing_id__in=visible_leixing_ids,
+                zhuanqu_id__in=zhuanqu_ids,
+                shenhezhuangtai=target_shenhe
+            ).values(
+                'id', 'biaoqian', 'jiage', 'tupian_url', 'duiwai_xiaoliang', 'paixu',
+                'leixing_id', 'zhuanqu_id'
+            ).order_by('-paixu', 'id')
+            shangpin_data = list(shangpin_queryset)
+        else:
+            shangpin_data = []
+
+        return {
+            'shangpinleixing': leixing_data,
+            'shangpinzhuanqu': zhuanqu_data,
+            'shangpinliebiao': shangpin_data
+        }
+
+
+class ShangdianLoginView(APIView):
+    """
+    商家后台登录接口（通过凭证直接获取店铺）
+    POST /shangdian/login
+    请求参数：
+        yonghuid  : 用户ID（7位）
+        zhanghao  : 登录账号
+        mima      : 密码
+    返回数据：
+        code: 0, data: {
+            token: "jwt_token",
+            yonghuid: "1234567",
+            dianpu_mingcheng: "店铺名称",
+            dianpu_touxiang: "头像相对URL",
+            erweima_url: "二维码相对URL"
+        }
+    """
+    permission_classes = [AllowAny]
+
+    def post(self, request):
+        # 1. 获取请求参数
+        yonghuid = request.data.get('yonghuid', '').strip()
+        zhanghao = request.data.get('zhanghao', '').strip()
+        mima = request.data.get('mima', '').strip()
+
+        # 2. 参数完整性校验
+        if not yonghuid or not zhanghao or not mima:
+            return Response({'code': 400, 'msg': '用户ID、账号、密码均不能为空'})
+
+        # 3. 验证用户主表是否存在
+        try:
+            user_main = UserMain.objects.get(yonghuid=yonghuid)
+        except UserMain.DoesNotExist:
+            logger.warning(f"登录失败：用户ID不存在 - {yonghuid}")
+            return Response({'code': 404, 'msg': '账号或密码错误'})
+
+        # 4. 通过用户ID + 账号查询凭证表
+        try:
+            pingzheng = YonghuPingzheng.objects.get(
+                yonghu=yonghuid,
+                zhanghao=zhanghao,
+                is_active=True
+            )
+        except YonghuPingzheng.DoesNotExist:
+            logger.warning(f"登录失败：账号或密码错误 - 用户ID:{yonghuid}, 账号:{zhanghao}")
+            return Response({'code': 401, 'msg': '账号或密码错误'})
+
+        # 5. 校验密码
+        if pingzheng.mima != mima:
+            logger.warning(f"登录失败：密码错误 - 用户ID:{yonghuid}, 账号:{zhanghao}")
+            return Response({'code': 401, 'msg': '账号或密码错误'})
+
+        # 6. 【修改点】通过凭证直接获取关联的店铺（利用 OneToOneField 反向关系）
+        try:
+            dianpu = pingzheng.dianpu
+        except Dianpu.DoesNotExist:
+            logger.error(f"登录异常：凭证 {zhanghao} 未关联任何店铺")
+            return Response({'code': 403, 'msg': '您尚未关联店铺，请联系管理员'})
+
+        # 7. 检查店铺状态
+        if dianpu.zhuangtai != 1:
+            logger.warning(f"登录失败：店铺已被封禁 - 店铺ID:{dianpu.id}, 用户ID:{yonghuid}")
+            return Response({'code': 403, 'msg': '店铺已被封禁，无法登录'})
+
+        # 8. 生成 JWT Token
+        refresh = RefreshToken.for_user(user_main)
+        token = str(refresh.access_token)
+
+        # 9. 更新最后登录时间
+        user_main.last_login_time = timezone.now()
+        user_main.save(update_fields=['last_login_time'])
+
+        # 10. 构造返回数据
+        data = {
+            'token': token,
+            'yonghuid': user_main.yonghuid,
+            'dianpu_mingcheng': dianpu.dianpu_mingcheng,
+            'dianpu_touxiang': dianpu.dianpu_touxiang or '',
+            'erweima_url': dianpu.erweima_url or ''
+        }
+
+        logger.info(f"商家登录成功：用户ID {yonghuid} - 店铺 {dianpu.dianpu_mingcheng}")
+        return Response({'code': 0, 'msg': '登录成功', 'data': data})
+
+
+
+
+
+
+'''class ShangdianLoginView(APIView):
+    """
+    商家后台登录接口（安全修正版）
+    POST /shangdian/login
+    请求参数：
+        yonghuid  : 用户ID（7位）
+        zhanghao  : 登录账号
+        mima      : 密码
+    返回数据：
+        code: 0, data: {
+            token: "jwt_token",
+            yonghuid: "1234567",
+            dianpu_mingcheng: "店铺名称",
+            dianpu_touxiang: "头像相对URL",
+            erweima_url: "二维码相对URL"
+        }
+    """
+    permission_classes = [AllowAny]
+
+    def post(self, request):
+        # 1. 获取请求参数
+        yonghuid = request.data.get('yonghuid', '').strip()
+        zhanghao = request.data.get('zhanghao', '').strip()
+        mima = request.data.get('mima', '').strip()
+
+        # 2. 参数完整性校验
+        if not yonghuid or not zhanghao or not mima:
+            return Response({'code': 400, 'msg': '用户ID、账号、密码均不能为空'})
+
+        # 3. 【第一步】验证用户主表是否存在
+        try:
+            user_main = UserMain.objects.get(yonghuid=yonghuid)
+        except UserMain.DoesNotExist:
+            logger.warning(f"登录失败：用户ID不存在 - {yonghuid}")
+            return Response({'code': 404, 'msg': '用户不存在'})
+
+        # 4. 【第二步】通过用户ID + 账号查询凭证表（防止用他人账号登录）
+        try:
+            pingzheng = YonghuPingzheng.objects.get(
+                yonghu=yonghuid,           # 关键：必须匹配当前用户ID
+                zhanghao=zhanghao,         # 必须匹配账号
+                is_active=True             # 必须启用
+            )
+        except YonghuPingzheng.DoesNotExist:
+            logger.warning(f"登录失败：账号或密码错误 - 用户ID:{yonghuid}, 账号:{zhanghao}")
+            return Response({'code': 401, 'msg': '账号或密码错误'})
+
+        # 5. 校验密码（明文对比，后续可改为哈希）
+        if pingzheng.mima != mima:
+            logger.warning(f"登录失败：密码错误 - 用户ID:{yonghuid}, 账号:{zhanghao}")
+            return Response({'code': 401, 'msg': '账号或密码错误'})
+
+        # 6. 【第三步】通过用户ID查询绑定关系表，获取店铺ID
+        try:
+            binding = YonghuDianpuBangding.objects.select_related('dianpu').get(yonghu=user_main)
+            dianpu = binding.dianpu
+        except YonghuDianpuBangding.DoesNotExist:
+            logger.error(f"登录异常：用户 {yonghuid} 未绑定任何店铺")
+            return Response({'code': 403, 'msg': '您尚未绑定任何店铺，请联系管理员'})
+
+        # 7. 【第四步】检查店铺状态
+        if dianpu.zhuangtai != 1:
+            logger.warning(f"登录失败：店铺已被封禁 - 店铺ID:{dianpu.id}, 用户ID:{yonghuid}")
+            return Response({'code': 403, 'msg': '店铺已被封禁，无法登录'})
+
+        # 8. 生成 JWT Token（关联 UserMain）
+        refresh = RefreshToken.for_user(user_main)
+        token = str(refresh.access_token)
+
+        # 9. 更新最后登录时间
+        user_main.last_login_time = timezone.now()
+        user_main.save(update_fields=['last_login_time'])
+
+        # 10. 构造返回数据
+        data = {
+            'token': token,
+            'yonghuid': user_main.yonghuid,
+            'dianpu_mingcheng': dianpu.dianpu_mingcheng,
+            'dianpu_touxiang': dianpu.dianpu_touxiang or '',
+            'erweima_url': dianpu.erweima_url or ''
+        }
+
+        logger.info(f"商家登录成功：用户ID {yonghuid} - 店铺 {dianpu.dianpu_mingcheng}")
+        return Response({'code': 0, 'msg': '登录成功', 'data': data})'''
+
+
+
+# shangdian/views.py 追加
+from django.db.models import Sum
+
+from shangdian.models import DianpuShouzhiMeiriTongji
+
+class DianpuShouzhiTongjiView(APIView):
+    """
+    店铺每日收支统计接口（支持按日、月、年聚合）
+    URL: /dianpu/dpsztj
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 身份验证
+        frontend_user_id = request.data.get('userId')
+        if not frontend_user_id:
+            return Response({'code': 400, 'msg': '缺少 userId'})
+
+        dianpu, error = verify_shop_permission(request, frontend_user_id)
+        if error:
+            return error
+
+        granularity = request.data.get('granularity', 'day')  # day / month / year
+        year = request.data.get('year')
+        month = request.data.get('month')
+
+        # 查询当前店铺的统计记录
+        qs = DianpuShouzhiMeiriTongji.objects.filter(dianpu_id=dianpu.id)
+
+        if granularity == 'day':
+            if not year or not month:
+                return Response({'code': 400, 'msg': '日颗粒度需要提供年份和月份'})
+            try:
+                year = int(year)
+                month = int(month)
+            except (TypeError, ValueError):
+                return Response({'code': 400, 'msg': '年份或月份格式错误'})
+
+            # 取出该月每一天的数据，并按日排序
+            daily_data = qs.filter(nian=year, yue=month).values('ri').annotate(
+                xiadan_zongliang=Sum('xiadan_zongliang'),
+                xiadan_zonge=Sum('xiadan_zonge'),
+                chengjiao_zongliang=Sum('chengjiao_zongliang'),
+                chengjiao_zonge=Sum('chengjiao_zonge'),
+                tuikuan_zongliang=Sum('tuikuan_zongliang'),
+                tuikuan_zonge=Sum('tuikuan_zonge'),
+                shouyi_zonge=Sum('shouyi_zonge'),
+            ).order_by('ri')
+
+            # 补全缺失的日期（默认值为0）
+            import calendar
+            days_in_month = calendar.monthrange(year, month)[1]
+            result = []
+            for day in range(1, days_in_month + 1):
+                found = next((item for item in daily_data if item['ri'] == day), None)
+                if found:
+                    result.append(found)
+                else:
+                    result.append({
+                        'ri': day,
+                        'xiadan_zongliang': 0, 'xiadan_zonge': 0,
+                        'chengjiao_zongliang': 0, 'chengjiao_zonge': 0,
+                        'tuikuan_zongliang': 0, 'tuikuan_zonge': 0,
+                        'shouyi_zonge': 0,
+                    })
+            return Response({'code': 0, 'data': result, 'type': 'day'})
+
+        elif granularity == 'month':
+            if not year:
+                return Response({'code': 400, 'msg': '月颗粒度需要提供年份'})
+            try:
+                year = int(year)
+            except (TypeError, ValueError):
+                return Response({'code': 400, 'msg': '年份格式错误'})
+
+            # 按月份聚合
+            monthly_data = qs.filter(nian=year).values('yue').annotate(
+                xiadan_zongliang=Sum('xiadan_zongliang'),
+                xiadan_zonge=Sum('xiadan_zonge'),
+                chengjiao_zongliang=Sum('chengjiao_zongliang'),
+                chengjiao_zonge=Sum('chengjiao_zonge'),
+                tuikuan_zongliang=Sum('tuikuan_zongliang'),
+                tuikuan_zonge=Sum('tuikuan_zonge'),
+                shouyi_zonge=Sum('shouyi_zonge'),
+            ).order_by('yue')
+
+            # 补全 1~12 月
+            result = []
+            for m in range(1, 13):
+                found = next((item for item in monthly_data if item['yue'] == m), None)
+                if found:
+                    result.append(found)
+                else:
+                    result.append({
+                        'yue': m,
+                        'xiadan_zongliang': 0, 'xiadan_zonge': 0,
+                        'chengjiao_zongliang': 0, 'chengjiao_zonge': 0,
+                        'tuikuan_zongliang': 0, 'tuikuan_zonge': 0,
+                        'shouyi_zonge': 0,
+                    })
+            return Response({'code': 0, 'data': result, 'type': 'month'})
+
+        elif granularity == 'year':
+            # 按年份聚合
+            yearly_data = qs.values('nian').annotate(
+                xiadan_zongliang=Sum('xiadan_zongliang'),
+                xiadan_zonge=Sum('xiadan_zonge'),
+                chengjiao_zongliang=Sum('chengjiao_zongliang'),
+                chengjiao_zonge=Sum('chengjiao_zonge'),
+                tuikuan_zongliang=Sum('tuikuan_zongliang'),
+                tuikuan_zonge=Sum('tuikuan_zonge'),
+                shouyi_zonge=Sum('shouyi_zonge'),
+            ).order_by('nian')
+            return Response({'code': 0, 'data': list(yearly_data), 'type': 'year'})
+
+        else:
+            return Response({'code': 400, 'msg': '无效的颗粒度'})
+
+
+class ShopOverviewView(APIView):
+    """
+    店铺概览数据接口
+    URL: /shangdian/sjdpgl
+    Method: POST
+    权限: JWT认证
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 从请求体中获取前端传递的 userId（用于防越权）
+        frontend_user_id = request.data.get('userId')
+        if not frontend_user_id:
+            return Response(
+                {'code': 400, 'msg': '缺少必要参数 userId'}
+            )
+
+        # 调用公共验证方法
+        dianpu, error_response = verify_shop_permission(request, frontend_user_id)
+        if error_response:
+            return error_response
+
+        # 验证通过，构造返回数据（新增字段，其余保持不变）
+        data = {
+            'id': dianpu.id,
+            'dianpu_mingcheng': dianpu.dianpu_mingcheng,
+            'dianpu_touxiang': dianpu.dianpu_touxiang or '',
+            'lianxi_dianhua': dianpu.lianxi_dianhua or '',
+            'weixinhao': dianpu.weixinhao or '',
+            'zhuangtai': dianpu.zhuangtai,
+            'bangding_yonghushu': dianpu.bangding_yonghushu,
+            'erweima_url': dianpu.erweima_url or '',
+            'create_time': dianpu.create_time.isoformat() if dianpu.create_time else '',
+            'update_time': dianpu.update_time.isoformat() if dianpu.update_time else '',
+            # 新增字段
+            'kaiqi_shouyi_choucheng': dianpu.kaiqi_shouyi_choucheng,
+            'shouyi_choucheng_feilv': float(dianpu.shouyi_choucheng_feilv) if dianpu.shouyi_choucheng_feilv else 0.0,
+            'ketixian_yue': float(dianpu.ketixian_yue),
+            'zhengqu_zonge': float(dianpu.zhengqu_zonge),
+            'meiri_tixian_xiane': float(dianpu.meiri_tixian_xiane) if dianpu.meiri_tixian_xiane else 0.0,
+            'kaiqi_meiri_xiane': dianpu.kaiqi_meiri_xiane,
+        }
+
+        return Response({
+            'code': 0,
+            'msg': 'success',
+            'data': data
+        })
+
+
+
+# 新增导入
+from django.http import HttpResponse
+from utils.oss_utils import get_oss_client   # 使用您已有的 COS 客户端获取方法
+
+class QrcodeDownloadView(APIView):
+    """
+    店铺二维码下载接口（通过后端代理下载，解决跨域限制）
+    URL: /shangdian/xzewm?dianpu_id=xx
+    权限: JWT认证 + 店铺归属验证
+    """
+    permission_classes = [IsAuthenticated]
+
+    def get(self, request):
+        # 1. 身份验证与店铺校验
+        frontend_user_id = request.GET.get('userId')   # 前端通过查询参数传递 userId
+        if not frontend_user_id:
+            return Response({'code': 400, 'msg': '缺少必要参数 userId'}, status=400)
+
+        dianpu, error_response = verify_shop_permission(request, frontend_user_id)
+        if error_response:
+            return error_response
+
+        # 2. 获取店铺的二维码相对路径
+        erweima_relative_url = dianpu.erweima_url
+        if not erweima_relative_url:
+            return HttpResponse('店铺暂无二维码', status=404)
+
+        # 3. 拼接 OSS 完整访问地址（使用 settings 中的域名）
+        oss_domain = getattr(settings, 'COS_DOMAIN', '')
+        if not oss_domain:
+            logger.error("COS_DOMAIN 未配置")
+            return HttpResponse('OSS域名未配置', status=500)
+
+        image_url = oss_domain.rstrip('/') + '/' + erweima_relative_url.lstrip('/')
+
+        # 4. 从腾讯云 COS 获取图片内容
+        try:
+            client = get_oss_client()
+            bucket = getattr(settings, 'COS_BUCKET', '')
+            response = client.get_object(Bucket=bucket, Key=erweima_relative_url)
+            image_data = response['Body'].get_raw_stream().read()
+        except Exception as e:
+            logger.exception("从COS获取二维码失败")
+            return HttpResponse('下载失败，请稍后重试', status=502)
+
+        # 5. 构造下载响应，强制浏览器保存为文件
+        filename = f"店铺二维码_{dianpu.dianpu_mingcheng}.png"
+        response = HttpResponse(image_data, content_type='image/png')
+        response['Content-Disposition'] = f'attachment; filename="{filename}"'
+        response['Content-Length'] = str(len(image_data))
+        return response
+
+
+class ShopQrcodeView(APIView):
+    """
+    店铺专属二维码生成/更新接口
+    URL: /shangdian/sdscdpm
+    Method: POST
+    权限: JWT认证
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 获取前端传递的 userId
+        frontend_user_id = request.data.get('userId')
+        if not frontend_user_id:
+            return Response(
+                {'code': 400, 'msg': '缺少必要参数 userId'},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # 公共验证
+        dianpu, error_response = verify_shop_permission(request, frontend_user_id)
+        if error_response:
+            return error_response
+
+        # 获取缓存的微信 access_token
+        access_token = self._get_wx_access_token()
+        if not access_token:
+            return Response(
+                {'code': 500, 'msg': '获取微信 access_token 失败'},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+        # 构造小程序码请求参数
+        # 注意：scene 最大32个字符，我们使用店铺ID
+        scene = str(dianpu.id)
+        page_path = "pages/index/index"  # 前端小程序首页路径
+        wx_url = f'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token={access_token}'
+        post_data = {
+            'scene': scene,
+            'page': page_path,
+            'width': 430,
+            'auto_color': False,
+            'line_color': {'r': 0, 'g': 0, 'b': 0},
+        }
+
+        # 调用微信接口生成小程序码
+        try:
+            wx_resp = requests.post(wx_url, json=post_data, timeout=10)
+        except Exception as e:
+            logger.error(f"请求微信生成二维码接口异常: {e}")
+            return Response(
+                {'code': 500, 'msg': '调用微信服务失败'},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+        # 判断返回是否为图片
+        if wx_resp.status_code != 200 or 'image' not in wx_resp.headers.get('content-type', ''):
+            error_info = wx_resp.json() if wx_resp.headers.get('content-type') == 'application/json' else {}
+            errmsg = error_info.get('errmsg', '未知错误')
+            logger.error(f"微信生成二维码失败: {errmsg}")
+            return Response(
+                {'code': 500, 'msg': f'生成二维码失败: {errmsg}'},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+        # 构造文件名和 COS 路径
+        timestamp = int(time.time())
+        # 三层文件夹结构: dianpu/shangjiadianpu/dianpuerweima/
+        filename = f"dianpu_{dianpu.id}_{timestamp}.png"
+        oss_path = f"dianpu/shangjiadianpu/dianpuerweima/{filename}"
+        file_obj = io.BytesIO(wx_resp.content)
+
+        # 上传到 COS
+        try:
+            full_url = upload_to_oss(file_obj, oss_path)
+        except Exception as e:
+            logger.error(f"上传二维码到 COS 失败: {e}")
+            return Response(
+                {'code': 500, 'msg': '图片上传失败'},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+        if not full_url:
+            return Response(
+                {'code': 500, 'msg': '图片上传失败'},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+        # 提取相对路径（根据您的 upload_to_oss 返回值格式调整）
+        cos_domain = getattr(settings, 'COS_DOMAIN', '')
+        if cos_domain and full_url.startswith(cos_domain):
+            relative_path = full_url[len(cos_domain):].lstrip('/')
+        else:
+            relative_path = oss_path
+
+        # 删除旧二维码文件（如果存在）
+        old_relative_path = dianpu.erweima_url
+        if old_relative_path:
+            try:
+                delete_from_oss(old_relative_path)
+            except Exception as e:
+                logger.warning(f"删除旧二维码文件失败: {old_relative_path}, 错误: {e}")
+
+        # 更新数据库
+        with transaction.atomic():
+            dianpu.erweima_url = relative_path
+            dianpu.save(update_fields=['erweima_url', 'update_time'])
+
+        return Response({
+            'code': 0,
+            'msg': 'success',
+            'data': {'erweima_url': relative_path}
+        })
+
+    def _get_wx_access_token(self):
+        """
+        获取微信小程序 access_token，带缓存
+        缓存键: wx_mini_access_token
+        """
+        cache_key = 'wx_mini_access_token'
+        token = cache.get(cache_key)
+        if token:
+            return token
+
+        appid = getattr(settings, 'WEIXIN_APPID', '')
+        secret = getattr(settings, 'WEIXIN_SECRET', '')
+        if not appid or not secret:
+            logger.error("微信小程序 AppID 或 Secret 未配置")
+            return None
+
+        url = f'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={appid}&secret={secret}'
+        try:
+            resp = requests.get(url, timeout=5)
+            data = resp.json()
+            token = data.get('access_token')
+            expires_in = data.get('expires_in', 7200)
+            if token:
+                # 提前200秒过期，防止边界情况
+                cache.set(cache_key, token, expires_in - 200)
+            return token
+        except Exception as e:
+            logger.error(f"获取微信 access_token 异常: {e}")
+            return None
+
+
+
+
+from django.db.models import Count
+from rest_framework.views import APIView
+
+from shangpin.models import ShangpinLeixing
+
+
+class ShopProductConfigView(APIView):
+    """
+    获取商品发布所需配置：公共类型、店铺商品类型、专区及各自商品数量
+    URL: /shangdian/dphqspxx
+    权限: JWT认证 + 店铺归属验证
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 1. 身份验证，获取店铺对象
+        frontend_user_id = request.data.get('userId')
+        if not frontend_user_id:
+            return Response({'code': 400, 'msg': '缺少必要参数 userId'})
+
+        dianpu, error = verify_shop_permission(request, frontend_user_id)
+        if error:
+            return error
+
+        # ---------- 2. 公共商品类型（需审核正常） ----------
+        try:
+            public_types_qs = ShangpinLeixing.objects.filter(shenhezhuangtai=1).values(
+                'id', 'jieshao', 'tupian_url'
+            )
+            public_types = [{
+                'id': pt['id'],
+                'jieshao': pt['jieshao'] or '',
+                'tupian_url': pt['tupian_url'] or '',
+            } for pt in public_types_qs]
+        except Exception as e:
+            logger.exception("查询公共商品类型失败")
+            return Response({'code': 500, 'msg': '服务器错误'})
+
+        # ---------- 3. 店铺商品类型 ----------
+        try:
+            shop_types = ShangpinLeixingDianpu.objects.filter(
+                dianpu_id=dianpu.id
+            ).select_related('gonggong_leixing').order_by('-paixu')
+        except Exception as e:
+            logger.exception("查询店铺商品类型失败")
+            return Response({'code': 500, 'msg': '服务器错误'})
+
+        type_ids = []
+        shop_product_types = []
+        for t in shop_types:
+            shop_product_types.append({
+                'id': t.id,
+                'jieshao': t.jieshao or '',
+                'tupian_url': t.tupian_url or '',
+                'paixu': t.paixu,
+                'shangjia_zhuangtai': t.shangjia_zhuangtai,
+                'fengjin_zhuangtai': t.fengjin_zhuangtai,
+                'shenhe_zhuangtai': t.shenhe_zhuangtai,
+                'gonggong_leixing_id': t.gonggong_leixing_id,
+            })
+            type_ids.append(t.id)
+
+        # ---------- 4. 各类型商品数量统计 ----------
+        type_product_counts = {}
+        if type_ids:
+            counts = Shangpin.objects.filter(
+                dianpu_id=dianpu.id,
+                dianpu_leixing_id__in=type_ids
+            ).values('dianpu_leixing_id').annotate(cnt=Count('id'))
+            type_product_counts = {item['dianpu_leixing_id']: item['cnt'] for item in counts}
+
+        # ---------- 5. 专区列表 ----------
+        try:
+            zhuanqu_qs = ShangpinZhuanqu.objects.filter(
+                dianpu_id=dianpu.id
+            ).order_by('-paixu').values(
+                'id', 'mingzi', 'paixu', 'shangjia_zhuangtai',
+                'fengjin_zhuangtai', 'dianpu_leixing_id'
+            )
+            zhuanqu_list = []
+            zhuanqu_ids = []
+            for zq in zhuanqu_qs:
+                zhuanqu_list.append({
+                    'id': zq['id'],
+                    'mingzi': zq['mingzi'] or '',
+                    'paixu': zq['paixu'],
+                    'shangjia_zhuangtai': zq['shangjia_zhuangtai'],
+                    'fengjin_zhuangtai': zq['fengjin_zhuangtai'],
+                    'dianpu_leixing_id': zq['dianpu_leixing_id'],
+                })
+                zhuanqu_ids.append(zq['id'])
+        except Exception as e:
+            logger.exception("查询专区失败")
+            return Response({'code': 500, 'msg': '服务器错误'})
+
+        # ---------- 6. 各专区商品数量统计 ----------
+        zhuanqu_product_counts = {}
+        if zhuanqu_ids:
+            counts = Shangpin.objects.filter(
+                dianpu_id=dianpu.id,
+                zhuanqu_id__in=zhuanqu_ids
+            ).values('zhuanqu_id').annotate(cnt=Count('id'))
+            zhuanqu_product_counts = {item['zhuanqu_id']: item['cnt'] for item in counts}
+
+        return Response({
+            'code': 0,
+            'msg': 'success',
+            'data': {
+                'public_types': public_types,
+                'shop_product_types': shop_product_types,
+                'zhuanqu_list': zhuanqu_list,
+                'type_product_counts': type_product_counts,
+                'zhuanqu_product_counts': zhuanqu_product_counts,
+            }
+        })
+
+
+from django.db import transaction
+from utils.oss_utils import delete_from_oss   # 引入文件删除工具
+
+# shangdian/views.py
+import logging
+from django.db import models, transaction
+
+
+
+class ShopProductModifyView(APIView):
+    """店铺商品类型与专区管理（增、改、删）"""
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            frontend_user_id = request.data.get('userId') or request.POST.get('userId')
+            if not frontend_user_id:
+                return Response({'code': 400, 'msg': '缺少必要参数 userId'})
+
+            dianpu, error = verify_shop_permission(request, frontend_user_id)
+            if error:
+                return error
+
+            action = request.data.get('action') or request.POST.get('action')
+            if not action:
+                return Response({'code': 400, 'msg': '缺少操作类型 action'})
+
+            handlers = {
+                'add_type': self._add_type,
+                'update_type': self._update_type,
+                'delete_type': self._delete_type,
+                'add_zhuanqu': self._add_zhuanqu,
+                'update_zhuanqu': self._update_zhuanqu,
+                'delete_zhuanqu': self._delete_zhuanqu,
+            }
+            handler = handlers.get(action)
+            if not handler:
+                return Response({'code': 400, 'msg': '不支持的操作类型'})
+
+            return handler(dianpu, request)
+
+        except Exception as e:
+            logger.exception("ShopProductModifyView 全局异常")
+            return Response({'code': 500, 'msg': '服务器内部错误'})
+
+    # ---------- 商品类型操作 ----------
+    @transaction.atomic
+    def _add_type(self, dianpu, request):
+        """添加店铺商品类型"""
+        try:
+            jieshao = request.data.get('jieshao') or request.POST.get('jieshao')
+            gonggong_leixing_id = request.data.get('gonggong_leixing_id') or request.POST.get('gonggong_leixing_id')
+            paixu = request.data.get('paixu', 0) or request.POST.get('paixu', 0)
+
+            if not jieshao or not gonggong_leixing_id:
+                return Response({'code': 400, 'msg': '缺少介绍或公共类型ID'})
+
+            # 验证公共类型存在且正常
+            if not ShangpinLeixing.objects.filter(id=gonggong_leixing_id, shenhezhuangtai=1).exists():
+                return Response({'code': 400, 'msg': '所选公共商品类型无效'})
+
+            image_file = request.FILES.get('image')
+            if not image_file:
+                return Response({'code': 400, 'msg': '必须上传类型图片'})
+
+            # 上传图片
+            file_path = f"dianpu/shangpin/shangpinleixing/{dianpu.id}_{int(time.time())}.png"
+            full_url = upload_to_oss(image_file, file_path)
+            if not full_url:
+                return Response({'code': 500, 'msg': '图片上传失败'})
+
+            # 提取相对路径
+            tupian_url = full_url.replace(settings.COS_DOMAIN.rstrip('/') + '/', '', 1)
+
+            # 审核状态
+            audit_config = DianpuShangpinShenheShezhi.objects.filter(id=1).first()
+            shenhe_status = not (audit_config and audit_config.kaiqi_shenhe)
+
+            ShangpinLeixingDianpu.objects.create(
+                dianpu_id=dianpu.id,
+                gonggong_leixing_id=gonggong_leixing_id,
+                jieshao=jieshao,
+                tupian_url=tupian_url,
+                paixu=paixu,
+                shangjia_zhuangtai=True,
+                fengjin_zhuangtai=False,
+                shenhe_zhuangtai=shenhe_status,
+            )
+            return Response({'code': 0, 'msg': '商品类型添加成功'})
+        except Exception as e:
+            logger.exception("添加商品类型失败")
+            return Response({'code': 500, 'msg': '添加失败，请稍后重试'})
+
+    @transaction.atomic
+    def _update_type(self, dianpu, request):
+        """修改店铺商品类型，支持更换图片（先删旧图）"""
+        type_id = request.data.get('type_id') or request.POST.get('type_id')
+        if not type_id:
+            return Response({'code': 400, 'msg': '缺少 type_id'})
+
+        try:
+            obj = ShangpinLeixingDianpu.objects.select_for_update().get(
+                id=type_id, dianpu_id=dianpu.id
+            )
+        except ShangpinLeixingDianpu.DoesNotExist:
+            return Response({'code': 404, 'msg': '商品类型不存在'})
+        except Exception as e:
+            logger.exception("查询商品类型异常")
+            return Response({'code': 500, 'msg': '服务器错误'})
+
+        try:
+            update_fields = []
+            content_changed = False
+
+            # 简介
+            if 'jieshao' in request.data or 'jieshao' in request.POST:
+                obj.jieshao = request.data.get('jieshao') or request.POST.get('jieshao')
+                update_fields.append('jieshao')
+                content_changed = True
+
+            # 映射公共类型
+            if 'gonggong_leixing_id' in request.data or 'gonggong_leixing_id' in request.POST:
+                new_id = request.data.get('gonggong_leixing_id') or request.POST.get('gonggong_leixing_id')
+                if not ShangpinLeixing.objects.filter(id=new_id, shenhezhuangtai=1).exists():
+                    return Response({'code': 400, 'msg': '公共商品类型无效'})
+                obj.gonggong_leixing_id = new_id
+                update_fields.append('gonggong_leixing_id')
+                content_changed = True
+
+            # 排序
+            if 'paixu' in request.data or 'paixu' in request.POST:
+                obj.paixu = request.data.get('paixu') or request.POST.get('paixu')
+                update_fields.append('paixu')
+
+            # 上架状态
+            if 'shangjia_zhuangtai' in request.data or 'shangjia_zhuangtai' in request.POST:
+                val = request.data.get('shangjia_zhuangtai') or request.POST.get('shangjia_zhuangtai')
+                if isinstance(val, str):
+                    val = val.lower() in ('true', '1', 'yes')
+                obj.shangjia_zhuangtai = bool(val)
+                update_fields.append('shangjia_zhuangtai')
+
+            # 图片更换：先删除旧图，再上传新图
+            image_file = request.FILES.get('image')
+            if image_file:
+                if obj.tupian_url:
+                    delete_from_oss(obj.tupian_url)                # 删除旧图片
+                file_path = f"dianpu/shangpin/shangpinleixing/{dianpu.id}_{int(time.time())}.png"
+                full_url = upload_to_oss(image_file, file_path)
+                if not full_url:
+                    return Response({'code': 500, 'msg': '图片上传失败'})
+                obj.tupian_url = full_url.replace(settings.COS_DOMAIN.rstrip('/') + '/', '', 1)
+                update_fields.append('tupian_url')
+                content_changed = True
+
+            # 审核重置
+            if content_changed:
+                audit_config = DianpuShangpinShenheShezhi.objects.filter(id=1).first()
+                if audit_config and audit_config.kaiqi_shenhe:
+                    obj.shenhe_zhuangtai = False
+                    update_fields.append('shenhe_zhuangtai')
+
+            if update_fields:
+                obj.save(update_fields=update_fields)
+            return Response({'code': 0, 'msg': '商品类型更新成功'})
+        except Exception as e:
+            logger.exception("修改商品类型失败")
+            return Response({'code': 500, 'msg': '修改失败，请稍后重试'})
+
+    @transaction.atomic
+    def _delete_type(self, dianpu, request):
+        """删除店铺商品类型，可选是否同时删除关联商品"""
+        type_id = request.data.get('id') or request.POST.get('id')
+        if not type_id:
+            return Response({'code': 400, 'msg': '缺少类型ID'})
+
+        try:
+            obj = ShangpinLeixingDianpu.objects.select_for_update().get(
+                id=type_id, dianpu_id=dianpu.id
+            )
+        except ShangpinLeixingDianpu.DoesNotExist:
+            return Response({'code': 404, 'msg': '商品类型不存在'})
+        except Exception as e:
+            logger.exception("查询商品类型异常")
+            return Response({'code': 500, 'msg': '服务器错误'})
+
+        try:
+            delete_products = request.data.get('delete_products') or request.POST.get('delete_products')
+            delete_products = str(delete_products).lower() in ('true', '1', 'yes')
+
+            if delete_products:
+                # 删除该类型下所有关联商品（同时清理图片）
+                products = Shangpin.objects.filter(
+                    dianpu_leixing_id=obj.id, dianpu_id=dianpu.id
+                )
+                for p in products:
+                    if p.tupian_url:
+                        delete_from_oss(p.tupian_url)
+                    if p.guize_tupian:
+                        delete_from_oss(p.guize_tupian)
+                    p.delete()
+            else:
+                # 仅解除关联，不删商品
+                Shangpin.objects.filter(
+                    dianpu_leixing_id=obj.id, dianpu_id=dianpu.id
+                ).update(dianpu_leixing=None)
+
+            # 删除类型自身图片
+            if obj.tupian_url:
+                delete_from_oss(obj.tupian_url)
+            obj.delete()
+            return Response({'code': 0, 'msg': '类型删除成功'})
+        except Exception as e:
+            logger.exception("删除商品类型失败")
+            return Response({'code': 500, 'msg': '删除失败，请稍后重试'})
+
+    # ---------- 专区操作 ----------
+    @transaction.atomic
+    def _add_zhuanqu(self, dianpu, request):
+        """添加专区，自动从店铺商品类型获取 leixing_id（公共商品类型ID）"""
+        try:
+            mingzi = request.data.get('mingzi')
+            dianpu_leixing_id = request.data.get('dianpu_leixing_id')
+            paixu = request.data.get('paixu', 0)
+
+            if not mingzi or not dianpu_leixing_id:
+                return Response({'code': 400, 'msg': '缺少名称或所属商品类型'})
+
+            # 获取店铺商品类型，并拿到映射的公共类型ID
+            try:
+                shop_type = ShangpinLeixingDianpu.objects.get(
+                    id=dianpu_leixing_id, dianpu_id=dianpu.id
+                )
+                leixing_id = shop_type.gonggong_leixing_id   # 这就是专区需要的 leixing_id
+            except ShangpinLeixingDianpu.DoesNotExist:
+                return Response({'code': 400, 'msg': '所选商品类型无效'})
+
+            # 验证公共类型有效
+            if not ShangpinLeixing.objects.filter(id=leixing_id, shenhezhuangtai=1).exists():
+                return Response({'code': 400, 'msg': '关联的公共商品类型无效'})
+
+            ShangpinZhuanqu.objects.create(
+                dianpu_id=dianpu.id,
+                mingzi=mingzi,
+                dianpu_leixing_id=dianpu_leixing_id,
+                leixing_id=leixing_id,                     # 自动填充
+                paixu=paixu,
+                shangjia_zhuangtai=True,
+                fengjin_zhuangtai=False,
+            )
+            return Response({'code': 0, 'msg': '专区添加成功'})
+        except Exception as e:
+            logger.exception("添加专区失败")
+            return Response({'code': 500, 'msg': '添加失败，请稍后重试'})
+
+    @transaction.atomic
+    def _update_zhuanqu(self, dianpu, request):
+        """修改专区，若更换所属商品类型则同步更新 leixing_id"""
+        zhuanqu_id = request.data.get('zhuanqu_id')
+        if not zhuanqu_id:
+            return Response({'code': 400, 'msg': '缺少 zhuanqu_id'})
+
+        try:
+            obj = ShangpinZhuanqu.objects.select_for_update().get(
+                id=zhuanqu_id, dianpu_id=dianpu.id
+            )
+        except ShangpinZhuanqu.DoesNotExist:
+            return Response({'code': 404, 'msg': '专区不存在'})
+        except Exception as e:
+            logger.exception("查询专区异常")
+            return Response({'code': 500, 'msg': '服务器错误'})
+
+        try:
+            update_fields = []
+
+            if 'mingzi' in request.data:
+                obj.mingzi = request.data.get('mingzi')
+                update_fields.append('mingzi')
+
+            if 'dianpu_leixing_id' in request.data:
+                new_id = request.data.get('dianpu_leixing_id')
+                try:
+                    shop_type = ShangpinLeixingDianpu.objects.get(
+                        id=new_id, dianpu_id=dianpu.id
+                    )
+                    obj.dianpu_leixing_id = new_id
+                    obj.leixing_id = shop_type.gonggong_leixing_id   # 同步更新公共类型ID
+                    update_fields.extend(['dianpu_leixing_id', 'leixing_id'])
+                except ShangpinLeixingDianpu.DoesNotExist:
+                    return Response({'code': 400, 'msg': '所选商品类型无效'})
+
+            if 'paixu' in request.data:
+                obj.paixu = request.data.get('paixu')
+                update_fields.append('paixu')
+
+            if 'shangjia_zhuangtai' in request.data:
+                val = request.data.get('shangjia_zhuangtai')
+                if isinstance(val, str):
+                    val = val.lower() in ('true', '1', 'yes')
+                obj.shangjia_zhuangtai = bool(val)
+                update_fields.append('shangjia_zhuangtai')
+
+            if update_fields:
+                obj.save(update_fields=update_fields)
+            return Response({'code': 0, 'msg': '专区更新成功'})
+        except Exception as e:
+            logger.exception("修改专区失败")
+            return Response({'code': 500, 'msg': '修改失败，请稍后重试'})
+
+    @transaction.atomic
+    def _delete_zhuanqu(self, dianpu, request):
+        """删除专区，可选是否同时删除关联商品"""
+        zhuanqu_id = request.data.get('id')
+        if not zhuanqu_id:
+            return Response({'code': 400, 'msg': '缺少专区ID'})
+
+        try:
+            obj = ShangpinZhuanqu.objects.select_for_update().get(
+                id=zhuanqu_id, dianpu_id=dianpu.id
+            )
+        except ShangpinZhuanqu.DoesNotExist:
+            return Response({'code': 404, 'msg': '专区不存在'})
+        except Exception as e:
+            logger.exception("查询专区异常")
+            return Response({'code': 500, 'msg': '服务器错误'})
+
+        try:
+            delete_products = request.data.get('delete_products')
+            delete_products = str(delete_products).lower() in ('true', '1', 'yes')
+
+            if delete_products:
+                products = Shangpin.objects.filter(
+                    zhuanqu_id=obj.id, dianpu_id=dianpu.id
+                )
+                for p in products:
+                    if p.tupian_url:
+                        delete_from_oss(p.tupian_url)
+                    if p.guize_tupian:
+                        delete_from_oss(p.guize_tupian)
+                    p.delete()
+            else:
+                Shangpin.objects.filter(
+                    zhuanqu_id=obj.id, dianpu_id=dianpu.id
+                ).update(zhuanqu_id=None)
+
+            obj.delete()
+            return Response({'code': 0, 'msg': '专区删除成功'})
+        except Exception as e:
+            logger.exception("删除专区失败")
+            return Response({'code': 500, 'msg': '删除失败，请稍后重试'})
+
+
+from django.core.paginator import Paginator
+class ShopProductListView(APIView):
+    """
+    商品列表接口，支持筛选、分页。
+    URL: /shangdian/sdhqspsj
+    权限: JWT认证 + 店铺验证
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 1. 身份验证，获取店铺对象
+        frontend_user_id = request.data.get('userId')
+        if not frontend_user_id:
+            return Response({'code': 400, 'msg': '缺少必要参数 userId'})
+
+        dianpu, error = verify_shop_permission(request, frontend_user_id)
+        if error:
+            return error
+
+        # 2. 安全解析分页与筛选参数
+        try:
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('page_size', 20))
+        except (TypeError, ValueError):
+            return Response({'code': 400, 'msg': '分页参数格式错误'})
+
+        keyword = str(request.data.get('keyword', '')).strip()
+        shop_product_type_id = request.data.get('shop_product_type_id')  # 店铺商品类型ID
+        zhuanqu_id = request.data.get('zhuanqu_id')                     # 专区ID
+
+        # 布尔型筛选字段
+        def parse_bool(val):
+            if val is None or val == '':
+                return None
+            if isinstance(val, bool):
+                return val
+            if isinstance(val, str):
+                return val.lower() in ('true', '1', 'yes')
+            return bool(val)
+
+        shenhe = parse_bool(request.data.get('shenhe_zhuangtai'))
+        shangjia = parse_bool(request.data.get('shangjia_zhuangtai'))
+        fengjin = parse_bool(request.data.get('fengjin_zhuangtai'))
+
+        # 3. 构建查询（只查当前店铺的商品）
+        products = Shangpin.objects.filter(dianpu_id=dianpu.id).select_related(
+            'dianpu_leixing'
+        ).only(
+            'id', 'biaoqian', 'jiage', 'kucun', 'leixing_id', 'zhuanqu_id',
+            'zhenshi_xiaoliang', 'duiwai_xiaoliang', 'jieshao', 'xiadan_xuzhi',
+            'guize_tupian', 'yaoqiuleixing', 'huiyuan_id', 'yongjin',
+            'tupian_url', 'ewai_dashou_fencheng', 'paixu',
+            'dianpu_leixing_id', 'shangjia_zhuangtai', 'fengjin_zhuangtai',
+            'shenhe_zhuangtai', 'create_time', 'update_time'
+        )
+
+        # 筛选
+        if shop_product_type_id is not None:
+            try:
+                products = products.filter(dianpu_leixing_id=int(shop_product_type_id))
+            except (ValueError, TypeError):
+                return Response({'code': 400, 'msg': 'shop_product_type_id 格式错误'})
+
+        if zhuanqu_id is not None:
+            try:
+                products = products.filter(zhuanqu_id=int(zhuanqu_id))
+            except (ValueError, TypeError):
+                return Response({'code': 400, 'msg': 'zhuanqu_id 格式错误'})
+
+        if shenhe is not None:
+            products = products.filter(shenhe_zhuangtai=shenhe)
+        if shangjia is not None:
+            products = products.filter(shangjia_zhuangtai=shangjia)
+        if fengjin is not None:
+            products = products.filter(fengjin_zhuangtai=fengjin)
+
+        # 关键词搜索（商品ID、标题、介绍）
+        if keyword:
+            products = products.filter(
+                models.Q(id__icontains=keyword) |
+                models.Q(biaoqian__icontains=keyword) |
+                models.Q(jieshao__icontains=keyword)
+            )
+
+        # 4. 分页
+        total_count = products.count()
+        paginator = Paginator(products, page_size)
+        page_obj = paginator.get_page(page)
+
+        # 5. 构造返回数据
+        product_list = []
+        for p in page_obj:
+            product_list.append({
+                'id': p.id,
+                'biaoqian': p.biaoqian or '',
+                'jiage': p.jiage,
+                'kucun': p.kucun,
+                'leixing_id': p.leixing_id,
+                'zhuanqu_id': p.zhuanqu_id,
+                'zhenshi_xiaoliang': p.zhenshi_xiaoliang,
+                'duiwai_xiaoliang': p.duiwai_xiaoliang,
+                'jieshao': p.jieshao or '',
+                'xiadan_xuzhi': p.xiadan_xuzhi or '',
+                'guize_tupian': p.guize_tupian or '',
+                'yaoqiuleixing': p.yaoqiuleixing,
+                'huiyuan_id': p.huiyuan_id or '',
+                'yongjin': p.yongjin,
+                'tupian_url': p.tupian_url or '',
+                'ewai_dashou_fencheng': p.ewai_dashou_fencheng,
+                'paixu': p.paixu,
+                'dianpu_leixing_id': p.dianpu_leixing_id,
+                'shangjia_zhuangtai': p.shangjia_zhuangtai,
+                'fengjin_zhuangtai': p.fengjin_zhuangtai,
+                'shenhe_zhuangtai': p.shenhe_zhuangtai,
+                'create_time': p.create_time.isoformat() if p.create_time else '',
+                'update_time': p.update_time.isoformat() if p.update_time else '',
+            })
+
+        return Response({
+            'code': 0,
+            'data': {
+                'list': product_list,
+                'total': total_count,
+            }
+        })
+
+
+
+
+
+
+
+class ShopProductModifyView1(APIView):
+    """
+    商品统一操作：修改、添加、删除
+    URL: /shangdian/xgdpsplx
+    权限: JWT认证 + 店铺验证
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        frontend_user_id = request.data.get('userId')
+        if not frontend_user_id:
+            return Response({'code': 400, 'msg': '缺少必要参数 userId'})
+
+        dianpu, error = verify_shop_permission(request, frontend_user_id)
+        if error:
+            return error
+
+        action = request.data.get('action')
+        if not action:
+            return Response({'code': 400, 'msg': '缺少操作类型 action'})
+
+        # 分发
+        if action == 'update_product':
+            return self._update_product(dianpu, request.data)
+        elif action == 'add_product':
+            return self._add_product(dianpu, request.data)
+        elif action == 'delete_product':
+            return self._delete_product(dianpu, request.data)
+        else:
+            return Response({'code': 400, 'msg': '不支持的操作类型'})
+
+    # ---------- 修改商品 ----------
+    @transaction.atomic
+    def _update_product(self, dianpu, data):
+        product_id = data.get('product_id')
+        if not product_id:
+            return Response({'code': 400, 'msg': '缺少 product_id'})
+
+        try:
+            product = Shangpin.objects.select_for_update().get(id=product_id, dianpu_id=dianpu.id)
+        except Shangpin.DoesNotExist:
+            return Response({'code': 404, 'msg': '商品不存在'})
+
+        update_fields = []
+        # 标记是否有核心内容修改（会触发审核重置）
+        content_changed = False
+
+        # 标题
+        if 'biaoqian' in data:
+            product.biaoqian = data['biaoqian']
+            update_fields.append('biaoqian')
+            content_changed = True
+
+        # 价格
+        if 'jiage' in data:
+            product.jiage = data['jiage']
+            update_fields.append('jiage')
+            content_changed = True
+
+        # 库存
+        if 'kucun' in data:
+            product.kucun = data['kucun']
+            update_fields.append('kucun')
+            content_changed = True
+
+        # 店铺商品类型
+        if 'dianpu_leixing_id' in data:
+            # 验证类型属于当前店铺
+            new_type_id = data['dianpu_leixing_id']
+            if not ShangpinLeixingDianpu.objects.filter(id=new_type_id, dianpu_id=dianpu.id).exists():
+                return Response({'code': 400, 'msg': '无效的店铺商品类型'})
+            product.dianpu_leixing_id = new_type_id
+            update_fields.append('dianpu_leixing_id')
+            content_changed = True
+
+        # 专区
+        if 'zhuanqu_id' in data:
+            new_zq_id = data['zhuanqu_id']
+            if new_zq_id and not ShangpinZhuanqu.objects.filter(id=new_zq_id, dianpu_id=dianpu.id).exists():
+                return Response({'code': 400, 'msg': '无效的专区'})
+            product.zhuanqu_id = new_zq_id or None
+            update_fields.append('zhuanqu_id')
+            content_changed = True
+
+        # 介绍
+        if 'jieshao' in data:
+            product.jieshao = data['jieshao']
+            update_fields.append('jieshao')
+            content_changed = True
+
+        # 下单须知
+        if 'xiadan_xuzhi' in data:
+            product.xiadan_xuzhi = data['xiadan_xuzhi']
+            update_fields.append('xiadan_xuzhi')
+
+        # 抢单要求类型
+        if 'yaoqiuleixing' in data:
+            yqlx = int(data['yaoqiuleixing'])
+            if yqlx not in [1, 2]:
+                return Response({'code': 400, 'msg': '抢单要求类型无效'})
+            product.yaoqiuleixing = yqlx
+            update_fields.append('yaoqiuleixing')
+            content_changed = True
+
+        # 会员ID
+        if 'huiyuan_id' in data:
+            # 当抢单要求是会员时可能传
+            product.huiyuan_id = data['huiyuan_id'] or None
+            update_fields.append('huiyuan_id')
+            content_changed = True
+
+        # 佣金
+        if 'yongjin' in data:
+            product.yongjin = data['yongjin'] or 0
+            update_fields.append('yongjin')
+            content_changed = True
+
+        # 打手额外分成金额（不能超过商品价格）
+        if 'ewai_dashou_fencheng' in data:
+            fencheng = data['ewai_dashou_fencheng'] or 0
+            current_price = product.jiage
+            if fencheng > current_price:
+                return Response({'code': 400, 'msg': '分成金额不能超过商品价格'})
+            product.ewai_dashou_fencheng = fencheng
+            update_fields.append('ewai_dashou_fencheng')
+            content_changed = True
+
+        # 排序
+        if 'paixu' in data:
+            product.paixu = data['paixu']
+            update_fields.append('paixu')
+
+        # 上架状态
+        if 'shangjia_zhuangtai' in data:
+            product.shangjia_zhuangtai = data['shangjia_zhuangtai']
+            update_fields.append('shangjia_zhuangtai')
+
+        # 商品图片（上传新图则替换旧图）
+        if 'tupian_url' in data and data['tupian_url'] != product.tupian_url:
+            # 删除旧图
+            if product.tupian_url:
+                delete_from_oss(product.tupian_url)
+            product.tupian_url = data['tupian_url']
+            update_fields.append('tupian_url')
+            content_changed = True
+
+        # 规则图片
+        if 'guize_tupian' in data:
+            new_rule = data['guize_tupian'] or ''
+            if new_rule != (product.guize_tupian or ''):
+                if product.guize_tupian:
+                    delete_from_oss(product.guize_tupian)
+                product.guize_tupian = new_rule if new_rule else None
+                update_fields.append('guize_tupian')
+                content_changed = True
+
+        # 检查全局审核模式：若开启且内容有修改，则标记为未审核
+        if content_changed:
+            audit_config = DianpuShangpinShenheShezhi.objects.filter(id=1).first()
+            if audit_config and audit_config.kaiqi_shenhe:
+                product.shenhe_zhuangtai = False
+                update_fields.append('shenhe_zhuangtai')
+
+        if update_fields:
+            product.save(update_fields=update_fields + ['update_time'])
+        return Response({'code': 0, 'msg': '商品修改成功'})
+
+    # ---------- 添加商品 ----------
+    @transaction.atomic
+    def _add_product(self, dianpu, data):
+        biaoqian = data.get('biaoqian')
+        jiage = data.get('jiage')
+        kucun = data.get('kucun')
+        dianpu_leixing_id = data.get('dianpu_leixing_id')
+        zhuanqu_id = data.get('zhuanqu_id')
+        jieshao = data.get('jieshao')
+        # 必填校验
+        if not all([biaoqian, jiage is not None, kucun is not None, dianpu_leixing_id, zhuanqu_id, jieshao]):
+            return Response({'code': 400, 'msg': '必填项缺失'})
+
+        # 验证店铺商品类型
+        try:
+            shop_type = ShangpinLeixingDianpu.objects.get(id=dianpu_leixing_id, dianpu_id=dianpu.id)
+        except ShangpinLeixingDianpu.DoesNotExist:
+            return Response({'code': 400, 'msg': '无效的店铺商品类型'})
+
+        # 获取映射的公共商品类型
+        try:
+            public_type = ShangpinLeixing.objects.get(id=shop_type.gonggong_leixing_id, shenhezhuangtai=1)
+        except ShangpinLeixing.DoesNotExist:
+            return Response({'code': 400, 'msg': '关联的公共商品类型无效'})
+
+        # 抢单要求：默认会员，若用户选择了会员但未指定，则用公共类型的会员ID
+        yaoqiuleixing = data.get('yaoqiuleixing', 1)
+        if yaoqiuleixing == 1:
+            huiyuan_id = data.get('huiyuan_id') or public_type.huiyuan_id or None
+            yongjin = None
+        else:
+            huiyuan_id = None
+            yongjin = data.get('yongjin') or public_type.yongjin or 0
+
+        # 打手额外分成：金额不能大于价格，没传则0
+
+        ewai_fencheng = data.get('ewai_dashou_fencheng') or 0
+
+        try:
+            ewai_val = float(ewai_fencheng)
+            jiage_val = float(jiage)
+            if ewai_val > jiage_val:
+                return Response({'code': 400, 'msg': '分成金额不能超过商品价格'})
+        except ValueError:
+            # 处理转换失败的情况，比如记录日志或设为默认值
+            print("无法转换为数字")
+
+        '''if ewai_fencheng > jiage:
+            return Response({'code': 400, 'msg': '分成金额不能超过商品价格'})'''
+
+        # 审核状态：根据全局配置决定
+        shenhe_status = True  # 默认通过
+        audit_config = DianpuShangpinShenheShezhi.objects.filter(id=1).first()
+        if audit_config and audit_config.kaiqi_shenhe:
+            shenhe_status = False
+
+        # 创建商品
+        product = Shangpin.objects.create(
+            biaoqian=biaoqian,
+            jiage=jiage,
+            kucun=kucun,
+            dianpu_id=dianpu.id,
+            dianpu_leixing_id=dianpu_leixing_id,
+            zhuanqu_id=zhuanqu_id,
+            leixing_id=public_type.id,          # 公共商品类型ID
+            jieshao=jieshao,
+            xiadan_xuzhi=data.get('xiadan_xuzhi', ''),
+            guize_tupian=data.get('guize_tupian') or None,
+            tupian_url=data.get('tupian_url') or '',  # 商品图片必须由前端上传后传入
+            yaoqiuleixing=yaoqiuleixing,
+            huiyuan_id=huiyuan_id,
+            yongjin=yongjin,
+            ewai_dashou_fencheng=ewai_fencheng,
+            kaioi_ewai_dashou_fencheng=True,   # 强制开启
+            paixu=data.get('paixu', 0),
+            shangjia_zhuangtai=data.get('shangjia_zhuangtai', True),  # 默认上架
+            fengjin_zhuangtai=False,            # 默认未封禁
+            shenhe_zhuangtai=shenhe_status,
+            shenhezhuangtai=1,                  # 另一个审核字段永远正常
+        )
+        return Response({'code': 0, 'msg': '商品添加成功', 'product_id': product.id})
+
+    # ---------- 删除商品 ----------
+    @transaction.atomic
+    def _delete_product(self, dianpu, data):
+        product_id = data.get('product_id')
+        if not product_id:
+            return Response({'code': 400, 'msg': '缺少 product_id'})
+
+        try:
+            product = Shangpin.objects.select_for_update().get(id=product_id, dianpu_id=dianpu.id)
+        except Shangpin.DoesNotExist:
+            return Response({'code': 404, 'msg': '商品不存在'})
+
+        # 删除关联图片（OSS）
+        if product.tupian_url:
+            delete_from_oss(product.tupian_url)
+        if product.guize_tupian:
+            delete_from_oss(product.guize_tupian)
+
+        product.delete()
+        return Response({'code': 0, 'msg': '商品已删除'})
+
+
+
+
+from shangpin.models import Huiyuan                 # 会员模型，根据实际路径调整
+class MemberListView(APIView):
+    """
+    获取所有会员列表（供商品发布时选择）
+    URL: /shangdian/hqhy
+    权限：JWT认证 + 店铺归属验证
+    说明：前端需传递 userId，接口会进行身份及店铺状态校验
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # ---------- 1. 获取前端传递的用户ID（必须） ----------
+        frontend_user_id = request.data.get('userId')
+        if not frontend_user_id:
+            return Response({'code': 400, 'msg': '缺少必要参数 userId'})
+
+        # ---------- 2. 调用公共验证方法（会校验用户身份、店铺状态） ----------
+        dianpu, error_response = verify_shop_permission(request, frontend_user_id)
+        if error_response:
+            return error_response
+
+        # ---------- 3. 查询所有会员（只返回前端需要的字段） ----------
+        try:
+            members = Huiyuan.objects.all().values('huiyuan_id', 'jieshao')
+            member_list = [
+                {
+                    'huiyuan_id': m['huiyuan_id'],
+                    'jieshao': m['jieshao'] or ''
+                }
+                for m in members
+            ]
+        except Exception as e:
+            logger.exception("获取会员列表失败")
+            return Response({'code': 500, 'msg': '服务器错误'})
+
+        # ---------- 4. 返回成功响应 ----------
+        return Response({
+            'code': 0,
+            'msg': 'success',
+            'data': member_list
+        })
+
+
+
+
+from django.db import transaction, IntegrityError
+from django.core.paginator import Paginator, EmptyPage
+
+
+
+class SubShopListView(APIView):
+    """
+    获取下级店铺列表，同时返回上级分红汇总
+    URL: /shangdian/wdxjdp
+    方法: POST
+    权限: JWT认证 + 上级店铺身份验证
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 1. 身份验证 - 获取上级店铺对象
+        user_id = request.data.get('userId')
+        if not user_id:
+            return Response({'code': 400, 'msg': '缺少 userId'})
+
+        parent_dianpu, error = verify_shop_permission(request, user_id)
+        if error:
+            return error
+        # 此时 parent_dianpu 即为当前上级店铺
+
+        # 2. 读取筛选参数
+        dianpu_mingcheng = request.data.get('dianpu_mingcheng', '').strip()
+        zhuangtai = request.data.get('zhuangtai')
+        bind_min = request.data.get('bind_min')
+        bind_max = request.data.get('bind_max')
+        page = request.data.get('page', 1)
+        page_size = request.data.get('page_size', 10)
+
+        # 3. 查询下级店铺：yaoqing_dianpu_id 等于当前上级店铺ID
+        queryset = Dianpu.objects.filter(yaoqing_dianpu_id=parent_dianpu.id)
+
+        # 4. 筛选条件
+        if dianpu_mingcheng:
+            queryset = queryset.filter(dianpu_mingcheng__icontains=dianpu_mingcheng)
+        if zhuangtai is not None:
+            try:
+                zhuangtai = int(zhuangtai)
+                queryset = queryset.filter(zhuangtai=zhuangtai)
+            except (ValueError, TypeError):
+                pass
+        if bind_min is not None:
+            try:
+                bind_min = int(bind_min)
+                queryset = queryset.filter(bangding_yonghushu__gte=bind_min)
+            except (ValueError, TypeError):
+                pass
+        if bind_max is not None:
+            try:
+                bind_max = int(bind_max)
+                queryset = queryset.filter(bangding_yonghushu__lte=bind_max)
+            except (ValueError, TypeError):
+                pass
+
+        # 5. 排序：按创建时间倒序
+        queryset = queryset.order_by('-create_time')
+
+        # 6. 分页
+        try:
+            paginator = Paginator(queryset, page_size)
+            page_obj = paginator.page(page)
+        except EmptyPage:
+            page_obj = paginator.page(1)
+
+        # 7. 构建列表数据
+        shop_list = []
+        for shop in page_obj:
+            shop_list.append({
+                'id': shop.id,
+                'dianpu_mingcheng': shop.dianpu_mingcheng,
+                'dianpu_touxiang': shop.dianpu_touxiang or '',
+                'lianxi_dianhua': shop.lianxi_dianhua or '',
+                'zhuangtai': shop.zhuangtai,
+                'bangding_yonghushu': shop.bangding_yonghushu,
+                'zhengqu_zonge': str(shop.zhengqu_zonge),
+                'ketixian_yue': str(shop.ketixian_yue),
+                'create_time': shop.create_time.strftime('%Y-%m-%d %H:%M:%S') if shop.create_time else '',
+                'update_time': shop.update_time.strftime('%Y-%m-%d %H:%M:%S') if shop.update_time else '',
+                'erweima_url': shop.erweima_url or '',
+                'fenhong_choucheng_feilv': str(shop.fenhong_choucheng_feilv) if shop.fenhong_choucheng_feilv else '0.0000',
+            })
+
+        # 8. 上级分红汇总（从当前店铺主表读取）
+        shangji_leiji = str(parent_dianpu.shangji_fenhong_leiji) if parent_dianpu.shangji_fenhong_leiji else '0.00'
+        shangji_ketixian = str(parent_dianpu.shangji_ketixian_fenhong) if parent_dianpu.shangji_ketixian_fenhong else '0.00'
+
+        return Response({
+            'code': 200,
+            'msg': '获取成功',
+            'data': {
+                'list': shop_list,
+                'total': paginator.count,
+                'page': page_obj.number,
+                'page_size': page_size,
+                'shangji_fenhong_leiji': shangji_leiji,
+                'shangji_ketixian_fenhong': shangji_ketixian,
+            }
+        })
+
+
+class SubShopModifyView(APIView):
+    """
+    添加/修改下级店铺
+    URL: /shangdian/xjdpbj
+    方法: POST
+    权限: JWT认证 + 上级店铺身份验证
+    action字段：
+        - 'add'   : 添加新的子店铺
+        - 'update': 修改已有子店铺的状态/分红费率
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 1. 身份验证
+        user_id = request.data.get('userId')
+        if not user_id:
+            return Response({'code': 400, 'msg': '缺少 userId'})
+
+        parent_dianpu, error = verify_shop_permission(request, user_id)
+        if error:
+            return error
+
+        action = request.data.get('action', '').strip().lower()
+        if action == 'add':
+            return self._add_subshop(request, parent_dianpu)
+        elif action == 'update':
+            return self._update_subshop(request, parent_dianpu)
+        else:
+            return Response({'code': 400, 'msg': '未知操作类型，action 应为 add 或 update'})
+
+    def _add_subshop(self, request, parent_dianpu):
+        """添加子店铺，需提供用户UID、账号、密码、店铺名称等"""
+        user_uid = request.data.get('user_uid', '').strip()
+        zhanghao = request.data.get('zhanghao', '').strip()
+        mima = request.data.get('mima', '')
+        dianpu_mingcheng = request.data.get('dianpu_mingcheng', '').strip()
+        lianxi_dianhua = request.data.get('lianxi_dianhua', '').strip() or None
+        fenhong_feilv = request.data.get('fenhong_choucheng_feilv', None)
+
+        # 必填校验
+        if not all([user_uid, zhanghao, mima, dianpu_mingcheng]):
+            return Response({'code': 400, 'msg': '必填字段缺失（user_uid, zhanghao, mima, dianpu_mingcheng）'})
+
+        # 检查用户是否存在
+        if not UserMain.objects.filter(yonghuid=user_uid).exists():
+            return Response({'code': 404, 'msg': '对应的小程序用户不存在'})
+
+        # 检查账号是否已占用
+        if YonghuPingzheng.objects.filter(zhanghao=zhanghao).exists():
+            return Response({'code': 400, 'msg': '登录账号已存在'})
+        if YonghuPingzheng.objects.filter(yonghu=user_uid).exists():
+            return Response({'code': 400, 'msg': '该用户 ID 已有店铺凭证'})
+
+        # 费率处理：前端可选，后端默认 0.0500
+        if fenhong_feilv is not None:
+            try:
+                fenhong_feilv = float(fenhong_feilv)
+                if fenhong_feilv < 0 or fenhong_feilv > 1:
+                    return Response({'code': 400, 'msg': '分红费率需在 0~1 之间'})
+            except (ValueError, TypeError):
+                return Response({'code': 400, 'msg': '分红费率格式错误'})
+        else:
+            fenhong_feilv = 0.0500
+
+        try:
+            with transaction.atomic():
+                # 创建凭证
+                pingzheng = YonghuPingzheng.objects.create(
+                    yonghu=user_uid,
+                    zhanghao=zhanghao,
+                    mima=mima,
+                    is_active=True
+                )
+                # 创建店铺，关联上级
+                dianpu = Dianpu.objects.create(
+                    pingzheng=pingzheng,
+                    dianpu_mingcheng=dianpu_mingcheng,
+                    lianxi_dianhua=lianxi_dianhua or '',
+                    yaoqing_dianpu_id=parent_dianpu.id,      # 关键：绑定上级
+                    fenhong_choucheng_feilv=fenhong_feilv,
+                    # 其他字段使用默认值
+                )
+                return Response({
+                    'code': 200,
+                    'msg': '子店铺添加成功',
+                    'dianpu_id': dianpu.id
+                })
+        except IntegrityError as e:
+            logger.exception("创建子店铺违反唯一约束")
+            return Response({'code': 400, 'msg': '数据冲突，请检查账号或用户ID'})
+        except Exception as e:
+            logger.exception("创建子店铺失败")
+            return Response({'code': 500, 'msg': '创建失败，请稍后重试'})
+
+    def _update_subshop(self, request, parent_dianpu):
+        """修改子店铺状态和上级分红费率"""
+        dianpu_id = request.data.get('dianpu_id')
+        if not dianpu_id:
+            return Response({'code': 400, 'msg': '缺少 dianpu_id'})
+
+        try:
+            dianpu_id = int(dianpu_id)
+        except (ValueError, TypeError):
+            return Response({'code': 400, 'msg': 'dianpu_id 需为数字'})
+
+        try:
+            with transaction.atomic():
+                sub_dianpu = Dianpu.objects.select_for_update().get(id=dianpu_id)
+                # 权限校验：确保该店铺的上级就是当前店铺
+                if sub_dianpu.yaoqing_dianpu_id != parent_dianpu.id:
+                    return Response({'code': 403, 'msg': '无权修改该店铺，非您的下级'})
+
+                # 更新状态（如果有传）
+                if 'zhuangtai' in request.data:
+                    zhuangtai = request.data['zhuangtai']
+                    if zhuangtai not in (0, 1, '0', '1'):
+                        return Response({'code': 400, 'msg': '店铺状态只能为 0(封禁) 或 1(正常)'})
+                    sub_dianpu.zhuangtai = int(zhuangtai)
+
+                # 更新上级分红费率（如果有传）
+                if 'fenhong_choucheng_feilv' in request.data:
+                    feilv = request.data['fenhong_choucheng_feilv']
+                    try:
+                        feilv = float(feilv)
+                        if feilv < 0 or feilv > 1:
+                            return Response({'code': 400, 'msg': '分红费率需在 0~1 之间'})
+                        sub_dianpu.fenhong_choucheng_feilv = feilv
+                    except (ValueError, TypeError):
+                        return Response({'code': 400, 'msg': '分红费率格式错误'})
+
+                sub_dianpu.save(update_fields=['zhuangtai', 'fenhong_choucheng_feilv', 'update_time'])
+                return Response({'code': 200, 'msg': '修改成功'})
+
+        except Dianpu.DoesNotExist:
+            return Response({'code': 404, 'msg': '店铺不存在'})
+        except Exception as e:
+            logger.exception("修改下级店铺失败")
+            return Response({'code': 500, 'msg': '修改失败，请稍后重试'})
+
+
+
+
+
+# shangdian/views/order_manage_views.py
+"""
+店铺订单管理接口
+包含：
+1. 统计数据：商品类型及订单总数、各状态订单数
+2. 订单列表：支持筛选、分页、返回订单详情及打手图片（含跨平台图片拉取）
+"""
+
+from concurrent.futures import ThreadPoolExecutor, as_completed
+
+from django.db.models import Count, Q, Prefetch
+
+from django.core.paginator import Paginator, EmptyPage
+          # 已存在的验证函数
+from dingdan.models import Dingdan, DingdanPingtai, Dashoutupian
+from peizhi.models import ClubConfig, Club                        # 跨平台相关模型，按实际路径调整
+
+from collections import defaultdict
+
+# 如果有 ClubConfig 模型用于获取存储桶域名，确保导入（如没有可忽略，使用 settings 中的 OSS 域名）
+try:
+    from kuaping.models import ClubConfig
+except ImportError:
+    ClubConfig = None
+
+
+
+
+# ================================================================
+# 视图1：订单统计接口
+# ================================================================
+class ShopOrderStatisticsView(APIView):
+    """
+    店铺订单统计接口
+    URL: POST /shangdian/ddltj
+    权限: JWT认证 + 店铺身份验证
+
+    请求参数:
+        userId (必填): 店铺所属用户的ID
+
+    返回结构:
+    {
+        "code": 200,
+        "msg": "统计成功",
+        "data": {
+            "types": [                         # 所有商品类型
+                {
+                    "id": 类型ID,
+                    "jieshao": "类型介绍",
+                    "tupian_url": "类型图片相对路径",
+                    "order_count": 该类型订单总数,
+                    "status_counts": {         # 该类型下各状态订单数（键为字符串）
+                        "1": 数量,
+                        "7": 数量,
+                        "2": 数量,
+                        "8": 数量,
+                        "3": 数量,
+                        "4": 数量,
+                        "5": 数量,
+                        "6": 数量
+                    }
+                },
+                ...
+            ],
+            "status_counts": {                # 全局各状态订单总数
+                "1": 总数,
+                "7": 总数,
+                "2": 总数,
+                "8": 总数,
+                "3": 总数,
+                "4": 总数,
+                "5": 总数,
+                "6": 总数
+            },
+            "total_orders": 订单总量
+        }
+    }
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 1. 获取身份标识
+        user_id = request.data.get('userId', '').strip()
+        if not user_id:
+            return Response({'code': 400, 'msg': '缺少 userId'})
+
+        # 2. 验证店铺身份，获取店铺对象
+        dianpu, error = verify_shop_permission(request, user_id)
+        if error:
+            return error
+
+        shop_id = dianpu.id
+
+        # 3. 获取所有正常的商品类型（审核状态=1）
+        types_qs = ShangpinLeixing.objects.filter(
+            shenhezhuangtai=1
+        ).order_by('-paixu', 'id')
+
+        # 构建类型列表，初始化各状态计数为 0
+        type_list = []
+        for t in types_qs:
+            type_list.append({
+                'id': t.id,
+                'jieshao': t.jieshao or '',
+                'tupian_url': t.tupian_url or '',
+                'order_count': 0,
+                'status_counts': {
+                    '1': 0, '7': 0, '2': 0, '8': 0,
+                    '3': 0, '4': 0, '5': 0, '6': 0
+                }
+            })
+
+        # 4. 获取本店铺所有订单 ID（通过平台扩展表）
+        order_ids = list(
+            DingdanPingtai.objects.filter(dianpu_id=shop_id)
+            .values_list('dingdan_id', flat=True)
+        )
+
+        total_orders = 0                     # 订单总量
+        global_counts = defaultdict(int)     # 全局各状态计数
+
+        if order_ids:
+            # 5. 按商品类型和订单状态聚合统计
+            agg = (
+                Dingdan.objects
+                .filter(dingdan_id__in=order_ids)
+                .values('leixing_id', 'zhuangtai')
+                .annotate(cnt=Count('id'))
+            )
+            for row in agg:
+                lid = row['leixing_id']        # 商品类型ID
+                st = str(row['zhuangtai'])     # 状态码 -> 字符串
+                cnt = row['cnt']
+
+                # 累加总量与全局状态
+                total_orders += cnt
+                global_counts[st] += cnt
+
+                # 填充到对应商品类型
+                for tp in type_list:
+                    if tp['id'] == lid:
+                        tp['order_count'] += cnt
+                        if st in tp['status_counts']:
+                            tp['status_counts'][st] += cnt
+                        break
+
+        # 6. 保证全局统计返回所有8个状态
+        all_status_keys = ['1', '7', '2', '8', '3', '4', '5', '6']
+        final_global = {k: global_counts.get(k, 0) for k in all_status_keys}
+
+        return Response({
+            'code': 200,
+            'msg': '统计成功',
+            'data': {
+                'types': type_list,
+                'status_counts': final_global,
+                'total_orders': total_orders
+            }
+        })
+
+
+
+
+
+def get_oss_domain():
+    """
+    获取对象存储的域名（用于拼接本地打手图片完整 URL）
+    优先从 ClubConfig 获取，其次从 settings.OSS_URL 获取
+    """
+    if ClubConfig:
+        my_config = ClubConfig.objects.filter(is_self=1).first()
+        if my_config and my_config.storage_bucket_domain:
+            return my_config.storage_bucket_domain.rstrip('/') + '/'
+    # 降级使用 settings 中的 OSS URL
+    return getattr(settings, 'OSS_URL', '').rstrip('/') + '/'
+
+
+def _fetch_partner_images_for_order(order, oss_domain):
+    """
+    根据单个订单获取打手提交的图片列表（完整绝对 URL）。
+    处理本地图片 + 跨平台图片（重试拉取对方平台图片）
+
+    返回: (images_list, is_punished, punishment_info)
+    """
+    images = []
+    is_punished = False
+    punishment_info = {}
+
+    # 1. 本地打手图片（我方平台的打手提交）
+    if order.jiedan_dashou_id:
+        local_imgs = Dashoutupian.objects.filter(
+            dingdan_id=order.dingdan_id,
+            dashou=order.jiedan_dashou_id
+        ).values_list('tupian', flat=True)
+        for rel_path in local_imgs:
+            if rel_path:
+                if rel_path.startswith('http'):
+                    images.append(rel_path)
+                else:
+                    images.append(oss_domain + rel_path.lstrip('/'))
+
+    # 2. 如果订单是跨平台且需要获取对方打手图片
+    if order.is_cross and order.partner_club_id and order.partner_order_id:
+        try:
+            my_club = ClubConfig.objects.filter(is_self=1).first()
+            if not my_club:
+                logger.error("无法获取本俱乐部配置")
+                return images, is_punished, punishment_info
+            self_club_id = my_club.club_id
+
+            # 获取合作关系
+
+            club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=order.partner_club_id)
+            partner_domain = club_rel.partner_domain.rstrip('/')
+
+            # 构建对方接口URL
+            url = partner_domain + '/houtai/kpthqtp'
+            payload = {'order_id': order.partner_order_id, 'club_id': self_club_id}
+            retries = 2
+            for attempt in range(retries):
+                try:
+                    resp = requests.post(url, json=payload, timeout=5)
+                    if resp.status_code == 200:
+                        data = resp.json()
+                        if data.get('code') == 0:
+                            partner_data = data.get('data', {})
+                            partner_imgs = partner_data.get('images', [])
+                            # 对方返回的图片可能是相对路径，拼接对方域名
+                            for img in partner_imgs:
+                                if img.startswith('http'):
+                                    images.append(img)
+                                else:
+                                    images.append(partner_domain + '/' + img.lstrip('/'))
+                            punishment_info = partner_data.get('punishment', {})
+                            is_punished = bool(punishment_info.get('cfliyou'))
+                            break
+                    else:
+                        logger.warning(f"对方接口HTTP错误: {resp.status_code}")
+                except Exception as e:
+                    logger.warning(f"请求对方图片失败（重试{attempt+1}）: {e}")
+        except Exception as e:
+            logger.error(f"获取跨平台图片异常: {e}")
+
+    return images, is_punished, punishment_info
+
+
+def _get_images_for_orders(orders, oss_domain, max_workers=10):
+    """
+    并发获取多个订单的打手图片，返回字典 {dingdan_id: (images, is_punished, punishment_info)}
+    """
+    result = {}
+    with ThreadPoolExecutor(max_workers=max_workers) as executor:
+        future_to_order = {
+            executor.submit(_fetch_partner_images_for_order, order, oss_domain): order.dingdan_id
+            for order in orders
+        }
+        for future in as_completed(future_to_order):
+            dingdan_id = future_to_order[future]
+            try:
+                images, is_punished, pun_info = future.result()
+                result[dingdan_id] = (images, is_punished, pun_info)
+            except Exception as e:
+                logger.error(f"获取订单 {dingdan_id} 图片失败: {e}")
+                result[dingdan_id] = ([], False, {})
+    return result
+
+
+class ShopOrderManageView(APIView):
+    """
+    店铺订单管理与统计接口
+
+    URL: /shangdian/ddlbhq
+    方法: POST
+    权限: JWT认证 + 店铺身份验证 (verify_shop_permission)
+
+    请求参数:
+        - userId (必填): 当前店铺对应的小程序用户ID
+        - action (可选): 值为 'statistics' 时返回统计数据；其他任意值或省略均返回订单列表
+
+    统计模式 (action='statistics') 返回:
+        types: 商品类型列表，每个类型包含:
+            id, jieshao, tupian_url, order_count, status_counts
+        status_counts: 各状态订单总数 (全局)
+        total_orders: 订单总量
+
+    列表模式 (默认) 支持筛选、分页、搜索，返回:
+        list: 订单列表，每个订单包含:
+            dingdan_id, zhuangtai, jine, dashou_fencheng, jiedan_dashou_id, dashou_liuyan,
+            zhiding_id, shangpin_id, tupian, jieshao, beizhu, nicheng, leixing_id,
+            create_time, update_time, pingtai_kuozhan (laoban_id, laoban_pingjia, dianpu_shouyi),
+            dashou_images (绝对URL数组), is_punished, is_fadaned
+        total: 总条数
+        page: 当前页码
+        page_size: 每页条数
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        user_id = request.data.get('userId', '').strip()
+        if not user_id:
+            return Response({'code': 400, 'msg': '缺少 userId'})
+
+        # 验证店铺身份
+        dianpu, error_response = verify_shop_permission(request, user_id)
+        if error_response:
+            return error_response
+
+        action = request.data.get('action', '').strip().lower()
+        if action == 'statistics':
+            return self._handle_statistics(dianpu)
+        else:
+            return self._handle_order_list(request, dianpu)
+
+    def _handle_statistics(self, dianpu):
+        """统计逻辑：商品类型计数 + 各状态订单数 + 总量"""
+        shop_id = dianpu.id
+
+        # 1. 获取正常商品类型（审核状态=1）
+        types_qs = ShangpinLeixing.objects.filter(shenhezhuangtai=1).order_by('-paixu', 'id')
+        types_data = []
+        type_ids = []
+        for t in types_qs:
+            types_data.append({
+                'id': t.id,
+                'jieshao': t.jieshao or '',
+                'tupian_url': t.tupian_url or '',
+                'order_count': 0,          # 之后填充
+                'status_counts': {}        # 该类型下各状态计数
+            })
+            type_ids.append(t.id)
+
+        # 2. 获取本店铺所有订单 ID
+        order_ids = DingdanPingtai.objects.filter(
+            dianpu_id=shop_id
+        ).values_list('dingdan_id', flat=True)
+
+        # 统计结构
+        type_status_map = defaultdict(lambda: defaultdict(int))
+        global_status_counts = defaultdict(int)
+        total_orders = 0
+
+        if order_ids:
+            # 批量聚合统计
+            aggregation = Dingdan.objects.filter(
+                dingdan_id__in=order_ids
+            ).values('leixing_id', 'zhuangtai').annotate(cnt=Count('id'))
+
+            for row in aggregation:
+                lx_id = row['leixing_id']
+                zt = row['zhuangtai']
+                cnt = row['cnt']
+                if lx_id in type_ids:
+                    type_status_map[lx_id][zt] += cnt
+                global_status_counts[zt] += cnt
+                total_orders += cnt
+
+        # 填充统计数据回类型列表
+        for t in types_data:
+            tid = t['id']
+            t['order_count'] = sum(type_status_map[tid].values())
+            t['status_counts'] = dict(type_status_map[tid])
+
+        return Response({
+            'code': 200,
+            'msg': '获取成功',
+            'data': {
+                'types': types_data,
+                'status_counts': dict(global_status_counts),
+                'total_orders': total_orders
+            }
+        })
+
+    def _handle_order_list(self, request, dianpu):
+        """列表逻辑：筛选 + 分页 + 搜索 + 图片并发获取"""
+        shop_id = dianpu.id
+
+        # ---------- 解析筛选参数 ----------
+        leixing_id = request.data.get('leixing_id')
+        zhuangtai = request.data.get('zhuangtai')
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        jiedan_dashou_id = request.data.get('jiedan_dashou_id', '').strip()
+        nicheng = request.data.get('nicheng', '').strip()
+        laoban_id = request.data.get('laoban_id', '').strip()
+        jieshao = request.data.get('jieshao', '').strip()
+
+        page = request.data.get('page', 1)
+        page_size = request.data.get('page_size', 20)
+
+        # ---------- 基础查询：店铺的订单（通过扩展表关联） ----------
+        queryset = DingdanPingtai.objects.filter(
+            dianpu_id=shop_id
+        ).select_related('dingdan').order_by('-dingdan__create_time')
+
+        # 应用筛选
+        if leixing_id is not None:
+            queryset = queryset.filter(dingdan__leixing_id=leixing_id)
+        if zhuangtai is not None:
+            queryset = queryset.filter(dingdan__zhuangtai=zhuangtai)
+        if dingdan_id:
+            queryset = queryset.filter(dingdan__dingdan_id__icontains=dingdan_id)
+        if jiedan_dashou_id:
+            queryset = queryset.filter(dingdan__jiedan_dashou_id=jiedan_dashou_id)
+        if nicheng:
+            queryset = queryset.filter(dingdan__nicheng__icontains=nicheng)
+        if laoban_id:
+            queryset = queryset.filter(laoban_id=laoban_id)       # 扩展表字段
+        if jieshao:
+            queryset = queryset.filter(dingdan__jieshao__icontains=jieshao)
+
+        # ---------- 分页 ----------
+        paginator = Paginator(queryset, page_size)
+        try:
+            page_obj = paginator.page(page)
+        except EmptyPage:
+            page_obj = paginator.page(1)
+
+        # 收集当前页订单列表（主表 + 扩展表）
+        orders_with_ext = []
+        for pt_kuozhan in page_obj:
+            orders_with_ext.append((pt_kuozhan.dingdan, pt_kuozhan))
+
+        # 提取所有订单主表对象，用于并发获取打手图片
+        dingdan_objs = [order for order, _ in orders_with_ext]
+        oss_domain = get_oss_domain()
+        images_map = _get_images_for_orders(dingdan_objs, oss_domain)
+
+        # ---------- 组装返回数据 ----------
+        result_list = []
+        for order, pt_kuozhan in orders_with_ext:
+            order_data = {
+                'dingdan_id': order.dingdan_id,
+                'zhuangtai': order.zhuangtai,
+                'jine': float(order.jine) if order.jine else 0.00,
+                'dashou_fencheng': float(order.dashou_fencheng) if order.dashou_fencheng else 0.00,
+                'jiedan_dashou_id': order.jiedan_dashou_id or '',
+                'dashou_liuyan': order.dashou_liuyan or '',  # 打手留言
+                'zhiding_id': order.zhiding_id or '',
+                'shangpin_id': order.shangpin_id or '',
+                'tupian': order.tupian or '',
+                'jieshao': order.jieshao or '',
+                'beizhu': order.beizhu or '',
+                'nicheng': order.nicheng or '',
+                'leixing_id': order.leixing_id,
+                'create_time': order.create_time.strftime('%Y-%m-%d %H:%M:%S') if order.create_time else '',
+                'update_time': order.update_time.strftime('%Y-%m-%d %H:%M:%S') if order.update_time else '',
+                'pingtai_kuozhan': {
+                    'laoban_id': pt_kuozhan.laoban_id or '',
+                    'laoban_pingjia': pt_kuozhan.laoban_pingjia or '',
+                    'dianpu_shouyi': float(pt_kuozhan.dianpu_shouyi) if pt_kuozhan.dianpu_shouyi else 0.00,
+                },
+                # 打手图片（已在后端拼接绝对 URL）
+                'dashou_images': images_map.get(order.dingdan_id, ([], False, {}))[0],
+                'is_punished': images_map.get(order.dingdan_id, ([], False, {}))[1],
+                'is_fadaned': False,      # 暂不支持罚款状态，可根据需要扩展
+            }
+            result_list.append(order_data)
+
+        return Response({
+            'code': 200,
+            'msg': '获取成功',
+            'data': {
+                'list': result_list,
+                'total': paginator.count,
+                'page': page_obj.number,
+                'page_size': page_size
+            }
+        })
+
+
+
+
+
+# ================================================================
+# shangdian/views/refund_view.py
+# 店铺退款接口 —— 基于跨平台退款接口二改，只处理平台订单，我方派单
+# ================================================================
+import json
+import time
+import random
+import string
+import hashlib
+import hmac
+import logging
+import traceback
+from decimal import Decimal
+import xmltodict          # 解析微信退款回执
+import requests
+from django.db import transaction
+from django.conf import settings
+from django.core.exceptions import ObjectDoesNotExist
+from rest_framework.views import APIView
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+
+from shangdian.utils import verify_shop_permission          # 店铺身份验证
+from dingdan.models import Dingdan, DingdanPingtai, Dashoutupian, Tuikuanjilu
+from yonghu.models import UserMain
+from shangdian.models import Dianpu
+
+logger = logging.getLogger(__name__)
+
+
+class ShopRefundView(APIView):
+    """
+    店铺订单退款接口
+    URL: POST /shangdian/tk
+    权限: JWT认证 + 店铺身份验证（只处理平台订单，我方派单）
+
+    请求参数:
+        userId (必填)   : 店铺所属用户的ID
+        dingdan_id (必填): 订单ID
+        reason (可选)   : 退款理由
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 1. 获取参数
+        user_id = request.data.get('userId', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        reason = request.data.get('reason', '').strip()      # 退款理由
+
+        if not user_id or not dingdan_id:
+            return Response({'code': 400, 'msg': '参数不完整'})
+
+        # 2. 店铺身份验证
+        dianpu, error = verify_shop_permission(request, user_id)
+        if error:
+            return error
+
+        shop_id = dianpu.id
+
+        # 3. 查询订单，必须属于本店铺（通过扩展表关联）
+        try:
+            # 通过扩展表确认归属，并 select_related 获取订单主表
+            pingtai_ext = DingdanPingtai.objects.select_related('dingdan').get(
+                dianpu_id=shop_id,
+                dingdan__dingdan_id=dingdan_id
+            )
+            order = pingtai_ext.dingdan
+        except DingdanPingtai.DoesNotExist:
+            logger.warning(f"订单 {dingdan_id} 不属于店铺 {shop_id} 或不存在")
+            return Response({'code': 404, 'msg': '订单不存在或不属于本店铺'})
+
+        # 4. 订单状态校验（只有这些状态可退款）
+        allowed_statuses = [1, 7, 2, 8, 4]
+        if order.zhuangtai not in allowed_statuses:
+            logger.warning(f"订单状态不允许退款: {order.zhuangtai}")
+            return Response({'code': 400, 'msg': '订单状态不允许退款'})
+
+        # 5. 全部视为平台订单（我方派单），调用微信退款
+        refund_result = self._call_wechat_refund(order)
+        if refund_result['code'] != 0:
+            return Response({'code': 400, 'msg': refund_result['msg']})
+
+        # 6. 事务内更新订单、打手、记录、统计
+        dashou_id = order.jiedan_dashou_id
+        try:
+            with transaction.atomic():
+                # 更新订单状态为已退款
+                order.zhuangtai = 5
+                order.clkf = str(shop_id)       # 处理人记录为店铺ID
+                if reason:
+                    order.tkly = reason
+                order.save()
+
+                # 更新打手统计（退款量+1，状态置为空闲）
+                if dashou_id:
+                    try:
+                        dashou_user = UserMain.objects.get(yonghuid=dashou_id)
+                        dashou_profile = dashou_user.dashou_profile
+                        dashou_profile.tuikuanliang += 1
+                        dashou_profile.zhuangtai = 1
+                        dashou_profile.save()
+                    except (UserMain.DoesNotExist, ObjectDoesNotExist):
+                        logger.warning(f"退款：打手 {dashou_id} 不存在，跳过状态更新")
+
+                # 更新退款记录表
+                self._update_refund_record(order, dashou_id, str(shop_id), reason)
+
+                # 打手每日统计（退款动作）
+                try:
+                    from houtai.utils import update_dashou_daily_by_action
+                    update_dashou_daily_by_action(
+                        yonghuid=dashou_id,
+                        amount=order.dashou_fencheng or Decimal('0.00'),
+                        action=3   # 3 表示退款
+                    )
+                except Exception as e:
+                    logger.error(f"打手每日统计更新失败: {e}")
+
+                # 更新平台支出记录
+                try:
+                    from dingdan.utils import update_daily_payout
+                    update_daily_payout(order.jine)
+                except Exception as e:
+                    logger.error(f"更新每日支出失败: {e}")
+
+                # ========== 新增：商品和店铺每日统计 ==========
+                try:
+                    from shangdian.utils import update_dianpu_daily_stat
+                    from shangpin.utils import update_shangpin_daily_stat
+                    # 商品每日统计（只要有商品ID就执行）
+                    if order.shangpin_id:
+                        # 从扩展表获取已计算好的收益值（下单时已存储）
+                        pingtai_shouyi = Decimal('0.00')
+                        dianpu_shouyi = Decimal('0.00')
+                        if hasattr(order, 'pingtai_kuozhan'):
+                            pingtai_shouyi = order.pingtai_kuozhan.pingtai_shouyi or Decimal('0.00')
+                            dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00')
+
+                        update_shangpin_daily_stat(
+                            shangpin_id=order.shangpin_id,
+                            caozuo_leixing=3,  # 3 = 退款
+                            dingdan_jiage=order.jine,
+                            pingtai_shouyi=pingtai_shouyi,
+                            dianpu_zongshouyi=dianpu_shouyi
+                        )
+                        logger.info(f"商品统计更新完成，商品ID: {order.shangpin_id}")
+
+                    # 店铺每日统计（仅当存在店铺ID时执行）
+                    dianpu_id = None
+                    if hasattr(order, 'pingtai_kuozhan'):
+                        dianpu_id = order.pingtai_kuozhan.dianpu_id
+                    if dianpu_id:
+                        dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00')
+                        update_dianpu_daily_stat(
+                            dianpu_id=dianpu_id,
+                            caozuo_leixing=3,  # 3 = 退款
+                            dingdan_jiage=order.jine,
+                            dianpu_shouyi=dianpu_shouyi
+                        )
+                        logger.info(f"店铺统计更新完成，店铺ID: {dianpu_id}")
+                except Exception as e:
+                    logger.error(f"商品/店铺统计更新失败: {e}")
+                    logger.error(traceback.format_exc())
+                    # 统计失败不影响主流程
+                # =============================================
+
+        except Exception as e:
+            logger.exception("退款事务执行失败")
+            return Response({'code': 500, 'msg': '退款处理失败，请稍后重试'})
+
+        # 7. 跨平台通知（如果存在对方平台订单ID，异步通知，不影响主流程）
+        partner_order_id = order.partner_order_id
+        partner_club_id = order.partner_club_id
+        if partner_order_id and partner_club_id:
+            try:
+                self._notify_partner_refund(dingdan_id, partner_club_id, partner_order_id, reason, order.jine)
+            except Exception as e:
+                logger.error(f"跨平台退款通知异常: {e}")
+
+        return Response({'code': 200, 'msg': '退款成功'})
+
+    # ========== 微信退款 ==========
+    def _call_wechat_refund(self, order):
+        """调用微信支付退款接口"""
+        appid = getattr(settings, 'WEIXIN_APPID', '')
+        mch_id = getattr(settings, 'WEIXIN_MCHID', '')
+        key = getattr(settings, 'WEIXIN_SHANGHUMIYAO', '')
+        cert_path = getattr(settings, 'WEIXIN_CERT_PATH', '')
+        key_path = getattr(settings, 'WEIXIN_KEY_PATH', '')
+
+        if not all([appid, mch_id, key, cert_path, key_path]):
+            return {'code': 500, 'msg': '微信支付配置不完整'}
+
+        out_refund_no = self._generate_refund_no(order.dingdan_id)
+        total_fee = int(float(order.jine or 0) * 100)
+        refund_fee = total_fee
+
+        params = {
+            'appid': appid,
+            'mch_id': mch_id,
+            'nonce_str': self._generate_nonce_str(),
+            'out_refund_no': out_refund_no,
+            'total_fee': total_fee,
+            'refund_fee': refund_fee,
+            'refund_desc': '店铺退款',
+        }
+        if order.wechat_transaction_id:
+            params['transaction_id'] = order.wechat_transaction_id
+        else:
+            params['out_trade_no'] = order.dingdan_id
+
+        # 签名
+        sorted_keys = sorted(params.keys())
+        stringA = '&'.join([f"{k}={params[k]}" for k in sorted_keys])
+        stringSignTemp = f"{stringA}&key={key}"
+        sign = hashlib.md5(stringSignTemp.encode('utf-8')).hexdigest().upper()
+        params['sign'] = sign
+
+        xml_data = self._dict_to_xml(params)
+        url = 'https://api.mch.weixin.qq.com/secapi/pay/refund'
+
+        try:
+            response = requests.post(url, data=xml_data, cert=(cert_path, key_path), timeout=10)
+            result = xmltodict.parse(response.content)['xml']
+            logger.info(f"微信退款响应: {result}")
+        except Exception as e:
+            logger.error(f"微信退款请求异常: {e}", exc_info=True)
+            return {'code': 500, 'msg': '微信退款请求异常'}
+
+        if result.get('return_code') == 'SUCCESS' and result.get('result_code') == 'SUCCESS':
+            return {'code': 0, 'msg': '退款成功'}
+        else:
+            err_msg = result.get('err_code_des', result.get('return_msg', '未知错误'))
+            return {'code': 400, 'msg': err_msg}
+
+    # ========== 退款记录 ==========
+    def _update_refund_record(self, order, dashou_id, chuli_id, reason):
+        """更新退款记录表"""
+        try:
+            refund_record, created = Tuikuanjilu.objects.get_or_create(
+                dingdan_id=order.dingdan_id,
+                defaults={
+                    'dashouid': dashou_id or '',
+                    'qingqiuid': '',
+                    'chuliid': chuli_id,
+                    'liyou': reason or '店铺退款',
+                    'sqzhuangtai': 1,
+                    'jine': order.jine or 0,
+                    'dashou_fencheng': order.dashou_fencheng or 0,
+                    'jieshao': order.jieshao or '',
+                    'beizhu': '店铺退款',
+                    'nicheng': order.nicheng or '',
+                }
+            )
+            if not created:
+                refund_record.sqzhuangtai = 1
+                refund_record.chuliid = chuli_id
+                if reason:
+                    refund_record.liyou = reason
+                refund_record.save()
+        except Exception as e:
+            logger.error(f"更新退款记录异常: {e}")
+
+    # ========== 跨平台通知 ==========
+    def _notify_partner_refund(self, dingdan_id, partner_club_id, partner_order_id, reason, amount):
+        """
+        通知对方平台我方已退款。
+        此方法执行不影响主流程，任何异常仅记录日志。
+        """
+        try:
+            from dingdan.models import ClubConfig, Club, CrossPlatformOrderData
+            my_config = ClubConfig.objects.filter(is_self=1).first()
+            if not my_config:
+                logger.error("未配置我方俱乐部信息，无法通知对方")
+                return
+            self_club_id = my_config.club_id
+            club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=partner_club_id)
+            partner_domain = club_rel.partner_domain.rstrip('/')
+            notify_url = f"{partner_domain}/houtai/dfddtk"
+
+            payload = {
+                'order_id': partner_order_id,
+                'club_id': self_club_id,
+                'status': 5,
+                'reason': reason or '店铺退款'
+            }
+            resp = requests.post(notify_url, json=payload, timeout=3)
+            if resp.status_code == 200:
+                resp_json = resp.json()
+                if resp_json.get('code') == 0:
+                    # 更新跨平台扩展表状态
+                    cross_data, _ = CrossPlatformOrderData.objects.get_or_create(
+                        dingdan_id=dingdan_id,
+                        defaults={
+                            'partner_order_id': partner_order_id,
+                            'partner_club_id': partner_club_id,
+                            'partner_order_status': resp_json.get('data', {}).get('partner_status', 0),
+                            'partner_dashou_id': resp_json.get('data', {}).get('partner_dashou_id', ''),
+                            'partner_amount': amount or 0,
+                        }
+                    )
+                    if not _:
+                        cross_data.partner_order_status = resp_json.get('data', {}).get('partner_status', 0)
+                        cross_data.save()
+                else:
+                    logger.warning(f"对方平台返回错误: {resp_json.get('msg')}")
+            else:
+                logger.warning(f"通知对方HTTP错误: {resp.status_code}")
+        except Exception as e:
+            logger.error(f"通知对方平台异常: {e}")
+
+    # ========== 工具方法 ==========
+    def _generate_nonce_str(self):
+        return ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+
+    def _generate_refund_no(self, dingdan_id):
+        timestamp = str(int(time.time()))
+        rand = ''.join(random.choices('0123456789', k=4))
+        return f"{dingdan_id}REF{timestamp}{rand}"
+
+    def _dict_to_xml(self, data):
+        xml = ['<xml>']
+        for k, v in data.items():
+            xml.append(f'<{k}>{v}</{k}>')
+        xml.append('</xml>')
+        return ''.join(xml)
+
+
+
+
+
+
+class ShopForceCompleteView(APIView):
+    """
+    店铺强制结单接口
+    URL: POST /shangdian/qzjd
+    权限: JWT认证 + 店铺身份验证
+
+    请求参数:
+        userId    (必填) : 店铺所属用户的ID
+        dingdan_id(必填) : 订单ID
+
+    说明:
+        - 只处理平台订单（fadan_pingtai == 1）
+        - 订单必须属于当前店铺
+        - 订单状态必须为 8（结算中）才能强制结单
+        - 默认视为我方派单，根据是否有对方订单ID判断是否跨平台
+        - 本地订单：给打手结算、更新打手余额和统计、更新店铺收益统计
+        - 跨平台订单：仅通知对方平台，不处理打手
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # ========== 1. 获取参数 ==========
+        user_id = request.data.get('userId', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+
+        if not user_id or not dingdan_id:
+            return Response({'code': 400, 'msg': '参数不完整'})
+
+        # ========== 2. 店铺身份验证 ==========
+        dianpu, error = verify_shop_permission(request, user_id)
+        if error:
+            return error
+
+        shop_id = dianpu.id
+
+        # ========== 3. 查询订单并验证归属 ==========
+        try:
+            # 通过平台扩展表确认订单属于本店铺
+            pingtai_ext = DingdanPingtai.objects.select_related('dingdan').get(
+                dianpu_id=shop_id,
+                dingdan__dingdan_id=dingdan_id
+            )
+            order = pingtai_ext.dingdan
+        except DingdanPingtai.DoesNotExist:
+            logger.warning(f"订单 {dingdan_id} 不属于店铺 {shop_id} 或不存在")
+            return Response({'code': 404, 'msg': '订单不存在或不属于本店铺'})
+
+        # ========== 4. 校验订单状态必须为 8（结算中） ==========
+        if order.zhuangtai != 8:
+            logger.warning(f"订单 {dingdan_id} 当前状态为 {order.zhuangtai}，不是结算中")
+            return Response({'code': 400, 'msg': f'订单状态不是结算中，当前状态: {order.zhuangtai}'})
+
+        # ========== 5. 判断是否为跨平台订单（有对方订单ID就认为是跨平台） ==========
+        is_cross = order.is_cross and (order.partner_order_id or order.partner_club_id)
+        dashou_id = order.jiedan_dashou_id
+        dashou_fencheng = order.dashou_fencheng or Decimal('0.00')
+        jine = order.jine or Decimal('0.00')
+
+        try:
+            with transaction.atomic():
+                # 锁定订单行，防止并发
+                order = Dingdan.objects.select_for_update().get(dingdan_id=dingdan_id)
+
+                # ============================
+                # 情况1：跨平台订单（我方派单给对方平台打手）
+                # ============================
+                if is_cross:
+                    # 只需更新我方订单状态，打手在对方平台，不处理我方打手余额
+                    order.zhuangtai = 3              # 已完成
+                    order.clkf = str(shop_id)        # 处理人记录为店铺ID
+                    order.save()
+
+                    # 店铺结算时，若涉及跨平台收益，这里是否要更新店铺统计？
+                    # 根据业务需求，可在此处调用 update_dianpu_daily_stat 等
+                    # 但通常跨平台订单的资金已在对方平台流转，店铺仅作为发单方，
+                    # 收益可能已在其他环节计算，此处可根据需要添加统计。
+
+                    # 通知对方平台（异步，不影响主流程）
+                    if order.partner_club_id and order.partner_order_id:
+                        transaction.on_commit(
+                            lambda: self._notify_partner_order_complete(
+                                order.partner_club_id,
+                                order.partner_order_id,
+                                shop_id
+                            )
+                        )
+
+                # ============================
+                # 情况2：本地订单（我方打手接单）
+                # ============================
+                else:
+                    if not dashou_id:
+                        return Response({'code': 400, 'msg': '订单无接单打手，无法结算'})
+                    if dashou_fencheng < 0:
+                        return Response({'code': 400, 'msg': '打手分成金额无效'})
+
+                    # ---------- 更新打手余额和统计 ----------
+                    try:
+                        dashou_user = UserMain.objects.get(yonghuid=dashou_id)
+                        dashou_profile = dashou_user.dashou_profile
+                        dashou_profile.chengjiaozongliang += 1
+                        dashou_profile.yue += dashou_fencheng
+                        dashou_profile.zonge += dashou_fencheng
+                        dashou_profile.jinrishouyi += dashou_fencheng
+                        dashou_profile.jinyueshouyi += dashou_fencheng
+                        dashou_profile.zhuangtai = 1       # 空闲
+                        dashou_profile.save()
+                    except (UserMain.DoesNotExist, ObjectDoesNotExist):
+                        logger.warning(f"本地订单结算：打手 {dashou_id} 不存在，跳过打手更新")
+
+                    # ---------- 更新订单状态 ----------
+                    order.zhuangtai = 3
+                    order.clkf = str(shop_id)
+                    order.save()
+
+                    # ---------- 打手每日统计（成交） ----------
+                    try:
+                        from houtai.utils import update_dashou_daily_by_action
+                        update_dashou_daily_by_action(
+                            yonghuid=dashou_id,
+                            amount=dashou_fencheng,
+                            action=2               # 2 表示成交（结算）
+                        )
+                    except Exception as e:
+                        logger.error(f"打手每日统计更新失败: {e}")
+
+                    # ---------- 店铺收益统计（结算） ----------
+                    # 根据订单上的店铺收益 (从扩展表取) 更新店铺每日统计及余额
+                    # 前提：订单创建时已存储了 dianpu_shouyi 到扩展表
+                    if pingtai_ext.dianpu_shouyi:
+                        try:
+                            from shangpin.utils import update_shangpin_daily_stat
+                            # 商品每日统计（只要有商品ID就执行）
+                            if order.shangpin_id:
+                                # 从扩展表获取已计算好的收益值（下单时已存储）
+                                pingtai_shouyi = Decimal('0.00')
+                                dianpu_shouyi = Decimal('0.00')
+                                if hasattr(order, 'pingtai_kuozhan'):
+                                    pingtai_shouyi = order.pingtai_kuozhan.pingtai_shouyi or Decimal('0.00')
+                                    dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00')
+
+                                update_shangpin_daily_stat(
+                                    shangpin_id=order.shangpin_id,
+                                    caozuo_leixing=2,  # 2 = 结算
+                                    dingdan_jiage=order.jine,
+                                    pingtai_shouyi=pingtai_shouyi,
+                                    dianpu_zongshouyi=dianpu_shouyi
+                                )
+                                logger.info(f"商品统计更新完成，商品ID: {order.shangpin_id}")
+                            from shangdian.utils import update_dianpu_daily_stat
+                            update_dianpu_daily_stat(
+                                dianpu_id=shop_id,
+                                caozuo_leixing=2,      # 结算操作
+                                dingdan_jiage=jine,
+                                dianpu_shouyi=pingtai_ext.dianpu_shouyi,
+                                # 如果涉及上级分红，可从扩展表取相应字段传入，此处略
+                            )
+                        except Exception as e:
+                            logger.error(f"店铺每日统计更新失败: {e}")
+
+                # ========== 6. 记录操作日志 ==========
+                logger.info(f"强制结单成功，订单 {dingdan_id}，店铺 {shop_id}")
+
+                return Response({'code': 200, 'msg': '强制结单成功'})
+
+        except Dingdan.DoesNotExist:
+            logger.warning(f"订单不存在: {dingdan_id}")
+            return Response({'code': 404, 'msg': '订单不存在'})
+        except Exception as e:
+            logger.error(f"强制结单接口异常: {str(e)}", exc_info=True)
+            return Response({'code': 500, 'msg': '服务器内部错误'})
+
+    # ==================== 通知对方平台（异步） ====================
+    def _notify_partner_order_complete(self, partner_club_id, partner_order_id, shop_id):
+        """通知对方平台我方订单已完成（状态3）"""
+        try:
+            # 尝试获取对方域名等配置（与退款接口类似）
+
+
+            my_config = ClubConfig.objects.filter(is_self=1).first()
+            if not my_config:
+                logger.error("未配置我方俱乐部信息，无法通知对方")
+                return
+            self_club_id = my_config.club_id
+
+            club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=partner_club_id)
+            partner_domain = club_rel.partner_domain.rstrip('/')
+            notify_url = f"{partner_domain}/houtai/dfddtk"
+
+            import requests
+            payload = {
+                'order_id': partner_order_id,
+                'club_id': self_club_id,
+                'status': 3
+            }
+            resp = requests.post(notify_url, json=payload, timeout=3)
+            if resp.status_code == 200:
+                resp_data = resp.json()
+                if resp_data.get('code') == 0:
+                    logger.info(f"通知对方订单已完成: {partner_order_id}")
+                else:
+                    logger.warning(f"对方平台返回错误: {resp_data.get('msg')}")
+            else:
+                logger.warning(f"通知对方HTTP错误: {resp.status_code}")
+        except Exception as e:
+            logger.error(f"通知对方平台异常: {e}")
+
+
+# ================================================================
+# shangdian/views/transfer_hall_view.py
+# 店铺转移大厅接口 —— 严格二改，不添加任何原接口没有的逻辑
+# ================================================================
+# ================================================================
+# shangdian/views/transfer_hall_view.py
+# 店铺转移大厅接口 —— 添加本地打手退款统计
+# ================================================================
+import logging
+import threading
+
+from django.core.exceptions import ObjectDoesNotExist
+
+from dingdan.models import Dingdan, DingdanPingtai, OrderDashouHistory
+
+from houtai.utils import update_dashou_daily_by_action   # 打手每日统计（退款用）
+
+
+
+
+class ShopTransferHallView(APIView):
+    """
+    店铺转移大厅接口
+    URL: POST /shangdian/zydt
+    权限: JWT认证 + 店铺身份验证
+
+    请求参数:
+        userId    (必填) : 店铺所属用户的ID
+        dingdan_id(必填) : 订单ID
+
+    说明:
+        - 只处理平台订单，我方派单
+        - 允许转移的状态：2,8,4
+        - 决定是否处理本地打手：有对方订单ID或俱乐部ID（跨平台）则不处理本地打手，只通知对方；
+          没有对方信息则处理本地打手（释放+退款统计）
+        - 转移后清空对方平台信息，订单重回可接单状态
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # ---------- 1. 获取参数 ----------
+        user_id = request.data.get('userId', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+
+        if not user_id or not dingdan_id:
+            return Response({'code': 400, 'msg': '参数不完整'})
+
+        # ---------- 2. 店铺身份验证 ----------
+        dianpu, error = verify_shop_permission(request, user_id)
+        if error:
+            return error
+
+        shop_id = dianpu.id
+
+        # ---------- 3. 验证订单归属 ----------
+        try:
+            pingtai_ext = DingdanPingtai.objects.select_related('dingdan').get(
+                dianpu_id=shop_id,
+                dingdan__dingdan_id=dingdan_id
+            )
+            order = pingtai_ext.dingdan
+        except DingdanPingtai.DoesNotExist:
+            logger.warning(f"订单 {dingdan_id} 不属于店铺 {shop_id} 或不存在")
+            return Response({'code': 404, 'msg': '订单不存在或不属于本店铺'})
+
+        # ---------- 4. 状态校验 ----------
+        if order.zhuangtai not in [2, 8, 4]:
+            return Response({'code': 400, 'msg': f'订单状态不允许转移大厅，当前状态: {order.zhuangtai}'})
+
+        # ---------- 5. 提取关键字段 ----------
+        current_dashou_id = order.jiedan_dashou_id
+        zhiding_id = order.zhiding_id
+        partner_club_id = order.partner_club_id
+        partner_order_id = order.partner_order_id
+        dashou_fencheng = order.dashou_fencheng or 0   # 用于退款统计
+
+        # 是否跨平台：只要有对方信息即认为是跨平台订单
+        is_cross = bool(partner_club_id or partner_order_id)
+
+        try:
+            with transaction.atomic():
+                # 锁定订单行
+                order = Dingdan.objects.select_for_update().get(dingdan_id=dingdan_id)
+
+                # ---------- 6. 记录打手历史（原接口保留逻辑） ----------
+                if current_dashou_id:
+                    last_history = OrderDashouHistory.objects.filter(
+                        dingdan_id=dingdan_id
+                    ).order_by('-times').first()
+                    next_times = (last_history.times + 1) if last_history else 1
+                    OrderDashouHistory.objects.create(
+                        dingdan_id=dingdan_id,
+                        dashou_id=current_dashou_id,
+                        times=next_times,
+                        operator=str(shop_id)
+                    )
+
+                # ---------- 7. 释放本地打手 + 退款统计（仅当非跨平台时处理） ----------
+                if not is_cross and current_dashou_id:
+                    try:
+                        dashou_profile = UserDashou.objects.get(user__yonghuid=current_dashou_id)
+                        dashou_profile.zhuangtai = 1      # 设为空闲
+                        dashou_profile.save()
+                    except ObjectDoesNotExist:
+                        logger.warning(f"打手 {current_dashou_id} 不存在，跳过状态更新")
+                    else:
+                        # 打手释放成功后，记录每日退款统计（转移视为退款）
+                        try:
+                            update_dashou_daily_by_action(
+                                yonghuid=current_dashou_id,
+                                amount=dashou_fencheng,
+                                action=3              # 3 表示退款
+                            )
+                            logger.info(f"打手 {current_dashou_id} 转移大厅退款统计成功")
+                        except Exception as e:
+                            logger.error(f"打手每日统计失败: {e}")
+
+                # ---------- 8. 清空对方平台信息并重置订单 ----------
+                order.partner_club_id = None
+                order.partner_order_id = None
+                order.jiedan_dashou_id = None
+                order.clkf = str(shop_id)
+
+                # 根据是否有指定打手决定状态
+                order.zhuangtai = 7 if zhiding_id else 1
+                order.save()
+
+                # ---------- 9. 异步通知对方平台（如果有对方信息） ----------
+                if is_cross and partner_club_id and partner_order_id:
+                    # 获取我方俱乐部ID
+                    my_club_config = None
+                    try:
+                        from peizhi.models import ClubConfig
+                        my_club_config = ClubConfig.objects.filter(is_self=1).first()
+                    except Exception as e:
+                        logger.error(f"获取俱乐部配置失败: {e}")
+
+                    if my_club_config:
+                        self_club_id = my_club_config.club_id
+                        def notify():
+                            try:
+                                from dingdan.models import CrossPlatformOrderData
+                                from peizhi.models import Club        # 确保导入
+                                club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=partner_club_id)
+                                partner_domain = club_rel.partner_domain.rstrip('/')
+                                notify_url = f"{partner_domain}/houtai/kpttzzydt"
+                                payload = {
+                                    'order_id': partner_order_id,
+                                    'club_id': self_club_id
+                                }
+                                resp = requests.post(notify_url, json=payload, timeout=3)
+                                if resp.status_code == 200:
+                                    resp_json = resp.json()
+                                    if resp_json.get('code') == 0:
+                                        # 更新跨平台订单数据（原接口逻辑）
+                                        try:
+                                            cross_data, _ = CrossPlatformOrderData.objects.get_or_create(
+                                                dingdan_id=dingdan_id,
+                                                defaults={
+                                                    'partner_order_id': partner_order_id,
+                                                    'partner_club_id': partner_club_id,
+                                                    'partner_order_status': resp_json.get('data', {}).get('partner_status', 0),
+                                                    'partner_dashou_id': '',
+                                                    'partner_amount': order.jine or 0,
+                                                }
+                                            )
+                                            if not _:
+                                                cross_data.partner_order_status = resp_json.get('data', {}).get('partner_status', 0)
+                                                cross_data.save(update_fields=['partner_order_status'])
+                                            logger.info(f"转移大厅通知对方成功: {dingdan_id}")
+                                        except Exception as e:
+                                            logger.error(f"更新跨平台订单数据失败: {e}")
+                                    else:
+                                        logger.warning(f"对方平台返回错误: {resp_json.get('msg')}")
+                                else:
+                                    logger.warning(f"对方接口HTTP错误: {resp.status_code}")
+                            except Club.DoesNotExist:
+                                logger.error(f"未找到对方俱乐部配置: partner_club_id={partner_club_id}")
+                            except Exception as e:
+                                logger.error(f"转移大厅通知对方异常: {e}")
+
+                        threading.Thread(target=notify).start()
+
+                logger.info(f"转移大厅成功，订单 {dingdan_id}")
+                return Response({'code': 200, 'msg': '转移大厅成功'})
+
+        except Dingdan.DoesNotExist:
+            return Response({'code': 404, 'msg': '订单不存在'})
+        except Exception as e:
+            logger.error(f"转移大厅接口异常: {str(e)}", exc_info=True)
+            return Response({'code': 500, 'msg': '服务器内部错误'})
+
+
+
+
+
+# ================================================================
+# shangdian/views/fine_apply_view.py
+# 店铺罚款申请接口 —— 二改自 FineApplyView（客服罚款）
+# ================================================================
+
+from dingdan.models import Dingdan, DingdanPingtai, Fadan       # 订单、罚款记录
+
+
+class ShopFineApplyView(APIView):
+    """
+    店铺罚款申请接口
+    URL: POST /shangdian/fksq
+    权限: JWT认证 + 店铺身份验证
+
+    请求参数:
+        userId              (必填) : 店铺所属用户的ID（用于身份验证）
+        dingdan_id          (必填) : 订单ID
+        reason              (必填) : 罚款原因
+        amount              (必填) : 罚款金额（元）
+        yingxiang_qiangdan  (可选) : 是否影响抢单，1=是，0=否，默认1
+
+    说明:
+        - 仅处理平台订单，需属于当前店铺
+        - 本地/对方派单处理逻辑与客服接口一致：
+            无对方订单ID 或 对方派单 → 本地生成罚单
+            有对方订单ID且我方派单 → 跨平台通知对方，本地也记录（标记对方俱乐部ID）
+        - 申请人：店铺ID，身份码固定为4（店铺管理员）
+        - 被处罚人：接单打手，身份码固定为1
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # ---------- 1. 提取参数 ----------
+        user_id = request.data.get('userId', '').strip()               # 店铺用户ID
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        chufaliyou = request.data.get('reason', '').strip()            # 罚款原因（对应前端的reason）
+        fakuanjine = request.data.get('amount', 0)                     # 罚款金额（对应前端的amount）
+        yingxiang_qiangdan = request.data.get('yingxiang_qiangdan', 1) # 影响抢单
+
+        if not all([user_id, dingdan_id, chufaliyou, fakuanjine]):
+            return Response({'code': 400, 'msg': '参数不完整'})
+
+        try:
+            # ---------- 2. 店铺身份验证 ----------
+            dianpu, error = verify_shop_permission(request, user_id)
+            if error:
+                return error
+            shop_id = dianpu.id   # 店铺ID，作为罚款申请人
+
+            # ---------- 3. 验证订单归属 ----------
+            try:
+                pingtai_ext = DingdanPingtai.objects.select_related('dingdan').get(
+                    dianpu_id=shop_id,
+                    dingdan__dingdan_id=dingdan_id
+                )
+                order = pingtai_ext.dingdan
+            except DingdanPingtai.DoesNotExist:
+                logger.warning(f"罚款申请：订单 {dingdan_id} 不属于店铺 {shop_id}")
+                return Response({'code': 404, 'msg': '订单不存在或不属于本店铺'})
+
+            # ---------- 4. 获取打手ID ----------
+            dashou_id = order.jiedan_dashou_id
+            if not dashou_id:
+                return Response({'code': 400, 'msg': '该订单无接单打手，无法罚款'})
+
+            # ---------- 5. 重复罚款检查 ----------
+            if Fadan.objects.filter(beichufa_id=dashou_id, guanliandingdan_id=dingdan_id).exists():
+                return Response({'code': 400, 'msg': '该打手已被罚款过'})
+
+            # ---------- 6. 跨平台相关字段 ----------
+            partner_order_id = order.partner_order_id or ''
+            partner_club_id = order.partner_club_id or ''
+            dispatch_type = order.dispatch_type or 0          # 1=我方派单，2=对方派单
+
+            # 本地创建罚单的通用函数
+            def create_local_fadan(partner_club=''):
+                Fadan.objects.create(
+                    beichufa_id=dashou_id,
+                    shenqing_chufa=str(shop_id),             # 申请人记为店铺ID
+                    shenfen=1,                                # 被处罚人身份：1 打手
+                    chufaliyou=chufaliyou,
+                    fakuanjine=fakuanjine,
+                    guanliandingdan_id=dingdan_id,
+                    zhuangtai=1,                              # 待缴纳
+                    yingxiang_qiangdan=yingxiang_qiangdan,
+                    shenqingren_shenfen=4,                    # 申请人身份：4 店铺管理员
+                    partner_club_id=partner_club,
+                )
+
+            # ---------- 7. 判断处罚流向 ----------
+            # 情况A：没有对方订单ID，或对方派单 → 本地处罚
+            if not partner_order_id or dispatch_type == 2:
+                with transaction.atomic():
+                    create_local_fadan()
+                logger.info(f"本地罚款成功: 订单 {dingdan_id}, 打手 {dashou_id}, 金额 {fakuanjine}")
+                return Response({'code': 200, 'msg': '罚款已生成'})
+
+            # ---------- 8. 情况B：有对方订单ID且我方派单 → 跨平台通知对方 ----------
+            # 获取我方俱乐部ID
+            try:
+                my_club = ClubConfig.objects.filter(is_self=1).first()
+                if not my_club:
+                    return Response({'code': 500, 'msg': '系统配置错误，缺少本俱乐部信息'})
+                self_club_id = my_club.club_id
+                club_rel = Club.objects.get(club_id=self_club_id, partner_club_id=partner_club_id)
+                partner_domain = club_rel.partner_domain
+            except Club.DoesNotExist:
+                return Response({'code': 500, 'msg': '未找到对方平台配置，无法通知'})
+            except Exception as e:
+                logger.error(f"获取对方平台信息失败: {e}")
+                return Response({'code': 500, 'msg': '获取对方平台信息失败'})
+
+            # 构造通知 payload
+            url = partner_domain.rstrip('/') + '/houtai/kffkdssq_notify'
+            payload = {
+                'order_id': partner_order_id,               # 对方平台的订单ID
+                'club_id': self_club_id,                    # 我方俱乐部ID
+                'chufaliyou': chufaliyou,
+                'fakuanjine': fakuanjine,
+                'yingxiang_qiangdan': yingxiang_qiangdan,
+                'shenqingren_shenfen': 4,                   # 店铺管理员身份
+                'operator': str(shop_id),
+            }
+
+            # 带重试的通知
+            success = False
+            for _ in range(2):
+                try:
+                    resp = requests.post(url, json=payload, timeout=3)
+                    if resp.status_code == 200 and resp.json().get('code') == 0:
+                        success = True
+                        break
+                except Exception:
+                    continue
+
+            if not success:
+                return Response({'code': 500, 'msg': '通知对方平台失败，请稍后重试'})
+
+            # 通知成功后，本地也记录一笔（标记为跨平台）
+            with transaction.atomic():
+                create_local_fadan(partner_club=partner_club_id)
+
+            logger.info(f"跨平台罚款通知成功: 订单 {dingdan_id}")
+            return Response({'code': 200, 'msg': '罚款已提交至对方平台'})
+
+        except Exception as e:
+            logger.error(f"店铺罚款申请异常: {traceback.format_exc()}")
+            return Response({'code': 500, 'msg': '服务器内部错误'})
\ No newline at end of file
diff --git a/shangpin/__init__.py b/shangpin/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/shangpin/__pycache__/__init__.cpython-313.pyc b/shangpin/__pycache__/__init__.cpython-313.pyc
new file mode 100644
index 0000000..e25f167
Binary files /dev/null and b/shangpin/__pycache__/__init__.cpython-313.pyc differ
diff --git a/shangpin/__pycache__/admin.cpython-313.pyc b/shangpin/__pycache__/admin.cpython-313.pyc
new file mode 100644
index 0000000..483b82d
Binary files /dev/null and b/shangpin/__pycache__/admin.cpython-313.pyc differ
diff --git a/shangpin/__pycache__/apps.cpython-313.pyc b/shangpin/__pycache__/apps.cpython-313.pyc
new file mode 100644
index 0000000..af0f484
Binary files /dev/null and b/shangpin/__pycache__/apps.cpython-313.pyc differ
diff --git a/shangpin/__pycache__/models.cpython-313.pyc b/shangpin/__pycache__/models.cpython-313.pyc
new file mode 100644
index 0000000..8ce1540
Binary files /dev/null and b/shangpin/__pycache__/models.cpython-313.pyc differ
diff --git a/shangpin/__pycache__/urls.cpython-313.pyc b/shangpin/__pycache__/urls.cpython-313.pyc
new file mode 100644
index 0000000..2a8a31e
Binary files /dev/null and b/shangpin/__pycache__/urls.cpython-313.pyc differ
diff --git a/shangpin/__pycache__/utils.cpython-313.pyc b/shangpin/__pycache__/utils.cpython-313.pyc
new file mode 100644
index 0000000..15c0ca5
Binary files /dev/null and b/shangpin/__pycache__/utils.cpython-313.pyc differ
diff --git a/shangpin/__pycache__/views.cpython-313.pyc b/shangpin/__pycache__/views.cpython-313.pyc
new file mode 100644
index 0000000..089f4bb
Binary files /dev/null and b/shangpin/__pycache__/views.cpython-313.pyc differ
diff --git a/shangpin/admin.py b/shangpin/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/shangpin/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/shangpin/apps.py b/shangpin/apps.py
new file mode 100644
index 0000000..9666a1b
--- /dev/null
+++ b/shangpin/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class ShangpinConfig(AppConfig):
+    name = "shangpin"
diff --git a/shangpin/migrations/0001_initial.py b/shangpin/migrations/0001_initial.py
new file mode 100644
index 0000000..7a3a91b
--- /dev/null
+++ b/shangpin/migrations/0001_initial.py
@@ -0,0 +1,86 @@
+# Generated by Django 6.0 on 2025-12-20 23:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="Shangpin",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True, serialize=False, verbose_name="商品ID"
+                    ),
+                ),
+                (
+                    "jiage",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="商品价格",
+                    ),
+                ),
+                (
+                    "kucun",
+                    models.PositiveIntegerField(default=0, verbose_name="商品库存"),
+                ),
+                (
+                    "leixing",
+                    models.PositiveIntegerField(
+                        blank=True, null=True, verbose_name="商品类型"
+                    ),
+                ),
+                (
+                    "zhuanqu",
+                    models.PositiveIntegerField(
+                        blank=True, null=True, verbose_name="商品专区"
+                    ),
+                ),
+                (
+                    "zhenshi_xiaoliang",
+                    models.PositiveIntegerField(default=0, verbose_name="商品真实销量"),
+                ),
+                (
+                    "duiwai_xiaoliang",
+                    models.PositiveIntegerField(default=0, verbose_name="商品对外销量"),
+                ),
+                (
+                    "jieshao",
+                    models.TextField(blank=True, null=True, verbose_name="商品介绍"),
+                ),
+                (
+                    "tupian_url",
+                    models.URLField(blank=True, null=True, verbose_name="商品图片URL"),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更改时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "商品",
+                "verbose_name_plural": "商品",
+                "db_table": "shangpin",
+                "indexes": [
+                    models.Index(
+                        fields=["leixing"], name="shangpin_leixing_d19864_idx"
+                    ),
+                    models.Index(
+                        fields=["zhuanqu"], name="shangpin_zhuanqu_9fdc1b_idx"
+                    ),
+                ],
+            },
+        ),
+    ]
diff --git a/shangpin/migrations/0002_shangpinleixing_shangpinzhuanqu_and_more.py b/shangpin/migrations/0002_shangpinleixing_shangpinzhuanqu_and_more.py
new file mode 100644
index 0000000..db817d7
--- /dev/null
+++ b/shangpin/migrations/0002_shangpinleixing_shangpinzhuanqu_and_more.py
@@ -0,0 +1,123 @@
+# Generated by Django 6.0 on 2025-12-21 18:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shangpin", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="ShangpinLeixing",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True, serialize=False, verbose_name="类型ID"
+                    ),
+                ),
+                (
+                    "jieshao",
+                    models.CharField(
+                        max_length=45, unique=True, verbose_name="类型介绍"
+                    ),
+                ),
+                (
+                    "tupian_url",
+                    models.CharField(
+                        blank=True,
+                        max_length=500,
+                        null=True,
+                        verbose_name="类型图片URL",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "商品类型",
+                "verbose_name_plural": "商品类型",
+                "db_table": "shangpin_leixing",
+            },
+        ),
+        migrations.CreateModel(
+            name="ShangpinZhuanqu",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True, serialize=False, verbose_name="专区ID"
+                    ),
+                ),
+                (
+                    "mingzi",
+                    models.CharField(
+                        max_length=45, unique=True, verbose_name="专区名称"
+                    ),
+                ),
+                ("leixing_id", models.PositiveIntegerField(verbose_name="类型ID")),
+            ],
+            options={
+                "verbose_name": "商品专区",
+                "verbose_name_plural": "商品专区",
+                "db_table": "shangpin_zhuanqu",
+            },
+        ),
+        migrations.RemoveIndex(
+            model_name="shangpin",
+            name="shangpin_leixing_d19864_idx",
+        ),
+        migrations.RemoveIndex(
+            model_name="shangpin",
+            name="shangpin_zhuanqu_9fdc1b_idx",
+        ),
+        migrations.AddField(
+            model_name="shangpin",
+            name="biaoqian",
+            field=models.CharField(
+                blank=True, max_length=45, null=True, verbose_name="商品标题"
+            ),
+        ),
+        migrations.AddField(
+            model_name="shangpin",
+            name="guize_tupian",
+            field=models.CharField(
+                blank=True, max_length=500, null=True, verbose_name="规则图片URL"
+            ),
+        ),
+        migrations.AddField(
+            model_name="shangpin",
+            name="leixing_id",
+            field=models.PositiveIntegerField(
+                blank=True, null=True, verbose_name="商品类型ID"
+            ),
+        ),
+        migrations.AddField(
+            model_name="shangpin",
+            name="xiadan_xuzhi",
+            field=models.TextField(blank=True, null=True, verbose_name="下单须知"),
+        ),
+        migrations.AddField(
+            model_name="shangpin",
+            name="zhuanqu_id",
+            field=models.PositiveIntegerField(
+                blank=True, null=True, verbose_name="商品专区ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="shangpin",
+            name="tupian_url",
+            field=models.CharField(
+                blank=True, max_length=500, null=True, verbose_name="商品图片URL"
+            ),
+        ),
+        migrations.RemoveField(
+            model_name="shangpin",
+            name="leixing",
+        ),
+        migrations.RemoveField(
+            model_name="shangpin",
+            name="zhuanqu",
+        ),
+    ]
diff --git a/shangpin/migrations/0003_alter_shangpinleixing_jieshao_and_more.py b/shangpin/migrations/0003_alter_shangpinleixing_jieshao_and_more.py
new file mode 100644
index 0000000..d786ded
--- /dev/null
+++ b/shangpin/migrations/0003_alter_shangpinleixing_jieshao_and_more.py
@@ -0,0 +1,27 @@
+# Generated by Django 6.0 on 2025-12-21 23:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shangpin", "0002_shangpinleixing_shangpinzhuanqu_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="shangpinleixing",
+            name="jieshao",
+            field=models.CharField(
+                blank=True, max_length=45, null=True, verbose_name="类型介绍"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="shangpinzhuanqu",
+            name="mingzi",
+            field=models.CharField(
+                blank=True, max_length=45, null=True, verbose_name="专区名称"
+            ),
+        ),
+    ]
diff --git a/shangpin/migrations/0004_huiyuan_huiyuangoumai_shangpin_huiyuan_id_and_more.py b/shangpin/migrations/0004_huiyuan_huiyuangoumai_shangpin_huiyuan_id_and_more.py
new file mode 100644
index 0000000..dc11e3b
--- /dev/null
+++ b/shangpin/migrations/0004_huiyuan_huiyuangoumai_shangpin_huiyuan_id_and_more.py
@@ -0,0 +1,124 @@
+# Generated by Django 6.0 on 2025-12-23 21:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shangpin", "0003_alter_shangpinleixing_jieshao_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Huiyuan",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "huiyuan_id",
+                    models.CharField(max_length=6, unique=True, verbose_name="会员ID"),
+                ),
+                ("jieshao", models.CharField(max_length=30, verbose_name="会员介绍")),
+                (
+                    "jiage",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="会员价格",
+                    ),
+                ),
+                (
+                    "goumai_cishu",
+                    models.PositiveIntegerField(default=0, verbose_name="购买次数"),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "会员",
+                "verbose_name_plural": "会员",
+                "db_table": "huiyuan",
+            },
+        ),
+        migrations.CreateModel(
+            name="Huiyuangoumai",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True, serialize=False, verbose_name="购买记录ID"
+                    ),
+                ),
+                (
+                    "huiyuan_id",
+                    models.CharField(
+                        db_index=True, max_length=6, verbose_name="会员ID"
+                    ),
+                ),
+                (
+                    "yonghu_id",
+                    models.CharField(
+                        db_index=True, max_length=32, verbose_name="用户ID"
+                    ),
+                ),
+                (
+                    "huiyuan_zhuangtai",
+                    models.PositiveIntegerField(default=1, verbose_name="会员状态"),
+                ),
+                ("daoqi_time", models.DateTimeField(verbose_name="会员到期时间")),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "用户购买会员",
+                "verbose_name_plural": "用户购买会员",
+                "db_table": "huiyuangoumai",
+            },
+        ),
+        migrations.AddField(
+            model_name="shangpin",
+            name="huiyuan_id",
+            field=models.CharField(
+                blank=True, max_length=6, null=True, verbose_name="会员ID"
+            ),
+        ),
+        migrations.AddField(
+            model_name="shangpin",
+            name="yaoqiuleixing",
+            field=models.PositiveIntegerField(
+                blank=True, null=True, verbose_name="抢单要求类型"
+            ),
+        ),
+        migrations.AddField(
+            model_name="shangpin",
+            name="yongjin",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                max_digits=10,
+                null=True,
+                verbose_name="佣金要求",
+            ),
+        ),
+    ]
diff --git a/shangpin/migrations/0005_huiyuangoumai_jieshao.py b/shangpin/migrations/0005_huiyuangoumai_jieshao.py
new file mode 100644
index 0000000..b55799c
--- /dev/null
+++ b/shangpin/migrations/0005_huiyuangoumai_jieshao.py
@@ -0,0 +1,18 @@
+# Generated by Django 6.0 on 2025-12-27 22:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shangpin", "0004_huiyuan_huiyuangoumai_shangpin_huiyuan_id_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="huiyuangoumai",
+            name="jieshao",
+            field=models.CharField(max_length=30, null=True, verbose_name="会员介绍"),
+        ),
+    ]
diff --git a/shangpin/migrations/0006_shangpinleixing_huiyuan_id_and_more.py b/shangpin/migrations/0006_shangpinleixing_huiyuan_id_and_more.py
new file mode 100644
index 0000000..e3d07c4
--- /dev/null
+++ b/shangpin/migrations/0006_shangpinleixing_huiyuan_id_and_more.py
@@ -0,0 +1,38 @@
+# Generated by Django 6.0 on 2025-12-29 20:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shangpin", "0005_huiyuangoumai_jieshao"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="shangpinleixing",
+            name="huiyuan_id",
+            field=models.CharField(
+                blank=True, max_length=6, null=True, verbose_name="会员ID"
+            ),
+        ),
+        migrations.AddField(
+            model_name="shangpinleixing",
+            name="yaoqiuleixing",
+            field=models.PositiveIntegerField(
+                blank=True, null=True, verbose_name="抢单要求类型"
+            ),
+        ),
+        migrations.AddField(
+            model_name="shangpinleixing",
+            name="yongjin",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                max_digits=10,
+                null=True,
+                verbose_name="佣金要求",
+            ),
+        ),
+    ]
diff --git a/shangpin/migrations/0007_huiyuan_guanshifc_huiyuan_jtjieshao_czjilu_gsfenhong.py b/shangpin/migrations/0007_huiyuan_guanshifc_huiyuan_jtjieshao_czjilu_gsfenhong.py
new file mode 100644
index 0000000..9b76790
--- /dev/null
+++ b/shangpin/migrations/0007_huiyuan_guanshifc_huiyuan_jtjieshao_czjilu_gsfenhong.py
@@ -0,0 +1,173 @@
+# Generated by Django 6.0 on 2026-01-06 23:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shangpin", "0006_shangpinleixing_huiyuan_id_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="huiyuan",
+            name="guanshifc",
+            field=models.DecimalField(
+                decimal_places=2, default=0.0, max_digits=10, verbose_name="管事分成"
+            ),
+        ),
+        migrations.AddField(
+            model_name="huiyuan",
+            name="jtjieshao",
+            field=models.TextField(blank=True, null=True, verbose_name="会员规则介绍"),
+        ),
+        migrations.CreateModel(
+            name="Czjilu",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "dingdan_id",
+                    models.CharField(
+                        db_index=True, max_length=32, unique=True, verbose_name="订单ID"
+                    ),
+                ),
+                (
+                    "huiyuan_id",
+                    models.CharField(
+                        blank=True, max_length=6, null=True, verbose_name="会员ID"
+                    ),
+                ),
+                (
+                    "zhuangtai",
+                    models.IntegerField(blank=True, null=True, verbose_name="订单状态"),
+                ),
+                (
+                    "yonghuid",
+                    models.CharField(
+                        db_index=True, max_length=7, verbose_name="用户ID"
+                    ),
+                ),
+                (
+                    "jine",
+                    models.DecimalField(
+                        decimal_places=2, max_digits=10, verbose_name="订单金额"
+                    ),
+                ),
+                (
+                    "leixing",
+                    models.IntegerField(
+                        blank=True,
+                        null=True,
+                        verbose_name="充值类型，1:会员，2:押金,3:积分,4:商家",
+                    ),
+                ),
+                (
+                    "shuoming",
+                    models.CharField(
+                        blank=True, max_length=100, null=True, verbose_name="订单说明"
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "充值记录订单",
+                "verbose_name_plural": "充值记录订单",
+                "db_table": "czjilu",
+                "indexes": [
+                    models.Index(
+                        fields=["dingdan_id"], name="czjilu_dingdan_39bbd0_idx"
+                    ),
+                    models.Index(fields=["yonghuid"], name="czjilu_yonghui_a0555f_idx"),
+                ],
+            },
+        ),
+        migrations.CreateModel(
+            name="Gsfenhong",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "dingdan_id",
+                    models.CharField(max_length=32, unique=True, verbose_name="订单ID"),
+                ),
+                (
+                    "guanshi",
+                    models.CharField(
+                        db_index=True, max_length=7, verbose_name="管事ID"
+                    ),
+                ),
+                (
+                    "dashouid",
+                    models.CharField(
+                        db_index=True, max_length=7, unique=True, verbose_name="打手ID"
+                    ),
+                ),
+                (
+                    "shuoming",
+                    models.CharField(
+                        blank=True, max_length=100, null=True, verbose_name="订单说明"
+                    ),
+                ),
+                (
+                    "fenhong",
+                    models.DecimalField(
+                        decimal_places=2, max_digits=10, verbose_name="订单分红金额"
+                    ),
+                ),
+                (
+                    "avatar",
+                    models.CharField(
+                        blank=True, max_length=500, null=True, verbose_name="打手头像"
+                    ),
+                ),
+                (
+                    "nicheng",
+                    models.CharField(max_length=50, null=True, verbose_name="打手昵称"),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "管事分红记录",
+                "verbose_name_plural": "管事分红记录",
+                "db_table": "gsfenhong",
+                "indexes": [
+                    models.Index(
+                        fields=["guanshi"], name="gsfenhong_guanshi_dc440f_idx"
+                    ),
+                    models.Index(
+                        fields=["dashouid"], name="gsfenhong_dashoui_5473ca_idx"
+                    ),
+                ],
+            },
+        ),
+    ]
diff --git a/shangpin/migrations/0008_alter_huiyuangoumai_unique_together_and_more.py b/shangpin/migrations/0008_alter_huiyuangoumai_unique_together_and_more.py
new file mode 100644
index 0000000..fb53e42
--- /dev/null
+++ b/shangpin/migrations/0008_alter_huiyuangoumai_unique_together_and_more.py
@@ -0,0 +1,36 @@
+# Generated by Django 4.2.27 on 2026-01-20 15:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shangpin", "0007_huiyuan_guanshifc_huiyuan_jtjieshao_czjilu_gsfenhong"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="huiyuangoumai",
+            unique_together={("yonghu_id", "huiyuan_id")},
+        ),
+        migrations.AddIndex(
+            model_name="huiyuangoumai",
+            index=models.Index(
+                fields=["yonghu_id"], name="huiyuangoum_yonghu__ba2138_idx"
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="huiyuangoumai",
+            index=models.Index(
+                fields=["huiyuan_id"], name="huiyuangoum_huiyuan_35fe1d_idx"
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="huiyuangoumai",
+            index=models.Index(
+                fields=["yonghu_id", "huiyuan_id"],
+                name="huiyuangoum_yonghu__21e6e1_idx",
+            ),
+        ),
+    ]
diff --git a/shangpin/migrations/0009_alter_shangpinleixing_yaoqiuleixing.py b/shangpin/migrations/0009_alter_shangpinleixing_yaoqiuleixing.py
new file mode 100644
index 0000000..a19540b
--- /dev/null
+++ b/shangpin/migrations/0009_alter_shangpinleixing_yaoqiuleixing.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.27 on 2026-01-25 20:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shangpin", "0008_alter_huiyuangoumai_unique_together_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="shangpinleixing",
+            name="yaoqiuleixing",
+            field=models.PositiveIntegerField(
+                blank=True, null=True, verbose_name="抢单要求类型1：会员2：佣金"
+            ),
+        ),
+    ]
diff --git a/shangpin/migrations/0010_shangpin_paixu_shangpinleixing_paixu_and_more.py b/shangpin/migrations/0010_shangpin_paixu_shangpinleixing_paixu_and_more.py
new file mode 100644
index 0000000..0834b5e
--- /dev/null
+++ b/shangpin/migrations/0010_shangpin_paixu_shangpinleixing_paixu_and_more.py
@@ -0,0 +1,35 @@
+# Generated by Django 4.2.27 on 2026-02-07 13:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shangpin", "0009_alter_shangpinleixing_yaoqiuleixing"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="shangpin",
+            name="paixu",
+            field=models.IntegerField(default=0, verbose_name="排序权重"),
+        ),
+        migrations.AddField(
+            model_name="shangpinleixing",
+            name="paixu",
+            field=models.IntegerField(default=0, verbose_name="排序权重"),
+        ),
+        migrations.AddField(
+            model_name="shangpinleixing",
+            name="shenhezhuangtai",
+            field=models.IntegerField(
+                default=1, help_text="1=正常, 2=审核专用", verbose_name="审核状态"
+            ),
+        ),
+        migrations.AddField(
+            model_name="shangpinzhuanqu",
+            name="paixu",
+            field=models.IntegerField(default=0, verbose_name="排序权重"),
+        ),
+    ]
diff --git a/shangpin/migrations/0011_shangpin_shenhezhuangtai_and_more.py b/shangpin/migrations/0011_shangpin_shenhezhuangtai_and_more.py
new file mode 100644
index 0000000..2e75e5c
--- /dev/null
+++ b/shangpin/migrations/0011_shangpin_shenhezhuangtai_and_more.py
@@ -0,0 +1,27 @@
+# Generated by Django 4.2.27 on 2026-02-09 16:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shangpin", "0010_shangpin_paixu_shangpinleixing_paixu_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="shangpin",
+            name="shenhezhuangtai",
+            field=models.IntegerField(
+                default=1, help_text="1=正常, 2=审核专用", verbose_name="审核状态"
+            ),
+        ),
+        migrations.AddField(
+            model_name="shangpinzhuanqu",
+            name="shenhezhuangtai",
+            field=models.IntegerField(
+                default=1, help_text="1=正常, 2=审核专用", verbose_name="审核状态"
+            ),
+        ),
+    ]
diff --git a/shangpin/migrations/0012_alter_gsfenhong_dashouid.py b/shangpin/migrations/0012_alter_gsfenhong_dashouid.py
new file mode 100644
index 0000000..b3814c6
--- /dev/null
+++ b/shangpin/migrations/0012_alter_gsfenhong_dashouid.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.27 on 2026-03-01 23:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shangpin", "0011_shangpin_shenhezhuangtai_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="gsfenhong",
+            name="dashouid",
+            field=models.CharField(db_index=True, max_length=7, verbose_name="打手ID"),
+        ),
+    ]
diff --git a/shangpin/migrations/0013_gsfenhong_huiyuan_id_gsfenhong_zuzhang_fenhong_and_more.py b/shangpin/migrations/0013_gsfenhong_huiyuan_id_gsfenhong_zuzhang_fenhong_and_more.py
new file mode 100644
index 0000000..00193cc
--- /dev/null
+++ b/shangpin/migrations/0013_gsfenhong_huiyuan_id_gsfenhong_zuzhang_fenhong_and_more.py
@@ -0,0 +1,129 @@
+# Generated by Django 4.2.27 on 2026-03-18 21:00
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shangpin", "0012_alter_gsfenhong_dashouid"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="gsfenhong",
+            name="huiyuan_id",
+            field=models.CharField(
+                blank=True, max_length=6, null=True, verbose_name="会员ID"
+            ),
+        ),
+        migrations.AddField(
+            model_name="gsfenhong",
+            name="zuzhang_fenhong",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                max_digits=10,
+                null=True,
+                verbose_name="组长分红金额",
+            ),
+        ),
+        migrations.AddField(
+            model_name="gsfenhong",
+            name="zuzhang_id",
+            field=models.CharField(
+                blank=True,
+                db_index=True,
+                max_length=7,
+                null=True,
+                verbose_name="组长ID",
+            ),
+        ),
+        migrations.AddField(
+            model_name="huiyuan",
+            name="zuzhangfc",
+            field=models.DecimalField(
+                decimal_places=2, default=0.0, max_digits=10, verbose_name="组长分成"
+            ),
+        ),
+        migrations.CreateModel(
+            name="DuociFenhong",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "guanshi",
+                    models.CharField(
+                        db_index=True, max_length=7, verbose_name="管事ID"
+                    ),
+                ),
+                (
+                    "zuzhang",
+                    models.CharField(
+                        blank=True,
+                        db_index=True,
+                        max_length=7,
+                        null=True,
+                        verbose_name="组长ID",
+                    ),
+                ),
+                ("cishu", models.PositiveIntegerField(verbose_name="分红次数")),
+                (
+                    "guanshi_fenhong",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="管事分红金额",
+                    ),
+                ),
+                (
+                    "zuzhang_fenhong",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="组长分红金额",
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+                (
+                    "huiyuan",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="shangpin.huiyuan",
+                        verbose_name="会员",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "多次分红配置",
+                "verbose_name_plural": "多次分红配置",
+                "db_table": "duoci_fenhong",
+                "indexes": [
+                    models.Index(
+                        fields=["guanshi"], name="duoci_fenho_guanshi_b3de53_idx"
+                    ),
+                    models.Index(
+                        fields=["zuzhang"], name="duoci_fenho_zuzhang_69997d_idx"
+                    ),
+                ],
+                "unique_together": {("huiyuan", "guanshi", "cishu")},
+            },
+        ),
+    ]
diff --git a/shangpin/migrations/0014_remove_duocifenhong_duoci_fenho_guanshi_b3de53_idx_and_more.py b/shangpin/migrations/0014_remove_duocifenhong_duoci_fenho_guanshi_b3de53_idx_and_more.py
new file mode 100644
index 0000000..e325aca
--- /dev/null
+++ b/shangpin/migrations/0014_remove_duocifenhong_duoci_fenho_guanshi_b3de53_idx_and_more.py
@@ -0,0 +1,74 @@
+# Generated by Django 4.2.27 on 2026-03-22 22:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shangpin", "0013_gsfenhong_huiyuan_id_gsfenhong_zuzhang_fenhong_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveIndex(
+            model_name="duocifenhong",
+            name="duoci_fenho_guanshi_b3de53_idx",
+        ),
+        migrations.RemoveIndex(
+            model_name="duocifenhong",
+            name="duoci_fenho_zuzhang_69997d_idx",
+        ),
+        migrations.AlterUniqueTogether(
+            name="duocifenhong",
+            unique_together=set(),
+        ),
+        migrations.AddField(
+            model_name="duocifenhong",
+            name="yonghuid",
+            field=models.CharField(
+                db_index=True, default=123, max_length=7, verbose_name="用户ID"
+            ),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="shangpin",
+            name="ewai_dashou_fencheng",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                max_digits=10,
+                null=True,
+                verbose_name="打手额外分成金额",
+            ),
+        ),
+        migrations.AddField(
+            model_name="shangpin",
+            name="kaioi_ewai_dashou_fencheng",
+            field=models.BooleanField(
+                default=False, verbose_name="是否开启打手额外分成"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="duocifenhong",
+            name="huiyuan",
+            field=models.CharField(max_length=10, verbose_name="会员ID"),
+        ),
+        migrations.AlterUniqueTogether(
+            name="duocifenhong",
+            unique_together={("huiyuan", "yonghuid", "cishu")},
+        ),
+        migrations.AddIndex(
+            model_name="duocifenhong",
+            index=models.Index(
+                fields=["yonghuid"], name="duoci_fenho_yonghui_db6a2f_idx"
+            ),
+        ),
+        migrations.RemoveField(
+            model_name="duocifenhong",
+            name="guanshi",
+        ),
+        migrations.RemoveField(
+            model_name="duocifenhong",
+            name="zuzhang",
+        ),
+    ]
diff --git a/shangpin/migrations/0015_shangpinleixing_is_cross_enabled_and_more.py b/shangpin/migrations/0015_shangpinleixing_is_cross_enabled_and_more.py
new file mode 100644
index 0000000..1f34933
--- /dev/null
+++ b/shangpin/migrations/0015_shangpinleixing_is_cross_enabled_and_more.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.2.27 on 2026-03-30 12:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "shangpin",
+            "0014_remove_duocifenhong_duoci_fenho_guanshi_b3de53_idx_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="shangpinleixing",
+            name="is_cross_enabled",
+            field=models.BooleanField(default=False, verbose_name="是否开启平台互通"),
+        ),
+        migrations.AlterField(
+            model_name="shangpin",
+            name="yaoqiuleixing",
+            field=models.PositiveIntegerField(
+                blank=True, null=True, verbose_name="抢单要求类型1:会员2：佣金"
+            ),
+        ),
+    ]
diff --git a/shangpin/migrations/0016_gsfenhong_fenhong_leixing.py b/shangpin/migrations/0016_gsfenhong_fenhong_leixing.py
new file mode 100644
index 0000000..0747299
--- /dev/null
+++ b/shangpin/migrations/0016_gsfenhong_fenhong_leixing.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.27 on 2026-06-07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shangpin", "0015_shangpinleixing_is_cross_enabled_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="gsfenhong",
+            name="fenhong_leixing",
+            field=models.PositiveSmallIntegerField(
+                choices=[(1, "会员分红"), (2, "押金分红"), (3, "商家订单分红")],
+                default=1,
+                verbose_name="分红类型",
+            ),
+        ),
+    ]
diff --git a/shangpin/migrations/__init__.py b/shangpin/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/shangpin/migrations/__pycache__/0001_initial.cpython-313.pyc b/shangpin/migrations/__pycache__/0001_initial.cpython-313.pyc
new file mode 100644
index 0000000..297a10b
Binary files /dev/null and b/shangpin/migrations/__pycache__/0001_initial.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/0002_shangpinleixing_shangpinzhuanqu_and_more.cpython-313.pyc b/shangpin/migrations/__pycache__/0002_shangpinleixing_shangpinzhuanqu_and_more.cpython-313.pyc
new file mode 100644
index 0000000..d4bcc2c
Binary files /dev/null and b/shangpin/migrations/__pycache__/0002_shangpinleixing_shangpinzhuanqu_and_more.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/0003_alter_shangpinleixing_jieshao_and_more.cpython-313.pyc b/shangpin/migrations/__pycache__/0003_alter_shangpinleixing_jieshao_and_more.cpython-313.pyc
new file mode 100644
index 0000000..705df48
Binary files /dev/null and b/shangpin/migrations/__pycache__/0003_alter_shangpinleixing_jieshao_and_more.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/0004_huiyuan_huiyuangoumai_shangpin_huiyuan_id_and_more.cpython-313.pyc b/shangpin/migrations/__pycache__/0004_huiyuan_huiyuangoumai_shangpin_huiyuan_id_and_more.cpython-313.pyc
new file mode 100644
index 0000000..cd486b3
Binary files /dev/null and b/shangpin/migrations/__pycache__/0004_huiyuan_huiyuangoumai_shangpin_huiyuan_id_and_more.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/0005_huiyuangoumai_jieshao.cpython-313.pyc b/shangpin/migrations/__pycache__/0005_huiyuangoumai_jieshao.cpython-313.pyc
new file mode 100644
index 0000000..4df1522
Binary files /dev/null and b/shangpin/migrations/__pycache__/0005_huiyuangoumai_jieshao.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/0006_shangpinleixing_huiyuan_id_and_more.cpython-313.pyc b/shangpin/migrations/__pycache__/0006_shangpinleixing_huiyuan_id_and_more.cpython-313.pyc
new file mode 100644
index 0000000..0b453b7
Binary files /dev/null and b/shangpin/migrations/__pycache__/0006_shangpinleixing_huiyuan_id_and_more.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/0007_huiyuan_guanshifc_huiyuan_jtjieshao_czjilu_gsfenhong.cpython-313.pyc b/shangpin/migrations/__pycache__/0007_huiyuan_guanshifc_huiyuan_jtjieshao_czjilu_gsfenhong.cpython-313.pyc
new file mode 100644
index 0000000..60d92b2
Binary files /dev/null and b/shangpin/migrations/__pycache__/0007_huiyuan_guanshifc_huiyuan_jtjieshao_czjilu_gsfenhong.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/0008_alter_huiyuangoumai_unique_together_and_more.cpython-313.pyc b/shangpin/migrations/__pycache__/0008_alter_huiyuangoumai_unique_together_and_more.cpython-313.pyc
new file mode 100644
index 0000000..6d0cbe9
Binary files /dev/null and b/shangpin/migrations/__pycache__/0008_alter_huiyuangoumai_unique_together_and_more.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/0009_alter_shangpinleixing_yaoqiuleixing.cpython-313.pyc b/shangpin/migrations/__pycache__/0009_alter_shangpinleixing_yaoqiuleixing.cpython-313.pyc
new file mode 100644
index 0000000..fdcfc57
Binary files /dev/null and b/shangpin/migrations/__pycache__/0009_alter_shangpinleixing_yaoqiuleixing.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/0010_shangpin_paixu_shangpinleixing_paixu_and_more.cpython-313.pyc b/shangpin/migrations/__pycache__/0010_shangpin_paixu_shangpinleixing_paixu_and_more.cpython-313.pyc
new file mode 100644
index 0000000..07f31d2
Binary files /dev/null and b/shangpin/migrations/__pycache__/0010_shangpin_paixu_shangpinleixing_paixu_and_more.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/0011_shangpin_shenhezhuangtai_and_more.cpython-313.pyc b/shangpin/migrations/__pycache__/0011_shangpin_shenhezhuangtai_and_more.cpython-313.pyc
new file mode 100644
index 0000000..49fd9a6
Binary files /dev/null and b/shangpin/migrations/__pycache__/0011_shangpin_shenhezhuangtai_and_more.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/0012_alter_gsfenhong_dashouid.cpython-313.pyc b/shangpin/migrations/__pycache__/0012_alter_gsfenhong_dashouid.cpython-313.pyc
new file mode 100644
index 0000000..5387158
Binary files /dev/null and b/shangpin/migrations/__pycache__/0012_alter_gsfenhong_dashouid.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/0013_gsfenhong_huiyuan_id_gsfenhong_zuzhang_fenhong_and_more.cpython-313.pyc b/shangpin/migrations/__pycache__/0013_gsfenhong_huiyuan_id_gsfenhong_zuzhang_fenhong_and_more.cpython-313.pyc
new file mode 100644
index 0000000..6c78ae3
Binary files /dev/null and b/shangpin/migrations/__pycache__/0013_gsfenhong_huiyuan_id_gsfenhong_zuzhang_fenhong_and_more.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/0014_remove_duocifenhong_duoci_fenho_guanshi_b3de53_idx_and_more.cpython-313.pyc b/shangpin/migrations/__pycache__/0014_remove_duocifenhong_duoci_fenho_guanshi_b3de53_idx_and_more.cpython-313.pyc
new file mode 100644
index 0000000..198181b
Binary files /dev/null and b/shangpin/migrations/__pycache__/0014_remove_duocifenhong_duoci_fenho_guanshi_b3de53_idx_and_more.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/0015_shangpinleixing_is_cross_enabled_and_more.cpython-313.pyc b/shangpin/migrations/__pycache__/0015_shangpinleixing_is_cross_enabled_and_more.cpython-313.pyc
new file mode 100644
index 0000000..173fbdd
Binary files /dev/null and b/shangpin/migrations/__pycache__/0015_shangpinleixing_is_cross_enabled_and_more.cpython-313.pyc differ
diff --git a/shangpin/migrations/__pycache__/__init__.cpython-313.pyc b/shangpin/migrations/__pycache__/__init__.cpython-313.pyc
new file mode 100644
index 0000000..ba330cd
Binary files /dev/null and b/shangpin/migrations/__pycache__/__init__.cpython-313.pyc differ
diff --git a/shangpin/models.py b/shangpin/models.py
new file mode 100644
index 0000000..0e64e25
--- /dev/null
+++ b/shangpin/models.py
@@ -0,0 +1,364 @@
+from django.db import models
+from django.utils import timezone
+
+
+class Shangpin(models.Model):
+    """商品表 - 100-1000条数据"""
+    id = models.AutoField(primary_key=True, verbose_name='商品ID')
+    biaoqian = models.CharField(max_length=45,null=True, blank=True, verbose_name='商品标题')  # 15汉字
+    jiage = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='商品价格')
+    kucun = models.PositiveIntegerField(default=0, verbose_name='商品库存')
+    leixing_id = models.PositiveIntegerField(null=True, blank=True,verbose_name='商品类型ID')  # 直接存数字
+    zhuanqu_id = models.PositiveIntegerField(null=True, blank=True,verbose_name='商品专区ID')  # 直接存数字
+    zhenshi_xiaoliang = models.PositiveIntegerField(default=0, verbose_name='商品真实销量')
+    duiwai_xiaoliang = models.PositiveIntegerField(default=0, verbose_name='商品对外销量')
+    jieshao = models.TextField(null=True, blank=True, verbose_name='商品介绍')
+
+    # 新增字段
+    xiadan_xuzhi = models.TextField(null=True, blank=True, verbose_name='下单须知')  # 支持500字，可换行
+    guize_tupian = models.CharField(max_length=500, null=True, blank=True, verbose_name='规则图片URL')
+
+    yaoqiuleixing = models.PositiveIntegerField(null=True, blank=True, verbose_name='抢单要求类型1:会员2：佣金')
+    huiyuan_id = models.CharField(max_length=6, null=True, blank=True, verbose_name='会员ID')
+    yongjin = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True,verbose_name='佣金要求')
+
+    # 原有图片URL
+    tupian_url = models.CharField(max_length=500, null=True, blank=True, verbose_name='商品图片URL')
+
+    # 🔥 新增：是否开启打手额外分成
+    kaioi_ewai_dashou_fencheng = models.BooleanField(default=False, verbose_name='是否开启打手额外分成')
+    # 🔥 新增：打手额外分成金额（开启时使用此值，否则按利率计算）
+    ewai_dashou_fencheng = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True,verbose_name='打手额外分成金额')
+
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更改时间')
+    # 🔴【新增】排序字段
+    paixu = models.IntegerField(default=0, verbose_name='排序权重')
+    shenhezhuangtai = models.IntegerField(default=1, verbose_name='审核状态', help_text='1=正常, 2=审核专用')
+
+    dianpu = models.ForeignKey(
+        'shangdian.Dianpu',  # 🔥 跨应用完整路径
+        on_delete=models.CASCADE,
+        null=True,
+        blank=True,
+        db_index=True,
+        verbose_name='所属店铺'
+    )
+    dianpu_leixing = models.ForeignKey(
+        'shangdian.ShangpinLeixingDianpu',
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        db_index=True,
+        verbose_name='店铺商品类型'
+    )
+    shangjia_zhuangtai = models.BooleanField(default=True, verbose_name='是否上架')
+    fengjin_zhuangtai = models.BooleanField(default=True, verbose_name='是否封禁')
+    shenhe_zhuangtai = models.BooleanField(default=False, verbose_name='平台审核状态',help_text='True=审核通过，False=未审核')
+
+    class Meta:
+        db_table = 'shangpin'
+        verbose_name = '商品'
+        verbose_name_plural = '商品'
+        # 不要索引！数据量太小
+
+    def __str__(self):
+        return f"商品{self.id}:{self.biaoqian}"
+
+
+
+
+class ShangpinLeixing(models.Model):
+    """商品类型表 - <10条数据"""
+    id = models.AutoField(primary_key=True, verbose_name='类型ID')
+    yaoqiuleixing = models.PositiveIntegerField(null=True, blank=True, verbose_name='抢单要求类型1：会员2：佣金')
+    huiyuan_id = models.CharField(max_length=6, null=True, blank=True, verbose_name='会员ID')
+    yongjin = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='佣金要求')
+    jieshao = models.CharField(max_length=45, null=True, blank=True, verbose_name='类型介绍')  # 15汉字
+    tupian_url = models.CharField(max_length=500, null=True, blank=True, verbose_name='类型图片URL')  # 用CharField
+    # 🔴【新增】两个字段
+    is_cross_enabled = models.BooleanField(default=False, verbose_name='是否开启平台互通')
+    # 🔴 新增：是否特殊商品类型
+    is_special_type = models.BooleanField(default=False, verbose_name='是否特殊商品类型')
+
+    paixu = models.IntegerField(default=0, verbose_name='排序权重')
+    shenhezhuangtai = models.IntegerField(default=1, verbose_name='审核状态', help_text='1=正常, 2=审核专用')
+
+    # 在 ShangpinLeixing 类中添加
+    bankuai = models.ForeignKey(
+        'dengji.Bankuai',
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        verbose_name='所属板块'
+    )
+
+    class Meta:
+        db_table = 'shangpin_leixing'
+        verbose_name = '商品类型'
+        verbose_name_plural = '商品类型'
+
+    def __str__(self):
+        return f"{self.jieshao}"
+
+
+class ShangpinZhuanqu(models.Model):
+    """商品专区表 - <50条数据"""
+    id = models.AutoField(primary_key=True, verbose_name='专区ID')
+    mingzi = models.CharField(max_length=45, null=True, blank=True, verbose_name='专区名称')  # 15汉字
+    leixing_id = models.PositiveIntegerField(verbose_name='类型ID')  # 直接存数字，不关联
+    paixu = models.IntegerField(default=0, verbose_name='排序权重')
+    shenhezhuangtai = models.IntegerField(default=1, verbose_name='审核状态', help_text='1=正常, 2=审核专用')
+    dianpu = models.ForeignKey(
+        'shangdian.Dianpu',  # 🔥 跨应用完整路径
+        on_delete=models.CASCADE,
+        null=True,
+        blank=True,
+        db_index=True,
+        verbose_name='所属店铺'
+    )
+    dianpu_leixing = models.ForeignKey(
+        'shangdian.ShangpinLeixingDianpu',
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        db_index=True,
+        verbose_name='店铺商品类型'
+    )
+    shangjia_zhuangtai = models.BooleanField(default=True, verbose_name='是否上架')
+    fengjin_zhuangtai = models.BooleanField(default=True, verbose_name='是否封禁')
+
+    class Meta:
+        db_table = 'shangpin_zhuanqu'
+        verbose_name = '商品专区'
+        verbose_name_plural = '商品专区'
+
+    def __str__(self):
+        return f"{self.mingzi}"
+
+
+class Huiyuan(models.Model):
+    huiyuan_id = models.CharField(max_length=6, unique=True, verbose_name='会员ID')
+    jieshao = models.CharField(max_length=30, verbose_name='会员介绍')
+    jtjieshao = models.TextField(null=True, blank=True, verbose_name='会员规则介绍')
+    jiage = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='会员价格')
+    guanshifc = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='管事分成')
+    goumai_cishu = models.PositiveIntegerField(default=0, verbose_name='购买次数')
+    zuzhangfc = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='组长分成')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+    bankuai = models.ForeignKey(
+        'dengji.Bankuai',
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        verbose_name='所属板块'
+    )
+
+    class Meta:
+        db_table = 'huiyuan'
+        verbose_name = '会员'
+        verbose_name_plural = '会员'
+
+    def __str__(self):
+        return f"会员{self.huiyuan_id}:{self.jieshao}"
+
+
+class Huiyuangoumai(models.Model):
+    id = models.AutoField(primary_key=True, verbose_name='购买记录ID')
+    huiyuan_id = models.CharField(max_length=6, db_index=True, verbose_name='会员ID')
+    yonghu_id = models.CharField(max_length=32,db_index=True, verbose_name='用户ID')
+    huiyuan_zhuangtai = models.PositiveIntegerField(default=1, verbose_name='会员状态')
+    jieshao = models.CharField(max_length=30,null=True,verbose_name='会员介绍')
+    daoqi_time = models.DateTimeField(verbose_name='会员到期时间')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'huiyuangoumai'
+        verbose_name = '用户购买会员'
+        verbose_name_plural = '用户购买会员'
+        # 添加这个联合唯一约束
+        unique_together = [['yonghu_id', 'huiyuan_id']]
+
+        # 顺便优化索引（可选的，建议加）
+        indexes = [
+            models.Index(fields=['yonghu_id']),
+            models.Index(fields=['huiyuan_id']),
+            models.Index(fields=['yonghu_id', 'huiyuan_id']),  # 复合索引加速查询
+        ]
+
+    def __str__(self):
+        return f"用户{self.yonghu_id}-会员{self.huiyuan_id}"
+
+    def jiance_shifou_daoqi(self):
+        # 使用Django的timezone，它会自动处理时区
+        now = timezone.now()
+        if now > self.daoqi_time:
+            # 过期了
+            if self.huiyuan_zhuangtai != 0:
+                self.huiyuan_zhuangtai = 0
+                self.save()
+            return True
+        else:
+            # 没过期
+            if self.huiyuan_zhuangtai != 1:
+                self.huiyuan_zhuangtai = 1
+                self.save()
+            return False
+
+
+
+class Czjilu(models.Model):
+    dingdan_id = models.CharField(max_length=32, unique=True, db_index=True, verbose_name='订单ID')
+    huiyuan_id = models.CharField(max_length=6, null=True, blank=True, verbose_name='会员ID')
+    zhuangtai = models.IntegerField(null=True, blank=True, verbose_name='订单状态')
+    yonghuid = models.CharField(max_length=7, db_index=True, verbose_name='用户ID')
+    jine = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='订单金额')
+    leixing = models.IntegerField(null=True, blank=True, verbose_name='充值类型，1:会员，2:押金,3:积分,4:商家')
+    shuoming = models.CharField(max_length=100, null=True, blank=True, verbose_name='订单说明')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+    class Meta:
+        db_table = 'czjilu'
+        verbose_name = '充值记录订单'
+        verbose_name_plural = '充值记录订单'
+        # 为高频查询字段添加索引
+        indexes = [
+            models.Index(fields=['dingdan_id']),
+            models.Index(fields=['yonghuid']),
+
+
+        ]
+
+
+
+
+class Gsfenhong(models.Model):
+    dingdan_id = models.CharField(max_length=32, unique=True, verbose_name='订单ID')
+    guanshi = models.CharField(max_length=7, db_index=True, verbose_name='管事ID')
+    dashouid = models.CharField(max_length=7,db_index=True,verbose_name='打手ID')
+    shuoming = models.CharField(max_length=100, null=True, blank=True, verbose_name='订单说明')
+    fenhong = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='订单分红金额')
+    avatar = models.CharField(max_length=500, null=True, blank=True, verbose_name='打手头像')
+    nicheng = models.CharField(max_length=50, null=True, verbose_name='打手昵称')
+    zuzhang_id = models.CharField(max_length=7, null=True, blank=True, db_index=True, verbose_name='组长ID')
+    zuzhang_fenhong = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True,verbose_name='组长分红金额')
+    huiyuan_id = models.CharField(max_length=6, null=True, blank=True, verbose_name='会员ID')
+    fenhong_leixing = models.PositiveSmallIntegerField(
+        default=1,
+        choices=[(1, '会员分红'), (2, '押金分红'), (3, '商家订单分红')],
+        verbose_name='分红类型'
+    )
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'gsfenhong'
+        verbose_name = '管事分红记录'
+        verbose_name_plural = '管事分红记录'
+        # 为高频查询字段添加索引
+        indexes = [
+            models.Index(fields=['guanshi']),
+            models.Index(fields=['dashouid']),
+
+        ]
+
+
+
+
+
+
+class DuociFenhong(models.Model):
+    """
+    多次分红配置表
+    用于配置不同次数下管事和组长的分红金额
+    """
+    huiyuan = models.CharField(max_length=10, verbose_name='会员ID')
+    yonghuid = models.CharField(max_length=7, db_index=True, verbose_name='用户ID')
+
+    cishu = models.PositiveIntegerField(verbose_name='分红次数')
+    guanshi_fenhong = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='管事分红金额')
+    zuzhang_fenhong = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='组长分红金额')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'duoci_fenhong'
+        verbose_name = '多次分红配置'
+        verbose_name_plural = '多次分红配置'
+        unique_together = ('huiyuan', 'yonghuid', 'cishu')  # 同一管事、同一会员、同一次数唯一
+        indexes = [
+            models.Index(fields=['yonghuid']),
+
+        ]
+
+    def __str__(self):
+        return f"会员{self.huiyuan_id} 用户{self.yonghuid} 次数{self.cishu}"
+
+
+
+
+
+
+class ShangpinMeiriTongji(models.Model):
+    """
+    商品每日统计表
+    按商品 + 日期维度记录点单、成交、退款及收益数据
+    日期精确到天，冗余年月日字段便于分组查询
+    """
+    shangpin = models.ForeignKey(
+        'shangpin.Shangpin',
+        on_delete=models.CASCADE,
+        db_index=True,
+        verbose_name='商品ID'
+    )
+    riqi = models.DateField(db_index=True, verbose_name='统计日期')
+    nian = models.PositiveSmallIntegerField(verbose_name='年份')
+    yue = models.PositiveSmallIntegerField(verbose_name='月份')
+    ri = models.PositiveSmallIntegerField(verbose_name='日')
+
+    # 点单统计（下单即累加）
+    diandan_zongliang = models.PositiveIntegerField(default=0, verbose_name='点单总量')
+    diandan_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='点单总额')
+
+    # 成交统计（订单完成时累加）
+    chengjiao_zongliang = models.PositiveIntegerField(default=0, verbose_name='成交总量')
+    chengjiao_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='成交总额')
+
+    # 退款统计
+    tuikuan_zongliang = models.PositiveIntegerField(default=0, verbose_name='退款总量')
+    tuikuan_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='退款总额')
+
+    # 收益统计（新增）
+    pingtai_shouyi = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='平台收益')
+    dianpu_zongshouyi = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='店铺总收益')
+
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'shangpin_meiri_tongji'
+        verbose_name = '商品每日统计'
+        verbose_name_plural = verbose_name
+        # 每天每个商品唯一记录
+        unique_together = [['shangpin', 'riqi']]
+        indexes = [
+            models.Index(fields=['shangpin', 'riqi']),
+            models.Index(fields=['nian', 'yue', 'ri']),
+        ]
+
+    def __str__(self):
+        return f"{self.shangpin.biaoqian} - {self.riqi}"
+
+    def clean(self):
+        """保存前自动填充年月日冗余字段"""
+        if self.riqi:
+            self.nian = self.riqi.year
+            self.yue = self.riqi.month
+            self.ri = self.riqi.day
+        super().clean()
+
+    def save(self, *args, **kwargs):
+        self.clean()
+        super().save(*args, **kwargs)
\ No newline at end of file
diff --git a/shangpin/tests.py b/shangpin/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/shangpin/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/shangpin/urls.py b/shangpin/urls.py
new file mode 100644
index 0000000..d5592fe
--- /dev/null
+++ b/shangpin/urls.py
@@ -0,0 +1,70 @@
+# shangpin/urls.py
+from django.urls import path
+from django.views.decorators.csrf import csrf_exempt
+from .views import ShangpinHuoquView, ShangpinXiangqingHuoquView, DashouHuiyuanList, \
+    YajinGoumai, YajinHuitiao, YajinShibai, YajinLunxun, JifenBuchong, JifenHuitiao, JifenShibai, \
+    JifenLunxun, HuiyuanGoumai, HuiyuanHuitiao, HuiyuanShibai, HuiyuanLunxun, ShangjiaChenggong, \
+    ShangjiaChongzhi, ShangjiaHuitiao, ShangjiaShibai, GuanshiFenhongListAPI, AdGetAllDataView, ShangpinLeixingFabuView, \
+    ShangpinZhuanquFabuView, ShangpinFabuView, GuizeTupianShangchuanView, AdHuiyuanHqView, HuiyuanXiugaiView, \
+    AdHuiyuanFbView, AdShangpinHuQu, AdLeixingXiuGai, AdLunboXiuGai, AdZhuanquXiuGai, AdGonggaoXiuGai, \
+    AdShangpinGuizeXiuGai, AdShangpinXiuGai, AdShangpinNeiRongHuoQu, HuiyuanTypeListView, HuiyuanRecordListView, \
+    AdLeixingPaixuXiuGai, ZuzhangFenhongView, CzhqdyView, DsqrgmdhView
+
+urlpatterns = [
+    path('shangpinhuoqu/', ShangpinHuoquView.as_view(), name='获取商品数据商品类型和专区'),
+    path('xiangqinghuoqu/', ShangpinXiangqingHuoquView.as_view(), name='获取商品详情数据'),
+    path('dshyhq', DashouHuiyuanList.as_view(), name='打手充值获取会员信息'),
+    path('yajingoumai', YajinGoumai.as_view(), name='打手购买押金'),
+    path('yajinhuitiao', csrf_exempt(YajinHuitiao.as_view()), name='押金支付回调'),
+    #path('yajinhuitiao', YajinHuitiao.as_view(), name='押金支付回调'),
+    path('yajinshibai', YajinShibai.as_view(), name='押金支付失败'),
+    path('yajinlunxun', YajinLunxun.as_view(), name='押金支付轮询'),
+    # 积分相关接口
+    path('jifenbc', JifenBuchong.as_view(), name='积分补充参数生成'),
+    #path('jifenhuitiao', JifenHuitiao.as_view(), name='积分充值回调'),
+    path('jifenhuitiao', csrf_exempt(JifenHuitiao.as_view()), name='积分充值回调'),
+    path('jifenshibai', JifenShibai.as_view(), name='积分支付失败'),
+    path('jifenlunxun', JifenLunxun.as_view(), name='积分支付轮询'),
+
+    # 会员相关接口
+    path('huiyuangm', HuiyuanGoumai.as_view(), name='会员购买参数生成'),
+    #path('huiyuanhuitiao', HuiyuanHuitiao.as_view(), name='会员支付回调'),
+    path('huiyuanhuitiao', csrf_exempt(HuiyuanHuitiao.as_view()), name='会员支付回调'),
+    path('huiyuanshibai', HuiyuanShibai.as_view(), name='会员支付失败'),
+    path('huiyuanlx', HuiyuanLunxun.as_view(), name='会员支付轮询'),
+    path('sjcz', ShangjiaChongzhi.as_view(), name='商家充值支付参数获取'),  # 商家充值支付参数
+    #path('sjhuitiao', ShangjiaHuitiao.as_view(), name='商家支付官方回调'),  # 商家支付回调
+    path('sjhuitiao', csrf_exempt(ShangjiaHuitiao.as_view()), name='商家支付官方回调'),
+    path('sjshibai', ShangjiaShibai.as_view(), name='商家支付失败'),  # 商家支付失败处理
+    path('sjcg', ShangjiaChenggong.as_view(), name='商家支付成功'),  # 商家支付成功轮询
+    path('fenhonghq', GuanshiFenhongListAPI.as_view(), name='管事获取打手充值记录'),
+    path('adhqlx', AdGetAllDataView.as_view(), name='管理员获取商品类型会员类型专区类型'),
+    path('leixingfabu', ShangpinLeixingFabuView.as_view(), name='添加商品类型'),
+    # 商品专区相关接口
+    path('zhuanqufabu', ShangpinZhuanquFabuView.as_view(), name='添加商品专区'),
+    # 商品发布相关接口
+    path('shangpinsc', ShangpinFabuView.as_view(), name='商品发布'),
+    # 规则图片上传接口
+    path('guizesc', GuizeTupianShangchuanView.as_view(), name='发布商品规则'),
+    path('adhuiyuanhq', AdHuiyuanHqView.as_view(), name='管理员获取会员信息'),
+    path('huiyuanxiugai', HuiyuanXiugaiView.as_view(), name='修改会员信息'),  # 修改会员
+    path('adhuiyuanfb', AdHuiyuanFbView.as_view(), name='发布会员'),  # 发布会员
+    path('adsphq', AdShangpinHuQu.as_view(), name='管理员商品管理页面数据获取'),
+    path('adggxg', AdGonggaoXiuGai.as_view(), name='管理员公告修改'),
+    path('adzqxg', AdZhuanquXiuGai.as_view(), name='管理员专区修改'),
+    path('adlunboxg', AdLunboXiuGai.as_view(), name='管理员轮播图修改'),
+    path('adleixingxg', AdLeixingXiuGai.as_view(), name='管理员商品类型修改'),
+    path('adspnrhq', AdShangpinNeiRongHuoQu.as_view(), name='管理员商品详情获取'),
+
+    # 2. 更改商品数据接口（修改/删除）
+    path('adspxqxg',AdShangpinXiuGai.as_view(), name='管理员商品详情修改'),
+
+    # 3. 规则图片更换接口
+    path('adspgzxg',AdShangpinGuizeXiuGai.as_view(), name='管理员商品规则修改'),
+    path('adhyjllxcx', HuiyuanTypeListView.as_view(), name='管理员查询会员记录获取会员类型'),
+    path('adhyjlcxhq', HuiyuanRecordListView.as_view(), name='管理员查询会员记录'),
+    path('adleixingpaixuxg', AdLeixingPaixuXiuGai.as_view(), name='商品类型排序修改'),
+    path('zuzhangfenhong', ZuzhangFenhongView.as_view(), name='组长分红记录获取'),
+    path('czhqdy', CzhqdyView.as_view(), name='充值打手抵押查询'),
+    path('dsqrgmdh', DsqrgmdhView.as_view(), name='充值抵扣'),
+]
\ No newline at end of file
diff --git a/shangpin/utils.py b/shangpin/utils.py
new file mode 100644
index 0000000..4bc52ab
--- /dev/null
+++ b/shangpin/utils.py
@@ -0,0 +1,113 @@
+# tongji/utils.py 或 shangpin/utils.py
+
+import logging
+from datetime import date
+from decimal import Decimal
+from django.db import transaction
+from django.db.models import F
+from .models import ShangpinMeiriTongji
+from shangpin.models import Shangpin
+
+logger = logging.getLogger(__name__)
+
+
+def update_shangpin_daily_stat(
+    shangpin_id,
+    caozuo_leixing,
+    dingdan_jiage=Decimal('0.00'),
+    pingtai_shouyi=Decimal('0.00'),
+    dianpu_zongshouyi=Decimal('0.00')
+):
+    """
+    原子更新商品每日统计数据（高并发安全，无店铺关联）
+
+    参数:
+        shangpin_id: 商品ID (int)
+        caozuo_leixing: 操作类型
+                        1 = 下单（点单）
+                        2 = 结算（成交）
+                        3 = 退款
+        dingdan_jiage: 订单金额（商品价格），默认0.00
+        pingtai_shouyi: 平台收益金额，默认0.00
+        dianpu_zongshouyi: 店铺总收益金额，默认0.00
+
+    注意:
+        - 金额若小于0则自动设为0
+        - 日期自动取当天
+        - 使用 select_for_update 配合事务，保证并发时数据绝对准确
+        - 若商品不存在，仅记录日志不中断主流程
+    """
+    # 参数归一化与合法性处理
+    dingdan_jiage = Decimal(str(dingdan_jiage)) if dingdan_jiage else Decimal('0.00')
+    pingtai_shouyi = Decimal(str(pingtai_shouyi)) if pingtai_shouyi else Decimal('0.00')
+    dianpu_zongshouyi = Decimal(str(dianpu_zongshouyi)) if dianpu_zongshouyi else Decimal('0.00')
+
+    if dingdan_jiage < 0:
+        dingdan_jiage = Decimal('0.00')
+    if pingtai_shouyi < 0:
+        pingtai_shouyi = Decimal('0.00')
+    if dianpu_zongshouyi < 0:
+        dianpu_zongshouyi = Decimal('0.00')
+
+    today = date.today()
+
+    # 校验商品是否存在（不加锁，仅校验）
+    if not Shangpin.objects.filter(id=shangpin_id).exists():
+        logger.error(f"商品ID {shangpin_id} 不存在，统计更新失败")
+        return
+
+    # 开启事务，使用行锁确保并发安全
+    with transaction.atomic():
+        # 获取或创建统计记录，并锁定该行
+        tongji, created = ShangpinMeiriTongji.objects.select_for_update().get_or_create(
+            shangpin_id=shangpin_id,
+            riqi=today,
+            defaults={
+                'nian': today.year,
+                'yue': today.month,
+                'ri': today.day,
+                'diandan_zongliang': 0,
+                'diandan_zonge': Decimal('0.00'),
+                'chengjiao_zongliang': 0,
+                'chengjiao_zonge': Decimal('0.00'),
+                'tuikuan_zongliang': 0,
+                'tuikuan_zonge': Decimal('0.00'),
+                'pingtai_shouyi': Decimal('0.00'),
+                'dianpu_zongshouyi': Decimal('0.00'),
+            }
+        )
+
+        # 根据操作类型构建更新字段（使用 F 表达式累加）
+        update_fields = {}
+
+        if caozuo_leixing == 1:  # 下单
+            update_fields['diandan_zongliang'] = F('diandan_zongliang') + 1
+            update_fields['diandan_zonge'] = F('diandan_zonge') + dingdan_jiage
+
+        elif caozuo_leixing == 2:  # 结算（成交）
+            update_fields['chengjiao_zongliang'] = F('chengjiao_zongliang') + 1
+            update_fields['chengjiao_zonge'] = F('chengjiao_zonge') + dingdan_jiage
+            # 收益直接累加传入值
+            update_fields['pingtai_shouyi'] = F('pingtai_shouyi') + pingtai_shouyi
+            update_fields['dianpu_zongshouyi'] = F('dianpu_zongshouyi') + dianpu_zongshouyi
+
+        elif caozuo_leixing == 3:  # 退款
+            update_fields['tuikuan_zongliang'] = F('tuikuan_zongliang') + 1
+            update_fields['tuikuan_zonge'] = F('tuikuan_zonge') + dingdan_jiage
+            # 退款是否应扣减收益？根据业务需求决定，此处暂不处理收益字段
+
+        else:
+            logger.warning(f"未知的操作类型: {caozuo_leixing}")
+            return
+
+        # 原子更新字段
+        if update_fields:
+            for field, value in update_fields.items():
+                setattr(tongji, field, value)
+            tongji.save(update_fields=list(update_fields.keys()))
+
+        logger.info(
+            f"商品统计更新: 商品ID={shangpin_id}, 操作类型={caozuo_leixing}, "
+            f"订单金额={dingdan_jiage}, 平台收益={pingtai_shouyi}, "
+            f"店铺收益={dianpu_zongshouyi}, 日期={today}"
+        )
\ No newline at end of file
diff --git a/shangpin/views.py b/shangpin/views.py
new file mode 100644
index 0000000..457b993
--- /dev/null
+++ b/shangpin/views.py
@@ -0,0 +1,8724 @@
+# shangpin/views.py
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.throttling import AnonRateThrottle
+from django.db import models
+from shangpin.models import ShangpinLeixing, ShangpinZhuanqu, Shangpin
+import logging
+from rest_framework.permissions import AllowAny  # 新增这行
+
+# 配置日志
+logger = logging.getLogger(__name__)
+
+
+
+
+class ShangpinHuoquView(APIView):
+    """
+    商品数据获取接口
+    一次性返回商品类型、商品专区、商品列表
+    """
+
+    # 应用节流（限制频率）
+    throttle_classes = [AnonRateThrottle]
+    permission_classes = [AllowAny]
+
+    def post(self, request):
+        """
+        处理POST请求，返回所有商品相关数据
+        """
+        try:
+            logger.info("收到商品数据获取请求")
+
+            # 1. 查询商品类型（只查询正常状态的类型，并排序）
+            # 正常运营：只显示 shenhezhuangtai=2 的商品类型
+            leixing_queryset = ShangpinLeixing.objects.filter(
+                shenhezhuangtai=1  # 只取正常状态
+            ).order_by('-paixu', 'id')  # 先按paixu降序，再按id升序
+
+            # 注意：审核期间使用下面这行代码（先注释掉）
+            '''leixing_queryset = ShangpinLeixing.objects.filter(
+                 shenhezhuangtai=2  # 审核期间：只取审核专用状态
+             ).order_by('-paixu', 'id')'''
+
+            shangpinleixing_data = []
+            for leixing in leixing_queryset:
+                shangpinleixing_data.append({
+                    "id": leixing.id,
+                    "jieshao": leixing.jieshao,
+                    "tupian_url": leixing.tupian_url,
+                    "paixu": leixing.paixu
+                })
+
+            # 2. 查询商品专区（只查询可见类型下的专区，并排序）
+            # 先获取可见的类型ID列表
+            visible_leixing_ids = [leixing['id'] for leixing in shangpinleixing_data]
+
+            if visible_leixing_ids:
+                zhuanqu_queryset = ShangpinZhuanqu.objects.filter(
+                    leixing_id__in=visible_leixing_ids,
+                    shenhezhuangtai=1  # 🔴【添加】只筛选审核状态为2的专区
+                ).order_by('-paixu', 'id')  # 先按paixu降序，再按id升序
+            else:
+                zhuanqu_queryset = ShangpinZhuanqu.objects.none()
+
+            shangpinzhuanqu_data = []
+            for zhuanqu in zhuanqu_queryset:
+                shangpinzhuanqu_data.append({
+                    "id": zhuanqu.id,
+                    "mingzi": zhuanqu.mingzi,
+                    "leixing_id": zhuanqu.leixing_id,
+                    "paixu": zhuanqu.paixu
+                })
+
+            # 3. 查询商品列表（只查询可见专区下的商品，并排序）
+            # 先获取可见的专区ID列表
+            visible_zhuanqu_ids = [zhuanqu['id'] for zhuanqu in shangpinzhuanqu_data]
+
+            if visible_zhuanqu_ids:
+                # 注意：这里使用values()只获取指定字段，提高查询效率
+                shangpin_queryset = Shangpin.objects.filter(
+                    zhuanqu_id__in=visible_zhuanqu_ids,
+                    shenhezhuangtai=1  # 🔴【添加】只筛选审核状态为2的商品
+                ).values(
+                    'id', 'biaoqian', 'jiage', 'leixing_id',
+                    'zhuanqu_id', 'tupian_url', 'duiwai_xiaoliang', 'paixu'
+                ).order_by('-paixu', 'id')  # 先按paixu降序，再按id升序
+
+                # 将QuerySet转换为列表
+                shangpinliebiao_data = list(shangpin_queryset)
+            else:
+                shangpinliebiao_data = []
+
+            # 4. 构建返回数据
+            response_data = {
+                "shangpinleixing": shangpinleixing_data,
+                "shangpinzhuanqu": shangpinzhuanqu_data,
+                "shangpinliebiao": shangpinliebiao_data
+            }
+
+            logger.info(f"返回数据：类型{len(shangpinleixing_data)}个，"
+                        f"专区{len(shangpinzhuanqu_data)}个，"
+                        f"商品{len(shangpinliebiao_data)}个")
+
+            # 5. 返回响应
+            return Response(response_data, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            # 记录异常
+            logger.error(f"获取商品数据时发生错误：{str(e)}", exc_info=True)
+
+            # 返回错误响应
+            error_data = {
+                "error": "服务器内部错误",
+                "detail": "获取商品数据失败，请稍后重试"
+            }
+            return Response(error_data, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+class ShangpinXiangqingHuoquView(APIView):
+    """
+    商品详情接口 - 极简版
+    假设所有字段都存在，直接返回
+    """
+
+    throttle_classes = [AnonRateThrottle]
+    permission_classes = [AllowAny]
+
+    def post(self, request):
+        try:
+            shangpin_id = request.data.get('shangpin_id')
+
+            if not shangpin_id:
+                return Response({
+                    "code": 1,
+                    "msg": "商品ID不能为空",
+                    "data": None
+                }, status=400)
+
+            # 直接查询，数据量小，性能没问题
+            shangpin = Shangpin.objects.filter(id=shangpin_id).first()
+
+            if not shangpin:
+                return Response({
+                    "code": 2,
+                    "msg": "商品不存在",
+                    "data": None
+                }, status=404)
+
+            # 直接构建数据，不处理空值
+            data = {
+                "tupian": shangpin.tupian_url,
+                "biaoti": shangpin.biaoqian,
+                "jiage": shangpin.jiage,
+                "xiangqing": shangpin.jieshao,
+                "xiadanxuzhi": shangpin.xiadan_xuzhi,
+                "guize": shangpin.guize_tupian,
+                "xiaoliang": shangpin.duiwai_xiaoliang,
+                "kucun": shangpin.kucun,
+            }
+
+            return Response({
+                "code": 0,
+                "msg": "success",
+                "data": data
+            })
+
+        except Exception as e:
+            logger.error(f"接口异常: {e}")
+            return Response({
+                "code": 500,
+                "msg": "服务器错误",
+                "data": None
+            }, status=500)
+
+
+
+# views.py
+from rest_framework.views import APIView
+from rest_framework.permissions import IsAuthenticated
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+class DashouHuiyuanList(APIView):
+    """
+    获取打手会员商品列表
+    路径：/shangpin/dshyhq
+    请求方式：POST
+    权限：JWT认证
+    返回：会员商品列表，字段对应前端需求
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 检查用户是否是打手（通过反向查询）
+            try:
+                dashou = request.user.dashou_profile
+            except UserDashou.DoesNotExist:
+                logger.warning(f"用户{request.user.yonghuid}不是打手，尝试访问打手接口")
+                return Response({
+                    'code': 400,
+                    'message': '用户不是打手，无法访问此接口'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 检查打手账号状态
+            if dashou.zhanghaozhuangtai != 1:
+                logger.warning(f"打手{request.user.yonghuid}账号状态异常: {dashou.zhanghaozhuangtai}")
+                return Response({
+                    'code': 400,
+                    'message': '账号状态异常，无法购买会员'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 查询所有会员数据（ORM查询，确保性能）
+            huiyuan_queryset = Huiyuan.objects.all().only(
+                'huiyuan_id',  # 会员ID
+                'jieshao',     # 会员名字（注意：jieshao字段实际存储的是会员名字）
+                'jtjieshao',   # 会员具体介绍
+                'jiage'        # 会员价格
+            ).order_by('jiage')  # 按价格排序
+
+            # 4. 构建返回数据列表
+            huiyuan_list = []
+            for huiyuan in huiyuan_queryset:
+                huiyuan_list.append({
+                    'id': huiyuan.huiyuan_id,       # 会员ID（对应前端id）
+                    'mingzi': huiyuan.jieshao,      # 会员名字（对应前端mingzi）
+                    'jiage': float(huiyuan.jiage),  # 会员价格（转为浮点数）
+                    'jieshao': huiyuan.jtjieshao    # 会员介绍（对应前端jieshao）
+                })
+
+            # 5. 返回数据
+            return Response({
+                'code': 200,
+                'message': '获取会员列表成功',
+                'data': huiyuan_list  # 对应前端接收的列表
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            logger.error(f"获取会员列表接口异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '服务器内部错误，请稍后重试'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+from rest_framework.views import APIView
+from rest_framework.permissions import IsAuthenticated
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class YajinGoumai(APIView):
+    """
+    押金充值支付参数接口
+    路径：/shangpin/yajingoumai
+    请求方式：POST
+    权限：JWT认证
+    参数：jine（金额，1-10000元）
+    返回：支付参数(payParams)和订单ID(dingdanid)
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 验证用户身份和状态
+            try:
+                dashou = request.user.dashou_profile
+            except UserDashou.DoesNotExist:
+                return Response({
+                    'code': 400,
+                    'message': '用户不是打手，无法充值押金'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            if dashou.zhanghaozhuangtai != 1:
+                return Response({
+                    'code': 400,
+                    'message': '账号状态异常，无法进行充值'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 获取并验证金额参数
+            jine = request.data.get('jine')
+            if not jine:
+                return Response({
+                    'code': 400,
+                    'message': '请填写充值金额'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            try:
+                jine = int(jine)
+            except (ValueError, TypeError):
+                return Response({
+                    'code': 400,
+                    'message': '金额格式错误，请填写1-10000的整数'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 验证金额范围
+            if jine < 1 or jine > 10000:
+                return Response({
+                    'code': 400,
+                    'message': '充值金额必须在1-10000元之间'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 生成订单ID（使用你提供的算法，前缀改为CzYJ）
+            timestamp_ms = int(time.time() * 1000)
+            timestamp_ns = int(time.time_ns() // 1000) % 1000000
+            random_num = random.randint(0, 99)
+
+            dingdanid = f"CzYJ{timestamp_ms:011d}{timestamp_ns:06d}{random_num:02d}"
+
+            # 4. 创建充值记录订单
+            chongzhi_jilu = Czjilu.objects.create(
+                dingdan_id=dingdanid,
+                zhuangtai=9,  # 未支付状态
+                yonghuid=request.user.yonghuid,
+                jine=jine,
+                leixing=2,  # 充值类型：2=押金
+                shuoming=settings.YAJIN_PAY_DESCRIPTION
+            )
+
+            logger.info(f"创建押金充值订单: 用户{request.user.yonghuid}, 订单{dingdanid}, 金额{jine}元")
+
+            # 5. 生成微信支付参数
+            try:
+                pay_params = self.generate_wechat_pay_params(
+                    dingdanid=dingdanid,
+                    jine=jine,
+                    openid=request.user.openid,  # 直接从request.user获取openid
+                    pay_type='yajin'
+                )
+            except Exception as e:
+                # 支付参数生成失败，删除订单记录
+                chongzhi_jilu.delete()
+                logger.error(f"生成微信支付参数失败: {str(e)}")
+                return Response({
+                    'code': 500,
+                    'message': f'支付参数生成失败: {str(e)}'
+                }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            # 6. 返回支付参数和订单ID
+            return Response({
+                'code': 200,
+                'message': '支付参数生成成功',
+                'payParams': pay_params,  # 支付参数（前端接收为payParams）
+                'dingdanid': dingdanid  # 订单ID（前端接收为dingdanid）
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            logger.error(f"押金充值接口异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '服务器内部错误，请稍后重试'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def generate_wechat_pay_params(self, dingdanid, jine, openid, pay_type):
+        """生成微信小程序支付参数"""
+        # 获取配置
+        APPID = settings.WEIXIN_APPID
+        MCHID = settings.WEIXIN_MCHID
+        KEY = settings.WEIXIN_SHANGHUMIYAO
+
+        # 根据支付类型获取对应的配置
+        if pay_type == 'yajin':
+            PAY_DESCRIPTION = settings.YAJIN_PAY_DESCRIPTION
+            NOTIFY_URL = settings.YAJIN_PAY_NOTIFY_URL
+        elif pay_type == 'jifen':
+            PAY_DESCRIPTION = settings.JIFEN_PAY_DESCRIPTION
+            NOTIFY_URL = settings.JIFEN_PAY_NOTIFY_URL
+        elif pay_type == 'huiyuan':
+            PAY_DESCRIPTION = settings.HUIYUAN_PAY_DESCRIPTION
+            NOTIFY_URL = settings.HUIYUAN_PAY_NOTIFY_URL
+        else:
+            raise Exception('未知的支付类型')
+
+        # 生成随机字符串
+        nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+
+        # 金额转换（元转分）
+        total_fee = int(jine * 100)
+
+        # 交易类型（小程序支付使用JSAPI）
+        trade_type = 'JSAPI'
+
+        # 获取客户端IP
+        user_ip = self.get_client_ip()
+
+        # 1. 第一次签名（统一下单接口）
+        sign_data = {
+            'appid': APPID,
+            'mch_id': MCHID,
+            'nonce_str': nonce_str,
+            'body': PAY_DESCRIPTION,
+            'out_trade_no': dingdanid,
+            'total_fee': total_fee,
+            'spbill_create_ip': user_ip,
+            'notify_url': NOTIFY_URL,
+            'trade_type': trade_type,
+            'openid': openid  # 小程序支付必须传openid
+        }
+
+        # 按照参数名ASCII码从小到大排序
+        sorted_sign_data = sorted(sign_data.items(), key=lambda x: x[0])
+
+        # 拼接字符串
+        sign_string = '&'.join([f"{key}={value}" for key, value in sorted_sign_data if value])
+        sign_string += f'&key={KEY}'
+
+        # MD5签名
+        sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+
+        # 构造XML数据
+        xml_data = f"""<xml>
+<appid>{APPID}</appid>
+<body>{PAY_DESCRIPTION}</body>
+<mch_id>{MCHID}</mch_id>
+<nonce_str>{nonce_str}</nonce_str>
+<notify_url>{NOTIFY_URL}</notify_url>
+<openid>{openid}</openid>
+<out_trade_no>{dingdanid}</out_trade_no>
+<spbill_create_ip>{user_ip}</spbill_create_ip>
+<total_fee>{total_fee}</total_fee>
+<trade_type>{trade_type}</trade_type>
+<sign>{sign}</sign>
+</xml>"""
+
+        # 调用微信统一下单接口（官方地址）
+        response = requests.post(
+            'https://api.mch.weixin.qq.com/pay/unifiedorder',
+            data=xml_data.encode('utf-8'),
+            headers={'Content-Type': 'application/xml'},
+            timeout=10  # 设置超时
+        )
+
+        # 解析返回的XML
+        root = ET.fromstring(response.content)
+
+        return_code = root.find('return_code').text
+        result_code = root.find('result_code').text
+
+        if return_code == 'SUCCESS' and result_code == 'SUCCESS':
+            # 获取prepay_id
+            prepay_id = root.find('prepay_id').text
+
+            # 2. 第二次签名（小程序支付参数）
+            timestamp = str(int(time.time()))
+            nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+            package = f'prepay_id={prepay_id}'
+            sign_type = 'MD5'
+
+            # 生成支付签名（注意：这里key的大小写和字段名与第一次不同）
+            pay_sign_data = {
+                'appId': APPID,  # 注意：这里是appId，不是appid
+                'timeStamp': timestamp,  # 注意：这里是timeStamp，不是timestamp
+                'nonceStr': nonce_str,
+                'package': package,
+                'signType': sign_type
+            }
+
+            sorted_pay_sign_data = sorted(pay_sign_data.items(), key=lambda x: x[0])
+            pay_sign_string = '&'.join([f"{key}={value}" for key, value in sorted_pay_sign_data])
+            pay_sign_string += f'&key={KEY}'
+            pay_sign = hashlib.md5(pay_sign_string.encode('utf-8')).hexdigest().upper()
+
+            # 返回前端需要的支付参数
+            return {
+                'appId': APPID,  # 对应前端：appId
+                'timeStamp': timestamp,  # 对应前端：timeStamp
+                'nonceStr': nonce_str,  # 对应前端：nonceStr
+                'package': package,  # 对应前端：package
+                'signType': sign_type,  # 对应前端：signType
+                'paySign': pay_sign  # 对应前端：paySign
+            }
+        else:
+            # 获取错误信息
+            err_code = root.find('err_code')
+            err_code_des = root.find('err_code_des')
+            return_msg = root.find('return_msg')
+
+            error_details = f"return_code: {return_code}"
+            if err_code is not None:
+                error_details += f", err_code: {err_code.text}"
+            if err_code_des is not None:
+                error_details += f", err_code_des: {err_code_des.text}"
+            if return_msg is not None:
+                error_details += f", return_msg: {return_msg.text}"
+
+            raise Exception(f"微信支付下单失败: {error_details}")
+
+    def get_client_ip(self):
+        """获取客户端IP（从DRF的request对象中获取）"""
+        request = self.request
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0]
+        else:
+            ip = request.META.get('REMOTE_ADDR')
+        return ip if ip else '127.0.0.1'
+
+
+# views.py
+from django.views import View
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class YajinHuitiao(View):
+    """
+    押金支付回调接口
+    路径：/shangpin/yajinhuitiao
+    注意：这个接口不需要JWT认证，由微信服务器调用
+    """
+
+    def post(self, request):
+        try:
+            # 1. 解析微信回调XML数据
+            request_body = request.body
+            logger.info(f"收到微信支付回调，原始数据: {request_body.decode('utf-8')}")
+
+            root = ET.fromstring(request_body)
+
+            # 获取关键字段
+            return_code = root.find('return_code').text
+            result_code = root.find('result_code').text
+            out_trade_no = root.find('out_trade_no').text  # 订单ID
+            transaction_id = root.find('transaction_id').text  # 微信交易号
+            total_fee = int(root.find('total_fee').text)  # 支付金额（分）
+
+            logger.info(f"回调数据解析: 订单{out_trade_no}, 状态{return_code}/{result_code}, 金额{total_fee}分")
+
+            # 2. 验证基本返回状态
+            if return_code != 'SUCCESS' or result_code != 'SUCCESS':
+                logger.warning(f"微信支付回调状态异常: {return_code}/{result_code}")
+                return self.wechat_response('FAIL', '支付失败')
+
+            # 3. 验证签名（确保是微信发来的）
+            if not self.verify_signature(request_body):
+                logger.error(f"签名验证失败: {out_trade_no}")
+                return self.wechat_response('FAIL', '签名验证失败')
+
+            # 4. 查询订单
+            try:
+                order = Czjilu.objects.get(dingdan_id=out_trade_no)
+                logger.info(f"找到订单: {order.dingdan_id}, 状态: {order.zhuangtai}, 金额: {order.jine}")
+            except Czjilu.DoesNotExist:
+                logger.error(f"订单不存在: {out_trade_no}")
+                return self.wechat_response('FAIL', '订单不存在')
+
+            # 5. 检查订单状态是否为未支付（9）
+            if order.zhuangtai != 9:
+                logger.warning(f"订单状态不是未支付: {order.dingdan_id}, 当前状态: {order.zhuangtai}")
+                # 已处理过的订单直接返回成功，避免微信重复回调
+                return self.wechat_response('SUCCESS', 'OK')
+
+            # 6. 验证金额（微信返回的是分，需要转换）
+            wechat_amount_yuan = total_fee / 100  # 转换为元
+            order_amount_yuan = float(order.jine)  # 订单金额（元）
+
+            # 允许1分钱的误差（浮点数比较）
+            if abs(wechat_amount_yuan - order_amount_yuan) > 0.01:
+                logger.error(f"金额不一致: 订单金额{order_amount_yuan}元, 支付金额{wechat_amount_yuan}元")
+                return self.wechat_response('FAIL', '金额不一致')
+
+            # 7. 更新订单状态为已支付（3）
+            order.zhuangtai = 3
+            order.save(update_fields=['zhuangtai'])
+            logger.info(f"订单状态更新成功: {order.dingdan_id} -> 3")
+
+            # 8. 更新打手押金
+            try:
+                # 通过用户ID查找打手（高效查询）
+                dashou = UserDashou.objects.get(user__yonghuid=order.yonghuid)
+
+                # 增加押金（使用Decimal确保精度）
+                from decimal import Decimal
+                dashou.yajin += Decimal(str(order_amount_yuan))
+                dashou.save(update_fields=['yajin'])
+
+                logger.info(f"打手押金更新成功: 用户{order.yonghuid}, 增加{order_amount_yuan}元, 新押金{dashou.yajin}")
+
+                # 8b. 押金分红（仅微信确认到账后；费率 Lilubiao fadanpingtai=12）
+                try:
+                    from decimal import Decimal
+                    from django.db import transaction
+                    from dingdan.models import Lilubiao
+                    from shangpin.models import Gsfenhong
+                    from yonghu.models import UserGuanshi
+
+                    guanshi_id = dashou.yaoqingren
+                    if not guanshi_id:
+                        logger.info(f"押金分红跳过: 打手{order.yonghuid}无邀请管事")
+                    elif Gsfenhong.objects.filter(dingdan_id=order.dingdan_id).exists():
+                        logger.info(f"押金分红已处理: 订单{order.dingdan_id}")
+                    else:
+                        lilu_obj = Lilubiao.objects.filter(fadanpingtai='12').first()
+                        rate = lilu_obj.lilu if lilu_obj and lilu_obj.lilu is not None else Decimal('0')
+                        if rate <= 0:
+                            logger.info(f"押金分红跳过: 费率未配置或为0")
+                        else:
+                            recharge_amount = Decimal(str(order_amount_yuan))
+                            fenhong_jine = (recharge_amount * rate).quantize(Decimal('0.01'))
+                            if fenhong_jine > 0:
+                                with transaction.atomic():
+                                    guanshi = UserGuanshi.objects.select_for_update().get(
+                                        user__yonghuid=guanshi_id
+                                    )
+                                    guanshi.yue += fenhong_jine
+                                    guanshi.chongzhifenrun += fenhong_jine
+                                    guanshi.save(update_fields=['yue', 'chongzhifenrun'])
+
+                                    user_main = dashou.user
+                                    Gsfenhong.objects.create(
+                                        dingdan_id=order.dingdan_id,
+                                        guanshi=guanshi_id,
+                                        dashouid=order.yonghuid,
+                                        shuoming='押金分红',
+                                        fenhong=fenhong_jine,
+                                        avatar=user_main.avatar,
+                                        nicheng=dashou.nicheng or '未知打手',
+                                        fenhong_leixing=2,
+                                    )
+                                logger.info(
+                                    f"押金分红成功: 订单{order.dingdan_id}, 管事{guanshi_id}, "
+                                    f"打手{order.yonghuid}, 金额{fenhong_jine}元"
+                                )
+                                try:
+                                    from houtai.utils import update_guanshi_daily_by_action
+                                    update_guanshi_daily_by_action(
+                                        yonghuid=guanshi_id,
+                                        action=4,
+                                        amount=fenhong_jine,
+                                    )
+                                except Exception as e:
+                                    logger.error(f"押金分红管事日统计更新失败: {e}")
+                except UserGuanshi.DoesNotExist:
+                    logger.warning(f"押金分红跳过: 管事{guanshi_id}不存在")
+                except Exception as e:
+                    logger.error(f"押金分红处理失败: {str(e)}", exc_info=True)
+
+            except UserDashou.DoesNotExist:
+                # 如果找不到打手，记录错误，但依然返回成功（避免微信重复回调）
+                logger.error(f"打手信息不存在: 用户{order.yonghuid}")
+                return self.wechat_response('SUCCESS', 'OK')
+            except Exception as e:
+                logger.error(f"更新打手押金失败: {str(e)}", exc_info=True)
+                return self.wechat_response('FAIL', '更新押金失败')
+
+            # ==== 在返回成功响应之前添加这段代码 ====
+
+            # 更新收支记录表
+            try:
+                from peizhi.models import Szjilu
+                from decimal import Decimal
+
+
+
+                # 获取订单金额（确保是Decimal类型）
+                jine_decimal = Decimal(str(order.jine)) if not isinstance(order.jine, Decimal) else order.jine
+
+                # 查询或创建ID=1的收支记录
+                from dingdan.utils import update_daily_income
+                update_daily_income(jine_decimal)
+
+                szjilu, created = Szjilu.objects.get_or_create(
+                    id=1,
+                    defaults={
+                        'zongsy': Decimal('0.00'),
+                        'zongls': Decimal('0.00'),
+                        'zongzc': Decimal('0.00'),
+                        'jrzc': Decimal('0.00'),
+                        'jrls': Decimal('0.00')
+                    }
+                )
+
+                # 更新三个字段
+                szjilu.zongsy += jine_decimal  # 总收益
+                szjilu.zongls += jine_decimal  # 总流水
+                szjilu.jrls += jine_decimal  # 今日流水
+
+                szjilu.save()
+
+                logger.info(f"收支记录更新成功: 订单{order.dingdan_id}, 金额{jine_decimal}元")
+
+            except Exception as e:
+                # 收支记录更新失败不影响主流程，只记录日志
+                logger.error(f"更新收支记录失败: {str(e)}", exc_info=True)
+
+            # ==== 添加结束 ====
+
+            # 9. 返回成功响应给微信
+            logger.info(f"押金支付回调处理完成: {out_trade_no}")
+            return self.wechat_response('SUCCESS', 'OK')
+
+        except ET.ParseError as e:
+            logger.error(f"XML解析失败: {str(e)}")
+            return self.wechat_response('FAIL', '数据格式错误')
+        except Exception as e:
+            logger.error(f"押金支付回调处理异常: {str(e)}", exc_info=True)
+            # 返回FAIL让微信重试
+            return self.wechat_response('FAIL', '处理异常')
+
+    def verify_signature(self, xml_data):
+        """验证微信支付签名"""
+        try:
+            root = ET.fromstring(xml_data)
+            sign = root.find('sign').text
+
+            if not sign:
+                logger.error("签名字段不存在")
+                return False
+
+            # 获取所有参数并排除sign
+            params = {}
+            for child in root:
+                if child.tag != 'sign' and child.text is not None:
+                    params[child.tag] = child.text
+
+            # 按照参数名ASCII码从小到大排序
+            sorted_params = sorted(params.items(), key=lambda x: x[0])
+
+            # 拼接字符串
+            sign_string = '&'.join([f"{key}={value}" for key, value in sorted_params if value])
+            sign_string += f'&key={settings.WEIXIN_SHANGHUMIYAO}'
+
+            # 计算签名
+            calculated_sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+
+            is_valid = sign == calculated_sign
+            if not is_valid:
+                logger.error(f"签名验证失败: 计算签名{calculated_sign}, 收到签名{sign}")
+
+            return is_valid
+
+        except Exception as e:
+            logger.error(f"验证签名异常: {str(e)}")
+            return False
+
+    def wechat_response(self, return_code, return_msg):
+        """返回微信支付回调响应"""
+        xml_response = f"""<xml>
+<return_code><![CDATA[{return_code}]]></return_code>
+<return_msg><![CDATA[{return_msg}]]></return_msg>
+</xml>"""
+
+        logger.info(f"返回微信响应: {return_code} - {return_msg}")
+        return HttpResponse(xml_response, content_type='application/xml')
+
+
+# views.py
+class YajinShibai(APIView):
+    """
+    押金支付失败处理接口
+    路径：/shangpin/yajinshibai
+    请求方式：POST
+    权限：JWT认证
+    参数：dingdanid（订单ID）
+    返回：删除结果
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取订单ID
+            dingdanid = request.data.get('dingdanid')
+            if not dingdanid:
+                return Response({
+                    'code': 400,
+                    'message': '订单ID不能为空'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 查询订单（确保是当前用户的订单）
+            try:
+                order = Czjilu.objects.get(
+                    dingdan_id=dingdanid,
+                    yonghuid=request.user.yonghuid
+                )
+            except Czjilu.DoesNotExist:
+                return Response({
+                    'code': 400,
+                    'message': '订单不存在或不属于当前用户'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 检查订单状态是否为未支付（9）
+            if order.zhuangtai == 9:
+                # 删除订单
+                order.delete()
+                logger.info(f"用户{request.user.yonghuid}删除未支付订单: {dingdanid}")
+
+                return Response({
+                    'code': 200,
+                    'message': '订单已删除'
+                }, status=status.HTTP_200_OK)
+            else:
+                return Response({
+                    'code': 400,
+                    'message': '订单状态不是未支付，无法删除'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+        except Exception as e:
+            logger.error(f"押金支付失败处理异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '服务器内部错误'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+# views.py
+class YajinLunxun(APIView):
+    """
+    押金支付成功轮询接口
+    路径：/shangpin/yajinlunxun
+    请求方式：POST
+    权限：JWT认证
+    参数：dingdanid（订单ID）
+    返回：订单状态和当前押金
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取订单ID
+            dingdanid = request.data.get('dingdanid')
+            if not dingdanid:
+                return Response({
+                    'code': 400,
+                    'message': '订单ID不能为空'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 查询订单（确保是当前用户的订单）
+            try:
+                order = Czjilu.objects.get(
+                    dingdan_id=dingdanid,
+                    yonghuid=request.user.yonghuid
+                )
+            except Czjilu.DoesNotExist:
+                return Response({
+                    'code': 400,
+                    'message': '订单不存在或不属于当前用户'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 检查订单状态是否为已支付（3）
+            if order.zhuangtai != 3:
+                logger.info(f"订单{dingdanid}尚未支付完成，当前状态: {order.zhuangtai}")
+                return Response({
+                    'code': 400,
+                    'message': '订单尚未支付完成'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 4. 获取打手押金（通过反向查询，最快捷的方式）
+            try:
+                dashou = request.user.dashou_profile
+                yajin = float(dashou.yajin)  # 转为浮点数方便前端处理
+
+                logger.info(f"轮询成功: 订单{dingdanid}已支付，用户{request.user.yonghuid}押金为{yajin}元")
+
+                return Response({
+                    'code': 200,
+                    'message': '支付流程全部完成',
+                    'yajin': yajin  # 返回当前押金（前端需要更新全局变量）
+                }, status=status.HTTP_200_OK)
+
+            except UserDashou.DoesNotExist:
+                logger.error(f"打手信息不存在: 用户{request.user.yonghuid}")
+                return Response({
+                    'code': 400,
+                    'message': '打手信息不存在'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+        except Exception as e:
+            logger.error(f"押金轮询异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '服务器内部错误'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+# views.py
+class JifenBuchong(APIView):
+    """
+    积分补充支付参数接口
+    路径：/shangpin/jifenbc
+    请求方式：POST
+    权限：JWT认证
+    参数：无（固定5元）
+    返回：支付参数(payParams)和订单ID(dingdanid)
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 验证用户身份和状态
+            try:
+                dashou = request.user.dashou_profile
+            except UserDashou.DoesNotExist:
+                return Response({
+                    'code': 400,
+                    'message': '用户不是打手，无法补充积分'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 检查打手账号状态
+            if dashou.zhanghaozhuangtai != 1:
+                return Response({
+                    'code': 400,
+                    'message': '账号状态异常，无法进行操作'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 检查积分是否已满（满分10分）
+            if dashou.jifen >= 10:
+                return Response({
+                    'code': 400,
+                    'message': '积分已满，无需补充'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 4. 生成订单ID（前缀CzJF表示积分充值）
+            timestamp_ms = int(time.time() * 1000)
+            timestamp_ns = int(time.time_ns() // 1000) % 1000000
+            random_num = random.randint(0, 99)
+
+            dingdanid = f"CzJF{timestamp_ms:011d}{timestamp_ns:06d}{random_num:02d}"
+
+            # 5. 创建积分充值记录订单（固定5元）
+            jine = 5.00  # 固定5元
+            chongzhi_jilu = Czjilu.objects.create(
+                dingdan_id=dingdanid,
+                zhuangtai=9,  # 未支付状态
+                yonghuid=request.user.yonghuid,
+                jine=jine,
+                leixing=3,  # 充值类型：3=积分
+                shuoming=settings.JIFEN_PAY_DESCRIPTION
+            )
+
+            logger.info(f"创建积分充值订单: 用户{request.user.yonghuid}, 订单{dingdanid}, 金额{jine}元")
+
+            # 6. 生成微信支付参数（完整版）
+            try:
+                pay_params = self.generate_wechat_pay_params(
+                    dingdanid=dingdanid,
+                    jine=jine,
+                    openid=request.user.openid,
+                    pay_type='jifen'
+                )
+            except Exception as e:
+                # 支付参数生成失败，删除订单记录
+                chongzhi_jilu.delete()
+                logger.error(f"生成积分支付参数失败: {str(e)}")
+                return Response({
+                    'code': 500,
+                    'message': f'支付参数生成失败: {str(e)}'
+                }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            # 7. 返回支付参数和订单ID
+            return Response({
+                'code': 200,
+                'message': '支付参数生成成功',
+                'payParams': pay_params,  # 对应前端payParams
+                'dingdanid': dingdanid  # 对应前端dingdanid
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            logger.error(f"积分充值接口异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '服务器内部错误，请稍后重试'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def generate_wechat_pay_params(self, dingdanid, jine, openid, pay_type):
+        """生成微信支付参数（完整版，无省略）"""
+        # 微信支付配置 - 从settings中获取
+        APPID = settings.WEIXIN_APPID
+        MCHID = settings.WEIXIN_MCHID
+        KEY = settings.WEIXIN_SHANGHUMIYAO
+
+        # 根据支付类型获取对应的配置
+        if pay_type == 'yajin':
+            PAY_DESCRIPTION = settings.YAJIN_PAY_DESCRIPTION
+            NOTIFY_URL = settings.YAJIN_PAY_NOTIFY_URL
+        elif pay_type == 'jifen':
+            PAY_DESCRIPTION = settings.JIFEN_PAY_DESCRIPTION
+            NOTIFY_URL = settings.JIFEN_PAY_NOTIFY_URL
+        elif pay_type == 'huiyuan':
+            PAY_DESCRIPTION = settings.HUIYUAN_PAY_DESCRIPTION
+            NOTIFY_URL = settings.HUIYUAN_PAY_NOTIFY_URL
+        else:
+            raise Exception('未知的支付类型')
+
+        # 生成随机字符串
+        nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+
+        # 金额转换（元转分）
+        total_fee = int(jine * 100)
+
+        # 交易类型（小程序支付使用JSAPI）
+        trade_type = 'JSAPI'
+
+        # 获取客户端IP
+        user_ip = self.get_client_ip()
+
+        # 1. 第一次签名（统一下单接口）
+        sign_data = {
+            'appid': APPID,
+            'mch_id': MCHID,
+            'nonce_str': nonce_str,
+            'body': PAY_DESCRIPTION,
+            'out_trade_no': dingdanid,
+            'total_fee': total_fee,
+            'spbill_create_ip': user_ip,
+            'notify_url': NOTIFY_URL,
+            'trade_type': trade_type,
+            'openid': openid  # 小程序支付必须传openid
+        }
+
+        # 按照参数名ASCII码从小到大排序
+        sorted_sign_data = sorted(sign_data.items(), key=lambda x: x[0])
+
+        # 拼接字符串
+        sign_string = '&'.join([f"{key}={value}" for key, value in sorted_sign_data if value])
+        sign_string += f'&key={KEY}'
+
+        # MD5签名
+        sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+
+        # 构造XML数据
+        xml_data = f"""<xml>
+<appid>{APPID}</appid>
+<body>{PAY_DESCRIPTION}</body>
+<mch_id>{MCHID}</mch_id>
+<nonce_str>{nonce_str}</nonce_str>
+<notify_url>{NOTIFY_URL}</notify_url>
+<openid>{openid}</openid>
+<out_trade_no>{dingdanid}</out_trade_no>
+<spbill_create_ip>{user_ip}</spbill_create_ip>
+<total_fee>{total_fee}</total_fee>
+<trade_type>{trade_type}</trade_type>
+<sign>{sign}</sign>
+</xml>"""
+
+        # 调用微信统一下单接口（官方地址）
+        response = requests.post(
+            'https://api.mch.weixin.qq.com/pay/unifiedorder',
+            data=xml_data.encode('utf-8'),
+            headers={'Content-Type': 'application/xml'},
+            timeout=10  # 设置超时
+        )
+
+        # 解析返回的XML
+        root = ET.fromstring(response.content)
+
+        return_code = root.find('return_code').text
+        result_code = root.find('result_code').text
+
+        if return_code == 'SUCCESS' and result_code == 'SUCCESS':
+            # 获取prepay_id
+            prepay_id = root.find('prepay_id').text
+
+            # 2. 第二次签名（小程序支付参数）
+            timestamp = str(int(time.time()))
+            nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+            package = f'prepay_id={prepay_id}'
+            sign_type = 'MD5'
+
+            # 生成支付签名（注意：这里key的大小写和字段名与第一次不同）
+            pay_sign_data = {
+                'appId': APPID,  # 注意：这里是appId，不是appid
+                'timeStamp': timestamp,  # 注意：这里是timeStamp，不是timestamp
+                'nonceStr': nonce_str,
+                'package': package,
+                'signType': sign_type
+            }
+
+            sorted_pay_sign_data = sorted(pay_sign_data.items(), key=lambda x: x[0])
+            pay_sign_string = '&'.join([f"{key}={value}" for key, value in sorted_pay_sign_data])
+            pay_sign_string += f'&key={KEY}'
+            pay_sign = hashlib.md5(pay_sign_string.encode('utf-8')).hexdigest().upper()
+
+            # 返回前端需要的支付参数
+            return {
+                'appId': APPID,  # 对应前端：appId
+                'timeStamp': timestamp,  # 对应前端：timeStamp
+                'nonceStr': nonce_str,  # 对应前端：nonceStr
+                'package': package,  # 对应前端：package
+                'signType': sign_type,  # 对应前端：signType
+                'paySign': pay_sign  # 对应前端：paySign
+            }
+        else:
+            # 获取错误信息
+            err_code = root.find('err_code')
+            err_code_des = root.find('err_code_des')
+            return_msg = root.find('return_msg')
+
+            error_details = f"return_code: {return_code}"
+            if err_code is not None:
+                error_details += f", err_code: {err_code.text}"
+            if err_code_des is not None:
+                error_details += f", err_code_des: {err_code_des.text}"
+            if return_msg is not None:
+                error_details += f", return_msg: {return_msg.text}"
+
+            raise Exception(f"微信支付下单失败: {error_details}")
+
+    def get_client_ip(self):
+        """获取客户端IP（完整版）"""
+        request = self.request
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0]
+        else:
+            ip = request.META.get('REMOTE_ADDR')
+        return ip if ip else '127.0.0.1'
+
+
+# views.py
+class JifenHuitiao(View):
+    """
+    积分支付回调接口
+    路径：/shangpin/jifenhuitiao
+    注意：这个接口不需要JWT认证，由微信服务器调用
+    """
+
+    def post(self, request):
+        try:
+            # 1. 解析微信回调XML数据
+            request_body = request.body
+            logger.info(f"收到积分支付回调，原始数据: {request_body.decode('utf-8')}")
+
+            root = ET.fromstring(request_body)
+
+            # 获取关键字段
+            return_code = root.find('return_code').text
+            result_code = root.find('result_code').text
+            out_trade_no = root.find('out_trade_no').text  # 订单ID
+            transaction_id = root.find('transaction_id').text  # 微信交易号
+            total_fee = int(root.find('total_fee').text)  # 支付金额（分）
+
+            logger.info(f"积分回调数据: 订单{out_trade_no}, 状态{return_code}/{result_code}, 金额{total_fee}分")
+
+            # 2. 验证基本返回状态
+            if return_code != 'SUCCESS' or result_code != 'SUCCESS':
+                logger.warning(f"积分支付回调状态异常: {return_code}/{result_code}")
+                return self.wechat_response('FAIL', '支付失败')
+
+            # 3. 验证签名
+            if not self.verify_signature(request_body):
+                logger.error(f"积分签名验证失败: {out_trade_no}")
+                return self.wechat_response('FAIL', '签名验证失败')
+
+            # 4. 查询订单
+            try:
+                order = Czjilu.objects.get(dingdan_id=out_trade_no)
+                logger.info(f"找到积分订单: {order.dingdan_id}, 状态: {order.zhuangtai}, 金额: {order.jine}")
+            except Czjilu.DoesNotExist:
+                logger.error(f"积分订单不存在: {out_trade_no}")
+                return self.wechat_response('FAIL', '订单不存在')
+
+            # 5. 检查订单状态是否为未支付（9）
+            if order.zhuangtai != 9:
+                logger.warning(f"积分订单状态不是未支付: {order.dingdan_id}, 当前状态: {order.zhuangtai}")
+                return self.wechat_response('SUCCESS', 'OK')
+
+            # 6. 验证金额（固定5元）
+            wechat_amount_yuan = total_fee / 100  # 转换为元
+            order_amount_yuan = float(order.jine)  # 订单金额（元）
+
+            # 验证是否是5元（允许1分钱误差）
+            if abs(wechat_amount_yuan - 5.00) > 0.01:
+                logger.error(f"积分金额错误: 订单金额{order_amount_yuan}元, 支付金额{wechat_amount_yuan}元")
+                return self.wechat_response('FAIL', '金额错误')
+
+            # ==== 在返回成功响应之前添加这段代码 ====
+
+            # 更新收支记录表
+            try:
+                from peizhi.models import Szjilu
+                from decimal import Decimal
+
+                # 获取订单金额（确保是Decimal类型）
+                jine_decimal = Decimal(str(order.jine)) if not isinstance(order.jine, Decimal) else order.jine
+
+                # 查询或创建ID=1的收支记录
+
+                from dingdan.utils import update_daily_income
+                update_daily_income(jine_decimal)
+
+                szjilu, created = Szjilu.objects.get_or_create(
+                    id=1,
+                    defaults={
+                        'zongsy': Decimal('0.00'),
+                        'zongls': Decimal('0.00'),
+                        'zongzc': Decimal('0.00'),
+                        'jrzc': Decimal('0.00'),
+                        'jrls': Decimal('0.00')
+                    }
+                )
+
+                # 更新三个字段
+                szjilu.zongsy += jine_decimal  # 总收益
+                szjilu.zongls += jine_decimal  # 总流水
+                szjilu.jrls += jine_decimal  # 今日流水
+
+                szjilu.save()
+
+                logger.info(f"收支记录更新成功: 订单{order.dingdan_id}, 金额{jine_decimal}元")
+
+            except Exception as e:
+                # 收支记录更新失败不影响主流程，只记录日志
+                logger.error(f"更新收支记录失败: {str(e)}", exc_info=True)
+
+            # ==== 添加结束 ====
+
+            # 7. 更新订单状态为已支付（3）
+            order.zhuangtai = 3
+            order.save(update_fields=['zhuangtai'])
+            logger.info(f"积分订单状态更新成功: {order.dingdan_id} -> 3")
+
+            # 8. 更新打手积分
+            try:
+                # 通过用户ID查找打手
+                dashou = UserDashou.objects.get(user__yonghuid=order.yonghuid)
+
+                # 检查积分是否小于10
+                if dashou.jifen < 10:
+                    # 增加5积分，但不超过10
+                    new_jifen = dashou.jifen + 5
+                    dashou.jifen = min(new_jifen, 10)  # 确保不超过10
+                    dashou.save(update_fields=['jifen'])
+
+                    logger.info(f"打手积分更新成功: 用户{order.yonghuid}, 增加5积分, 新积分{dashou.jifen}")
+
+
+
+
+                else:
+                    logger.warning(f"打手积分已满: 用户{order.yonghuid}, 当前积分{dashou.jifen}")
+
+            except UserDashou.DoesNotExist:
+                logger.error(f"打手信息不存在: 用户{order.yonghuid}")
+                return self.wechat_response('SUCCESS', 'OK')
+            except Exception as e:
+                logger.error(f"更新打手积分失败: {str(e)}", exc_info=True)
+                return self.wechat_response('FAIL', '更新积分失败')
+
+            # 9. 返回成功响应给微信
+            logger.info(f"积分支付回调处理完成: {out_trade_no}")
+            return self.wechat_response('SUCCESS', 'OK')
+
+        except ET.ParseError as e:
+            logger.error(f"积分XML解析失败: {str(e)}")
+            return self.wechat_response('FAIL', '数据格式错误')
+        except Exception as e:
+            logger.error(f"积分支付回调处理异常: {str(e)}", exc_info=True)
+            return self.wechat_response('FAIL', '处理异常')
+
+    def verify_signature(self, xml_data):
+        """验证微信支付签名"""
+        try:
+            root = ET.fromstring(xml_data)
+            sign = root.find('sign').text
+
+            if not sign:
+                logger.error("积分数签名字段不存在")
+                return False
+
+            # 获取所有参数并排除sign
+            params = {}
+            for child in root:
+                if child.tag != 'sign' and child.text is not None:
+                    params[child.tag] = child.text
+
+            # 按照参数名ASCII码从小到大排序
+            sorted_params = sorted(params.items(), key=lambda x: x[0])
+
+            # 拼接字符串
+            sign_string = '&'.join([f"{key}={value}" for key, value in sorted_params if value])
+            sign_string += f'&key={settings.WEIXIN_SHANGHUMIYAO}'
+
+            # 计算签名
+            calculated_sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+
+            is_valid = sign == calculated_sign
+            if not is_valid:
+                logger.error(f"积分签名验证失败: 计算签名{calculated_sign}, 收到签名{sign}")
+
+            return is_valid
+
+        except Exception as e:
+            logger.error(f"积分验证签名异常: {str(e)}")
+            return False
+
+    def wechat_response(self, return_code, return_msg):
+        """返回微信支付回调响应"""
+        xml_response = f"""<xml>
+<return_code><![CDATA[{return_code}]]></return_code>
+<return_msg><![CDATA[{return_msg}]]></return_msg>
+</xml>"""
+
+        logger.info(f"积分返回微信响应: {return_code} - {return_msg}")
+        return HttpResponse(xml_response, content_type='application/xml')
+
+
+# views.py
+class JifenShibai(APIView):
+    """
+    积分支付失败处理接口
+    路径：/shangpin/jifenshibai
+    请求方式：POST
+    权限：JWT认证
+    参数：dingdanid（订单ID）
+    返回：删除结果
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取订单ID
+            dingdanid = request.data.get('dingdanid')
+            if not dingdanid:
+                return Response({
+                    'code': 400,
+                    'message': '订单ID不能为空'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 查询订单（确保是当前用户的订单）
+            try:
+                order = Czjilu.objects.get(
+                    dingdan_id=dingdanid,
+                    yonghuid=request.user.yonghuid
+                )
+            except Czjilu.DoesNotExist:
+                return Response({
+                    'code': 400,
+                    'message': '订单不存在或不属于当前用户'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 检查订单类型是否为积分（3）
+            if order.leixing != 3:
+                return Response({
+                    'code': 400,
+                    'message': '订单类型错误，不是积分订单'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 4. 检查订单状态是否为未支付（9）
+            if order.zhuangtai == 9:
+                # 删除订单
+                order.delete()
+                logger.info(f"用户{request.user.yonghuid}删除未支付积分订单: {dingdanid}")
+
+                return Response({
+                    'code': 200,
+                    'message': '积分订单已删除'
+                }, status=status.HTTP_200_OK)
+            else:
+                return Response({
+                    'code': 400,
+                    'message': '积分订单状态不是未支付，无法删除'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+        except Exception as e:
+            logger.error(f"积分支付失败处理异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '服务器内部错误'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+# views.py
+class JifenLunxun(APIView):
+    """
+    积分支付成功轮询接口
+    路径：/shangpin/jifenlunxun
+    请求方式：POST
+    权限：JWT认证
+    参数：dingdanid（订单ID）
+    返回：订单状态和当前积分
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取订单ID
+            dingdanid = request.data.get('dingdanid')
+            if not dingdanid:
+                return Response({
+                    'code': 400,
+                    'message': '订单ID不能为空'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 查询订单（确保是当前用户的订单）
+            try:
+                order = Czjilu.objects.get(
+                    dingdan_id=dingdanid,
+                    yonghuid=request.user.yonghuid
+                )
+            except Czjilu.DoesNotExist:
+                return Response({
+                    'code': 400,
+                    'message': '订单不存在或不属于当前用户'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 检查订单类型是否为积分（3）
+            if order.leixing != 3:
+                return Response({
+                    'code': 400,
+                    'message': '订单类型错误，不是积分订单'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 4. 检查订单状态是否为已支付（3）
+            if order.zhuangtai != 3:
+                logger.info(f"积分订单{dingdanid}尚未支付完成，当前状态: {order.zhuangtai}")
+                return Response({
+                    'code': 400,
+                    'message': '积分订单尚未支付完成'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 5. 获取打手积分（通过反向查询）
+            try:
+                dashou = request.user.dashou_profile
+                jifen = dashou.jifen  # 直接使用整数
+
+                logger.info(f"积分轮询成功: 订单{dingdanid}已支付，用户{request.user.yonghuid}积分为{jifen}")
+
+                return Response({
+                    'code': 200,
+                    'message': '支付流程全部完成',
+                    'jifen': jifen  # 返回当前积分（前端需要更新全局变量）
+                }, status=status.HTTP_200_OK)
+
+            except UserDashou.DoesNotExist:
+                logger.error(f"打手信息不存在: 用户{request.user.yonghuid}")
+                return Response({
+                    'code': 400,
+                    'message': '打手信息不存在'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+        except Exception as e:
+            logger.error(f"积分轮询异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '服务器内部错误'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+# views.py
+from rest_framework.views import APIView
+from rest_framework.permissions import IsAuthenticated
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class HuiyuanGoumai(APIView):
+    """
+    会员充值支付参数接口
+    路径：/shangpin/huiyuangm
+    请求方式：POST
+    权限：JWT认证
+    参数：huiyuanid（会员ID）
+    返回：支付参数(payParams)和订单ID(dingdanid)
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取会员ID参数
+            huiyuanid = request.data.get('huiyuanid')
+            if not huiyuanid:
+                return Response({
+                    'code': 400,
+                    'message': '会员ID不能为空'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 验证用户身份和状态
+            try:
+                dashou = request.user.dashou_profile
+            except UserDashou.DoesNotExist:
+                return Response({
+                    'code': 400,
+                    'message': '用户不是打手，无法购买会员'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 检查打手账号状态
+            if dashou.zhanghaozhuangtai != 1:
+                return Response({
+                    'code': 400,
+                    'message': '账号状态异常，无法进行购买'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 4. 查询会员信息
+            try:
+                huiyuan = Huiyuan.objects.get(huiyuan_id=huiyuanid)
+            except Huiyuan.DoesNotExist:
+                return Response({
+                    'code': 400,
+                    'message': '会员信息不存在'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 5. 生成订单ID（前缀CzHY表示会员充值）
+            timestamp_ms = int(time.time() * 1000)
+            timestamp_ns = int(time.time_ns() // 1000) % 1000000
+            random_num = random.randint(0, 99)
+
+            dingdanid = f"CzHY{timestamp_ms:011d}{timestamp_ns:06d}{random_num:02d}"
+
+            # 6. 创建充值记录订单
+            jine = float(huiyuan.jiage)  # 会员价格
+            # 组合订单说明：会员介绍 + 配置描述
+            shuoming = f"{huiyuan.jieshao} - {settings.HUIYUAN_PAY_DESCRIPTION}"
+
+            chongzhi_jilu = Czjilu.objects.create(
+                dingdan_id=dingdanid,
+                zhuangtai=9,  # 未支付状态
+                yonghuid=request.user.yonghuid,
+                jine=jine,
+                leixing=1,  # 充值类型：1=会员
+                shuoming=shuoming,
+                huiyuan_id=huiyuanid  # 存储会员ID
+            )
+
+            logger.info(
+                f"创建会员充值订单: 用户{request.user.yonghuid}, 订单{dingdanid}, 会员{huiyuanid}, 金额{jine}元")
+
+            # 7. 生成微信支付参数
+            try:
+                pay_params = self.generate_wechat_pay_params(
+                    dingdanid=dingdanid,
+                    jine=jine,
+                    openid=request.user.openid,
+                    pay_type='huiyuan'
+                )
+            except Exception as e:
+                # 支付参数生成失败，删除订单记录
+                chongzhi_jilu.delete()
+                logger.error(f"生成会员支付参数失败: {str(e)}")
+                return Response({
+                    'code': 500,
+                    'message': f'支付参数生成失败: {str(e)}'
+                }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            # 8. 返回支付参数和订单ID
+            return Response({
+                'code': 200,
+                'message': '支付参数生成成功',
+                'payParams': pay_params,  # 对应前端payParams
+                'dingdanid': dingdanid  # 对应前端dingdanid
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            logger.error(f"会员充值接口异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '服务器内部错误，请稍后重试'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def generate_wechat_pay_params(self, dingdanid, jine, openid, pay_type):
+        """生成微信支付参数（完整版，无省略）"""
+        # 微信支付配置 - 从settings中获取
+        APPID = settings.WEIXIN_APPID
+        MCHID = settings.WEIXIN_MCHID
+        KEY = settings.WEIXIN_SHANGHUMIYAO
+
+        # 根据支付类型获取对应的配置
+        if pay_type == 'yajin':
+            PAY_DESCRIPTION = settings.YAJIN_PAY_DESCRIPTION
+            NOTIFY_URL = settings.YAJIN_PAY_NOTIFY_URL
+        elif pay_type == 'jifen':
+            PAY_DESCRIPTION = settings.JIFEN_PAY_DESCRIPTION
+            NOTIFY_URL = settings.JIFEN_PAY_NOTIFY_URL
+        elif pay_type == 'huiyuan':
+            PAY_DESCRIPTION = settings.HUIYUAN_PAY_DESCRIPTION
+            NOTIFY_URL = settings.HUIYUAN_PAY_NOTIFY_URL
+        else:
+            raise Exception('未知的支付类型')
+
+        # 生成随机字符串
+        nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+
+        # 金额转换（元转分）
+        total_fee = int(jine * 100)
+
+        # 交易类型（小程序支付使用JSAPI）
+        trade_type = 'JSAPI'
+
+        # 获取客户端IP
+        user_ip = self.get_client_ip()
+
+        # 1. 第一次签名（统一下单接口）
+        sign_data = {
+            'appid': APPID,
+            'mch_id': MCHID,
+            'nonce_str': nonce_str,
+            'body': PAY_DESCRIPTION,
+            'out_trade_no': dingdanid,
+            'total_fee': total_fee,
+            'spbill_create_ip': user_ip,
+            'notify_url': NOTIFY_URL,
+            'trade_type': trade_type,
+            'openid': openid  # 小程序支付必须传openid
+        }
+
+        # 按照参数名ASCII码从小到大排序
+        sorted_sign_data = sorted(sign_data.items(), key=lambda x: x[0])
+
+        # 拼接字符串
+        sign_string = '&'.join([f"{key}={value}" for key, value in sorted_sign_data if value])
+        sign_string += f'&key={KEY}'
+
+        # MD5签名
+        sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+
+        # 构造XML数据
+        xml_data = f"""<xml>
+<appid>{APPID}</appid>
+<body>{PAY_DESCRIPTION}</body>
+<mch_id>{MCHID}</mch_id>
+<nonce_str>{nonce_str}</nonce_str>
+<notify_url>{NOTIFY_URL}</notify_url>
+<openid>{openid}</openid>
+<out_trade_no>{dingdanid}</out_trade_no>
+<spbill_create_ip>{user_ip}</spbill_create_ip>
+<total_fee>{total_fee}</total_fee>
+<trade_type>{trade_type}</trade_type>
+<sign>{sign}</sign>
+</xml>"""
+
+        # 调用微信统一下单接口（官方地址）
+        response = requests.post(
+            'https://api.mch.weixin.qq.com/pay/unifiedorder',
+            data=xml_data.encode('utf-8'),
+            headers={'Content-Type': 'application/xml'},
+            timeout=10  # 设置超时
+        )
+
+        # 解析返回的XML
+        root = ET.fromstring(response.content)
+
+        return_code = root.find('return_code').text
+        result_code = root.find('result_code').text
+
+        if return_code == 'SUCCESS' and result_code == 'SUCCESS':
+            # 获取prepay_id
+            prepay_id = root.find('prepay_id').text
+
+            # 2. 第二次签名（小程序支付参数）
+            timestamp = str(int(time.time()))
+            nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+            package = f'prepay_id={prepay_id}'
+            sign_type = 'MD5'
+
+            # 生成支付签名（注意：这里key的大小写和字段名与第一次不同）
+            pay_sign_data = {
+                'appId': APPID,  # 注意：这里是appId，不是appid
+                'timeStamp': timestamp,  # 注意：这里是timeStamp，不是timestamp
+                'nonceStr': nonce_str,
+                'package': package,
+                'signType': sign_type
+            }
+
+            sorted_pay_sign_data = sorted(pay_sign_data.items(), key=lambda x: x[0])
+            pay_sign_string = '&'.join([f"{key}={value}" for key, value in sorted_pay_sign_data])
+            pay_sign_string += f'&key={KEY}'
+            pay_sign = hashlib.md5(pay_sign_string.encode('utf-8')).hexdigest().upper()
+
+            # 返回前端需要的支付参数
+            return {
+                'appId': APPID,  # 对应前端：appId
+                'timeStamp': timestamp,  # 对应前端：timeStamp
+                'nonceStr': nonce_str,  # 对应前端：nonceStr
+                'package': package,  # 对应前端：package
+                'signType': sign_type,  # 对应前端：signType
+                'paySign': pay_sign  # 对应前端：paySign
+            }
+        else:
+            # 获取错误信息
+            err_code = root.find('err_code')
+            err_code_des = root.find('err_code_des')
+            return_msg = root.find('return_msg')
+
+            error_details = f"return_code: {return_code}"
+            if err_code is not None:
+                error_details += f", err_code: {err_code.text}"
+            if err_code_des is not None:
+                error_details += f", err_code_des: {err_code_des.text}"
+            if return_msg is not None:
+                error_details += f", return_msg: {return_msg.text}"
+
+            raise Exception(f"微信支付下单失败: {error_details}")
+
+    def get_client_ip(self):
+        """获取客户端IP（完整版）"""
+        request = self.request
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0]
+        else:
+            ip = request.META.get('REMOTE_ADDR')
+        return ip if ip else '127.0.0.1'
+
+
+# views.py
+
+from django.views import View
+from django.http import HttpResponse
+from yonghu.models import UserDashou, UserMain, UserGuanshi,UserZuzhang
+from shangpin.models import Czjilu, Huiyuan, Huiyuangoumai, Gsfenhong,DuociFenhong
+from peizhi.models import Szjilu
+from datetime import timedelta
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+
+class HuiyuanHuitiao(View):
+    """
+    会员支付回调接口
+    路径：/shangpin/huiyuanhuitiao
+    """
+
+    def post(self, request):
+        try:
+            # 1. 解析微信回调XML数据
+            request_body = request.body
+            logger.info(f"收到会员支付回调，原始数据: {request_body.decode('utf-8')}")
+
+            root = ET.fromstring(request_body)
+
+            return_code = root.find('return_code').text
+            result_code = root.find('result_code').text
+            out_trade_no = root.find('out_trade_no').text
+            transaction_id = root.find('transaction_id').text
+            total_fee = int(root.find('total_fee').text)
+
+            logger.info(f"会员回调数据: 订单{out_trade_no}, 状态{return_code}/{result_code}, 金额{total_fee}分")
+
+            if return_code != 'SUCCESS' or result_code != 'SUCCESS':
+                logger.warning(f"会员支付回调状态异常: {return_code}/{result_code}")
+                return self.wechat_response('FAIL', '支付失败')
+
+            if not self.verify_signature(request_body):
+                logger.error(f"会员签名验证失败: {out_trade_no}")
+                return self.wechat_response('FAIL', '签名验证失败')
+
+            # 查询订单
+            try:
+                order = Czjilu.objects.get(dingdan_id=out_trade_no)
+            except Czjilu.DoesNotExist:
+                logger.error(f"会员订单不存在: {out_trade_no}")
+                return self.wechat_response('FAIL', '订单不存在')
+
+            if order.leixing != 1:
+                logger.error(f"订单类型错误: {order.leixing}, 期望1(会员)")
+                return self.wechat_response('FAIL', '订单类型错误')
+
+            if order.zhuangtai != 9:
+                logger.warning(f"会员订单状态不是未支付: {order.dingdan_id}, 当前状态: {order.zhuangtai}")
+                return self.wechat_response('SUCCESS', 'OK')
+
+            # 验证金额
+            wechat_amount_yuan = total_fee / 100
+            order_amount_yuan = float(order.jine)
+            if abs(wechat_amount_yuan - order_amount_yuan) > 0.01:
+                logger.error(f"会员金额不一致: 订单金额{order_amount_yuan}元, 支付金额{wechat_amount_yuan}元")
+                return self.wechat_response('FAIL', '金额不一致')
+
+            # 查询会员信息
+            try:
+                huiyuan = Huiyuan.objects.get(huiyuan_id=order.huiyuan_id)
+            except Huiyuan.DoesNotExist:
+                logger.error(f"会员信息不存在: {order.huiyuan_id}")
+                return self.wechat_response('FAIL', '会员信息不存在')
+
+            # ===== 更新收支记录 =====
+            try:
+                jine_decimal = Decimal(str(order.jine)) if not isinstance(order.jine, Decimal) else order.jine
+
+                from dingdan.utils import update_daily_income
+                update_daily_income(jine_decimal)
+
+                szjilu, _ = Szjilu.objects.get_or_create(
+                    id=1,
+                    defaults={'zongsy': Decimal('0.00'), 'zongls': Decimal('0.00'), 'zongzc': Decimal('0.00'),
+                              'jrzc': Decimal('0.00'), 'jrls': Decimal('0.00')}
+                )
+                szjilu.zongsy += jine_decimal
+                szjilu.zongls += jine_decimal
+                szjilu.jrls += jine_decimal
+                szjilu.save()
+                logger.info(f"收支记录更新成功: 订单{order.dingdan_id}, 金额{jine_decimal}元")
+            except Exception as e:
+                logger.error(f"更新收支记录失败: {str(e)}", exc_info=True)
+
+            # 更新订单状态
+            order.zhuangtai = 3
+            order.save(update_fields=['zhuangtai'])
+            logger.info(f"会员订单状态更新成功: {order.dingdan_id} -> 3")
+
+            # 更新会员购买次数
+            huiyuan.goumai_cishu += 1
+            huiyuan.save(update_fields=['goumai_cishu'])
+
+            # 处理会员购买记录
+            goumai_record, is_new, is_first_buy = self.process_huiyuan_goumai(
+                order.yonghuid, order.huiyuan_id, huiyuan
+            )
+
+            if is_first_buy:
+                self.add_first_buy_jifen(order.yonghuid)
+
+            # 🆕 新增：处理分红（包含管事和组长）
+            with transaction.atomic():
+                self.process_fenhong(order, huiyuan)
+
+            logger.info(f"会员支付回调处理完成: {out_trade_no}")
+            return self.wechat_response('SUCCESS', 'OK')
+
+        except ET.ParseError as e:
+            logger.error(f"会员XML解析失败: {str(e)}")
+            return self.wechat_response('FAIL', '数据格式错误')
+        except Exception as e:
+            logger.error(f"会员支付回调处理异常: {str(e)}", exc_info=True)
+            return self.wechat_response('FAIL', '处理异常')
+
+    # ---------- 以下为原方法，基本不变，但需要导入新增模型 ----------
+
+    def process_huiyuan_goumai(self, yonghuid, huiyuan_id, huiyuan):
+        """处理会员购买记录（与原代码一致）"""
+        try:
+            existing_record = Huiyuangoumai.objects.filter(
+                yonghu_id=yonghuid,
+                huiyuan_id=huiyuan_id
+            ).first()
+
+            is_first_buy_any = False
+
+            if existing_record:
+                existing_record.daoqi_time += timedelta(days=30)
+                existing_record.huiyuan_zhuangtai = 1
+                existing_record.save()
+                logger.info(f"会员续费: 用户{yonghuid}, 会员{huiyuan_id}")
+                return existing_record, False, False
+            else:
+                other_huiyuan_count = Huiyuangoumai.objects.filter(
+                    yonghu_id=yonghuid
+                ).exclude(huiyuan_id=huiyuan_id).count()
+                if other_huiyuan_count == 0:
+                    is_first_buy_any = True
+                    logger.info(f"用户{yonghuid}首次购买任何会员，将获得10积分")
+
+                goumai_record = Huiyuangoumai.objects.create(
+                    yonghu_id=yonghuid,
+                    huiyuan_id=huiyuan_id,
+                    jieshao=huiyuan.jieshao,
+                    huiyuan_zhuangtai=1,
+                    daoqi_time=timezone.now() + timedelta(days=30)
+                )
+                logger.info(f"新购会员: 用户{yonghuid}, 会员{huiyuan_id}")
+                return goumai_record, True, is_first_buy_any
+        except Exception as e:
+            logger.error(f"处理会员购买记录失败: {str(e)}", exc_info=True)
+            if "unique" in str(e).lower() or "duplicate" in str(e).lower():
+                logger.warning(f"检测到重复创建尝试，已由数据库拦截: 用户{yonghuid}, 会员{huiyuan_id}")
+                return self.process_huiyuan_goumai(yonghuid, huiyuan_id, huiyuan)
+            raise
+
+    def add_first_buy_jifen(self, yonghuid):
+        """首次购买积分奖励（与原代码一致）"""
+        try:
+            dashou = UserDashou.objects.get(user__yonghuid=yonghuid)
+            dashou.jifen += 10
+            dashou.save(update_fields=['jifen'])
+            logger.info(f"用户{yonghuid}首次购买会员，积分+10，当前积分: {dashou.jifen}")
+        except UserDashou.DoesNotExist:
+            logger.error(f"找不到打手记录，无法增加积分: {yonghuid}")
+        except Exception as e:
+            logger.error(f"增加积分失败: {str(e)}")
+
+    # 🆕 新增：统一分红处理函数
+    def process_fenhong(self, order, huiyuan):
+        """
+        处理管事和组长分红（支持多次分红配置）
+        """
+        try:
+            # 获取打手信息
+            dashou = UserDashou.objects.get(user__yonghuid=order.yonghuid)
+            guanshi_id = dashou.yaoqingren
+            if not guanshi_id:
+                logger.info(f"打手{order.yonghuid}没有邀请人，无分红")
+                return
+
+            # 获取管事信息
+            try:
+                guanshi = UserGuanshi.objects.get(user__yonghuid=guanshi_id)
+            except UserGuanshi.DoesNotExist:
+                logger.warning(f"管事信息不存在: {guanshi_id}")
+                return
+
+            # 获取组长ID（从管事扩展表的邀请人）
+            zuzhang_id = guanshi.yaoqingren
+
+            # 获取打手头像和昵称
+            user_main = dashou.user
+            avatar = user_main.avatar
+            nicheng = dashou.nicheng or "未知打手"
+
+            # 查询该打手针对该管事的已分红次数
+            existing_count = Gsfenhong.objects.filter(
+                dashouid=order.yonghuid,
+                guanshi=guanshi_id
+            ).count()
+            cishu = existing_count + 1  # 本次是第几次
+
+            # 获取订单金额（用于限制分红总额）
+            order_amount = Decimal(str(order.jine)) if not isinstance(order.jine, Decimal) else order.jine
+
+            # 计算管事分红金额
+            guanshi_fenhong = self._calc_guanshi_fenhong(guanshi, huiyuan, guanshi_id, cishu)
+            if guanshi_fenhong is None:
+                logger.info(f"管事{guanshi_id}本次无分红")
+                guanshi_fenhong = Decimal('0.00')
+
+            # 计算组长分红金额（如果存在组长）
+            zuzhang_fenhong = Decimal('0.00')
+            if zuzhang_id:
+                # 获取组长信息
+                try:
+                    zuzhang = UserZuzhang.objects.get(user__yonghuid=zuzhang_id)
+                except UserZuzhang.DoesNotExist:
+                    logger.warning(f"组长信息不存在: {zuzhang_id}")
+                    zuzhang = None
+
+                zuzhang_fenhong = self._calc_zuzhang_fenhong(zuzhang, huiyuan, zuzhang_id, cishu)
+                if zuzhang_fenhong is None:
+                    logger.info(f"组长{zuzhang_id}本次无分红")
+                    zuzhang_fenhong = Decimal('0.00')
+            else:
+                logger.info(f"管事{guanshi_id}没有组长，无组长分红")
+
+            # 检查分红总额是否超过订单金额（优先保证管事分红）
+            total_fenhong = guanshi_fenhong + zuzhang_fenhong
+            if total_fenhong > order_amount:
+                logger.warning(f"分红总额{total_fenhong}超过订单金额{order_amount}，组长分红设为0")
+                zuzhang_fenhong = Decimal('0.00')
+                total_fenhong = guanshi_fenhong
+                if total_fenhong > order_amount:
+                    logger.warning(f"管事分红{guanshi_fenhong}也超过订单金额，强制设为0")
+                    guanshi_fenhong = Decimal('0.00')
+                    total_fenhong = Decimal('0.00')
+
+            # 创建分红记录（先创建主记录，即使金额为0也记录？但为0无意义，所以只有大于0才创建）
+            if guanshi_fenhong > 0 or zuzhang_fenhong > 0:
+                # 更新管事扩展表
+                if guanshi_fenhong > 0:
+                    guanshi.chongzhifenrun += guanshi_fenhong
+                    guanshi.yue += guanshi_fenhong
+                    guanshi.jinrichongzhi += 1
+                    guanshi.jinyuechongzhi += 1
+                    guanshi.save(update_fields=['chongzhifenrun', 'yue', 'jinrichongzhi', 'jinyuechongzhi'])
+                    logger.info(f"管事分红成功: 管事{guanshi_id}, 金额{guanshi_fenhong}")
+
+                # 更新组长扩展表
+                if zuzhang_fenhong > 0 and zuzhang:
+                    zuzhang.fenyong_zonge += zuzhang_fenhong
+                    zuzhang.ketixian_jine += zuzhang_fenhong
+                    zuzhang.jinri_fenyong += zuzhang_fenhong
+                    zuzhang.jinyue_fenyong += zuzhang_fenhong
+                    zuzhang.save(update_fields=['fenyong_zonge', 'ketixian_jine', 'jinri_fenyong', 'jinyue_fenyong'])
+                    logger.info(f"组长分红成功: 组长{zuzhang_id}, 金额{zuzhang_fenhong}")
+
+                # 创建分红记录
+                Gsfenhong.objects.create(
+                    dingdan_id=order.dingdan_id,
+                    guanshi=guanshi_id,
+                    dashouid=order.yonghuid,
+                    shuoming=order.shuoming,
+                    fenhong=guanshi_fenhong,
+                    avatar=avatar,
+                    nicheng=nicheng,
+                    # 新增字段
+                    zuzhang_id=zuzhang_id if zuzhang_fenhong > 0 else None,
+                    zuzhang_fenhong=zuzhang_fenhong if zuzhang_fenhong > 0 else None,
+                    huiyuan_id=huiyuan.huiyuan_id,
+                    fenhong_leixing=1,
+                )
+
+
+
+                # ========== 管事每日统计（新购） ==========
+                if guanshi_fenhong > 0 and cishu == 1:
+                    try:
+                        from houtai.utils import update_guanshi_daily_by_action
+                        update_guanshi_daily_by_action(
+                            yonghuid=guanshi_id,
+                            action=2,
+                            amount=guanshi_fenhong
+                        )
+                        logger.info(f"管事每日统计更新成功（新购）：管事{guanshi_id}，分红{guanshi_fenhong}")
+                    except Exception as e:
+                        logger.error(f"管事每日统计更新失败（新购）：{str(e)}")
+
+                # ========== 管事每日统计（续费） ==========
+                if guanshi_fenhong > 0 and cishu > 1:
+                    try:
+                        from houtai.utils import update_guanshi_xufei_daily
+                        update_guanshi_xufei_daily(
+                            yonghuid=guanshi_id,
+                            xufei_jine=guanshi_fenhong
+                        )
+                        logger.info(f"管事续费统计更新成功：管事{guanshi_id}，续费分红{guanshi_fenhong}")
+                    except Exception as e:
+                        logger.error(f"管事续费统计更新失败：{str(e)}")
+
+                # ========== 组长每日统计（分佣收入） ==========
+                if zuzhang_fenhong > 0 and zuzhang_id:
+                    try:
+                        from houtai.utils import update_zuzhang_daily_by_action
+                        update_zuzhang_daily_by_action(
+                            yonghuid=zuzhang_id,
+                            action=2,
+                            amount=zuzhang_fenhong
+                        )
+                        logger.info(f"组长每日统计更新成功：组长{zuzhang_id}，分佣{zuzhang_fenhong}")
+                    except Exception as e:
+                        logger.error(f"组长每日统计更新失败：{str(e)}")
+
+
+                logger.info(f"分红记录创建成功: 订单{order.dingdan_id}")
+            else:
+                logger.info(f"分红金额均为0，不创建记录")
+
+        except Exception as e:
+            logger.error(f"处理分红失败: {str(e)}", exc_info=True)
+            # 不抛出异常，避免影响主流程
+
+    def _calc_guanshi_fenhong(self, guanshi, huiyuan, guanshi_id, cishu):
+        """计算管事分红金额"""
+        # 先查多次分红配置表
+        try:
+            config = DuociFenhong.objects.get(
+                huiyuan=huiyuan,
+                yonghuid=guanshi_id,
+                cishu=cishu
+            )
+            return Decimal(str(config.guanshi_fenhong))
+        except DuociFenhong.DoesNotExist:
+            pass
+
+        if cishu == 1:
+            # 第一次分红，取会员表默认金额
+            return Decimal(str(huiyuan.guanshifc))
+        else:
+            # 第二次及以上，检查是否开启二次分红
+            if guanshi.fenghong_erci_enabled:
+                return Decimal(str(guanshi.fenghong_erci))
+            else:
+                return None  # 无分红
+
+    def _calc_zuzhang_fenhong(self, zuzhang, huiyuan, zuzhang_id, cishu):
+        """计算组长分红金额"""
+        if zuzhang is None:
+            return None
+        # 查多次分红配置表
+        try:
+            config = DuociFenhong.objects.get(
+                huiyuan=huiyuan,
+                yonghuid=zuzhang_id,
+                cishu=cishu
+            )
+            return Decimal(str(config.zuzhang_fenhong))
+        except DuociFenhong.DoesNotExist:
+            pass
+
+        if cishu == 1:
+            # 第一次分红，取会员表默认组长分成
+            return Decimal(str(huiyuan.zuzhangfc))
+        else:
+            # 第二次及以上，检查组长是否开启额外分红
+            if zuzhang.kaioi_ewai_fenhong:
+                return Decimal(str(zuzhang.ewai_fenhong_jine))
+            else:
+                return None
+
+    # 以下为原辅助方法，保持原样
+    def verify_signature(self, xml_data):
+        """验证微信支付签名（与原代码一致）"""
+        try:
+            root = ET.fromstring(xml_data)
+            sign = root.find('sign').text
+            if not sign:
+                logger.error("会员签名字段不存在")
+                return False
+
+            params = {}
+            for child in root:
+                if child.tag != 'sign' and child.text is not None:
+                    params[child.tag] = child.text
+
+            sorted_params = sorted(params.items(), key=lambda x: x[0])
+            sign_string = '&'.join([f"{key}={value}" for key, value in sorted_params if value])
+            sign_string += f'&key={settings.WEIXIN_SHANGHUMIYAO}'
+            calculated_sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+            return sign == calculated_sign
+        except Exception as e:
+            logger.error(f"会员验证签名异常: {str(e)}")
+            return False
+
+    def wechat_response(self, return_code, return_msg):
+        """返回微信回调响应"""
+        xml_response = f"""<xml>
+<return_code><![CDATA[{return_code}]]></return_code>
+<return_msg><![CDATA[{return_msg}]]></return_msg>
+</xml>"""
+        logger.info(f"会员返回微信响应: {return_code} - {return_msg}")
+        return HttpResponse(xml_response, content_type='application/xml')
+
+
+
+'''class HuiyuanHuitiao(View):
+    """
+    会员支付回调接口
+    路径：/shangpin/huiyuanhuitiao
+    注意：这个接口不需要JWT认证，由微信服务器调用
+    """
+
+    def post(self, request):
+        try:
+            # 1. 解析微信回调XML数据
+            request_body = request.body
+            logger.info(f"收到会员支付回调，原始数据: {request_body.decode('utf-8')}")
+
+            root = ET.fromstring(request_body)
+
+            # 获取关键字段
+            return_code = root.find('return_code').text
+            result_code = root.find('result_code').text
+            out_trade_no = root.find('out_trade_no').text  # 订单ID
+            transaction_id = root.find('transaction_id').text  # 微信交易号
+            total_fee = int(root.find('total_fee').text)  # 支付金额（分）
+
+            logger.info(f"会员回调数据: 订单{out_trade_no}, 状态{return_code}/{result_code}, 金额{total_fee}分")
+
+            # 2. 验证基本返回状态
+            if return_code != 'SUCCESS' or result_code != 'SUCCESS':
+                logger.warning(f"会员支付回调状态异常: {return_code}/{result_code}")
+                return self.wechat_response('FAIL', '支付失败')
+
+            # 3. 验证签名（完整版）
+            if not self.verify_signature(request_body):
+                logger.error(f"会员签名验证失败: {out_trade_no}")
+                return self.wechat_response('FAIL', '签名验证失败')
+
+            # 4. 查询订单
+            try:
+                order = Czjilu.objects.get(dingdan_id=out_trade_no)
+                logger.info(f"找到会员订单: {order.dingdan_id}, 状态: {order.zhuangtai}, 金额: {order.jine}")
+            except Czjilu.DoesNotExist:
+                logger.error(f"会员订单不存在: {out_trade_no}")
+                return self.wechat_response('FAIL', '订单不存在')
+
+            # 5. 检查订单类型是否为会员（1）
+            if order.leixing != 1:
+                logger.error(f"订单类型错误: {order.leixing}, 期望1(会员)")
+                return self.wechat_response('FAIL', '订单类型错误')
+
+            # 6. 检查订单状态是否为未支付（9）
+            if order.zhuangtai != 9:
+                logger.warning(f"会员订单状态不是未支付: {order.dingdan_id}, 当前状态: {order.zhuangtai}")
+                return self.wechat_response('SUCCESS', 'OK')
+
+            # 7. 验证金额
+            wechat_amount_yuan = total_fee / 100  # 转换为元
+            order_amount_yuan = float(order.jine)  # 订单金额（元）
+
+            # 允许1分钱的误差
+            if abs(wechat_amount_yuan - order_amount_yuan) > 0.01:
+                logger.error(f"会员金额不一致: 订单金额{order_amount_yuan}元, 支付金额{wechat_amount_yuan}元")
+                return self.wechat_response('FAIL', '金额不一致')
+
+            # 8. 查询会员信息
+            try:
+                huiyuan = Huiyuan.objects.get(huiyuan_id=order.huiyuan_id)
+            except Huiyuan.DoesNotExist:
+                logger.error(f"会员信息不存在: {order.huiyuan_id}")
+                return self.wechat_response('FAIL', '会员信息不存在')
+
+            # ===== 在这里添加收支记录更新代码 =====
+            # 更新收支记录表
+            try:
+                from peizhi.models import Szjilu
+                from decimal import Decimal
+
+                # 获取订单金额（确保是Decimal类型）
+                jine_decimal = Decimal(str(order.jine)) if not isinstance(order.jine, Decimal) else order.jine
+
+                # 查询或创建ID=1的收支记录
+                szjilu, created = Szjilu.objects.get_or_create(
+                    id=1,
+                    defaults={
+                        'zongsy': Decimal('0.00'),
+                        'zongls': Decimal('0.00'),
+                        'zongzc': Decimal('0.00'),
+                        'jrzc': Decimal('0.00'),
+                        'jrls': Decimal('0.00')
+                    }
+                )
+
+                # 更新三个字段
+                szjilu.zongsy += jine_decimal  # 总收益
+                szjilu.zongls += jine_decimal  # 总流水
+                szjilu.jrls += jine_decimal  # 今日流水
+
+                szjilu.save()
+
+                logger.info(f"收支记录更新成功: 订单{order.dingdan_id}, 金额{jine_decimal}元")
+
+            except Exception as e:
+                # 收支记录更新失败不影响主流程，只记录日志
+                logger.error(f"更新收支记录失败: {str(e)}", exc_info=True)
+            # ===== 添加结束 =====
+
+
+            # 9. 更新订单状态为已支付（3）
+            order.zhuangtai = 3
+            order.save(update_fields=['zhuangtai'])
+            logger.info(f"会员订单状态更新成功: {order.dingdan_id} -> 3")
+
+            # 10. 更新会员表的购买次数
+            huiyuan.goumai_cishu += 1
+            huiyuan.save(update_fields=['goumai_cishu'])
+
+            # 11. 处理会员购买记录
+            #self.process_huiyuan_goumai(order.yonghuid, order.huiyuan_id, huiyuan)
+            goumai_record, is_new, is_first_buy = self.process_huiyuan_goumai(
+                order.yonghuid, order.huiyuan_id, huiyuan
+            )
+
+            # 12. 如果是首次购买任何会员，加10积分
+            if is_first_buy:
+                self.add_first_buy_jifen(order.yonghuid)
+
+            # 12. 处理管事分红（只有在第一次购买时才分红）
+            self.process_guanshi_fenhong(order, huiyuan)
+
+            # 13. 返回成功响应给微信
+            logger.info(f"会员支付回调处理完成: {out_trade_no}")
+            return self.wechat_response('SUCCESS', 'OK')
+
+        except ET.ParseError as e:
+            logger.error(f"会员XML解析失败: {str(e)}")
+            return self.wechat_response('FAIL', '数据格式错误')
+        except Exception as e:
+            logger.error(f"会员支付回调处理异常: {str(e)}", exc_info=True)
+            return self.wechat_response('FAIL', '处理异常')
+
+    def process_huiyuan_goumai(self, yonghuid, huiyuan_id, huiyuan):
+        """处理会员购买记录（优化版）"""
+        try:
+            # 1. 先尝试获取现有记录（如果存在就是续费）
+            existing_record = Huiyuangoumai.objects.filter(
+                yonghu_id=yonghuid,
+                huiyuan_id=huiyuan_id
+            ).first()
+
+            is_first_buy_any = False  # 标记是否首次购买任何会员
+
+            if existing_record:
+                # 已存在记录，续费
+                existing_record.daoqi_time += timedelta(days=30)
+                existing_record.huiyuan_zhuangtai = 1
+                existing_record.save()
+                logger.info(f"会员续费: 用户{yonghuid}, 会员{huiyuan_id}")
+                return existing_record, False, False  # (记录, 是否新建, 是否首次买任何)
+            else:
+                # 2. 检查是否是首次购买任何会员（关键查询！）
+                # 查询该用户是否买过其他会员
+                other_huiyuan_count = Huiyuangoumai.objects.filter(
+                    yonghu_id=yonghuid
+                ).exclude(huiyuan_id=huiyuan_id).count()  # 排除本次会员
+
+                if other_huiyuan_count == 0:
+                    # 这是该用户第一次买任何会员！
+                    is_first_buy_any = True
+                    logger.info(f"用户{yonghuid}首次购买任何会员，将获得10积分")
+
+                # 3. 创建新记录
+                goumai_record = Huiyuangoumai.objects.create(
+                    yonghu_id=yonghuid,
+                    huiyuan_id=huiyuan_id,
+                    jieshao=huiyuan.jieshao,
+                    huiyuan_zhuangtai=1,
+                    daoqi_time=timezone.now() + timedelta(days=30)
+                )
+                logger.info(f"新购会员: 用户{yonghuid}, 会员{huiyuan_id}")
+                return goumai_record, True, is_first_buy_any
+
+        except Exception as e:
+            logger.error(f"处理会员购买记录失败: {str(e)}", exc_info=True)
+            # 如果是因为唯一约束冲突（数据库已拦截）
+            if "unique" in str(e).lower() or "duplicate" in str(e).lower():
+                logger.warning(f"检测到重复创建尝试，已由数据库拦截: 用户{yonghuid}, 会员{huiyuan_id}")
+                # 重新查询并续费
+                return self.process_huiyuan_goumai(yonghuid, huiyuan_id, huiyuan)
+            raise
+
+    def add_first_buy_jifen(self, yonghuid):
+        """为首次购买会员的用户增加10积分"""
+        try:
+            # 找到对应的打手记录
+            dashou = UserDashou.objects.get(user__yonghuid=yonghuid)
+            # 增加10积分
+            dashou.jifen += 10
+            dashou.save(update_fields=['jifen'])
+            logger.info(f"用户{yonghuid}首次购买会员，积分+10，当前积分: {dashou.jifen}")
+
+            # 可选：记录积分变动历史
+            # self.create_jifen_history(yonghuid, 10, "首次购买会员奖励")
+
+        except UserDashou.DoesNotExist:
+            logger.error(f"找不到打手记录，无法增加积分: {yonghuid}")
+        except Exception as e:
+            logger.error(f"增加积分失败: {str(e)}")
+
+    def process_guanshi_fenhong(self, order, huiyuan):
+        """
+        处理管事分红（支持首次和二次分红，特殊用户首次可配置）
+        """
+        try:
+            # 1. 获取打手信息
+            dashou = UserDashou.objects.get(user__yonghuid=order.yonghuid)
+            yaoqingren = dashou.yaoqingren
+            if not yaoqingren:
+                logger.info(f"打手{order.yonghuid}没有邀请人，无分红")
+                return
+
+            # 2. 获取管事信息
+            try:
+                guanshi = UserGuanshi.objects.get(user__yonghuid=yaoqingren)
+            except UserGuanshi.DoesNotExist:
+                logger.warning(f"管事信息不存在: {yaoqingren}")
+                return
+
+            # 3. 获取打手头像和昵称
+            user_main = dashou.user
+            avatar = user_main.avatar
+            nicheng = dashou.nicheng or "未知打手"
+
+            # 4. 判断是该打手第几次分红（通过查询分红记录表）
+            existing_count = Gsfenhong.objects.filter(dashouid=order.yonghuid).count()
+            is_first = (existing_count == 0)  # 第一次分红
+
+            # 5. 确定分红金额
+            fenhong_amount = None
+            if is_first:
+                # 首次分红
+                special_ids = getattr(settings, 'SPECIAL_GUANSHI_IDS', [])
+                if yaoqingren in special_ids:
+                    # 特殊管事：从管事扩展表获取首次分红金额
+                    fenhong_amount = guanshi.fenhong_yici
+                    logger.info(f"管事{yaoqingren}为特殊用户，首次分红金额取配置值: {fenhong_amount}")
+                else:
+                    # 普通管事：从会员配置表获取分红金额
+                    fenhong_amount = huiyuan.guanshifc
+                    logger.info(f"管事{yaoqingren}为普通用户，首次分红金额取会员表: {fenhong_amount}")
+            else:
+                # 第二次及以上分红（目前只支持第二次）
+                if guanshi.fenghong_erci_enabled:
+                    fenhong_amount = guanshi.fenghong_erci
+                    logger.info(f"管事{yaoqingren}开启二次分红，分红金额: {fenhong_amount}")
+                else:
+                    logger.info(f"管事{yaoqingren}未开启二次分红，本次不分红")
+                    return
+
+            # 6. 如果分红金额 <= 0，则不分红
+            if fenhong_amount <= 0:
+                logger.info(f"分红金额 {fenhong_amount} <=0，不分红")
+                return
+
+            # 7. 创建分红记录（注意：dashouid 唯一约束已移除）
+            Gsfenhong.objects.create(
+                dingdan_id=order.dingdan_id,
+                guanshi=yaoqingren,
+                dashouid=order.yonghuid,
+                shuoming=order.shuoming,
+                fenhong=fenhong_amount,
+                avatar=avatar,
+                nicheng=nicheng
+            )
+
+            # 8. 更新管事扩展表
+            guanshi.chongzhifenrun += fenhong_amount
+            guanshi.yue += fenhong_amount
+            guanshi.jinrichongzhi += 1
+            guanshi.jinyuechongzhi += 1
+            guanshi.save(update_fields=['chongzhifenrun', 'yue', 'jinrichongzhi', 'jinyuechongzhi'])
+
+            logger.info(f"创建分红记录成功: 管事{yaoqingren}, 打手{order.yonghuid}, 分红{fenhong_amount}元")
+
+        except Exception as e:
+            logger.error(f"处理管事分红失败: {str(e)}", exc_info=True)
+            # 继续执行，不中断主流程
+
+
+
+
+
+    #不针对特殊用户，且不含二次分红的版本
+    #
+    #
+    #
+    #
+    #
+    #
+    def process_guanshi_fenhong(self, order, huiyuan):
+        """处理管事分红（完整版，只有第一次购买才分红）"""
+        try:
+            # 查询打手信息
+            dashou = UserDashou.objects.get(user__yonghuid=order.yonghuid)
+
+            # 检查是否已有分红记录（确保只有第一次购买才分红）
+            if Gsfenhong.objects.filter(dashouid=order.yonghuid).exists():
+                logger.info(f"打手{order.yonghuid}已有分红记录，不再分红")
+                return
+
+            # 获取管事ID（邀请人ID）
+            yaoqingren = dashou.yaoqingren
+            if not yaoqingren:
+                logger.info(f"打手{order.yonghuid}没有邀请人，无分红")
+                return
+
+            # 查询管事信息
+            try:
+                guanshi = UserGuanshi.objects.get(user__yonghuid=yaoqingren)
+            except UserGuanshi.DoesNotExist:
+                logger.warning(f"管事信息不存在: {yaoqingren}")
+                return
+
+            # 获取打手头像和昵称
+            user_main = dashou.user
+            avatar = user_main.avatar
+            nicheng = dashou.nicheng or "未知打手"
+
+            # 创建分红记录
+            fenhong_record = Gsfenhong.objects.create(
+                dingdan_id=order.dingdan_id,
+                guanshi=yaoqingren,
+                dashouid=order.yonghuid,
+                shuoming=order.shuoming,
+                fenhong=huiyuan.guanshifc,  # 管事分成金额
+                avatar=avatar,
+                nicheng=nicheng
+            )
+
+            # 更新管事扩展表数据
+            guanshi.chongzhifenrun += huiyuan.guanshifc
+            guanshi.yue += huiyuan.guanshifc
+            guanshi.jinrichongzhi += 1
+            guanshi.jinyuechongzhi += 1
+            guanshi.save(update_fields=['chongzhifenrun', 'yue', 'jinrichongzhi', 'jinyuechongzhi'])
+
+            logger.info(f"创建分红记录: 管事{yaoqingren}, 打手{order.yonghuid}, 分成{huiyuan.guanshifc}元")
+
+        except Exception as e:
+            logger.error(f"处理管事分红失败: {str(e)}", exc_info=True)
+            #
+            #
+            #
+            #
+            #
+            # 继续执行，不中断主流程
+            
+
+    def verify_signature(self, xml_data):
+        """验证微信支付签名（完整版）"""
+        try:
+            root = ET.fromstring(xml_data)
+            sign = root.find('sign').text
+
+            if not sign:
+                logger.error("会员签名字段不存在")
+                return False
+
+            # 获取所有参数并排除sign
+            params = {}
+            for child in root:
+                if child.tag != 'sign' and child.text is not None:
+                    params[child.tag] = child.text
+
+            # 按照参数名ASCII码从小到大排序
+            sorted_params = sorted(params.items(), key=lambda x: x[0])
+
+            # 拼接字符串
+            sign_string = '&'.join([f"{key}={value}" for key, value in sorted_params if value])
+            sign_string += f'&key={settings.WEIXIN_SHANGHUMIYAO}'
+
+            # 计算签名
+            calculated_sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+
+            is_valid = sign == calculated_sign
+            if not is_valid:
+                logger.error(f"会员签名验证失败: 计算签名{calculated_sign}, 收到签名{sign}")
+
+            return is_valid
+
+        except Exception as e:
+            logger.error(f"会员验证签名异常: {str(e)}")
+            return False
+
+    def wechat_response(self, return_code, return_msg):
+        """返回微信支付回调响应（完整版）"""
+        xml_response = f"""<xml>
+<return_code><![CDATA[{return_code}]]></return_code>
+<return_msg><![CDATA[{return_msg}]]></return_msg>
+</xml>"""
+
+        logger.info(f"会员返回微信响应: {return_code} - {return_msg}")
+        return HttpResponse(xml_response, content_type='application/xml')'''
+
+
+# views.py
+class HuiyuanShibai(APIView):
+    """
+    会员支付失败处理接口
+    路径：/shangpin/huiyuanshibai
+    请求方式：POST
+    权限：JWT认证
+    参数：dingdanid（订单ID）
+    返回：删除结果
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取订单ID
+            dingdanid = request.data.get('dingdanid')
+            if not dingdanid:
+                return Response({
+                    'code': 400,
+                    'message': '订单ID不能为空'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 查询订单（确保是当前用户的订单）
+            try:
+                order = Czjilu.objects.get(
+                    dingdan_id=dingdanid,
+                    yonghuid=request.user.yonghuid
+                )
+            except Czjilu.DoesNotExist:
+                return Response({
+                    'code': 400,
+                    'message': '订单不存在或不属于当前用户'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 检查订单类型是否为会员（1）
+            if order.leixing != 1:
+                return Response({
+                    'code': 400,
+                    'message': '订单类型错误，不是会员订单'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 4. 检查订单状态是否为未支付（9）
+            if order.zhuangtai == 9:
+                # 删除订单
+                order.delete()
+                logger.info(f"用户{request.user.yonghuid}删除未支付会员订单: {dingdanid}")
+
+                return Response({
+                    'code': 200,
+                    'message': '会员订单已删除'
+                }, status=status.HTTP_200_OK)
+            else:
+                return Response({
+                    'code': 400,
+                    'message': '会员订单状态不是未支付，无法删除'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+        except Exception as e:
+            logger.error(f"会员支付失败处理异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '服务器内部错误'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+# views.py
+class HuiyuanLunxun(APIView):
+    """
+    会员支付成功轮询接口
+    路径：/shangpin/huiyuanlx
+    请求方式：POST
+    权限：JWT认证
+    参数：dingdanid（订单ID）
+    返回：订单状态和会员信息
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取订单ID
+            dingdanid = request.data.get('dingdanid')
+            if not dingdanid:
+                return Response({
+                    'code': 400,
+                    'message': '订单ID不能为空'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 查询订单（确保是当前用户的订单）
+            try:
+                order = Czjilu.objects.get(
+                    dingdan_id=dingdanid,
+                    yonghuid=request.user.yonghuid
+                )
+            except Czjilu.DoesNotExist:
+                return Response({
+                    'code': 400,
+                    'message': '订单不存在或不属于当前用户'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 检查订单类型是否为会员（1）
+            if order.leixing != 1:
+                return Response({
+                    'code': 400,
+                    'message': '订单类型错误，不是会员订单'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 4. 检查订单状态是否为已支付（3）
+            if order.zhuangtai != 3:
+                logger.info(f"会员订单{dingdanid}尚未支付完成，当前状态: {order.zhuangtai}")
+                return Response({
+                    'code': 400,
+                    'message': '会员订单尚未支付完成'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 5. 查询会员信息
+            try:
+                huiyuan = Huiyuan.objects.get(huiyuan_id=order.huiyuan_id)
+
+                # 6. 查询会员购买记录
+                goumai_record = Huiyuangoumai.objects.filter(
+                    yonghu_id=request.user.yonghuid,
+                    huiyuan_id=order.huiyuan_id
+                ).first()
+
+                if not goumai_record:
+                    return Response({
+                        'code': 400,
+                        'message': '会员购买记录不存在'
+                    }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 7. 格式化到期时间
+                #from django.utils.timezone import localtime
+                #daoqi_time = localtime(goumai_record.daoqi_time).strftime('%Y-%m-%d %H:%M:%S')
+                daoqi_time = goumai_record.daoqi_time.strftime('%Y-%m-%d %H:%M:%S')
+                current_user = request.user
+                dashou = current_user.dashou_profile
+
+                logger.info(f"会员轮询成功: 订单{dingdanid}已支付，用户{request.user.yonghuid}, 会员{order.huiyuan_id}")
+
+                # 8. 返回会员信息（用于更新前端全局变量）
+                return Response({
+                    'code': 200,
+                    'message': '支付流程全部完成',
+                    'jifen': dashou.jifen,
+                    'huiyuan': {
+                        'huiyuanid': order.huiyuan_id,
+                        'huiyuanming': huiyuan.jieshao,
+                        'daoqi': daoqi_time,
+
+                    }
+                }, status=status.HTTP_200_OK)
+
+            except Huiyuan.DoesNotExist:
+                logger.error(f"会员信息不存在: {order.huiyuan_id}")
+                return Response({
+                    'code': 400,
+                    'message': '会员信息不存在'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+        except Exception as e:
+            logger.error(f"会员轮询异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '服务器内部错误'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+# views.py in shangpin app
+import time
+import random
+import string
+import hashlib
+import xml.etree.ElementTree as ET
+import requests
+from decimal import Decimal
+from django.conf import settings
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from yonghu.models import UserMain, UserShangjia
+from shangpin.models import Czjilu
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class ShangjiaChongzhi(APIView):
+    """
+    商家余额充值支付参数接口
+    路径：/shangpin/sjcz
+    请求方式：POST
+    权限：JWT认证
+    参数：jine（金额，1-10000元）
+    返回：支付参数(payParams)和订单ID(dingdanid)
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 验证用户身份和商家状态
+            try:
+                shangjia = request.user.shop_profile
+            except UserShangjia.DoesNotExist:
+                logger.warning(f"用户{request.user.yonghuid}尝试充值但不是商家")
+                return Response({
+                    'code': 400,
+                    'message': '用户不是商家，无法充值'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 检查商家状态
+            if shangjia.zhuangtai != 1:
+                logger.warning(f"商家{shangjia.nicheng}状态异常: {shangjia.zhuangtai}")
+                return Response({
+                    'code': 400,
+                    'message': '商家状态异常，无法进行充值'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 获取并验证金额参数
+            jine = request.data.get('jine')
+            if not jine:
+                return Response({
+                    'code': 400,
+                    'message': '请填写充值金额'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            try:
+                jine = float(jine)
+            except (ValueError, TypeError):
+                return Response({
+                    'code': 400,
+                    'message': '金额格式错误，请填写有效的数字'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 验证金额范围
+            if jine < settings.SHANGJIA_CZ_MIN_AMOUNT or jine > settings.SHANGJIA_CZ_MAX_AMOUNT:
+                return Response({
+                    'code': 400,
+                    'message': f'充值金额必须在{settings.SHANGJIA_CZ_MIN_AMOUNT}-{settings.SHANGJIA_CZ_MAX_AMOUNT}元之间'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 生成订单ID（使用配置的前缀）
+            timestamp_ms = int(time.time() * 1000)
+            timestamp_ns = int(time.time_ns() // 1000) % 1000000
+            random_num = random.randint(0, 99)
+
+            dingdanid = f"{settings.SHANGJIA_CZ_PREFIX}{timestamp_ms:011d}{timestamp_ns:06d}{random_num:02d}"
+
+            # 4. 创建充值记录订单
+            try:
+                chongzhi_jilu = Czjilu.objects.create(
+                    dingdan_id=dingdanid,
+                    zhuangtai=9,  # 未支付状态
+                    yonghuid=request.user.yonghuid,
+                    jine=jine,
+                    leixing=4,  # 充值类型：4=商家充值
+                    shuoming=settings.SHANGJIA_CZ_PAY_DESCRIPTION
+                )
+                logger.info(f"创建商家充值订单: 商家{shangjia.nicheng}, 订单{dingdanid}, 金额{jine}元")
+            except Exception as e:
+                logger.error(f"创建订单失败: {str(e)}")
+                return Response({
+                    'code': 500,
+                    'message': '订单创建失败，请重试'
+                }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            # 5. 生成微信支付参数
+            try:
+                pay_params = self.generate_wechat_pay_params(
+                    dingdanid=dingdanid,
+                    jine=jine,
+                    openid=request.user.openid,
+                    pay_type='shangjia'
+                )
+            except Exception as e:
+                # 支付参数生成失败，删除订单记录
+                chongzhi_jilu.delete()
+                logger.error(f"生成微信支付参数失败: {str(e)}")
+                return Response({
+                    'code': 500,
+                    'message': f'支付参数生成失败: {str(e)}'
+                }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            # 6. 返回支付参数和订单ID
+            logger.info(f"商家{shangjia.nicheng}支付参数生成成功: {dingdanid}")
+            return Response({
+                'code': 200,
+                'message': '支付参数生成成功',
+                'payParams': pay_params,
+                'dingdanid': dingdanid
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            logger.error(f"商家充值接口异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '服务器内部错误，请稍后重试'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def generate_wechat_pay_params(self, dingdanid, jine, openid, pay_type):
+        """生成微信小程序支付参数"""
+        # 获取配置
+        APPID = settings.WEIXIN_APPID
+        MCHID = settings.WEIXIN_MCHID
+        KEY = settings.WEIXIN_SHANGHUMIYAO
+
+        # 根据支付类型获取对应的配置
+        if pay_type == 'shangjia':
+            PAY_DESCRIPTION = settings.SHANGJIA_CZ_PAY_DESCRIPTION
+            NOTIFY_URL = settings.SHANGJIA_CZ_PAY_NOTIFY_URL
+        else:
+            raise Exception('未知的支付类型')
+
+        # 生成随机字符串
+        nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+
+        # 金额转换（元转分）
+        total_fee = int(Decimal(str(jine)) * 100)
+
+        # 交易类型（小程序支付使用JSAPI）
+        trade_type = 'JSAPI'
+
+        # 获取客户端IP
+        user_ip = self.get_client_ip()
+
+        # 1. 第一次签名（统一下单接口）
+        sign_data = {
+            'appid': APPID,
+            'mch_id': MCHID,
+            'nonce_str': nonce_str,
+            'body': PAY_DESCRIPTION,
+            'out_trade_no': dingdanid,
+            'total_fee': total_fee,
+            'spbill_create_ip': user_ip,
+            'notify_url': NOTIFY_URL,
+            'trade_type': trade_type,
+            'openid': openid  # 小程序支付必须传openid
+        }
+
+        # 按照参数名ASCII码从小到大排序
+        sorted_sign_data = sorted(sign_data.items(), key=lambda x: x[0])
+
+        # 拼接字符串
+        sign_string = '&'.join([f"{key}={value}" for key, value in sorted_sign_data if value])
+        sign_string += f'&key={KEY}'
+
+        # MD5签名
+        sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+
+        # 构造XML数据
+        xml_data = f"""<xml>
+<appid>{APPID}</appid>
+<body>{PAY_DESCRIPTION}</body>
+<mch_id>{MCHID}</mch_id>
+<nonce_str>{nonce_str}</nonce_str>
+<notify_url>{NOTIFY_URL}</notify_url>
+<openid>{openid}</openid>
+<out_trade_no>{dingdanid}</out_trade_no>
+<spbill_create_ip>{user_ip}</spbill_create_ip>
+<total_fee>{total_fee}</total_fee>
+<trade_type>{trade_type}</trade_type>
+<sign>{sign}</sign>
+</xml>"""
+
+        # 调用微信统一下单接口
+        response = requests.post(
+            'https://api.mch.weixin.qq.com/pay/unifiedorder',
+            data=xml_data.encode('utf-8'),
+            headers={'Content-Type': 'application/xml'},
+            timeout=10
+        )
+
+        # 解析返回的XML
+        root = ET.fromstring(response.content)
+
+        return_code = root.find('return_code').text
+        result_code = root.find('result_code').text
+
+        if return_code == 'SUCCESS' and result_code == 'SUCCESS':
+            # 获取prepay_id
+            prepay_id = root.find('prepay_id').text
+
+            # 2. 第二次签名（小程序支付参数）
+            timestamp = str(int(time.time()))
+            nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+            package = f'prepay_id={prepay_id}'
+            sign_type = 'MD5'
+
+            # 生成支付签名
+            pay_sign_data = {
+                'appId': APPID,
+                'timeStamp': timestamp,
+                'nonceStr': nonce_str,
+                'package': package,
+                'signType': sign_type
+            }
+
+            sorted_pay_sign_data = sorted(pay_sign_data.items(), key=lambda x: x[0])
+            pay_sign_string = '&'.join([f"{key}={value}" for key, value in sorted_pay_sign_data])
+            pay_sign_string += f'&key={KEY}'
+            pay_sign = hashlib.md5(pay_sign_string.encode('utf-8')).hexdigest().upper()
+
+            # 返回前端需要的支付参数
+            return {
+                'appId': APPID,
+                'timeStamp': timestamp,
+                'nonceStr': nonce_str,
+                'package': package,
+                'signType': sign_type,
+                'paySign': pay_sign
+            }
+        else:
+            # 获取错误信息
+            err_code = root.find('err_code')
+            err_code_des = root.find('err_code_des')
+            return_msg = root.find('return_msg')
+
+            error_details = f"return_code: {return_code}"
+            if err_code is not None:
+                error_details += f", err_code: {err_code.text}"
+            if err_code_des is not None:
+                error_details += f", err_code_des: {err_code_des.text}"
+            if return_msg is not None:
+                error_details += f", return_msg: {return_msg.text}"
+
+            raise Exception(f"微信支付下单失败: {error_details}")
+
+    def get_client_ip(self):
+        """获取客户端IP"""
+        request = self.request
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0]
+        else:
+            ip = request.META.get('REMOTE_ADDR')
+        return ip if ip else '127.0.0.1'
+
+
+
+from django.db import transaction
+
+logger = logging.getLogger(__name__)
+
+
+class ShangjiaHuitiao(View):
+    """
+    商家支付回调接口
+    路径：/shangpin/sjhuitiao
+    注意：这个接口不需要JWT认证，由微信服务器调用
+    """
+
+    def post(self, request):
+        try:
+            # 1. 解析微信回调XML数据
+            request_body = request.body
+            logger.info(f"收到商家支付回调，原始数据: {request_body.decode('utf-8')}")
+
+            root = ET.fromstring(request_body)
+
+            # 获取关键字段
+            return_code = root.find('return_code').text
+            result_code = root.find('result_code').text
+            out_trade_no = root.find('out_trade_no').text  # 订单ID
+            transaction_id = root.find('transaction_id').text  # 微信交易号
+            total_fee = int(root.find('total_fee').text)  # 支付金额（分）
+
+            logger.info(f"商家回调数据解析: 订单{out_trade_no}, 状态{return_code}/{result_code}, 金额{total_fee}分")
+
+            # 2. 验证基本返回状态
+            if return_code != 'SUCCESS' or result_code != 'SUCCESS':
+                logger.warning(f"商家支付回调状态异常: {return_code}/{result_code}")
+                return self.wechat_response('FAIL', '支付失败')
+
+            # 3. 验证签名（确保是微信发来的）
+            if not self.verify_signature(request_body):
+                logger.error(f"商家支付签名验证失败: {out_trade_no}")
+                return self.wechat_response('FAIL', '签名验证失败')
+
+            # 4. 查询订单
+            try:
+                from decimal import Decimal
+                order = Czjilu.objects.get(dingdan_id=out_trade_no)
+                logger.info(f"找到商家订单: {order.dingdan_id}, 状态: {order.zhuangtai}, 金额: {order.jine}")
+            except Czjilu.DoesNotExist:
+                logger.error(f"商家订单不存在: {out_trade_no}")
+                return self.wechat_response('FAIL', '订单不存在')
+
+            # 5. 检查订单状态是否为未支付（9）
+            if order.zhuangtai != 9:
+                logger.warning(f"商家订单状态不是未支付: {order.dingdan_id}, 当前状态: {order.zhuangtai}")
+                # 已处理过的订单直接返回成功，避免微信重复回调
+                return self.wechat_response('SUCCESS', 'OK')
+
+            # 6. 验证金额（微信返回的是分，需要转换）
+            wechat_amount_yuan = Decimal(str(total_fee)) / Decimal('100')  # 转换为元
+            order_amount_yuan = Decimal(str(order.jine))  # 订单金额（元）
+
+            # 允许1分钱的误差
+            if abs(wechat_amount_yuan - order_amount_yuan) > Decimal('0.01'):
+                logger.error(f"商家订单金额不一致: 订单金额{order_amount_yuan}元, 支付金额{wechat_amount_yuan}元")
+                return self.wechat_response('FAIL', '金额不一致')
+
+            # ===== 在这里添加收支记录更新代码 =====
+            # 更新收支记录表
+            try:
+                from peizhi.models import Szjilu
+                from decimal import Decimal
+
+                # 获取订单金额（确保是Decimal类型）
+                jine_decimal = Decimal(str(order.jine)) if not isinstance(order.jine, Decimal) else order.jine
+
+                # 查询或创建ID=1的收支记录
+
+                from dingdan.utils import update_daily_income
+                update_daily_income(jine_decimal)
+
+                szjilu, created = Szjilu.objects.get_or_create(
+                    id=1,
+                    defaults={
+                        'zongsy': Decimal('0.00'),
+                        'zongls': Decimal('0.00'),
+                        'zongzc': Decimal('0.00'),
+                        'jrzc': Decimal('0.00'),
+                        'jrls': Decimal('0.00')
+                    }
+                )
+
+                # 更新三个字段
+                szjilu.zongsy += jine_decimal  # 总收益
+                szjilu.zongls += jine_decimal  # 总流水
+                szjilu.jrls += jine_decimal  # 今日流水
+
+                szjilu.save()
+
+                logger.info(f"收支记录更新成功: 订单{order.dingdan_id}, 金额{jine_decimal}元")
+
+            except Exception as e:
+                # 收支记录更新失败不影响主流程，只记录日志
+                logger.error(f"更新收支记录失败: {str(e)}", exc_info=True)
+            # ===== 添加结束 =====
+
+
+
+            # 7. 使用事务更新订单状态和商家余额
+            with transaction.atomic():
+                # 更新订单状态为已支付（3）
+                order.zhuangtai = 3
+                order.save(update_fields=['zhuangtai'])
+                logger.info(f"商家订单状态更新成功: {order.dingdan_id} -> 3")
+
+                # 更新商家余额
+                try:
+                    # 通过用户ID查找商家（高效查询）
+                    shangjia = UserShangjia.objects.get(user__yonghuid=order.yonghuid)
+
+                    # 增加余额
+                    shangjia.yue += order_amount_yuan
+                    shangjia.save(update_fields=['yue'])
+
+                    logger.info(f"商家余额更新成功: 商家{shangjia.nicheng}, 增加{order_amount_yuan}元, 新余额{shangjia.yue}")
+
+                except UserShangjia.DoesNotExist:
+                    # 如果找不到商家，记录错误，但依然返回成功（避免微信重复回调）
+                    logger.error(f"商家信息不存在: 用户{order.yonghuid}")
+                    return self.wechat_response('SUCCESS', 'OK')
+                except Exception as e:
+                    logger.error(f"更新商家余额失败: {str(e)}", exc_info=True)
+                    # 回滚事务
+                    raise
+
+            # 8. 返回成功响应给微信
+            logger.info(f"商家支付回调处理完成: {out_trade_no}")
+            return self.wechat_response('SUCCESS', 'OK')
+
+        except ET.ParseError as e:
+            logger.error(f"XML解析失败: {str(e)}")
+            return self.wechat_response('FAIL', '数据格式错误')
+        except Exception as e:
+            logger.error(f"商家支付回调处理异常: {str(e)}", exc_info=True)
+            # 返回FAIL让微信重试
+            return self.wechat_response('FAIL', '处理异常')
+
+    def verify_signature(self, xml_data):
+        """验证微信支付签名"""
+        try:
+            root = ET.fromstring(xml_data)
+            sign = root.find('sign').text
+
+            if not sign:
+                logger.error("签名字段不存在")
+                return False
+
+            # 获取所有参数并排除sign
+            params = {}
+            for child in root:
+                if child.tag != 'sign' and child.text is not None:
+                    params[child.tag] = child.text
+
+            # 按照参数名ASCII码从小到大排序
+            sorted_params = sorted(params.items(), key=lambda x: x[0])
+
+            # 拼接字符串
+            sign_string = '&'.join([f"{key}={value}" for key, value in sorted_params if value])
+            sign_string += f'&key={settings.WEIXIN_SHANGHUMIYAO}'
+
+            # 计算签名
+            calculated_sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+
+            is_valid = sign == calculated_sign
+            if not is_valid:
+                logger.error(f"商家支付签名验证失败: 计算签名{calculated_sign}, 收到签名{sign}")
+
+            return is_valid
+
+        except Exception as e:
+            logger.error(f"验证签名异常: {str(e)}")
+            return False
+
+    def wechat_response(self, return_code, return_msg):
+        """返回微信支付回调响应"""
+        xml_response = f"""<xml>
+<return_code><![CDATA[{return_code}]]></return_code>
+<return_msg><![CDATA[{return_msg}]]></return_msg>
+</xml>"""
+
+        logger.info(f"返回微信响应: {return_code} - {return_msg}")
+        return HttpResponse(xml_response, content_type='application/xml')
+
+
+
+
+# views.py
+class ShangjiaShibai(APIView):
+    """
+    商家支付失败处理接口
+    路径：/shangpin/sjshibai
+    请求方式：POST
+    权限：JWT认证
+    参数：dingdanid（订单ID）
+    返回：删除结果
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取订单ID
+            dingdanid = request.data.get('dingdanid')
+            if not dingdanid:
+                return Response({
+                    'code': 400,
+                    'message': '订单ID不能为空'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 查询订单（确保是当前用户的订单）
+            try:
+                order = Czjilu.objects.get(
+                    dingdan_id=dingdanid,
+                    yonghuid=request.user.yonghuid,
+                    leixing=4  # 确保是商家充值订单
+                )
+            except Czjilu.DoesNotExist:
+                logger.warning(f"商家订单不存在或不属于当前用户: {dingdanid}, 用户{request.user.yonghuid}")
+                return Response({
+                    'code': 400,
+                    'message': '订单不存在或不属于当前用户'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 检查订单状态是否为未支付（9）
+            if order.zhuangtai == 9:
+                # 删除订单
+                order.delete()
+                logger.info(f"商家{request.user.shop_profile.nicheng}删除未支付订单: {dingdanid}")
+
+                return Response({
+                    'code': 200,
+                    'message': '订单已删除'
+                }, status=status.HTTP_200_OK)
+            else:
+                return Response({
+                    'code': 400,
+                    'message': '订单状态不是未支付，无法删除'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+        except UserShangjia.DoesNotExist:
+            return Response({
+                'code': 400,
+                'message': '用户不是商家'
+            }, status=status.HTTP_400_BAD_REQUEST)
+        except Exception as e:
+            logger.error(f"商家支付失败处理异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '服务器内部错误'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+# views.py
+class ShangjiaChenggong(APIView):
+    """
+    商家支付成功轮询接口
+    路径：/shangpin/sjcg
+    请求方式：POST
+    权限：JWT认证
+    参数：dingdanid（订单ID）
+    返回：订单状态和当前商家余额
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取订单ID
+            dingdanid = request.data.get('dingdanid')
+            if not dingdanid:
+                return Response({
+                    'code': 400,
+                    'message': '订单ID不能为空'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 查询订单（确保是当前用户的商家订单）
+            try:
+                order = Czjilu.objects.get(
+                    dingdan_id=dingdanid,
+                    yonghuid=request.user.yonghuid,
+                    leixing=4  # 商家充值类型
+                )
+            except Czjilu.DoesNotExist:
+                logger.warning(f"商家订单不存在: {dingdanid}, 用户{request.user.yonghuid}")
+                return Response({
+                    'code': 400,
+                    'message': '订单不存在或不属于当前用户'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 检查订单状态是否为已支付（3）
+            if order.zhuangtai != 3:
+                logger.info(f"商家订单{dingdanid}尚未支付完成，当前状态: {order.zhuangtai}")
+                return Response({
+                    'code': 400,
+                    'message': '订单尚未支付完成'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 4. 获取商家余额（通过反向查询）
+            try:
+                shangjia = request.user.shop_profile
+                yue = float(shangjia.yue)  # 转为浮点数方便前端处理
+
+                logger.info(f"商家轮询成功: 订单{dingdanid}已支付，商家{shangjia.nicheng}余额为{yue}元")
+
+                return Response({
+                    'code': 200,
+                    'message': '支付流程全部完成',
+                    'yue': yue  # 返回当前商家余额（前端需要更新全局变量）
+                }, status=status.HTTP_200_OK)
+
+            except UserShangjia.DoesNotExist:
+                logger.error(f"商家信息不存在: 用户{request.user.yonghuid}")
+                return Response({
+                    'code': 400,
+                    'message': '商家信息不存在'
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+        except Exception as e:
+            logger.error(f"商家轮询异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '服务器内部错误'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+# 管事分红记录查询API
+
+from django.db.models import Q
+from decimal import Decimal
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class GuanshiFenhongListAPI(APIView):
+    """
+    管事分红记录查询接口
+    权限：需要JWT认证
+    请求方式：POST
+    分页参数：page, page_size
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 获取当前管事用户ID
+            yonghuid = request.user.yonghuid
+
+            # 获取分页参数
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('page_size', 50))
+
+            if page < 1:
+                page = 1
+            if page_size < 1 or page_size > 100:  # 限制最大100条
+                page_size = 50
+
+            # 计算偏移量
+            offset = (page - 1) * page_size
+
+            # 查询条件：管事ID匹配
+            query = Q(guanshi=yonghuid)
+
+            # 先查询总数（使用分页查询优化）
+            from django.db.models import Count
+            from .models import Gsfenhong
+
+            # 查询总记录数
+            zong_tiaoshu = Gsfenhong.objects.filter(query).count()
+
+            # 查询去重后的打手数量
+            chongzhi_dashou_shuliang = Gsfenhong.objects.filter(query).values('dashouid').distinct().count()
+
+            # 查询当前页数据，按创建时间倒序排列
+            fenhong_list = Gsfenhong.objects.filter(query) \
+                .order_by('-create_time') \
+                .values('dashouid', 'avatar', 'nicheng', 'fenhong', 'create_time')[offset:offset + page_size]
+
+            # 格式化数据
+            formatted_list = []
+            for item in fenhong_list:
+                formatted_list.append({
+                    'yonghuid': item['dashouid'],  # 打手ID
+                    'avatar': item['avatar'] or '',  # 打手头像
+                    'nicheng': item['nicheng'] or '未知用户',  # 打手昵称
+                    'fenhong': str(item['fenhong']),  # 分红金额
+                    'create_time': item['create_time'].strftime('%Y-%m-%d %H:%M:%S') if item['create_time'] else ''
+                })
+
+            # 返回数据
+            return Response({
+                'code': 200,
+                'msg': '成功',
+                'data': {
+                    'list': formatted_list,
+                    'total': zong_tiaoshu,  # 总记录数
+                    'chongzhi_dashou_shuliang': chongzhi_dashou_shuliang,  # 充值打手数量（去重）
+                    'page': page,
+                    'page_size': page_size,
+                    'has_more': len(formatted_list) == page_size  # 是否还有更多数据
+                }
+            })
+
+        except Exception as e:
+            logger.error(f"查询管事分红记录失败: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'msg': f'服务器错误: {str(e)}',
+                'data': {}
+            })
+
+
+# views.py - 商品模块视图
+
+from django.shortcuts import render
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from rest_framework import status
+from django.db.models import Q
+import logging
+
+# 导入模型
+from yonghu.models import UserMain, AdminProfile
+from shangpin.models import ShangpinLeixing, ShangpinZhuanqu, Huiyuan
+
+# 日志记录器
+logger = logging.getLogger(__name__)
+
+
+class AdGetAllDataView(APIView):
+    """
+    获取商品类型、商品专区、会员数据的接口
+    接口地址：/shangpin/adhqlx
+    请求方法：POST
+    权限要求：JWT Token认证 + 管理员权限
+    """
+
+    # 需要JWT Token认证
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        """
+        处理POST请求，返回商品相关数据
+        """
+        try:
+            # 1. 获取请求数据
+            zhanghao = request.data.get('zhanghao')
+
+            if not zhanghao:
+                logger.warning(f"管理员接口：未接收到账号参数，请求用户：{request.user.yonghuid}")
+                return Response({
+                    'code': 400,
+                    'message': '缺少账号参数',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 获取当前登录用户
+            current_user = request.user
+
+            # 3. 验证用户类型是否为管理员
+            if current_user.user_type != 'admin':
+                logger.warning(
+                    f"权限验证失败：用户 {current_user.yonghuid} 的用户类型为 {current_user.user_type}，非管理员")
+                return Response({
+                    'code': 401,
+                    'message': '无管理员权限',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            # 4. 验证手机号与传递的账号是否一致
+            if current_user.phone != zhanghao:
+                logger.warning(
+                    f"账号验证失败：用户 {current_user.yonghuid} 的phone={current_user.phone}，传递的zhanghao={zhanghao}")
+                return Response({
+                    'code': 401,
+                    'message': '账号验证失败',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            # 5. 验证管理员扩展表是否存在
+            try:
+                admin_profile = current_user.admin_profile
+                logger.info(f"管理员验证通过：用户 {current_user.yonghuid}，手机号 {current_user.phone}")
+            except AdminProfile.DoesNotExist:
+                logger.error(
+                    f"管理员扩展表不存在：用户 {current_user.yonghuid} 虽然user_type=admin，但没有AdminProfile记录")
+                return Response({
+                    'code': 401,
+                    'message': '管理员信息不完整',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            # 6. 查询商品类型数据
+            try:
+                # 使用select_related或prefetch_related优化查询（如果需要关联查询）
+                # 这里直接查询所有字段，然后提取需要的字段
+                shangpinleixing_queryset = ShangpinLeixing.objects.all()
+
+                # 转换为前端需要的格式
+                shangpinleixing_list = []
+                for leixing in shangpinleixing_queryset:
+                    leixing_data = {
+                        'id': leixing.id,
+                        'yaoqiuleixing': leixing.yaoqiuleixing if leixing.yaoqiuleixing is not None else None,
+                        'huiyuan_id': leixing.huiyuan_id if leixing.huiyuan_id else None,
+                        'yongjin': str(leixing.yongjin) if leixing.yongjin is not None else None,
+                        'jieshao': leixing.jieshao if leixing.jieshao else '',
+                        'tupian_url': leixing.tupian_url if leixing.tupian_url else ''
+                    }
+                    shangpinleixing_list.append(leixing_data)
+
+                #logger.info(f"成功查询到 {len(shangpinleixing_list)} 条商品类型数据")
+
+            except Exception as e:
+                logger.error(f"查询商品类型数据时出错：{str(e)}")
+                shangpinleixing_list = []
+
+            # 7. 查询商品专区数据
+            try:
+                # 查询所有商品专区
+                zhuanqu_queryset = ShangpinZhuanqu.objects.all()
+
+                # 转换为前端需要的格式
+                zhuanqu_list = []
+                for zhuanqu in zhuanqu_queryset:
+                    zhuanqu_data = {
+                        'id': zhuanqu.id,
+                        'mingzi': zhuanqu.mingzi if zhuanqu.mingzi else '',
+                        'leixing_id': zhuanqu.leixing_id
+                    }
+                    zhuanqu_list.append(zhuanqu_data)
+
+               # logger.info(f"成功查询到 {len(zhuanqu_list)} 条商品专区数据")
+
+            except Exception as e:
+                logger.error(f"查询商品专区数据时出错：{str(e)}")
+                zhuanqu_list = []
+
+            # 8. 查询会员数据
+            try:
+                # 查询所有会员
+                huiyuan_queryset = Huiyuan.objects.all()
+
+                # 转换为前端需要的格式
+                huiyuan_list = []
+                for huiyuan in huiyuan_queryset:
+                    huiyuan_data = {
+                        'huiyuan_id': huiyuan.huiyuan_id,
+                        'jieshao': huiyuan.jieshao,
+                        'jiage': str(huiyuan.jiage)  # Decimal转为字符串
+                    }
+                    huiyuan_list.append(huiyuan_data)
+
+              #  logger.info(f"成功查询到 {len(huiyuan_list)} 条会员数据")
+
+            except Exception as e:
+                logger.error(f"查询会员数据时出错：{str(e)}")
+                huiyuan_list = []
+
+            # 9. 检查会员列表是否为空
+            if not huiyuan_list:
+                logger.warning("会员列表为空，可能会影响商品发布功能")
+
+            # 10. 组织返回数据
+            response_data = {
+                'code': 0,
+                'message': '获取数据成功',
+                'data': {
+                    'shangpinleixingList': shangpinleixing_list,
+                    'zhuanquList': zhuanqu_list,
+                    'huiyuanList': huiyuan_list
+                }
+            }
+
+            return Response(response_data, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            # 捕获未预期的异常
+            logger.error(f"接口处理异常：{str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': f'服务器内部错误：{str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+# views.py - shangpin模块
+from django.db import transaction
+from rest_framework.views import APIView
+from rest_framework import permissions, status
+from rest_framework.response import Response
+from django.shortcuts import get_object_or_404
+from rest_framework.parsers import MultiPartParser, FormParser, JSONParser
+import os
+import uuid
+
+# 导入模型和工具
+from .models import ShangpinLeixing, Huiyuan, ShangpinZhuanqu, Shangpin
+from yonghu.models import UserMain, AdminProfile
+from utils.oss_utils import validate_image, upload_to_oss
+
+
+class ShangpinLeixingFabuView(APIView):
+    """
+    商品类型发布接口
+    接收图片、类型介绍、抢单要求类型等字段
+    需要管理员权限
+    """
+    permission_classes = [permissions.IsAuthenticated]
+    parser_classes = (MultiPartParser, FormParser)  # 需要处理文件上传
+
+    def post(self, request):
+        try:
+            # === 1. 权限验证 ===
+            # 获取当前用户
+            user_main = request.user
+
+            # 1.1 验证前端传递的账号是否匹配（使用phone字段）
+            zhanghao = request.data.get('zhanghao', '').strip()
+            if not zhanghao:
+                return Response(
+                    {'code': 401, 'msg': '未提供账号信息', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 验证账号是否匹配（使用phone字段比较）
+            if user_main.phone != zhanghao:
+                return Response(
+                    {'code': 401, 'msg': '账号验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 1.2 验证是否为管理员（检查user_type字段）
+            if user_main.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'msg': '权限不足', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 1.3 验证管理员扩展表（使用AdminProfile模型）
+            try:
+                admin_profile = AdminProfile.objects.get(user=user_main)
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'msg': '管理员信息不存在', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # === 2. 接收并验证字段 ===
+            # 2.1 必填字段验证
+            jieshao = request.data.get('jieshao', '').strip()
+            yaoqiuleixing = request.data.get('yaoqiuleixing')
+
+
+            if not jieshao:
+                return Response(
+                    {'code': 400, 'msg': '类型介绍不能为空', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            if yaoqiuleixing not in ['1', '2']:
+                return Response(
+                    {'code': 400, 'msg': '抢单要求类型无效', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2.2 验证图片
+            tupian_file = request.FILES.get('file')
+            if not tupian_file:
+
+                return Response(
+                    {'code': 400, 'msg': '请上传类型图片', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 验证图片格式和大小
+            is_valid, error_msg = validate_image(tupian_file)
+            if not is_valid:
+                return Response(
+                    {'code': 400, 'msg': f'图片验证失败: {error_msg}', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2.3 根据抢单要求类型验证对应字段
+            huiyuan_id = request.data.get('huiyuan_id', '').strip()
+            yongjin = request.data.get('yongjin', '').strip()
+
+
+            # 转换yaoqiuleixing为整数便于处理
+            yaoqiuleixing_int = int(yaoqiuleixing)
+
+            if yaoqiuleixing_int == 1:  # 会员抢单
+                if not huiyuan_id:
+                    return Response(
+                        {'code': 400, 'msg': '会员抢单必须选择会员', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                # 验证会员ID是否存在
+                try:
+                    huiyuan_obj = Huiyuan.objects.get(huiyuan_id=huiyuan_id)
+                except Huiyuan.DoesNotExist:
+                    return Response(
+                        {'code': 400, 'msg': '会员ID不存在', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                # 会员ID为字符串，佣金为空
+                yongjin_value = None
+                huiyuan_id_value = huiyuan_id
+            else:  # yaoqiuleixing_int == 2 佣金抢单
+                if not yongjin:
+                    return Response(
+                        {'code': 400, 'msg': '佣金抢单必须填写佣金金额', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                try:
+                    # 验证佣金为有效数字
+                    yongjin_value = float(yongjin)
+                    if yongjin_value <= 0:
+                        return Response(
+                            {'code': 400, 'msg': '佣金金额必须大于0', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+                except ValueError:
+                    return Response(
+                        {'code': 400, 'msg': '佣金金额格式错误', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                huiyuan_id_value = None
+
+            # === 3. 创建商品类型记录 ===
+            with transaction.atomic():
+                # 3.1 创建商品类型对象
+                leixing_obj = ShangpinLeixing(
+                    jieshao=jieshao,
+                    yaoqiuleixing=yaoqiuleixing_int,
+                    huiyuan_id=huiyuan_id_value,
+                    yongjin=yongjin_value,
+                    # tupian_url 先留空，上传成功后再更新
+                )
+
+                # 保存到数据库获取ID
+                leixing_obj.save()
+                leixing_id = leixing_obj.id
+
+                # === 4. 处理图片上传 ===
+                try:
+                    # 4.1 生成文件名和路径
+                    file_extension = os.path.splitext(tupian_file.name)[1].lower()
+                    if not file_extension:
+                        file_extension = '.jpg'
+
+                    # 生成唯一文件名：商品类型ID + 随机UUID + 后缀
+                    unique_filename = f"{leixing_id}_{uuid.uuid4().hex}{file_extension}"
+
+                    # 构建OSS文件路径：a_long/leixing/{leixing_id}/{filename}
+                    oss_folder = 'a_long'  # 根文件夹
+                    leixing_folder = 'leixing'  # 类型文件夹
+
+                    # 构建完整路径
+                    oss_file_path = f"{oss_folder}/{leixing_folder}/{leixing_id}/{unique_filename}"
+
+                    # 4.2 上传到OSS
+                    tupian_url = upload_to_oss(tupian_file, oss_file_path)
+
+                    if not tupian_url:
+                        # 上传失败，抛出异常触发回滚
+                        raise Exception("图片上传到OSS失败")
+
+                    # 4.3 更新商品类型的图片URL（存储相对路径）
+                    leixing_obj.tupian_url = oss_file_path  # 存相对路径，方便拼接
+                    leixing_obj.save()
+
+                except Exception as oss_error:
+                    # 图片上传失败，事务会回滚，商品类型记录也会被删除
+                    print(f"OSS上传失败: {oss_error}")
+                    # 手动抛出异常触发事务回滚
+                    raise Exception(f"图片上传失败: {str(oss_error)}")
+
+                # === 5. 构建返回数据 ===
+                response_data = {
+                    'id': leixing_id,
+                    'jieshao': jieshao,
+                    'yaoqiuleixing': yaoqiuleixing_int,
+                    'tupian_url': leixing_obj.tupian_url,  # 相对路径
+                    'huiyuan_id': huiyuan_id_value,
+                    'yongjin': str(yongjin_value) if yongjin_value else None
+                }
+
+                # 返回成功响应
+                return Response({
+                    'code': 0,
+                    'msg': '商品类型添加成功',
+                    'data': response_data
+                })
+
+        except Exception as e:
+            # 捕获所有异常，返回500错误
+            import traceback
+            traceback.print_exc()
+            return Response({
+                'code': 500,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+class ShangpinZhuanquFabuView(APIView):
+    """
+    商品专区发布接口
+    接收专区名称、类型ID
+    需要管理员权限
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # === 1. 权限验证 ===
+            user_main = request.user
+
+            # 1.1 验证账号（使用phone字段）
+            zhanghao = request.data.get('zhanghao', '').strip()
+            if not zhanghao:
+                return Response(
+                    {'code': 401, 'msg': '未提供账号信息', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            if user_main.phone != zhanghao:
+                return Response(
+                    {'code': 401, 'msg': '账号验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 1.2 验证是否为管理员（检查user_type字段）
+            if user_main.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'msg': '权限不足', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 1.3 验证管理员扩展表（使用AdminProfile模型）
+            try:
+                admin_profile = AdminProfile.objects.get(user=user_main)
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'msg': '管理员信息不存在', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # === 2. 接收并验证字段 ===
+            mingzi = request.data.get('mingzi', '').strip()
+            leixing_id = request.data.get('leixing_id')
+
+            # 2.1 验证必填字段
+            if not mingzi:
+                return Response(
+                    {'code': 400, 'msg': '专区名称不能为空', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            if not leixing_id:
+                return Response(
+                    {'code': 400, 'msg': '类型ID不能为空', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2.2 验证类型ID是否存在
+            try:
+                # 验证商品类型是否存在
+                leixing_obj = ShangpinLeixing.objects.get(id=leixing_id)
+            except ShangpinLeixing.DoesNotExist:
+                return Response(
+                    {'code': 400, 'msg': '商品类型不存在', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2.3 验证名称长度（15汉字以内）
+            if len(mingzi) > 45:  # 数据库字段最大长度
+                return Response(
+                    {'code': 400, 'msg': '专区名称过长', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # === 3. 创建商品专区记录 ===
+            zhuanqu_obj = ShangpinZhuanqu(
+                mingzi=mingzi,
+                leixing_id=leixing_id
+            )
+
+            zhuanqu_obj.save()
+
+            # === 4. 构建返回数据 ===
+            response_data = {
+                'id': zhuanqu_obj.id,
+                'mingzi': mingzi,
+                'leixing_id': leixing_id
+            }
+
+            # 返回成功响应
+            return Response({
+                'code': 0,
+                'msg': '商品专区添加成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            import traceback
+            traceback.print_exc()
+            return Response({
+                'code': 500,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+class ShangpinFabuView(APIView):
+    """
+    商品发布接口
+    接收商品信息、图片等字段
+    需要管理员权限
+    """
+    permission_classes = [permissions.IsAuthenticated]
+    parser_classes = (MultiPartParser, FormParser)  # 需要处理文件上传
+
+    def post(self, request):
+        try:
+            # === 1. 权限验证 ===
+            user_main = request.user
+
+            # 1.1 验证账号（使用phone字段）
+            zhanghao = request.data.get('zhanghao', '').strip()
+            if not zhanghao:
+                return Response(
+                    {'code': 401, 'msg': '未提供账号信息', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            if user_main.phone != zhanghao:
+                return Response(
+                    {'code': 401, 'msg': '账号验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 1.2 验证是否为管理员（检查user_type字段）
+            if user_main.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'msg': '权限不足', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 1.3 验证管理员扩展表（使用AdminProfile模型）
+            try:
+                admin_profile = AdminProfile.objects.get(user=user_main)
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'msg': '管理员信息不存在', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # === 2. 接收并验证字段 ===
+            # 2.1 验证必填字段
+            biaoti = request.data.get('biaoti', '').strip()
+            jiage = request.data.get('jiage', '').strip()
+            kucun = request.data.get('kucun', '').strip()
+            leixing_id = request.data.get('leixing_id')
+            zhuanqu_id = request.data.get('zhuanqu_id')
+            yaoqiuleixing = request.data.get('yaoqiuleixing')
+            jieshao = request.data.get('jieshao', '').strip()
+
+            # 验证图片
+            shangpin_tupian = request.FILES.get('shangpin_tupian')
+            if not shangpin_tupian:
+
+                return Response(
+                    {'code': 400, 'msg': '请上传商品图片', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 验证图片格式和大小
+            is_valid, error_msg = validate_image(shangpin_tupian)
+            if not is_valid:
+                return Response(
+                    {'code': 400, 'msg': f'商品图片验证失败: {error_msg}', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2.2 验证必填字段是否为空
+            required_fields = {
+                'biaoti': biaoti,
+                'jiage': jiage,
+                'kucun': kucun,
+                'leixing_id': leixing_id,
+                'zhuanqu_id': zhuanqu_id,
+                'yaoqiuleixing': yaoqiuleixing,
+                'jieshao': jieshao
+            }
+
+            for field_name, field_value in required_fields.items():
+                if not field_value:
+                    return Response(
+                        {'code': 400, 'msg': f'{field_name}不能为空', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+            # 2.3 验证数值字段
+            try:
+                jiage_value = float(jiage)
+                if jiage_value <= 0:
+                    return Response(
+                        {'code': 400, 'msg': '商品价格必须大于0', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+            except ValueError:
+                return Response(
+                    {'code': 400, 'msg': '商品价格格式错误', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            try:
+                kucun_value = int(kucun)
+                if kucun_value < 0:
+                    return Response(
+                        {'code': 400, 'msg': '库存不能为负数', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+            except ValueError:
+                return Response(
+                    {'code': 400, 'msg': '库存必须为整数', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 验证抢单要求类型
+            if yaoqiuleixing not in ['1', '2']:
+                return Response(
+                    {'code': 400, 'msg': '抢单要求类型无效', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # === 3. 验证关联数据 ===
+            # 3.1 验证商品类型
+            try:
+                leixing_obj = ShangpinLeixing.objects.get(id=leixing_id)
+            except ShangpinLeixing.DoesNotExist:
+                return Response(
+                    {'code': 400, 'msg': '商品类型不存在', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 3.2 根据抢单要求类型验证商品类型
+            yaoqiuleixing_int = int(yaoqiuleixing)
+
+            if yaoqiuleixing_int == 1:  # 会员抢单
+                # 需要验证商品类型的抢单要求类型是否为1
+                if leixing_obj.yaoqiuleixing != 1:
+                    return Response(
+                        {'code': 400, 'msg': '商品类型与抢单要求类型不匹配', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 获取会员ID（从前端或商品类型）
+                huiyuan_id = request.data.get('huiyuan_id', leixing_obj.huiyuan_id)
+                if not huiyuan_id:
+                    return Response(
+                        {'code': 400, 'msg': '会员ID不能为空', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 验证会员是否存在
+                try:
+                    huiyuan_obj = Huiyuan.objects.get(huiyuan_id=huiyuan_id)
+                except Huiyuan.DoesNotExist:
+                    return Response(
+                        {'code': 400, 'msg': '会员不存在', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 设置会员相关字段
+                huiyuan_id_value = huiyuan_id
+                yongjin_value = None
+            else:  # 佣金抢单
+                # 需要验证商品类型的抢单要求类型是否为2
+                if leixing_obj.yaoqiuleixing != 2:
+                    return Response(
+                        {'code': 400, 'msg': '商品类型与抢单要求类型不匹配', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 获取佣金（从前端或商品类型）
+                yongjin = request.data.get('yongjin', leixing_obj.yongjin)
+                if not yongjin:
+                    return Response(
+                        {'code': 400, 'msg': '佣金金额不能为空', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                try:
+                    yongjin_value = float(yongjin)
+                    if yongjin_value <= 0:
+                        return Response(
+                            {'code': 400, 'msg': '佣金金额必须大于0', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+                except ValueError:
+                    return Response(
+                        {'code': 400, 'msg': '佣金金额格式错误', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                huiyuan_id_value = None
+
+            # 3.3 验证商品专区
+            try:
+                zhuanqu_obj = ShangpinZhuanqu.objects.get(id=zhuanqu_id, leixing_id=leixing_id)
+            except ShangpinZhuanqu.DoesNotExist:
+                return Response(
+                    {'code': 400, 'msg': '商品专区不存在或与商品类型不匹配', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # === 4. 创建商品记录 ===
+            with transaction.atomic():
+                # 4.1 获取其他字段
+                xuzhi = request.data.get('xuzhi', '').strip()
+                xiaoliang = request.data.get('xiaoliang', '0').strip()
+
+                # 转换销量为整数
+                try:
+                    duiwai_xiaoliang_value = int(xiaoliang) if xiaoliang else 0
+                except ValueError:
+                    duiwai_xiaoliang_value = 0
+
+                # 4.2 创建商品对象
+                shangpin_obj = Shangpin(
+                    biaoqian=biaoti,
+                    jiage=jiage_value,
+                    kucun=kucun_value,
+                    leixing_id=leixing_id,
+                    zhuanqu_id=zhuanqu_id,
+                    duiwai_xiaoliang=duiwai_xiaoliang_value,
+                    jieshao=jieshao,
+                    xiadan_xuzhi=xuzhi,
+                    yaoqiuleixing=yaoqiuleixing_int,
+                    huiyuan_id=huiyuan_id_value,
+                    yongjin=yongjin_value,
+                    # tupian_url 先留空，上传成功后再更新
+                )
+
+                # 保存到数据库获取ID
+                shangpin_obj.save()
+                shangpin_id = shangpin_obj.id
+
+                # === 5. 处理商品图片上传 ===
+                try:
+                    # 5.1 生成文件名和路径
+                    file_extension = os.path.splitext(shangpin_tupian.name)[1].lower()
+                    if not file_extension:
+                        file_extension = '.jpg'
+
+                    # 构建OSS文件路径：a_long/Spcc{shangpin_id}/{filename}
+                    oss_folder = 'a_long'  # 根文件夹
+                    spcc_folder = f"Spcc{shangpin_id}"  # 商品图片文件夹
+
+                    # 生成文件名：Spcc{shangpin_id}{file_extension}
+                    unique_filename = f"Spcc{shangpin_id}{file_extension}"
+
+                    # 构建完整路径
+                    oss_file_path = f"{oss_folder}/{spcc_folder}/{unique_filename}"
+
+                    # 5.2 上传到OSS
+                    tupian_url = upload_to_oss(shangpin_tupian, oss_file_path)
+
+                    if not tupian_url:
+                        # 上传失败，抛出异常触发回滚
+                        raise Exception("商品图片上传到OSS失败")
+
+                    # 5.3 更新商品的图片URL（存储相对路径）
+                    shangpin_obj.tupian_url = oss_file_path  # 存相对路径
+                    shangpin_obj.save()
+
+                except Exception as oss_error:
+                    # 图片上传失败，事务会回滚，商品记录也会被删除
+                    #print(f"商品图片OSS上传失败: {oss_error}")
+                    # 手动抛出异常触发事务回滚
+                    raise Exception(f"商品图片上传失败: {str(oss_error)}")
+
+                # === 6. 构建返回数据 ===
+                response_data = {
+                    'shangpin_id': shangpin_id,
+                    'biaoti': biaoti,
+                    'jiage': str(jiage_value),
+                    'kucun': kucun_value,
+                    'leixing_id': leixing_id,
+                    'zhuanqu_id': zhuanqu_id,
+                    'xiaoliang': duiwai_xiaoliang_value,
+                    'jieshao': jieshao,
+                    'xuzhi': xuzhi,
+                    'yaoqiuleixing': yaoqiuleixing_int,
+                    'huiyuan_id': huiyuan_id_value,
+                    'yongjin': str(yongjin_value) if yongjin_value else None,
+                    'tupian_url': shangpin_obj.tupian_url  # 相对路径
+                }
+
+                # 返回成功响应
+                return Response({
+                    'code': 0,
+                    'msg': '商品发布成功',
+                    'data': response_data
+                })
+
+        except Exception as e:
+            # 捕获所有异常，返回500错误
+            import traceback
+            traceback.print_exc()
+            return Response({
+                'code': 500,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+class GuizeTupianShangchuanView(APIView):
+    """
+    规则图片上传接口
+    接收商品ID和规则图片
+    需要管理员权限
+    """
+    permission_classes = [permissions.IsAuthenticated]
+    parser_classes = (MultiPartParser, FormParser)  # 需要处理文件上传
+
+    def post(self, request):
+        try:
+            # === 1. 权限验证 ===
+            user_main = request.user
+
+            # 1.1 验证账号（使用phone字段）
+            zhanghao = request.data.get('zhanghao', '').strip()
+            if not zhanghao:
+                return Response(
+                    {'code': 401, 'msg': '未提供账号信息', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            if user_main.phone != zhanghao:
+                return Response(
+                    {'code': 401, 'msg': '账号验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 1.2 验证是否为管理员（检查user_type字段）
+            if user_main.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'msg': '权限不足', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 1.3 验证管理员扩展表（使用AdminProfile模型）
+            try:
+                admin_profile = AdminProfile.objects.get(user=user_main)
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'msg': '管理员信息不存在', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # === 2. 接收并验证字段 ===
+            # 2.1 验证商品ID
+            shangpin_id = request.data.get('shangpin_id')
+            if not shangpin_id:
+                return Response(
+                    {'code': 400, 'msg': '商品ID不能为空', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2.2 验证规则图片
+            guize_tupian = request.FILES.get('guize_tupian')
+            if not guize_tupian:
+                return Response(
+                    {'code': 400, 'msg': '请上传规则图片', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 验证图片格式和大小
+            is_valid, error_msg = validate_image(guize_tupian)
+            if not is_valid:
+                return Response(
+                    {'code': 400, 'msg': f'规则图片验证失败: {error_msg}', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # === 3. 验证商品是否存在 ===
+            try:
+                shangpin_obj = Shangpin.objects.get(id=shangpin_id)
+            except Shangpin.DoesNotExist:
+                return Response(
+                    {'code': 400, 'msg': '商品不存在', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # === 4. 处理规则图片上传 ===
+            try:
+                # 4.1 生成文件名和路径
+                file_extension = os.path.splitext(guize_tupian.name)[1].lower()
+                if not file_extension:
+                    file_extension = '.jpg'
+
+                # 构建OSS文件路径：a_long/Spgz{shangpin_id}/{filename}
+                oss_folder = 'a_long'  # 根文件夹
+                spgz_folder = f"Spgz{shangpin_id}"  # 规则图片文件夹
+
+                # 生成文件名：Spgz{shangpin_id}{file_extension}
+                unique_filename = f"Spgz{shangpin_id}{file_extension}"
+
+                # 构建完整路径
+                oss_file_path = f"{oss_folder}/{spgz_folder}/{unique_filename}"
+
+                # 4.2 上传到OSS
+                tupian_url = upload_to_oss(guize_tupian, oss_file_path)
+
+                if not tupian_url:
+                    # 上传失败
+                    return Response({
+                        'code': 500,
+                        'msg': '规则图片上传失败',
+                        'data': None
+                    }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+                # 4.3 更新商品的规则图片URL（存储相对路径）
+                shangpin_obj.guize_tupian = oss_file_path  # 存相对路径
+                shangpin_obj.save()
+
+            except Exception as oss_error:
+                # OSS上传失败
+                print(f"规则图片OSS上传失败: {oss_error}")
+                return Response({
+                    'code': 500,
+                    'msg': f'规则图片上传失败: {str(oss_error)}',
+                    'data': None
+                }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            # === 5. 构建返回数据 ===
+            response_data = {
+                'shangpin_id': shangpin_id,
+                'guize_tupian_url': oss_file_path  # 相对路径
+            }
+
+            # 返回成功响应
+            return Response({
+                'code': 0,
+                'msg': '规则图片上传成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            # 捕获所有异常，返回500错误
+            import traceback
+            traceback.print_exc()
+            return Response({
+                'code': 500,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+class AdHuiyuanHqView(APIView):
+    """
+    管理员获取会员信息和商品类型接口
+    需要管理员权限
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # === 1. 权限验证 ===
+            # 获取当前用户
+            user_main = request.user
+
+            # 1.1 验证前端传递的账号是否匹配（使用phone字段）
+            zhanghao = request.data.get('zhanghao', '').strip()
+            if not zhanghao:
+                return Response(
+                    {'code': 401, 'msg': '权限验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 验证账号是否匹配（使用phone字段比较）
+            if user_main.phone != zhanghao:
+                return Response(
+                    {'code': 401, 'msg': '权限验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 1.2 验证是否为管理员（检查user_type字段）
+            if user_main.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'msg': '权限验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 1.3 验证管理员扩展表（使用AdminProfile模型）
+            try:
+                admin_profile = AdminProfile.objects.get(user=user_main)
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'msg': '权限验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # === 2. 查询会员表数据 ===
+            # 查询所有会员数据，按创建时间倒序排列
+            huiyuan_queryset = Huiyuan.objects.all().order_by('-create_time')
+
+            # 构建会员数据列表
+            huiyuan_list = []
+            for huiyuan in huiyuan_queryset:
+                huiyuan_data = {
+                    'huiyuan_id': huiyuan.huiyuan_id,  # 会员ID
+                    'jieshao': huiyuan.jieshao,  # 会员介绍（会员标题）
+                    'jtjieshao': huiyuan.jtjieshao if huiyuan.jtjieshao else '',  # 会员规则介绍（具体介绍）
+                    'jiage': str(huiyuan.jiage),  # 会员价格（转换为字符串，避免Decimal序列化问题）
+                    'guanshifc': str(huiyuan.guanshifc),  # 管事分成（转换为字符串）
+                    'goumai_cishu': huiyuan.goumai_cishu,  # 购买次数（销量）
+                    'create_time': huiyuan.create_time.strftime('%Y-%m-%d %H:%M:%S') if huiyuan.create_time else None,
+                    # 创建时间
+                    'update_time': huiyuan.update_time.strftime('%Y-%m-%d %H:%M:%S') if huiyuan.update_time else None
+                    # 更新时间
+                }
+                huiyuan_list.append(huiyuan_data)
+
+            # === 3. 查询商品类型表数据 ===
+            # 筛选抢单要求类型等于数字1的所有数据（yaoqiuleixing=1）
+            shangpinleixing_queryset = ShangpinLeixing.objects.filter(
+                yaoqiuleixing=1  # 抢单要求类型为1（会员抢单）
+            ).order_by('id')  # 按ID排序
+
+            # 构建商品类型数据列表
+            shangpinleixing_list = []
+            for leixing in shangpinleixing_queryset:
+                # 注意：这里只需要特定的字段
+                leixing_data = {
+                    'id': leixing.id,  # 商品类型ID
+                    'huiyuan_id': leixing.huiyuan_id,  # 会员ID（关联字段）
+                    'jieshao': leixing.jieshao,  # 类型介绍（商品类型名称）
+                    'tupian_url': leixing.tupian_url if leixing.tupian_url else ''  # 商品类型图片相对URL
+                }
+                shangpinleixing_list.append(leixing_data)
+
+            # === 4. 构建返回数据 ===
+            response_data = {
+                'huiyuanList': huiyuan_list,
+                'shangpinleixingList': shangpinleixing_list
+            }
+
+            # 返回成功响应
+            return Response({
+                'code': 0,
+                'msg': '获取数据成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            # 捕获所有异常，返回500错误
+            import traceback
+            traceback.print_exc()
+            return Response({
+                'code': 500,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+
+
+class HuiyuanXiugaiView(APIView):
+    """
+    会员修改接口
+    需要管理员权限
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # === 1. 权限验证 ===
+            user_main = request.user
+
+            # 1.1 验证前端传递的账号是否匹配（使用phone字段）
+            zhanghao = request.data.get('zhanghao', '').strip()
+            if not zhanghao:
+                return Response(
+                    {'code': 401, 'msg': '权限验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            if user_main.phone != zhanghao:
+                return Response(
+                    {'code': 401, 'msg': '权限验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 1.2 验证是否为管理员（检查user_type字段）
+            if user_main.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'msg': '权限验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 1.3 验证管理员扩展表
+            try:
+                admin_profile = AdminProfile.objects.get(user=user_main)
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'msg': '权限验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # === 2. 接收并验证必填字段 ===
+            huiyuan_id = request.data.get('huiyuan_id', '').strip()
+            if not huiyuan_id:
+                return Response(
+                    {'code': 400, 'msg': '会员ID不能为空', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # === 3. 查询会员数据 ===
+            try:
+                huiyuan_obj = Huiyuan.objects.get(huiyuan_id=huiyuan_id)
+            except Huiyuan.DoesNotExist:
+                return Response(
+                    {'code': 400, 'msg': '会员不存在', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # === 4. 更新会员信息 ===
+            # 4.1 获取前端传递的字段（只更新有值的字段）
+            jieshao = request.data.get('jieshao', '').strip()
+            jtjieshao = request.data.get('jtjieshao', '').strip()
+            jiage = request.data.get('jiage', '').strip()
+            guanshifc = request.data.get('guanshifc', '').strip()
+
+            # 4.2 更新字段
+            if jieshao:
+                # 验证名称长度（30个字符以内）
+                if len(jieshao) > 30:
+                    return Response(
+                        {'code': 400, 'msg': '会员名称不能超过30个字符', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                huiyuan_obj.jieshao = jieshao
+
+            if jtjieshao:
+                # 验证介绍长度（没有长度限制，但做一下基本检查）
+                if len(jtjieshao) > 2000:
+                    return Response(
+                        {'code': 400, 'msg': '会员介绍过长', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                huiyuan_obj.jtjieshao = jtjieshao
+
+            if jiage:
+                try:
+                    jiage_value = float(jiage)
+                    if jiage_value < 0:
+                        return Response(
+                            {'code': 400, 'msg': '会员价格不能为负数', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+                    if jiage_value > 100000:
+                        return Response(
+                            {'code': 400, 'msg': '会员价格不能超过10万元', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+                    huiyuan_obj.jiage = jiage_value
+                except ValueError:
+                    return Response(
+                        {'code': 400, 'msg': '会员价格格式错误', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+            if guanshifc:
+                try:
+                    guanshifc_value = float(guanshifc)
+                    if guanshifc_value < 0:
+                        return Response(
+                            {'code': 400, 'msg': '管事分成不能为负数', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+                    # 检查管事分成是否超过会员价格
+                    if hasattr(huiyuan_obj, 'jiage') and huiyuan_obj.jiage:
+                        if guanshifc_value > float(huiyuan_obj.jiage):
+                            return Response(
+                                {'code': 400, 'msg': '管事分成不能超过会员价格', 'data': None},
+                                status=status.HTTP_400_BAD_REQUEST
+                            )
+                    huiyuan_obj.guanshifc = guanshifc_value
+                except ValueError:
+                    return Response(
+                        {'code': 400, 'msg': '管事分成格式错误', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+            # 4.3 检查是否有任何字段需要更新
+            if not (jieshao or jtjieshao or jiage or guanshifc):
+                return Response(
+                    {'code': 400, 'msg': '没有需要更新的字段', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 4.4 保存更新
+            huiyuan_obj.save()
+
+            # === 5. 构建返回数据 ===
+            response_data = {
+                'huiyuan_id': huiyuan_obj.huiyuan_id,
+                'jieshao': huiyuan_obj.jieshao,
+                'jtjieshao': huiyuan_obj.jtjieshao if huiyuan_obj.jtjieshao else '',
+                'jiage': str(huiyuan_obj.jiage),
+                'guanshifc': str(huiyuan_obj.guanshifc),
+                'goumai_cishu': huiyuan_obj.goumai_cishu,
+                'create_time': huiyuan_obj.create_time.strftime(
+                    '%Y-%m-%d %H:%M:%S') if huiyuan_obj.create_time else None,
+                'update_time': huiyuan_obj.update_time.strftime(
+                    '%Y-%m-%d %H:%M:%S') if huiyuan_obj.update_time else None
+            }
+
+            # 返回成功响应
+            return Response({
+                'code': 0,
+                'msg': '会员信息修改成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            # 捕获所有异常，返回500错误
+            import traceback
+            traceback.print_exc()
+            return Response({
+                'code': 500,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+
+
+
+
+class AdHuiyuanFbView(APIView):
+    """
+    会员发布接口
+    需要管理员权限
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # === 1. 权限验证 ===
+            user_main = request.user
+
+            # 1.1 验证前端传递的账号是否匹配
+            zhanghao = request.data.get('zhanghao', '').strip()
+            if not zhanghao:
+                return Response(
+                    {'code': 401, 'msg': '权限验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            if user_main.phone != zhanghao:
+                return Response(
+                    {'code': 401, 'msg': '权限验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 1.2 验证是否为管理员
+            if user_main.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'msg': '权限验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 1.3 验证管理员扩展表
+            try:
+                admin_profile = AdminProfile.objects.get(user=user_main)
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'msg': '权限验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # === 2. 接收并验证字段 ===
+            jieshao = request.data.get('jieshao', '').strip()
+            jtjieshao = request.data.get('jtjieshao', '').strip()
+            jiage = request.data.get('jiage', '').strip()
+            guanshifc = request.data.get('guanshifc', '').strip()
+
+            # 2.1 验证必填字段
+            if not jieshao:
+                return Response(
+                    {'code': 400, 'msg': '会员名称不能为空', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            if not jiage:
+                return Response(
+                    {'code': 400, 'msg': '会员价格不能为空', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            if not guanshifc:
+                return Response(
+                    {'code': 400, 'msg': '管事分成不能为空', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2.2 验证字段长度和格式
+            if len(jieshao) > 30:
+                return Response(
+                    {'code': 400, 'msg': '会员名称不能超过30个字符', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            if jtjieshao and len(jtjieshao) > 2000:
+                return Response(
+                    {'code': 400, 'msg': '会员介绍过长', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2.3 验证价格和分成格式
+            try:
+                jiage_value = float(jiage)
+                if jiage_value <= 0:
+                    return Response(
+                        {'code': 400, 'msg': '会员价格必须大于0', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                if jiage_value > 100000:
+                    return Response(
+                        {'code': 400, 'msg': '会员价格不能超过10万元', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+            except ValueError:
+                return Response(
+                    {'code': 400, 'msg': '会员价格格式错误', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            try:
+                guanshifc_value = float(guanshifc)
+                if guanshifc_value < 0:
+                    return Response(
+                        {'code': 400, 'msg': '管事分成不能为负数', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                if guanshifc_value > jiage_value:
+                    return Response(
+                        {'code': 400, 'msg': '管事分成不能超过会员价格', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+            except ValueError:
+                return Response(
+                    {'code': 400, 'msg': '管事分成格式错误', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # === 3. 生成会员ID ===
+            # 生成6位唯一会员ID，格式：V + 5位随机数字字母
+            def generate_huiyuan_id():
+                # 使用V开头，后跟5位随机字符（数字和大写字母）
+                chars = string.digits + string.ascii_uppercase
+                while True:
+                    random_part = ''.join(random.choices(chars, k=5))
+                    huiyuan_id = f"V{random_part}"
+                    # 检查是否已存在
+                    if not Huiyuan.objects.filter(huiyuan_id=huiyuan_id).exists():
+                        return huiyuan_id
+
+            huiyuan_id = generate_huiyuan_id()
+
+            # === 4. 创建会员记录 ===
+            with transaction.atomic():
+                huiyuan_obj = Huiyuan(
+                    huiyuan_id=huiyuan_id,
+                    jieshao=jieshao,
+                    jtjieshao=jtjieshao if jtjieshao else '',
+                    jiage=jiage_value,
+                    guanshifc=guanshifc_value,
+                    goumai_cishu=0,  # 初始购买次数为0
+                )
+
+                huiyuan_obj.save()
+
+            # === 5. 构建返回数据 ===
+            response_data = {
+                'huiyuan_id': huiyuan_obj.huiyuan_id,
+                'jieshao': huiyuan_obj.jieshao,
+                'jtjieshao': huiyuan_obj.jtjieshao,
+                'jiage': str(huiyuan_obj.jiage),
+                'guanshifc': str(huiyuan_obj.guanshifc),
+                'goumai_cishu': huiyuan_obj.goumai_cishu,
+                'create_time': huiyuan_obj.create_time.strftime(
+                    '%Y-%m-%d %H:%M:%S') if huiyuan_obj.create_time else None,
+                'update_time': huiyuan_obj.update_time.strftime(
+                    '%Y-%m-%d %H:%M:%S') if huiyuan_obj.update_time else None
+            }
+
+            # 返回成功响应
+            return Response({
+                'code': 0,
+                'msg': '会员发布成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            # 捕获所有异常，返回500错误
+            import traceback
+            traceback.print_exc()
+            return Response({
+                'code': 500,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+from django.shortcuts import get_object_or_404
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from rest_framework import status
+from django.db.models import Q
+
+# 导入模型
+from yonghu.models import UserMain, AdminProfile
+from .models import ShangpinLeixing, ShangpinZhuanqu, Huiyuan, Shangpin
+from peizhi.models import Gonggao, Lunbo
+
+class AdShangpinHuQu(APIView):
+    """
+    后台商品管理页面数据获取接口
+    路径: /shangpin/adsphq/
+    方法: POST
+    权限: JWT认证 + 管理员权限
+    功能: 获取商品管理页面需要的所有数据
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取前端传递的账号
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            if not qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 2. 从JWT Token获取当前用户
+            dangqianyonghu = request.user
+
+            # 3. 验证账号匹配
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 4. 验证用户类型为管理员
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 5. 验证管理员扩展表数据
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 6. 查询公告数据（类型=1的公告）
+            gonggao_obj = Gonggao.objects.filter(leixing=1).first()
+            shangpingonggao = gonggao_obj.jieshao if gonggao_obj else ''
+
+            # 7. 查询轮播图数据（类型=1的轮播图）
+            lunbo_objs = Lunbo.objects.filter(leixing=1).values('tupian_url')
+            shangpinlunbo = [item['tupian_url'] for item in lunbo_objs]
+
+            # 8. 查询商品类型数据 - 【修改：添加排序字段】
+            shangpinleixing_data = ShangpinLeixing.objects.filter(
+                shenhezhuangtai=1  # 只返回审核状态为1（正常）的商品类型
+            ).values(
+                'id',  # 类型ID
+                'jieshao',  # 类型介绍（类型名称）
+                'tupian_url',  # 类型图片URL
+                'yaoqiuleixing',  # 抢单要求类型（1=会员抢单，2=佣金抢单）
+                'huiyuan_id',  # 会员ID（如果yaoqiuleixing=1）
+                'yongjin',  # 佣金要求（如果yaoqiuleixing=2）
+                'paixu'  # 【新增】排序字段
+            ).order_by('paixu', 'id')  # 先按排序字段排序，再按ID排序
+
+            # 9. 查询商品专区数据
+            shangpinzhuanqu_data = ShangpinZhuanqu.objects.all().values(
+                'id',  # 专区ID
+                'mingzi',  # 专区名称
+                'leixing_id',  # 所属类型ID
+                'paixu'  # 【新增】排序字段
+            )
+
+            # 10. 查询会员数据
+            huiyuan_data = Huiyuan.objects.all().values(
+                'huiyuan_id',  # 会员ID
+                'jieshao',  # 会员介绍（会员名称）
+                'jiage'  # 会员价格
+            )
+
+            # 11. 查询商品数据
+            shangpin_data = Shangpin.objects.all().values(
+                'id',  # 商品ID
+                'biaoqian',  # 商品标题/标签
+                'jiage',  # 商品价格
+                'leixing_id',  # 商品类型ID
+                'zhuanqu_id',  # 商品专区ID
+                'tupian_url',  # 商品图片URL
+                'duiwai_xiaoliang'  # 商品对外销量
+            )
+
+            # 12. 构造返回数据
+            response_data = {
+                'code': 0,
+                'message': '获取成功',
+                'data': {
+                    'shangpingonggao': shangpingonggao,  # 商品公告
+                    'shangpinlunbo': shangpinlunbo,  # 轮播图相对URL数组
+                    'shangpinleixing': list(shangpinleixing_data),  # 商品类型列表
+                    'shangpinzhuanqu': list(shangpinzhuanqu_data),  # 商品专区列表
+                    'huiyuanliebiao': list(huiyuan_data),  # 会员列表
+                    'shangpinliebiao': list(shangpin_data),  # 商品列表
+                }
+            }
+
+            return Response(response_data, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            print(f"获取商品管理数据异常: {e}")
+            return Response(
+                {'code': 500, 'message': '服务器内部错误'},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+
+class AdLeixingPaixuXiuGai(APIView):
+    """
+    后台商品类型排序修改接口
+    路径: /shangpin/adleixingpaixuxg/
+    方法: POST
+    权限: JWT认证 + 管理员权限
+    功能: 批量修改商品类型的排序顺序
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 权限验证
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            if not qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            dangqianyonghu = request.user
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 2. 获取排序数据
+            paixu_data = request.data.get('paixu_data', [])
+            if not paixu_data or not isinstance(paixu_data, list):
+                return Response(
+                    {'code': 400, 'message': '排序数据格式错误'},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 3. 验证数据格式
+            for item in paixu_data:
+                if not isinstance(item, dict) or 'id' not in item or 'paixu' not in item:
+                    return Response(
+                        {'code': 400, 'message': '排序数据格式错误：缺少id或paixu字段'},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 验证排序值为正整数
+                try:
+                    paixu_value = int(item['paixu'])
+                    if paixu_value <= 0:
+                        return Response(
+                            {'code': 400, 'message': '排序值必须为正整数'},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+                except ValueError:
+                    return Response(
+                        {'code': 400, 'message': '排序值必须为整数'},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+            # 4. 检查排序值是否重复
+            paixu_values = [item['paixu'] for item in paixu_data]
+            if len(paixu_values) != len(set(paixu_values)):
+                return Response(
+                    {'code': 400, 'message': '排序值不能重复'},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 5. 检查排序值范围是否连续（从1开始）
+            sorted_paixu = sorted(paixu_values)
+            if sorted_paixu[0] != 1 or sorted_paixu[-1] != len(paixu_values):
+                return Response(
+                    {'code': 400, 'message': '排序值必须从1开始连续'},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 6. 验证商品类型ID是否存在
+            leixing_ids = [item['id'] for item in paixu_data]
+            existing_ids = set(ShangpinLeixing.objects.filter(
+                id__in=leixing_ids,
+                shenhezhuangtai=1  # 只修改正常状态的商品类型
+            ).values_list('id', flat=True))
+
+            if len(existing_ids) != len(leixing_ids):
+                return Response(
+                    {'code': 400, 'message': '存在无效的商品类型ID'},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 7. 批量更新排序值（使用事务保证一致性）
+            from django.db import transaction
+
+            try:
+                with transaction.atomic():
+                    for item in paixu_data:
+                        leixing_id = item['id']
+                        paixu_value = int(item['paixu'])
+
+                        ShangpinLeixing.objects.filter(id=leixing_id).update(paixu=paixu_value)
+
+                    # 记录操作日志（可选）
+                    #print(f"管理员 {qianzhanghao} 修改了商品类型排序: {paixu_data}")
+
+            except Exception as e:
+                #print(f"更新排序时发生错误: {e}")
+                return Response(
+                    {'code': 500, 'message': '更新排序失败'},
+                    status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                )
+
+            # 8. 返回成功响应
+            return Response({
+                'code': 0,
+                'message': '排序更新成功',
+                'data': {
+                    'updated_count': len(paixu_data)
+                }
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            #print(f"商品类型排序修改异常: {e}")
+            return Response(
+                {'code': 500, 'message': '服务器内部错误'},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+'''class AdShangpinHuQu(APIView):
+    """
+    后台商品管理页面数据获取接口
+    路径: /shangpin/adsphq/
+    方法: POST
+    权限: JWT认证 + 管理员权限
+    功能: 获取商品管理页面需要的所有数据
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取前端传递的账号
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            if not qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 2. 从JWT Token获取当前用户
+            dangqianyonghu = request.user
+
+            # 3. 验证账号匹配
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 4. 验证用户类型为管理员
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 5. 验证管理员扩展表数据
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 6. 查询公告数据（类型=1的公告）
+            gonggao_obj = Gonggao.objects.filter(leixing=1).first()
+            shangpingonggao = gonggao_obj.jieshao if gonggao_obj else ''
+
+            # 7. 查询轮播图数据（类型=1的轮播图）
+            lunbo_objs = Lunbo.objects.filter(leixing=1).values('tupian_url')
+            shangpinlunbo = [item['tupian_url'] for item in lunbo_objs]
+
+            # 8. 查询商品类型数据
+            shangpinleixing_data = ShangpinLeixing.objects.all().values(
+                'id',  # 类型ID
+                'jieshao',  # 类型介绍（类型名称）
+                'tupian_url',  # 类型图片URL
+                'yaoqiuleixing',  # 抢单要求类型（1=会员抢单，2=佣金抢单）
+                'huiyuan_id',  # 会员ID（如果yaoqiuleixing=1）
+                'yongjin'  # 佣金要求（如果yaoqiuleixing=2）
+            )
+
+            # 9. 查询商品专区数据
+            shangpinzhuanqu_data = ShangpinZhuanqu.objects.all().values(
+                'id',  # 专区ID
+                'mingzi',  # 专区名称
+                'leixing_id'  # 所属类型ID
+            )
+
+            # 10. 查询会员数据
+            huiyuan_data = Huiyuan.objects.all().values(
+                'huiyuan_id',  # 会员ID
+                'jieshao',  # 会员介绍（会员名称）
+                'jiage'  # 会员价格
+            )
+
+            # 11. 查询商品数据
+            shangpin_data = Shangpin.objects.all().values(
+                'id',  # 商品ID
+                'biaoqian',  # 商品标题/标签
+                'jiage',  # 商品价格
+                'leixing_id',  # 商品类型ID
+                'zhuanqu_id',  # 商品专区ID
+                'tupian_url',  # 商品图片URL
+                'duiwai_xiaoliang'  # 商品对外销量
+            )
+
+            # 12. 构造返回数据
+            response_data = {
+                'code': 0,
+                'message': '获取成功',
+                'data': {
+                    'shangpingonggao': shangpingonggao,  # 商品公告
+                    'shangpinlunbo': shangpinlunbo,  # 轮播图相对URL数组
+                    'shangpinleixing': list(shangpinleixing_data),  # 商品类型列表
+                    'shangpinzhuanqu': list(shangpinzhuanqu_data),  # 商品专区列表
+                    'huiyuanliebiao': list(huiyuan_data),  # 会员列表
+                    'shangpinliebiao': list(shangpin_data),  # 商品列表
+                }
+            }
+
+            return Response(response_data, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            print(f"获取商品管理数据异常: {e}")
+            return Response(
+                {'code': 500, 'message': '服务器内部错误'},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )'''
+
+
+
+# shangpin/views.py
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from rest_framework import status
+from yonghu.models import UserMain, AdminProfile
+from peizhi.models import Gonggao
+
+
+class AdGonggaoXiuGai(APIView):
+    """
+    后台编辑公告接口
+    路径: /shangpin/adggxg/
+    方法: POST
+    权限: JWT认证 + 管理员权限
+    功能: 修改公告内容
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取前端传递的账号
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            if not qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 2. 从JWT Token获取当前用户
+            dangqianyonghu = request.user
+
+            # 3. 验证账号匹配
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 4. 验证用户类型为管理员
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 5. 验证管理员扩展表数据
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 6. 获取公告内容
+            gonggao_neirong = request.data.get('gonggao', '').strip()
+
+            # 7. 验证公告内容
+            if not gonggao_neirong:
+                return Response(
+                    {'code': 400, 'message': '公告内容不能为空', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            if len(gonggao_neirong) > 300:
+                return Response(
+                    {'code': 400, 'message': '公告内容不能超过300字', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 8. 查询公告表，类型为1的公告
+            gonggao_obj = Gonggao.objects.filter(leixing=1).first()
+
+            # 如果不存在，则创建
+            if not gonggao_obj:
+                gonggao_obj = Gonggao(leixing=1)
+
+            # 9. 更新公告内容
+            gonggao_obj.jieshao = gonggao_neirong
+            gonggao_obj.save()
+
+            # 10. 返回成功响应
+            return Response({
+                'code': 0,
+                'message': '公告更新成功',
+                'data': {
+                    'gonggao': gonggao_neirong
+                }
+            })
+
+        except Exception as e:
+            print(f"编辑公告异常: {e}")
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+
+class AdZhuanquXiuGai(APIView):
+    """
+    后台修改专区名称接口
+    路径: /shangpin/adzqxg/
+    方法: POST
+    权限: JWT认证 + 管理员权限
+    功能: 修改专区名称
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 权限验证
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            if not qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            dangqianyonghu = request.user
+
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 2. 获取专区ID和新的专区名称
+            zhuanqu_id = request.data.get('zhuanqu_id')
+            mingzi = request.data.get('mingzi', '').strip()
+
+            if not zhuanqu_id:
+                return Response(
+                    {'code': 400, 'message': '专区ID不能为空', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            if not mingzi:
+                return Response(
+                    {'code': 400, 'message': '专区名称不能为空', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            if len(mingzi) > 10:
+                return Response(
+                    {'code': 400, 'message': '专区名称不能大于10个字', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 3. 查询专区
+            try:
+                zhuanqu_obj = ShangpinZhuanqu.objects.get(id=zhuanqu_id)
+            except ShangpinZhuanqu.DoesNotExist:
+                return Response(
+                    {'code': 400, 'message': '专区不存在', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 4. 更新专区名称
+            zhuanqu_obj.mingzi = mingzi
+            zhuanqu_obj.save()
+
+            # 5. 返回成功响应
+            return Response({
+                'code': 0,
+                'message': '专区名称修改成功',
+                'data': {
+                    'id': zhuanqu_obj.id,
+                    'mingzi': zhuanqu_obj.mingzi,
+                    'leixing_id': zhuanqu_obj.leixing_id
+                }
+            })
+
+        except Exception as e:
+            print(f"修改专区名称异常: {e}")
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+
+
+
+from rest_framework.parsers import MultiPartParser, FormParser
+from django.db import transaction
+from utils.oss_utils import validate_image, upload_to_oss, delete_from_oss
+from peizhi.models import Lunbo
+import os
+import uuid
+import random
+import string
+
+
+class AdLunboXiuGai(APIView):
+    """
+    后台编辑轮播图接口
+    路径: /shangpin/adlunboxg/
+    方法: POST
+    权限: JWT认证 + 管理员权限
+    功能: 添加或删除轮播图
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = (MultiPartParser, FormParser,JSONParser)
+
+    def post(self, request):
+        try:
+            # 1. 权限验证
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            if not qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            dangqianyonghu = request.user
+
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 2. 获取操作类型
+            action = request.data.get('action', '').strip()  # 'add' 或 'delete'
+
+            if action not in ['add', 'delete']:
+                return Response(
+                    {'code': 400, 'message': '操作类型无效', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 3. 处理删除操作
+            if action == 'delete':
+                tupian_url = request.data.get('tupian_url', '').strip()
+
+                if not tupian_url:
+                    return Response(
+                        {'code': 400, 'message': '图片URL不能为空', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 查询轮播图记录
+                lunbo_obj = Lunbo.objects.filter(tupian_url=tupian_url, leixing=1).first()
+
+                if not lunbo_obj:
+                    return Response(
+                        {'code': 400, 'message': '轮播图不存在', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 从OSS删除图片
+                delete_success = delete_from_oss(tupian_url)
+
+                if not delete_success:
+                    return Response(
+                        {'code': 500, 'message': 'OSS删除失败', 'data': None},
+                        status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                    )
+
+                # 从数据库删除记录
+                lunbo_obj.delete()
+
+                return Response({
+                    'code': 0,
+                    'message': '删除成功',
+                    'data': None
+                })
+
+            # 4. 处理添加操作
+            else:  # action == 'add'
+                tupian_file = request.FILES.get('file')
+
+                if not tupian_file:
+                    return Response(
+                        {'code': 400, 'message': '请上传图片', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 验证图片
+                is_valid, error_msg = validate_image(tupian_file)
+                if not is_valid:
+                    return Response(
+                        {'code': 400, 'message': f'图片验证失败: {error_msg}', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 生成文件名和路径
+                file_extension = os.path.splitext(tupian_file.name)[1].lower()
+                if not file_extension:
+                    file_extension = '.jpg'
+
+                # 生成6位随机字符串作为文件名
+                random_str = ''.join(random.choices(string.ascii_lowercase + string.digits, k=6))
+                unique_filename = f"{random_str}{file_extension}"
+
+                # 构建OSS文件路径：a_long/lunbo/{filename}
+                oss_folder = 'a_long'
+                lunbo_folder = 'lunbo'
+
+                oss_file_path = f"{oss_folder}/{lunbo_folder}/{unique_filename}"
+
+                # 上传到OSS
+                tupian_url = upload_to_oss(tupian_file, oss_file_path)
+
+                if not tupian_url:
+                    return Response(
+                        {'code': 500, 'message': '图片上传失败', 'data': None},
+                        status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                    )
+
+                # 创建轮播图记录
+                lunbo_obj = Lunbo.objects.create(
+                    tupian_url=oss_file_path,  # 存相对路径
+                    leixing=1
+                )
+
+                return Response({
+                    'code': 0,
+                    'message': '添加成功',
+                    'data': {
+                        'tupian_url': lunbo_obj.tupian_url
+                    }
+                })
+
+        except Exception as e:
+            print(f"编辑轮播图异常: {e}")
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+
+class AdLeixingXiuGai(APIView):
+    """
+    后台编辑商品类型接口 - 优化版
+    支持：只改图片、只改字段、两者都改
+    拒绝：两者都不改
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = (MultiPartParser, FormParser, JSONParser)  # 添加JSONParser支持
+
+    def post(self, request):
+        try:
+            # 1. 权限验证（保持不变）
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            if not qianzhanghao:
+                return Response({'code': 401, 'message': '身份验证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+            dangqianyonghu = request.user
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response({'code': 401, 'message': '身份验证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+            if dangqianyonghu.user_type != 'admin':
+                return Response({'code': 401, 'message': '身份验证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response({'code': 401, 'message': '身份验证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+            # 2. 获取商品类型ID
+            leixing_id = request.data.get('leixing_id')
+            if not leixing_id:
+                return Response({'code': 400, 'message': '商品类型ID不能为空', 'data': None},
+                                status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 查询商品类型
+            try:
+                leixing_obj = ShangpinLeixing.objects.get(id=leixing_id)
+            except ShangpinLeixing.DoesNotExist:
+                return Response({'code': 400, 'message': '商品类型不存在', 'data': None},
+                                status=status.HTTP_400_BAD_REQUEST)
+
+            # 4. 获取字段并初始化变更标记
+            has_changed = False
+            jieshao = request.data.get('jieshao', '').strip()
+            yaoqiuleixing = request.data.get('yaoqiuleixing')
+            huiyuan_id = request.data.get('huiyuan_id', '').strip()
+            yongjin = request.data.get('yongjin', '').strip()
+            tupian_url = request.data.get('tupian_url', '').strip()  # 原有图片URL
+
+            # 5. 检查非图片字段是否有变更
+            if jieshao and jieshao != leixing_obj.jieshao:
+                leixing_obj.jieshao = jieshao
+                has_changed = True
+
+            if yaoqiuleixing and int(yaoqiuleixing) != leixing_obj.yaoqiuleixing:
+                leixing_obj.yaoqiuleixing = int(yaoqiuleixing)
+                has_changed = True
+
+                # 根据类型清空另一个字段
+                if leixing_obj.yaoqiuleixing == 1:
+                    leixing_obj.yongjin = None
+                    if huiyuan_id:
+                        leixing_obj.huiyuan_id = huiyuan_id
+                        # 验证会员存在
+                        try:
+                            Huiyuan.objects.get(huiyuan_id=huiyuan_id)
+                        except Huiyuan.DoesNotExist:
+                            return Response({'code': 400, 'msg': '会员ID不存在', 'data': None},
+                                            status=status.HTTP_400_BAD_REQUEST)
+                else:  # 类型2
+                    leixing_obj.huiyuan_id = None
+                    if yongjin:
+                        try:
+                            leixing_obj.yongjin = float(yongjin)
+                            if leixing_obj.yongjin <= 0:
+                                return Response({'code': 400, 'message': '佣金金额必须大于0', 'data': None},
+                                                status=status.HTTP_400_BAD_REQUEST)
+                        except ValueError:
+                            return Response({'code': 400, 'message': '佣金金额格式错误', 'data': None},
+                                            status=status.HTTP_400_BAD_REQUEST)
+
+            # ===== 在现有代码的第5步后面添加 =====
+
+            # 5.5 检查抢单要求类型不变时，会员ID或佣金是否有变更
+            if yaoqiuleixing and int(yaoqiuleixing) == leixing_obj.yaoqiuleixing:
+                # 类型没有变化，但需要检查对应字段的变化
+
+                # 情况1：会员抢单 (yaoqiuleixing == 1)
+                if leixing_obj.yaoqiuleixing == 1:
+                    # 检查会员ID是否变更
+                    if huiyuan_id and huiyuan_id != leixing_obj.huiyuan_id:
+                        # 验证会员存在
+                        try:
+                            Huiyuan.objects.get(huiyuan_id=huiyuan_id)
+                        except Huiyuan.DoesNotExist:
+                            return Response({'code': 400, 'msg': '会员ID不存在', 'data': None},
+                                            status=status.HTTP_400_BAD_REQUEST)
+
+                        leixing_obj.huiyuan_id = huiyuan_id
+                        has_changed = True
+                        # print(f"会员ID变更: {leixing_obj.huiyuan_id} -> {huiyuan_id}")
+
+                # 情况2：佣金抢单 (yaoqiuleixing == 2)
+                elif leixing_obj.yaoqiuleixing == 2:
+                    # 检查佣金是否变更
+                    if yongjin:
+                        try:
+                            new_yongjin = float(yongjin)
+                            if new_yongjin <= 0:
+                                return Response({'code': 400, 'message': '佣金金额必须大于0', 'data': None},
+                                                status=status.HTTP_400_BAD_REQUEST)
+
+                            # 判断是否有变化（考虑None的情况）
+                            current_yongjin = leixing_obj.yongjin
+                            if (current_yongjin is None and new_yongjin != 0) or \
+                                    (current_yongjin is not None and abs(
+                                        float(current_yongjin) - new_yongjin) > 0.001):
+                                leixing_obj.yongjin = new_yongjin
+                                has_changed = True
+                                # print(f"佣金变更: {current_yongjin} -> {new_yongjin}")
+
+                        except ValueError:
+                            return Response({'code': 400, 'message': '佣金金额格式错误', 'data': None},
+                                            status=status.HTTP_400_BAD_REQUEST)
+
+            # ===== 添加结束 =====
+
+            # 6. 处理图片上传（如果有新图片）
+            tupian_file = request.FILES.get('file')
+            if tupian_file:
+                # 验证图片
+                is_valid, error_msg = validate_image(tupian_file)
+                if not is_valid:
+                    return Response({'code': 400, 'message': f'图片验证失败: {error_msg}', 'data': None},
+                                    status=status.HTTP_400_BAD_REQUEST)
+
+                # 删除旧图片（如果存在）
+                if leixing_obj.tupian_url:
+                    delete_from_oss(leixing_obj.tupian_url)
+
+                # 生成文件名和路径
+                file_extension = os.path.splitext(tupian_file.name)[1].lower() or '.jpg'
+                oss_folder = 'a_long'
+                leixing_folder = 'leixing'
+
+                # 使用原文件名或生成新文件名
+                if leixing_obj.tupian_url:
+                    original_filename = leixing_obj.tupian_url.split('/')[-1]
+                else:
+                    original_filename = f"{leixing_id}_{uuid.uuid4().hex}{file_extension}"
+
+                oss_file_path = f"{oss_folder}/{leixing_folder}/{leixing_id}/{original_filename}"
+
+                # 上传到OSS
+                new_tupian_url = upload_to_oss(tupian_file, oss_file_path)
+                if not new_tupian_url:
+                    return Response({'code': 500, 'message': '图片上传失败', 'data': None},
+                                    status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+                leixing_obj.tupian_url = oss_file_path  # 存相对路径
+                has_changed = True
+            elif tupian_url and tupian_url != leixing_obj.tupian_url:
+                # 前端传了新URL（可能是从其他地方选择的）
+                leixing_obj.tupian_url = tupian_url
+                has_changed = True
+
+            # 7. 验证是否至少有变更
+            if not has_changed:
+                return Response({
+                    'code': 400,
+                    'message': '没有检测到任何更改',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 8. 保存并返回
+            leixing_obj.save()
+            # 8. 保存商品类型
+            leixing_obj.save()
+
+            # 🔴 ===========【新增：同步更新关联商品】===========
+            try:
+                from django.db.models import Q
+
+                # 1. 准备商品更新字典
+                shangpin_update_fields = {}
+
+                # 始终同步抢单要求类型
+                shangpin_update_fields['yaoqiuleixing'] = leixing_obj.yaoqiuleixing
+
+                # 根据抢单类型，同步对应字段并清空另一个
+                if leixing_obj.yaoqiuleixing == 1:  # 会员抢单
+                    if leixing_obj.huiyuan_id:  # 仅当会员ID非空时更新
+                        shangpin_update_fields['huiyuan_id'] = leixing_obj.huiyuan_id
+                    # 清空佣金字段
+                    shangpin_update_fields['yongjin'] = None
+                elif leixing_obj.yaoqiuleixing == 2:  # 佣金抢单
+                    if leixing_obj.yongjin:  # 仅当佣金非空时更新
+                        shangpin_update_fields['yongjin'] = leixing_obj.yongjin
+                    # 清空会员字段
+                    shangpin_update_fields['huiyuan_id'] = None
+
+                # 2. 执行批量更新（确保只有实际有变化的字段才会执行）
+                if shangpin_update_fields:
+                    # 查询所有属于该类型的商品（使用filter而非all以提高效率）
+                    affected_count = Shangpin.objects.filter(
+                        leixing_id=leixing_obj.id
+                    ).update(**shangpin_update_fields)
+
+                    # 可选：记录日志以便追踪
+                    # logger.info(f"商品类型{leixing_obj.id}修改成功，已同步更新{affected_count}个关联商品")
+
+            except Exception as sync_error:
+                # 商品同步失败不影响商品类型本身的修改，但记录错误
+                # 可根据需求决定是否抛出异常回滚整个事务
+                # 当前设计：记录错误但允许商品类型修改成功
+                logger.error(f"修改十五")
+
+                # 可在此添加更详细的错误日志记录
+            # 🔴 ===========【新增结束】===========
+
+
+
+
+
+
+
+            response_data = {
+                'id': leixing_obj.id,
+                'jieshao': leixing_obj.jieshao,
+                'tupian_url': leixing_obj.tupian_url,
+                'yaoqiuleixing': leixing_obj.yaoqiuleixing,
+                'huiyuan_id': leixing_obj.huiyuan_id,
+                'yongjin': str(leixing_obj.yongjin) if leixing_obj.yongjin else None
+            }
+
+            return Response({
+                'code': 0,
+                'message': '商品类型修改成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            print(f"编辑商品类型异常: {e}")
+            return Response({'code': 500, 'message': '服务器内部错误', 'data': None},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+
+
+
+
+'''class AdLeixingXiuGai(APIView):
+    """
+    后台编辑商品类型接口
+    路径: /shangpin/adleixingxg/
+    方法: POST
+    权限: JWT认证 + 管理员权限
+    功能: 修改商品类型信息
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = (MultiPartParser, FormParser)
+
+    def post(self, request):
+        try:
+            # 1. 权限验证
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            if not qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            dangqianyonghu = request.user
+
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败'},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 2. 获取商品类型ID
+            leixing_id = request.data.get('leixing_id')
+            if not leixing_id:
+                return Response(
+                    {'code': 400, 'message': '商品类型ID不能为空', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 3. 查询商品类型
+            try:
+                leixing_obj = ShangpinLeixing.objects.get(id=leixing_id)
+            except ShangpinLeixing.DoesNotExist:
+                return Response(
+                    {'code': 400, 'message': '商品类型不存在', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 4. 获取其他字段
+            jieshao = request.data.get('jieshao', '').strip()
+            yaoqiuleixing = request.data.get('yaoqiuleixing')
+            huiyuan_id = request.data.get('huiyuan_id', '').strip()
+            yongjin = request.data.get('yongjin', '').strip()
+
+            # 5. 验证必填字段
+            if not jieshao:
+                return Response(
+                    {'code': 400, 'message': '类型名称不能为空', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            if yaoqiuleixing not in ['1', '2']:
+                return Response(
+                    {'code': 400, 'message': '抢单要求类型无效', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            yaoqiuleixing_int = int(yaoqiuleixing)
+
+            # 6. 根据抢单要求类型验证对应字段
+            if yaoqiuleixing_int == 1:  # 会员抢单
+                if not huiyuan_id:
+                    return Response(
+                        {'code': 400, 'message': '会员抢单必须选择会员', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                # 验证会员ID是否存在
+                try:
+                    huiyuan_obj = Huiyuan.objects.get(huiyuan_id=huiyuan_id)
+                except Huiyuan.DoesNotExist:
+                    return Response(
+                        {'code': 400, 'msg': '会员ID不存在', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                # 会员ID为字符串，佣金为空
+                yongjin_value = None
+                huiyuan_id_value = huiyuan_id
+            else:  # yaoqiuleixing_int == 2 佣金抢单
+                if not yongjin:
+                    return Response(
+                        {'code': 400, 'message': '佣金抢单必须填写佣金金额', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                try:
+                    # 验证佣金为有效数字
+                    yongjin_value = float(yongjin)
+                    if yongjin_value <= 0:
+                        return Response(
+                            {'code': 400, 'message': '佣金金额必须大于0', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+                except ValueError:
+                    return Response(
+                        {'code': 400, 'message': '佣金金额格式错误', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                huiyuan_id_value = None
+
+            # 7. 处理图片上传（如果有新图片）
+            tupian_file = request.FILES.get('file')
+            tupian_url = None
+
+            if tupian_file:
+                # 验证图片
+                is_valid, error_msg = validate_image(tupian_file)
+                if not is_valid:
+                    return Response(
+                        {'code': 400, 'message': f'图片验证失败: {error_msg}', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 如果有原图片，先删除
+                if leixing_obj.tupian_url:
+                    delete_from_oss(leixing_obj.tupian_url)
+
+                # 生成文件名（使用原文件名，保持路径不变）
+                file_extension = os.path.splitext(tupian_file.name)[1].lower()
+                if not file_extension:
+                    file_extension = '.jpg'
+
+                # 构建OSS文件路径：使用原来的路径结构
+                oss_folder = 'a_long'
+                leixing_folder = 'leixing'
+
+                # 提取原文件名
+                if leixing_obj.tupian_url:
+                    # 如果原路径存在，使用原文件名
+                    original_filename = leixing_obj.tupian_url.split('/')[-1]
+                else:
+                    # 否则生成新的文件名
+                    original_filename = f"{leixing_id}_{uuid.uuid4().hex}{file_extension}"
+
+                oss_file_path = f"{oss_folder}/{leixing_folder}/{leixing_id}/{original_filename}"
+
+                # 上传到OSS
+                tupian_url = upload_to_oss(tupian_file, oss_file_path)
+
+                if not tupian_url:
+                    return Response(
+                        {'code': 500, 'message': '图片上传失败', 'data': None},
+                        status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                    )
+
+            # 8. 更新商品类型记录
+            leixing_obj.jieshao = jieshao
+            leixing_obj.yaoqiuleixing = yaoqiuleixing_int
+            leixing_obj.huiyuan_id = huiyuan_id_value
+            leixing_obj.yongjin = yongjin_value
+
+            if tupian_url:
+                leixing_obj.tupian_url = oss_file_path  # 存相对路径
+
+            leixing_obj.save()
+
+            # 9. 返回成功响应
+            response_data = {
+                'id': leixing_obj.id,
+                'jieshao': leixing_obj.jieshao,
+                'tupian_url': leixing_obj.tupian_url,
+                'yaoqiuleixing': leixing_obj.yaoqiuleixing,
+                'huiyuan_id': leixing_obj.huiyuan_id,
+                'yongjin': str(leixing_obj.yongjin) if leixing_obj.yongjin else None
+            }
+
+            return Response({
+                'code': 0,
+                'message': '商品类型修改成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            print(f"编辑商品类型异常: {e}")
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )'''
+
+
+
+
+logger = logging.getLogger(__name__)
+
+
+class AdShangpinNeiRongHuoQu(APIView):
+    """
+    后台获取商品详情接口
+    路径: /shangpin/adspnrhq/
+    方法: POST
+    权限: JWT认证 + 管理员权限
+    功能: 获取指定商品的详细信息
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        try:
+            # 1. 获取前端数据
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            shangpin_id = request.data.get('shangpin_id')
+
+            if not qianzhanghao or not shangpin_id:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2. 权限验证
+            dangqianyonghu = request.user
+
+            # 验证phone字段匹配
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                logger.warning(
+                    f"账号不匹配: 当前用户phone={getattr(dangqianyonghu, 'phone', '无')}, 前端账号={qianzhanghao}")
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 验证用户类型
+            if dangqianyonghu.user_type != 'admin':
+                logger.warning(f"非管理员访问: user_type={dangqianyonghu.user_type}")
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 3. 验证管理员扩展表
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AdminProfile.DoesNotExist:
+                logger.warning(f"管理员扩展表不存在: user_id={dangqianyonghu.id}")
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 4. 查询商品数据
+            try:
+                shangpin_obj = Shangpin.objects.get(id=shangpin_id)
+            except Shangpin.DoesNotExist:
+                return Response(
+                    {'code': 404, 'message': '商品不存在', 'data': None},
+                    status=status.HTTP_404_NOT_FOUND
+                )
+
+            # 5. 构建返回数据（与前端字段对应）
+            response_data = {
+                'tupian_url': shangpin_obj.tupian_url or '',  # 商品图片相对URL
+                'biaoti': shangpin_obj.biaoqian or '',  # 商品标题（前端用biaoti，对应biaoqian）
+                'jieshao': shangpin_obj.jieshao or '',  # 商品介绍
+                'jiage': str(shangpin_obj.jiage) if shangpin_obj.jiage else '0.00',  # 商品价格
+                'kucun': shangpin_obj.kucun,  # 商品库存
+                'zhenshixiaoliang': shangpin_obj.zhenshi_xiaoliang,  # 商品真实销量
+                'duiwaixiaoliang': shangpin_obj.duiwai_xiaoliang,  # 商品对外销量
+                'xiadanxuzhi': shangpin_obj.xiadan_xuzhi or '',  # 下单须知
+                'guizetupian_url': shangpin_obj.guize_tupian or '',  # 规则图片相对URL
+                #'yajin': str(shangpin_obj.yajin) if hasattr(shangpin_obj, 'yajin') and shangpin_obj.yajin else None,
+                # 押金（可能不存在）
+                'chuangjianshijian': shangpin_obj.create_time.strftime(
+                    '%Y-%m-%d %H:%M:%S') if shangpin_obj.create_time else '',
+                'genggaishijian': shangpin_obj.update_time.strftime(
+                    '%Y-%m-%d %H:%M:%S') if shangpin_obj.update_time else '',
+                # 额外字段，前端可能不需要但可以保留
+                'leixing_id': shangpin_obj.leixing_id,
+                'zhuanqu_id': shangpin_obj.zhuanqu_id,
+                'yaoqiuleixing': shangpin_obj.yaoqiuleixing,
+                'huiyuan_id': shangpin_obj.huiyuan_id,
+                'yongjin': str(shangpin_obj.yongjin) if shangpin_obj.yongjin else None,
+
+
+
+                'kaioi_ewai_dashou_fencheng': shangpin_obj.kaioi_ewai_dashou_fencheng,
+                'ewai_dashou_fencheng': str(shangpin_obj.ewai_dashou_fencheng) if shangpin_obj.ewai_dashou_fencheng else None,
+            }
+
+            return Response({
+                'code': 0,
+                'message': '获取成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            logger.error(f"获取商品详情异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+
+from rest_framework.parsers import MultiPartParser, FormParser
+from django.db import transaction
+
+
+'''class AdShangpinXiuGai(APIView):
+    """
+    后台更改商品数据接口 - 修复版
+    修复：1. 图片替换逻辑 2. 对外销量字段处理
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = (MultiPartParser, FormParser, JSONParser)
+
+    def post(self, request):
+        try:
+            # 1. 权限验证
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            shangpin_id = request.data.get('shangpin_id')
+
+            if not qianzhanghao or not shangpin_id:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 验证身份
+            dangqianyonghu = request.user
+
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 2. 判断操作类型：删除还是修改
+            action = request.data.get('action', 'update').strip().lower()
+
+            if action == 'delete':
+                return self._delete_shangpin(shangpin_id)
+            else:
+                return self._update_shangpin(request, shangpin_id)
+
+        except Exception as e:
+            logger.error(f"更改商品数据异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+    def _delete_shangpin(self, shangpin_id):
+        """删除商品逻辑"""
+        try:
+            # 查询商品
+            try:
+                shangpin_obj = Shangpin.objects.get(id=shangpin_id)
+            except Shangpin.DoesNotExist:
+                return Response(
+                    {'code': 404, 'message': '商品不存在', 'data': None},
+                    status=status.HTTP_404_NOT_FOUND
+                )
+
+            # 获取图片URL（如果有）
+            tupian_url = shangpin_obj.tupian_url
+            guizetupian_url = shangpin_obj.guize_tupian
+
+            # 异步或同步删除OSS图片（互不影响）
+            if tupian_url:
+                try:
+                    delete_from_oss(tupian_url)
+                except Exception as e:
+                    logger.warning(f"删除商品图片失败: {tupian_url}, 错误: {e}")
+
+            if guizetupian_url:
+                try:
+                    delete_from_oss(guizetupian_url)
+                except Exception as e:
+                    logger.warning(f"删除规则图片失败: {guizetupian_url}, 错误: {e}")
+
+            # 删除数据库记录
+            shangpin_obj.delete()
+
+            return Response({
+                'code': 0,
+                'message': '删除成功',
+                'data': {
+                    'shangpin_id': shangpin_id,
+                    'deleted': True
+                }
+            })
+
+        except Exception as e:
+            logger.error(f"删除商品异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '删除失败', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+    def _update_shangpin(self, request, shangpin_id):
+        """修改商品逻辑 - 修复：确保图片正确替换"""
+        try:
+            # 查询商品
+            try:
+                shangpin_obj = Shangpin.objects.get(id=shangpin_id)
+            except Shangpin.DoesNotExist:
+                return Response(
+                    {'code': 404, 'message': '商品不存在', 'data': None},
+                    status=status.HTTP_404_NOT_FOUND
+                )
+
+            has_changes = False
+
+            # 3. 处理图片上传（如果有新商品图片）
+            tupian_file = request.FILES.get('tupian_file')
+            if tupian_file:
+                # 验证图片
+                is_valid, error_msg = validate_image(tupian_file)
+                if not is_valid:
+                    return Response(
+                        {'code': 400, 'message': f'图片验证失败: {error_msg}', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 获取原图片URL
+                old_tupian_url = shangpin_obj.tupian_url
+
+                # 确定OSS路径
+                if old_tupian_url:
+                    # 有原图：使用原路径替换
+                    oss_file_path = old_tupian_url
+
+                    # 删除原图片
+                    try:
+                        delete_from_oss(old_tupian_url)
+                    except Exception as e:
+                        logger.warning(f"删除原商品图片失败: {old_tupian_url}, 错误: {e}")
+                        # 继续上传新图片
+                else:
+                    # 没有原图：创建新路径
+                    oss_folder = 'a_long'
+                    shangpin_folder = 'shangpin'
+                    file_extension = os.path.splitext(tupian_file.name)[1].lower() or '.jpg'
+                    filename = f"{shangpin_id}{file_extension}"
+                    oss_file_path = f"{oss_folder}/{shangpin_folder}/{filename}"
+
+                # 上传到OSS
+                new_tupian_url = upload_to_oss(tupian_file, oss_file_path)
+
+                if not new_tupian_url:
+                    return Response(
+                        {'code': 500, 'message': '图片上传失败', 'data': None},
+                        status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                    )
+
+                # 更新数据库中的图片URL
+                shangpin_obj.tupian_url = oss_file_path  # 存相对路径
+                has_changes = True
+
+            # 4. 处理其他字段（只更新有变化的字段）
+            field_mapping = {
+                'biaoti': 'biaoqian',
+                'jieshao': 'jieshao',
+                'jiage': 'jiage',
+                'kucun': 'kucun',
+                'duiwaixiaoliang': 'duiwai_xiaoliang',  # 关键：对外销量字段
+                'xiadanxuzhi': 'xiadan_xuzhi',
+                'yajin': 'yajin',
+            }
+
+            for front_field, db_field in field_mapping.items():
+                if front_field in request.data:
+                    new_value = request.data.get(front_field)
+
+                    # 空字符串处理
+                    if new_value == '':
+                        new_value = None
+
+                    if new_value is not None:
+                        # 获取当前值
+                        current_value = getattr(shangpin_obj, db_field)
+
+                        # 类型转换
+                        try:
+                            if db_field in ['jiage', 'yajin']:
+                                # 价格和押金
+                                if new_value:
+                                    new_value = Decimal(str(new_value))
+                                else:
+                                    new_value = None
+                            elif db_field in ['kucun', 'duiwai_xiaoliang']:
+                                # 库存和对外销量
+                                if new_value:
+                                    new_value = int(float(new_value))
+                                else:
+                                    new_value = 0
+                        except (ValueError, TypeError, InvalidOperation) as e:
+                            logger.warning(f"字段{front_field}转换失败: {new_value}, 错误: {e}")
+                            continue
+
+                        # 检查是否有变化（处理None值）
+                        if current_value != new_value:
+                            setattr(shangpin_obj, db_field, new_value)
+                            has_changes = True
+
+            # 5. 如果没有检测到任何更改
+            if not has_changes:
+                return Response({
+                    'code': 400,
+                    'message': '没有检测到任何更改',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 6. 保存更改
+            shangpin_obj.save()
+
+            # 7. 返回更新后的数据
+            response_data = {
+                'tupian_url': shangpin_obj.tupian_url or '',
+                'biaoti': shangpin_obj.biaoqian or '',
+                'jieshao': shangpin_obj.jieshao or '',
+                'jiage': str(shangpin_obj.jiage) if shangpin_obj.jiage else '0.00',
+                'kucun': shangpin_obj.kucun,
+                'duiwaixiaoliang': shangpin_obj.duiwai_xiaoliang,  # 返回对外销量
+                'xiadanxuzhi': shangpin_obj.xiadan_xuzhi or '',
+                'yajin': str(shangpin_obj.yongjin) if shangpin_obj.yongjin else None,
+                'genggaishijian': shangpin_obj.update_time.strftime(
+                    '%Y-%m-%d %H:%M:%S') if shangpin_obj.update_time else '',
+            }
+
+            return Response({
+                'code': 0,
+                'message': '更新成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            logger.error(f"更新商品异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '更新失败', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+
+import os
+from decimal import Decimal, InvalidOperation
+
+
+class AdShangpinGuizeXiuGai(APIView):
+    """
+    后台规则图片更换接口 - 修复版
+    修复：确保替换时使用正确的路径
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = (MultiPartParser, FormParser, JSONParser)
+
+    def post(self, request):
+        try:
+            # 1. 权限验证
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            shangpin_id = request.data.get('shangpin_id')
+            action = request.data.get('action', 'update').strip().lower()
+
+            if not qianzhanghao or not shangpin_id:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 验证身份
+            dangqianyonghu = request.user
+
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 2. 查询商品
+            try:
+                shangpin_obj = Shangpin.objects.get(id=shangpin_id)
+            except Shangpin.DoesNotExist:
+                return Response(
+                    {'code': 404, 'message': '商品不存在', 'data': None},
+                    status=status.HTTP_404_NOT_FOUND
+                )
+
+            # 3. 处理不同操作
+            if action == 'delete':
+                return self._delete_guize_image(shangpin_obj)
+            elif action == 'update':
+                return self._update_guize_image(request, shangpin_obj)
+            else:
+                return Response(
+                    {'code': 400, 'message': '操作类型无效', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+        except Exception as e:
+            logger.error(f"规则图片操作异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+    def _delete_guize_image(self, shangpin_obj):
+        """删除规则图片"""
+        guizetupian_url = shangpin_obj.guize_tupian
+
+        if guizetupian_url:
+            # 从OSS删除
+            try:
+                delete_success = delete_from_oss(guizetupian_url)
+                if not delete_success:
+                    logger.warning(f"OSS删除失败，但继续删除数据库记录: {guizetupian_url}")
+            except Exception as e:
+                logger.warning(f"删除规则图片异常: {e}")
+
+            # 清除数据库记录
+            shangpin_obj.guize_tupian = ''
+            shangpin_obj.save()
+
+        return Response({
+            'code': 0,
+            'message': '删除成功',
+            'data': {
+                'guizetupian_url': ''
+            }
+        })
+
+    def _update_guize_image(self, request, shangpin_obj):
+        """更新规则图片 - 修复：确保正确替换"""
+        guize_file = request.FILES.get('guize_file')
+
+        if not guize_file:
+            return Response(
+                {'code': 400, 'message': '请上传规则图片', 'data': None},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # 验证图片
+        is_valid, error_msg = validate_image(guize_file)
+        if not is_valid:
+            return Response(
+                {'code': 400, 'message': f'图片验证失败: {error_msg}', 'data': None},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # 处理路径
+        oss_folder = 'a_long'
+        spgz_folder = 'Spgz'
+        file_extension = os.path.splitext(guize_file.name)[1].lower() or '.jpg'
+
+        # 获取原规则图片URL
+        old_guizetupian_url = shangpin_obj.guize_tupian
+
+        if old_guizetupian_url:
+            # 有原图：使用原路径替换
+            oss_file_path = old_guizetupian_url
+
+            # 删除原图片
+            try:
+                delete_from_oss(old_guizetupian_url)
+            except Exception as e:
+                logger.warning(f"删除原规则图片失败: {old_guizetupian_url}, 错误: {e}")
+                # 继续上传新图片
+        else:
+            # 没有原图：创建新路径
+            filename = f"{shangpin_obj.id}{file_extension}"
+            oss_file_path = f"{oss_folder}/{spgz_folder}/{filename}"
+
+        # 上传到OSS（替换或新建）
+        new_guizetupian_url = upload_to_oss(guize_file, oss_file_path)
+
+        if not new_guizetupian_url:
+            return Response(
+                {'code': 500, 'message': '图片上传失败', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+        # 更新数据库（存相对路径）
+        shangpin_obj.guize_tupian = oss_file_path  # 存相对路径，如 "a_long/Spgz/123.jpg"
+        shangpin_obj.save()
+
+        return Response({
+            'code': 0,
+            'message': '规则图片更新成功',
+            'data': {
+                'guizetupian_url': oss_file_path  # 返回相对路径
+            }
+        })'''
+
+import os
+import time
+import random
+from decimal import Decimal, InvalidOperation
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.parsers import MultiPartParser, FormParser, JSONParser
+from rest_framework.permissions import IsAuthenticated
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+'''class AdShangpinXiuGai(APIView):
+    """
+    后台更改商品数据接口 - 修复版
+    修复：1. 每次上传生成新文件名 2. 解决浏览器缓存问题
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = (MultiPartParser, FormParser, JSONParser)
+
+    def post(self, request):
+        try:
+            # 1. 权限验证
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            shangpin_id = request.data.get('shangpin_id')
+
+            if not qianzhanghao or not shangpin_id:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 验证身份
+            dangqianyonghu = request.user
+
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 2. 判断操作类型：删除还是修改
+            action = request.data.get('action', 'update').strip().lower()
+
+            if action == 'delete':
+                return self._delete_shangpin(shangpin_id)
+            else:
+                return self._update_shangpin(request, shangpin_id)
+
+        except Exception as e:
+            logger.error(f"更改商品数据异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+    def _delete_shangpin(self, shangpin_id):
+        """删除商品逻辑"""
+        try:
+            # 查询商品
+            try:
+                shangpin_obj = Shangpin.objects.get(id=shangpin_id)
+            except Shangpin.DoesNotExist:
+                return Response(
+                    {'code': 404, 'message': '商品不存在', 'data': None},
+                    status=status.HTTP_404_NOT_FOUND
+                )
+
+            # 获取图片URL（如果有）
+            tupian_url = shangpin_obj.tupian_url
+            guizetupian_url = shangpin_obj.guize_tupian
+
+            # 异步或同步删除OSS图片
+            if tupian_url:
+                try:
+                    delete_from_oss(tupian_url)
+                except Exception as e:
+                    logger.warning(f"删除商品图片失败: {tupian_url}, 错误: {e}")
+
+            if guizetupian_url:
+                try:
+                    delete_from_oss(guizetupian_url)
+                except Exception as e:
+                    logger.warning(f"删除规则图片失败: {guizetupian_url}, 错误: {e}")
+
+            # 删除数据库记录
+            shangpin_obj.delete()
+
+            return Response({
+                'code': 0,
+                'message': '删除成功',
+                'data': {
+                    'shangpin_id': shangpin_id,
+                    'deleted': True
+                }
+            })
+
+        except Exception as e:
+            logger.error(f"删除商品异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '删除失败', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+    def _update_shangpin(self, request, shangpin_id):
+        """修改商品逻辑 - 修复：每次上传生成新文件名"""
+        try:
+            # 查询商品
+            try:
+                shangpin_obj = Shangpin.objects.get(id=shangpin_id)
+            except Shangpin.DoesNotExist:
+                return Response(
+                    {'code': 404, 'message': '商品不存在', 'data': None},
+                    status=status.HTTP_404_NOT_FOUND
+                )
+
+            has_changes = False
+
+            # 获取原图片URL（如果有）
+            old_tupian_url = shangpin_obj.tupian_url
+
+            # 3. 处理商品图片上传（如果有新商品图片）
+            tupian_file = request.FILES.get('tupian_file')
+            new_tupian_url = None
+
+            if tupian_file:
+                # 验证图片
+                is_valid, error_msg = validate_image(tupian_file)
+                if not is_valid:
+                    return Response(
+                        {'code': 400, 'message': f'图片验证失败: {error_msg}', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 生成新文件名：时间戳 + 随机数 + 原扩展名
+                timestamp = int(time.time() * 1000) % 100000000  # 8位时间戳
+                random_num = random.randint(1000, 9999)
+                file_extension = os.path.splitext(tupian_file.name)[1].lower() or '.jpg'
+                new_filename = f"sp_{timestamp}_{random_num}{file_extension}"
+
+                # 确定OSS路径
+                oss_folder = 'a_long'
+                shangpin_folder = 'shangpin'
+                oss_file_path = f"{oss_folder}/{shangpin_folder}/{new_filename}"
+
+                # 删除旧图片（如果存在）
+                if old_tupian_url:
+                    try:
+                        delete_from_oss(old_tupian_url)
+                        logger.info(f"已删除旧商品图片: {old_tupian_url}")
+                    except Exception as e:
+                        logger.warning(f"删除旧商品图片失败: {old_tupian_url}, 错误: {e}")
+                        # 继续上传新图片，不中断流程
+
+                # 上传到OSS
+                new_tupian_url = upload_to_oss(tupian_file, oss_file_path)
+
+                if not new_tupian_url:
+                    return Response(
+                        {'code': 500, 'message': '商品图片上传失败', 'data': None},
+                        status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                    )
+
+                # 更新数据库中的图片URL
+                shangpin_obj.tupian_url = oss_file_path  # 存相对路径
+                has_changes = True
+                logger.info(f"商品图片更新成功: {oss_file_path}")
+
+            # 4. 处理其他字段（只更新有变化的字段）
+            # 注意：这里同时处理 request.data（文本字段）和可能有文件的情况
+            field_mapping = {
+                'biaoti': 'biaoqian',
+                'jieshao': 'jieshao',
+                'jiage': 'jiage',
+                'kucun': 'kucun',
+                'duiwaixiaoliang': 'duiwai_xiaoliang',
+                'xiadanxuzhi': 'xiadan_xuzhi',
+                'yajin': 'yajin',
+            }
+
+            for front_field, db_field in field_mapping.items():
+                # 注意：request.data 可能包含文件和其他字段，但DRF会处理好
+                if front_field in request.data:
+                    new_value = request.data.get(front_field)
+
+                    # 空字符串处理
+                    if new_value == '':
+                        new_value = None
+
+                    if new_value is not None:
+                        # 获取当前值
+                        current_value = getattr(shangpin_obj, db_field)
+
+                        # 类型转换
+                        try:
+                            if db_field in ['jiage', 'yajin']:
+                                # 价格和押金
+                                if new_value:
+                                    new_value = Decimal(str(new_value))
+                                else:
+                                    new_value = None
+                            elif db_field in ['kucun', 'duiwai_xiaoliang']:
+                                # 库存和对外销量
+                                if new_value:
+                                    new_value = int(float(new_value))
+                                else:
+                                    new_value = 0
+                        except (ValueError, TypeError, InvalidOperation) as e:
+                            logger.warning(f"字段{front_field}转换失败: {new_value}, 错误: {e}")
+                            continue
+
+                        # 检查是否有变化（处理None值）
+                        if current_value != new_value:
+                            setattr(shangpin_obj, db_field, new_value)
+                            has_changes = True
+
+            # 5. 如果没有检测到任何更改
+            if not has_changes:
+                return Response({
+                    'code': 400,
+                    'message': '没有检测到任何更改',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 6. 保存更改
+            shangpin_obj.save()
+
+            # 7. 返回更新后的数据
+            response_data = {
+                'tupian_url': shangpin_obj.tupian_url or '',
+                'biaoti': shangpin_obj.biaoqian or '',
+                'jieshao': shangpin_obj.jieshao or '',
+                'jiage': str(shangpin_obj.jiage) if shangpin_obj.jiage else '0.00',
+                'kucun': shangpin_obj.kucun,
+                'duiwaixiaoliang': shangpin_obj.duiwai_xiaoliang,
+                'xiadanxuzhi': shangpin_obj.xiadan_xuzhi or '',
+                'yajin': str(shangpin_obj.yongjin) if shangpin_obj.yongjin else None,
+                'genggaishijian': shangpin_obj.update_time.strftime(
+                    '%Y-%m-%d %H:%M:%S') if shangpin_obj.update_time else '',
+            }
+
+            return Response({
+                'code': 0,
+                'message': '更新成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            logger.error(f"更新商品异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '更新失败', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )'''
+
+
+
+
+
+
+
+class AdShangpinXiuGai(APIView):
+    """
+    后台更改商品数据接口 - 修复版
+    修复：1. 每次上传生成新文件名 2. 解决浏览器缓存问题
+    新增：支持佣金、抢单要求类型、打手分红配置字段的修改
+    """
+
+    permission_classes = [permissions.IsAuthenticated]
+    parser_classes = (MultiPartParser, FormParser, JSONParser)
+
+    def post(self, request):
+        try:
+            # 1. 权限验证
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            shangpin_id = request.data.get('shangpin_id')
+
+            if not qianzhanghao or not shangpin_id:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 验证身份
+            dangqianyonghu = request.user
+
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 2. 判断操作类型：删除还是修改
+            action = request.data.get('action', 'update').strip().lower()
+
+            if action == 'delete':
+                return self._delete_shangpin(shangpin_id)
+            else:
+                return self._update_shangpin(request, shangpin_id)
+
+        except Exception as e:
+            logger.error(f"更改商品数据异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+    def _delete_shangpin(self, shangpin_id):
+        """删除商品逻辑（保持不变）"""
+        try:
+            try:
+                shangpin_obj = Shangpin.objects.get(id=shangpin_id)
+            except Shangpin.DoesNotExist:
+                return Response(
+                    {'code': 404, 'message': '商品不存在', 'data': None},
+                    status=status.HTTP_404_NOT_FOUND
+                )
+
+            tupian_url = shangpin_obj.tupian_url
+            guizetupian_url = shangpin_obj.guize_tupian
+
+            if tupian_url:
+                try:
+                    delete_from_oss(tupian_url)
+                except Exception as e:
+                    logger.warning(f"删除商品图片失败: {tupian_url}, 错误: {e}")
+
+            if guizetupian_url:
+                try:
+                    delete_from_oss(guizetupian_url)
+                except Exception as e:
+                    logger.warning(f"删除规则图片失败: {guizetupian_url}, 错误: {e}")
+
+            shangpin_obj.delete()
+
+            return Response({
+                'code': 0,
+                'message': '删除成功',
+                'data': {
+                    'shangpin_id': shangpin_id,
+                    'deleted': True
+                }
+            })
+
+        except Exception as e:
+            logger.error(f"删除商品异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '删除失败', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+    def _update_shangpin(self, request, shangpin_id):
+        """修改商品逻辑 - 增加对新字段的支持"""
+        try:
+            # 查询商品
+            try:
+                shangpin_obj = Shangpin.objects.get(id=shangpin_id)
+            except Shangpin.DoesNotExist:
+                return Response(
+                    {'code': 404, 'message': '商品不存在', 'data': None},
+                    status=status.HTTP_404_NOT_FOUND
+                )
+
+            has_changes = False
+
+            # 获取原图片URL
+            old_tupian_url = shangpin_obj.tupian_url
+
+            # 3. 处理商品图片上传
+            tupian_file = request.FILES.get('tupian_file')
+            new_tupian_url = None
+
+            if tupian_file:
+                is_valid, error_msg = validate_image(tupian_file)
+                if not is_valid:
+                    return Response(
+                        {'code': 400, 'message': f'图片验证失败: {error_msg}', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                timestamp = int(time.time() * 1000) % 100000000
+                random_num = random.randint(1000, 9999)
+                file_extension = os.path.splitext(tupian_file.name)[1].lower() or '.jpg'
+                new_filename = f"sp_{timestamp}_{random_num}{file_extension}"
+
+                oss_folder = 'a_long'
+                shangpin_folder = 'shangpin'
+                oss_file_path = f"{oss_folder}/{shangpin_folder}/{new_filename}"
+
+                if old_tupian_url:
+                    try:
+                        delete_from_oss(old_tupian_url)
+                        logger.info(f"已删除旧商品图片: {old_tupian_url}")
+                    except Exception as e:
+                        logger.warning(f"删除旧商品图片失败: {old_tupian_url}, 错误: {e}")
+
+                new_tupian_url = upload_to_oss(tupian_file, oss_file_path)
+
+                if not new_tupian_url:
+                    return Response(
+                        {'code': 500, 'message': '商品图片上传失败', 'data': None},
+                        status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                    )
+
+                shangpin_obj.tupian_url = oss_file_path
+                has_changes = True
+                logger.info(f"商品图片更新成功: {oss_file_path}")
+
+            # 4. 处理其他字段
+            field_mapping = {
+                'biaoti': 'biaoqian',
+                'jieshao': 'jieshao',
+                'jiage': 'jiage',
+                'kucun': 'kucun',
+                'duiwaixiaoliang': 'duiwai_xiaoliang',
+                'xiadanxuzhi': 'xiadan_xuzhi',
+                #'yajin': 'yajin',
+                # 🔥 新增字段映射
+                'yongjin': 'yongjin',
+                'yaoqiuleixing': 'yaoqiuleixing',
+                'kaioi_ewai_dashou_fencheng': 'kaioi_ewai_dashou_fencheng',
+                'ewai_dashou_fencheng': 'ewai_dashou_fencheng',
+            }
+
+            # 用于存储临时校验数据
+            new_yaoqiuleixing = None
+            new_yongjin = None
+            new_kaioi_ewai = None
+            new_ewai_fencheng = None
+
+            for front_field, db_field in field_mapping.items():
+                if front_field in request.data:
+                    new_value = request.data.get(front_field)
+
+                    # 空字符串处理
+                    if new_value == '':
+                        new_value = None
+
+                    # 🔥 对特殊字段进行提前捕获，以便后续业务校验
+                    if front_field == 'yaoqiuleixing':
+                        if new_value is not None:
+                            try:
+                                new_yaoqiuleixing = int(new_value)
+                            except (ValueError, TypeError):
+                                return Response(
+                                    {'code': 400, 'message': '抢单要求类型必须是数字', 'data': None},
+                                    status=status.HTTP_400_BAD_REQUEST
+                                )
+                            if new_yaoqiuleixing not in [1, 2]:
+                                return Response(
+                                    {'code': 400, 'message': '抢单要求类型只能为1(会员抢单)或2(佣金抢单)', 'data': None},
+                                    status=status.HTTP_400_BAD_REQUEST
+                                )
+                        continue  # 稍后统一处理
+
+                    if front_field == 'yongjin':
+                        if new_value is not None:
+                            try:
+                                new_yongjin = Decimal(str(new_value))
+                                if new_yongjin < 0:
+                                    raise ValueError
+                            except (ValueError, InvalidOperation):
+                                return Response(
+                                    {'code': 400, 'message': '佣金金额必须为正数', 'data': None},
+                                    status=status.HTTP_400_BAD_REQUEST
+                                )
+                        continue
+
+                    if front_field == 'kaioi_ewai_dashou_fencheng':
+                        if new_value is not None:
+                            # 可能传过来的是字符串 'true'/'false' 或布尔值
+                            if isinstance(new_value, str):
+                                new_kaioi_ewai = new_value.lower() in ['true', '1', 'on']
+                            else:
+                                new_kaioi_ewai = bool(new_value)
+                        continue
+
+                    if front_field == 'ewai_dashou_fencheng':
+                        if new_value is not None:
+                            try:
+                                new_ewai_fencheng = Decimal(str(new_value))
+                                if new_ewai_fencheng <= 0:
+                                    raise ValueError
+                            except (ValueError, InvalidOperation):
+                                return Response(
+                                    {'code': 400, 'message': '自定义分红金额必须为正数', 'data': None},
+                                    status=status.HTTP_400_BAD_REQUEST
+                                )
+                        continue
+
+                    # 原有字段处理
+                    if new_value is not None:
+                        current_value = getattr(shangpin_obj, db_field)
+                        try:
+                            if db_field in ['jiage']:
+                                if new_value:
+                                    new_value = Decimal(str(new_value))
+                                else:
+                                    new_value = None
+                            elif db_field in ['kucun', 'duiwai_xiaoliang']:
+                                if new_value:
+                                    new_value = int(float(new_value))
+                                else:
+                                    new_value = 0
+                        except (ValueError, TypeError, InvalidOperation) as e:
+                            logger.warning(f"字段{front_field}转换失败: {new_value}, 错误: {e}")
+                            continue
+
+                        if current_value != new_value:
+                            setattr(shangpin_obj, db_field, new_value)
+                            has_changes = True
+
+            # 🔥 处理抢单要求类型和佣金的关联校验
+            if new_yaoqiuleixing is not None:
+                # 先更新抢单类型
+                if shangpin_obj.yaoqiuleixing != new_yaoqiuleixing:
+                    if new_yaoqiuleixing == 1:
+
+                       pass
+                    else:
+                        shangpin_obj.yaoqiuleixing = new_yaoqiuleixing
+                    has_changes = True
+
+                # 如果设置为佣金抢单（2），则必须提供佣金金额
+                if new_yaoqiuleixing == 2:
+                    if new_yongjin is None:
+                        return Response(
+                            {'code': 400, 'message': '佣金抢单必须设置佣金金额', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+                    # 更新佣金
+                    if shangpin_obj.yongjin != new_yongjin:
+                        shangpin_obj.yongjin = new_yongjin
+                        has_changes = True
+                else:
+                    pass
+            else:
+                # 如果抢单类型未传，但佣金传了，需要根据现有类型决定是否允许修改
+                if new_yongjin is not None:
+                    if shangpin_obj.yaoqiuleixing == 2:
+                        # 当前是佣金抢单，允许修改佣金
+                        if shangpin_obj.yongjin != new_yongjin:
+                            shangpin_obj.yongjin = new_yongjin
+                            has_changes = True
+                    else:
+                        # 当前是会员抢单，不允许单独修改佣金（前端不应发生）
+                        return Response(
+                            {'code': 400, 'message': '当前为会员抢单，不能修改佣金金额', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+
+            # 🔥 处理打手分红配置
+            if new_kaioi_ewai is not None:
+                if new_kaioi_ewai:  # 开启自定义分红
+                    if new_ewai_fencheng is None:
+                        return Response(
+                            {'code': 400, 'message': '开启自定义分红必须提供分红金额', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+                    if new_ewai_fencheng <= 0:
+                        return Response(
+                            {'code': 400, 'message': '分红金额必须为正数', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+                    # 更新开关和金额
+                    if shangpin_obj.kaioi_ewai_dashou_fencheng != new_kaioi_ewai:
+                        shangpin_obj.kaioi_ewai_dashou_fencheng = new_kaioi_ewai
+                        has_changes = True
+                    if shangpin_obj.ewai_dashou_fencheng != new_ewai_fencheng:
+                        shangpin_obj.ewai_dashou_fencheng = new_ewai_fencheng
+                        has_changes = True
+                else:  # 关闭自定义分红
+                    if shangpin_obj.kaioi_ewai_dashou_fencheng != new_kaioi_ewai:
+                        shangpin_obj.kaioi_ewai_dashou_fencheng = new_kaioi_ewai
+                        has_changes = True
+                    # 关闭时清空金额（可选）
+                    if shangpin_obj.ewai_dashou_fencheng is not None:
+                        shangpin_obj.ewai_dashou_fencheng = None
+                        has_changes = True
+            else:
+                # 如果没有传递开关，但传递了分红金额，需要根据现有开关状态处理
+                if new_ewai_fencheng is not None:
+                    if shangpin_obj.kaioi_ewai_dashou_fencheng:
+                        # 开关已开启，允许修改金额
+                        if shangpin_obj.ewai_dashou_fencheng != new_ewai_fencheng:
+                            shangpin_obj.ewai_dashou_fencheng = new_ewai_fencheng
+                            has_changes = True
+                    else:
+                        # 开关未开启，不能单独修改金额
+                        return Response(
+                            {'code': 400, 'message': '未开启自定义分红，不能修改分红金额', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+
+            # 5. 如果没有检测到任何更改
+            if not has_changes:
+                return Response({
+                    'code': 400,
+                    'message': '没有检测到任何更改',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 6. 保存更改
+            shangpin_obj.save()
+
+            # 7. 返回更新后的数据（包含新字段）
+            response_data = {
+                'tupian_url': shangpin_obj.tupian_url or '',
+                'biaoti': shangpin_obj.biaoqian or '',
+                'jieshao': shangpin_obj.jieshao or '',
+                'jiage': str(shangpin_obj.jiage) if shangpin_obj.jiage else '0.00',
+                'kucun': shangpin_obj.kucun,
+                'duiwaixiaoliang': shangpin_obj.duiwai_xiaoliang,
+                'xiadanxuzhi': shangpin_obj.xiadan_xuzhi or '',
+                #'yajin': str(shangpin_obj.yajin) if shangpin_obj.yajin else None,
+                'genggaishijian': shangpin_obj.update_time.strftime(
+                    '%Y-%m-%d %H:%M:%S') if shangpin_obj.update_time else '',
+                # 🔥 新增返回字段
+                'yongjin': str(shangpin_obj.yongjin) if shangpin_obj.yongjin else None,
+                'yaoqiuleixing': shangpin_obj.yaoqiuleixing,
+                'kaioi_ewai_dashou_fencheng': shangpin_obj.kaioi_ewai_dashou_fencheng,
+                'ewai_dashou_fencheng': str(shangpin_obj.ewai_dashou_fencheng) if shangpin_obj.ewai_dashou_fencheng else None,
+            }
+
+            return Response({
+                'code': 0,
+                'message': '更新成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            logger.error(f"更新商品异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '更新失败', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+
+
+
+
+
+
+
+
+
+
+class AdShangpinGuizeXiuGai(APIView):
+    """
+    后台规则图片更换接口 - 修复版
+    修复：每次上传生成新文件名，避免浏览器缓存
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = (MultiPartParser, FormParser, JSONParser)
+
+    def post(self, request):
+        try:
+            # 1. 权限验证
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            shangpin_id = request.data.get('shangpin_id')
+            action = request.data.get('action', 'update').strip().lower()
+
+            if not qianzhanghao or not shangpin_id:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 验证身份
+            dangqianyonghu = request.user
+
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AdminProfile.DoesNotExist:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 2. 查询商品
+            try:
+                shangpin_obj = Shangpin.objects.get(id=shangpin_id)
+            except Shangpin.DoesNotExist:
+                return Response(
+                    {'code': 404, 'message': '商品不存在', 'data': None},
+                    status=status.HTTP_404_NOT_FOUND
+                )
+
+            # 3. 处理不同操作
+            if action == 'delete':
+                return self._delete_guize_image(shangpin_obj)
+            elif action == 'update':
+                return self._update_guize_image(request, shangpin_obj)
+            else:
+                return Response(
+                    {'code': 400, 'message': '操作类型无效', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+        except Exception as e:
+            logger.error(f"规则图片操作异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+    def _delete_guize_image(self, shangpin_obj):
+        """删除规则图片"""
+        guizetupian_url = shangpin_obj.guize_tupian
+
+        if guizetupian_url:
+            # 从OSS删除
+            try:
+                delete_success = delete_from_oss(guizetupian_url)
+                '''if delete_success:
+                    logger.info(f"已删除规则图片: {guizetupian_url}")
+                else:
+                    logger.warning(f"OSS删除失败，但继续删除数据库记录: {guizetupian_url}")'''
+            except Exception as e:
+                logger.warning(f"删除规则图片异常: {e}")
+
+            # 清除数据库记录
+            shangpin_obj.guize_tupian = ''
+            shangpin_obj.save()
+
+        return Response({
+            'code': 0,
+            'message': '删除成功',
+            'data': {
+                'guizetupian_url': ''
+            }
+        })
+
+    def _update_guize_image(self, request, shangpin_obj):
+        """更新规则图片 - 修复：每次上传生成新文件名"""
+        guize_file = request.FILES.get('guize_file')
+
+        if not guize_file:
+            return Response(
+                {'code': 400, 'message': '请上传规则图片', 'data': None},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # 验证图片
+        is_valid, error_msg = validate_image(guize_file)
+        if not is_valid:
+            return Response(
+                {'code': 400, 'message': f'图片验证失败: {error_msg}', 'data': None},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # 获取原规则图片URL
+        old_guizetupian_url = shangpin_obj.guize_tupian
+
+        # 生成新文件名：时间戳 + 随机数 + 原扩展名
+        timestamp = int(time.time() * 1000) % 100000000  # 8位时间戳
+        random_num = random.randint(1000, 9999)
+        file_extension = os.path.splitext(guize_file.name)[1].lower() or '.jpg'
+        new_filename = f"gz_{timestamp}_{random_num}{file_extension}"
+
+        # 确定OSS路径
+        oss_folder = 'a_long'
+        guize_folder = 'guize'  # 修改为你的要求：a_long/guize/
+        oss_file_path = f"{oss_folder}/{guize_folder}/{new_filename}"
+
+        # 删除旧图片（如果存在）
+        if old_guizetupian_url:
+            try:
+                delete_from_oss(old_guizetupian_url)
+                #logger.info(f"已删除旧规则图片: {old_guizetupian_url}")
+            except Exception as e:
+                logger.warning(f"删除旧规则图片失败: {old_guizetupian_url}, 错误: {e}")
+                # 继续上传新图片，不中断流程
+
+        # 上传到OSS
+        new_guizetupian_url = upload_to_oss(guize_file, oss_file_path)
+
+        if not new_guizetupian_url:
+            return Response(
+                {'code': 500, 'message': '规则图片上传失败', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+        # 更新数据库（存相对路径）
+        shangpin_obj.guize_tupian = oss_file_path
+        shangpin_obj.save()
+
+        #logger.info(f"规则图片更新成功: {oss_file_path}")
+
+        return Response({
+            'code': 0,
+            'message': '规则图片更新成功',
+            'data': {
+                'guizetupian_url': oss_file_path  # 返回相对路径
+            }
+        })
+
+
+
+
+
+# views.py
+from rest_framework.views import APIView
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework import status
+from django.utils import timezone
+from django.db.models import Q, Count, Subquery, OuterRef
+from django.db import connection
+from django.core.paginator import Paginator
+import json
+
+from .models import Huiyuan
+from yonghu.models import UserMain, AdminProfile
+
+
+class HuiyuanTypeListView(APIView):
+    """
+    获取会员类型列表接口
+    路径：/shangpin/adhyjllxcx
+    方法：POST
+    权限：JWT Token + 管理员验证
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 🔥 1. 身份验证
+            user = request.user
+
+            # 检查是否是管理员
+            if not hasattr(user, 'admin_profile'):
+                return Response({
+                    'code': 401,
+                    'message': '无权限访问',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            # 🔥 2. 获取所有会员类型
+            huiyuan_list = Huiyuan.objects.all().order_by('create_time')
+
+            # 🔥 3. 构建返回数据
+            huiyuan_data = []
+            for huiyuan in huiyuan_list:
+                huiyuan_data.append({
+                    'id': huiyuan.huiyuan_id,  # 会员ID
+                    'jieshao': huiyuan.jieshao,  # 会员介绍
+                    'jiage': str(huiyuan.jiage),  # 价格
+                    'goumai_cishu': huiyuan.goumai_cishu,  # 购买次数
+                    'create_time': huiyuan.create_time.strftime('%Y-%m-%d %H:%M:%S') if huiyuan.create_time else None
+                })
+
+            return Response({
+                'code': 0,
+                'message': '获取成功',
+                'data': huiyuan_data
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            print(f"获取会员类型列表失败: {str(e)}")
+            return Response({
+                'code': 500,
+                'message': '系统错误',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+class HuiyuanRecordListView(APIView):
+    """
+    获取会员记录列表接口
+    路径：/shangpin/adhyjlcxhq
+    方法：POST
+    权限：JWT Token + 管理员验证
+    参数：
+        - zhanghao: 管理员账号
+        - huiyuan_type: 会员类型ID
+        - jiluzhuangtai: 记录状态（1=未过期, 2=已过期）
+        - page: 页码
+        - pagesize: 每页条数
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 🔥 1. 身份验证
+            user = request.user
+
+            # 检查是否是管理员
+            if not hasattr(user, 'admin_profile'):
+                return Response({
+                    'code': 401,
+                    'message': '无权限访问',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            # 🔥 2. 获取参数
+            zhanghao = request.data.get('zhanghao', '').strip()
+            huiyuan_type = request.data.get('huiyuan_type', '').strip()
+            jiluzhuangtai = request.data.get('jiluzhuangtai', 1)  # 默认未过期
+            page = int(request.data.get('page', 1))
+            pagesize = int(request.data.get('pagesize', 5))
+
+            # 🔥 3. 参数验证
+            if not zhanghao:
+                return Response({
+                    'code': 400,
+                    'message': '管理员账号不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            if not huiyuan_type:
+                return Response({
+                    'code': 400,
+                    'message': '会员类型不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 🔥 4. 检查会员类型是否存在
+            huiyuan_obj = Huiyuan.objects.filter(huiyuan_id=huiyuan_type).first()
+            if not huiyuan_obj:
+                return Response({
+                    'code': 404,
+                    'message': '会员类型不存在',
+                    'data': None
+                }, status=status.HTTP_404_NOT_FOUND)
+
+            # 🔥 5. 构建基础查询（一次性获取所有符合条件的记录ID）
+            now = timezone.now()
+
+            # 🔥 使用原生SQL优化查询（避免N+1问题）
+            with connection.cursor() as cursor:
+                # 先查询符合条件的总记录数
+                count_sql = """
+                    SELECT COUNT(*) 
+                    FROM huiyuangoumai hg
+                    WHERE hg.huiyuan_id = %s 
+                """
+                params = [huiyuan_type]
+
+                if jiluzhuangtai == 1:  # 未过期
+                    count_sql += " AND hg.daoqi_time > %s"
+                    params.append(now)
+                else:  # 已过期
+                    count_sql += " AND hg.daoqi_time <= %s"
+                    params.append(now)
+
+                cursor.execute(count_sql, params)
+                total_count = cursor.fetchone()[0]
+
+                # 🔥 6. 分页查询（使用窗口函数提高性能）
+                offset = (page - 1) * pagesize
+
+                record_sql = """
+                    SELECT 
+                        hg.id,
+                        hg.yonghu_id,
+                        hg.huiyuan_id,
+                        hg.jieshao,
+                        hg.daoqi_time,
+                        hg.create_time,
+                        um.avatar,
+                        ud.nicheng
+                    FROM huiyuangoumai hg
+                    LEFT JOIN user_main um ON hg.yonghu_id = um.yonghuid
+                    LEFT JOIN user_dashou ud ON um.id = ud.user_id
+                    WHERE hg.huiyuan_id = %s 
+                """
+
+                record_params = [huiyuan_type]
+
+                if jiluzhuangtai == 1:  # 未过期
+                    record_sql += " AND hg.daoqi_time > %s"
+                    record_params.append(now)
+                else:  # 已过期
+                    record_sql += " AND hg.daoqi_time <= %s"
+                    record_params.append(now)
+
+                record_sql += " ORDER BY hg.create_time DESC LIMIT %s OFFSET %s"
+                record_params.extend([pagesize, offset])
+
+                cursor.execute(record_sql, record_params)
+                records = cursor.fetchall()
+
+            # 🔥 7. 处理查询结果
+            record_list = []
+            for record in records:
+                record_list.append({
+                    'id': record[0],
+                    'yonghuid': record[1],  # 用户ID
+                    'huiyuan_id': record[2],
+                    'jieshao': record[3],
+                    'daoqi_time': record[4].strftime('%Y-%m-%d %H:%M:%S') if record[4] else None,
+                    'create_time': record[5].strftime('%Y-%m-%d %H:%M:%S') if record[5] else None,
+                    'touxiang': record[6],  # 头像相对URL
+                    'nicheng': record[7] or record[1],  # 昵称或用户ID
+                    'yonghu_type': 2  # 🔥 默认打手类型（实际应该根据user_type判断）
+                })
+
+            # 🔥 8. 判断是否还有更多数据
+            has_more = (page * pagesize) < total_count
+
+            # 🔥 9. 获取会员类型统计信息（所有会员类型的当前状态总数）
+            huiyuan_types = Huiyuan.objects.all()
+            huiyuan_stats = []
+
+            for huiyuan in huiyuan_types:
+                # 使用COUNT查询统计
+                stats_sql = """
+                    SELECT COUNT(*) 
+                    FROM huiyuangoumai 
+                    WHERE huiyuan_id = %s 
+                """
+                stats_params = [huiyuan.huiyuan_id]
+
+                if jiluzhuangtai == 1:  # 未过期
+                    stats_sql += " AND daoqi_time > %s"
+                    stats_params.append(now)
+                else:  # 已过期
+                    stats_sql += " AND daoqi_time <= %s"
+                    stats_params.append(now)
+
+                with connection.cursor() as cursor:
+                    cursor.execute(stats_sql, stats_params)
+                    count = cursor.fetchone()[0]
+
+                huiyuan_stats.append({
+                    'id': huiyuan.huiyuan_id,
+                    'jieshao': huiyuan.jieshao,
+                    'count': count
+                })
+
+            return Response({
+                'code': 0,
+                'message': '获取成功',
+                'data': {
+                    'list': record_list,
+                    'total': total_count,
+                    'current_page': page,
+                    'page_size': pagesize,
+                    'has_more': has_more,
+                    'huiyuan_stats': huiyuan_stats,  # 🔥 所有会员类型的统计
+                    'current_huiyuan': {
+                        'id': huiyuan_obj.huiyuan_id,
+                        'jieshao': huiyuan_obj.jieshao,
+                        'count': total_count
+                    }
+                }
+            }, status=status.HTTP_200_OK)
+
+        except ValueError as e:
+            print(f"参数错误: {str(e)}")
+            return Response({
+                'code': 400,
+                'message': '参数错误',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        except Exception as e:
+            print(f"获取会员记录失败: {str(e)}")
+            import traceback
+            traceback.print_exc()
+            return Response({
+                'code': 500,
+                'message': '系统错误',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+import decimal
+
+class ZuzhangFenhongView(APIView):
+    """
+    组长分红记录接口
+    路径：/shangpin/zuzhangfenhong
+    方法：POST
+    权限：JWT认证，仅限组长身份
+    请求参数：
+        {
+            "page": 1,          # 页码，默认1
+            "page_size": 5       # 每页条数，默认5
+        }
+    返回：
+        {
+            "code": 200,
+            "msg": "success",
+            "data": {
+                "fenhong_zonge": "1234.56",       # 分红总额
+                "yaoqing_guanshi": 10,             # 邀请管事数
+                "fenhong_cishu": 50,                # 分红次数
+                "total": 50,                         # 总记录数
+                "has_more": false,                    # 是否有下一页
+                "list": [...]                          # 记录列表
+            }
+        }
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        current_user = request.user
+
+        # 1. 验证组长身份
+        try:
+            zuzhang = UserZuzhang.objects.get(user=current_user)
+        except UserZuzhang.DoesNotExist:
+            return Response({
+                'code': 403,
+                'msg': '当前用户不是组长身份',
+                'data': None
+            }, status=status.HTTP_403_FORBIDDEN)
+
+        # 2. 请求参数
+        page = int(request.data.get('page', 1))
+        page_size = int(request.data.get('page_size', 5))
+        page = max(page, 1)
+        page_size = max(page_size, 1)
+
+        # 3. 统计数据
+        # 3.1 分红总额（从组长扩展表）
+        fenhong_zonge = zuzhang.fenyong_zonge
+
+        # 3.2 邀请管事数（统计邀请人等于当前用户ID的管事记录）
+        yaoqing_guanshi = UserGuanshi.objects.filter(yaoqingren=current_user.yonghuid).count()
+
+        # 3.3 分红次数（总记录数）
+        base_queryset = Gsfenhong.objects.filter(zuzhang_id=current_user.yonghuid).order_by('-create_time')
+        fenhong_cishu = base_queryset.count()
+
+        # 4. 分页查询
+        start = (page - 1) * page_size
+        end = start + page_size
+        records = base_queryset[start:end]
+
+        # 5. 批量获取管事用户信息（只查 boss_profile 获取昵称）
+        guanshi_ids = list(set(rec.guanshi for rec in records if rec.guanshi))
+        guanshi_info_map = self._get_guanshi_info(guanshi_ids)
+
+        # 6. 组装列表数据
+        list_data = []
+        for rec in records:
+            # 打手信息（直接从记录中取快照）
+            dashou_avatar = rec.avatar or ''
+            dashou_nicheng = rec.nicheng or ''
+            dashou_yonghuid = rec.dashouid or ''
+
+            # 管事信息
+            guanshi_id = rec.guanshi
+            guanshi_info = guanshi_info_map.get(guanshi_id, {'avatar': '', 'nicheng': ''})
+            guanshi_avatar = guanshi_info['avatar']
+            guanshi_nicheng = guanshi_info['nicheng']
+
+            # 组长分红金额
+            fenhong = rec.zuzhang_fenhong
+            if fenhong is None:
+                fenhong = decimal.Decimal('0.00')
+            fenhong_str = str(fenhong.quantize(decimal.Decimal('0.00')))
+
+            # 时间格式化
+            create_time = rec.create_time.strftime('%Y-%m-%d %H:%M:%S') if rec.create_time else ''
+
+            list_data.append({
+                'dashou_avatar': dashou_avatar,
+                'dashou_nicheng': dashou_nicheng,
+                'dashou_yonghuid': dashou_yonghuid,
+                'guanshi_avatar': guanshi_avatar,
+                'guanshi_nicheng': guanshi_nicheng,
+                'guanshi_yonghuid': guanshi_id,
+                'fenhong': fenhong_str,
+                'create_time': create_time,
+            })
+
+        # 7. 是否有更多数据
+        has_more = (end < fenhong_cishu)
+
+        return Response({
+            'code': 200,
+            'msg': 'success',
+            'data': {
+                'fenhong_zonge': str(fenhong_zonge.quantize(decimal.Decimal('0.00'))),
+                'yaoqing_guanshi': yaoqing_guanshi,
+                'fenhong_cishu': fenhong_cishu,
+                'total': fenhong_cishu,
+                'has_more': has_more,
+                'list': list_data,
+            }
+        })
+
+    def _get_guanshi_info(self, guanshi_ids):
+        """
+        批量获取管事用户的头像和昵称
+        昵称从老板扩展表（boss_profile）获取，头像从主表获取
+        返回字典：{用户ID: {'avatar': 相对路径, 'nicheng': 昵称}}
+        """
+        if not guanshi_ids:
+            return {}
+
+        # 查询用户主表，并预加载 boss_profile
+        users = UserMain.objects.filter(yonghuid__in=guanshi_ids).select_related(
+            'boss_profile'
+        ).only(
+            'yonghuid', 'avatar',
+            'boss_profile__nickname'
+        )
+
+        info = {}
+        for user in users:
+            avatar = user.avatar or ''
+            # 从 boss_profile 获取昵称
+            if hasattr(user, 'boss_profile') and user.boss_profile:
+                nicheng = user.boss_profile.nickname or ''
+            else:
+                # 如果没有 boss_profile，使用默认昵称
+                nicheng = f"用户{user.yonghuid[-4:]}"
+            info[user.yonghuid] = {'avatar': avatar, 'nicheng': nicheng}
+
+        # 对于未查询到的用户，提供默认值
+        for gid in guanshi_ids:
+            if gid not in info:
+                info[gid] = {'avatar': '', 'nicheng': f"用户{gid[-4:]}"}
+
+        return info
+
+
+
+
+
+from dingdan.models import Lilubiao
+
+# 常量定义（可根据需要调整）
+INTEGRAL_PRICE = decimal.Decimal('10.00')  # 积分购买固定价格（元）
+
+
+'''class CzhqdyView(APIView):
+    """
+    获取可用抵扣身份接口
+    路径：/shangpin/czhqdy
+    方法：POST
+    权限：JWT认证
+    请求参数：
+        leixing: int  # 1=会员，2=押金，3=积分
+        huiyuan_id: str  # 当 leixing=1 时必传，会员ID
+        yajin_jine: decimal  # 当 leixing=2 时必传，押金金额（元）
+    返回：
+        {
+            "code": 200,
+            "msg": "success",
+            "data": [
+                {
+                    "id": 1,               # 身份ID：1打手 2管事 3组长
+                    "jieshao": "打手佣金抵扣",
+                    "xuyao": "22.22"         # 所需抵扣金额（保留两位小数）
+                },
+                ...
+            ]
+        }
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    # 身份ID与对应扩展表模型、余额字段、费率查询条件的映射
+    IDENTITY_CONFIG = [
+        {
+            'id': 1,
+            'name': '打手佣金抵扣',
+            'profile_attr': 'dashou_profile',  # UserMain 的反向 related_name
+            'balance_field': 'yue',
+            'rate_key': '5',
+            'model': UserDashou,
+        },
+        {
+            'id': 2,
+            'name': '管事分红抵扣',
+            'profile_attr': 'guanshi_profile',
+            'balance_field': 'yue',
+            'rate_key': '6',
+            'model': UserGuanshi,
+        },
+        {
+            'id': 3,
+            'name': '组长分红抵扣',
+            'profile_attr': 'zuzhang_profile',
+            'balance_field': 'ketixian_jine',
+            'rate_key': '8',
+            'model': UserZuzhang,
+        },
+    ]
+
+    def post(self, request):
+        # 获取参数
+        leixing = request.data.get('leixing')
+        huiyuan_id = request.data.get('huiyuan_id')
+        yajin_jine = request.data.get('yajin_jine')
+
+        # 参数校验
+        if leixing not in [1, 2, 3,4]:
+            return Response({'code': 400, 'msg': 'leixing 必须为 '}, status=status.HTTP_400_BAD_REQUEST)
+
+        if leixing == 1 and not huiyuan_id:
+            return Response({'code': 400, 'msg': '购买会员时必须提供 huiyuan_id'}, status=status.HTTP_400_BAD_REQUEST)
+
+        if leixing == 2:
+            if not yajin_jine:
+                return Response({'code': 400, 'msg': '购买押金时必须提供 yajin_jine'}, status=status.HTTP_400_BAD_REQUEST)
+            try:
+                yajin_jine = decimal.Decimal(str(yajin_jine))
+                if yajin_jine <= 0:
+                    raise ValueError
+            except:
+                return Response({'code': 400, 'msg': 'yajin_jine 必须为正数'}, status=status.HTTP_400_BAD_REQUEST)
+
+
+
+
+        # 获取当前用户
+        user = request.user
+
+        # 获取目标价格（需支付的原价）
+        target_price = None
+        if leixing == 1:
+            # 会员
+            try:
+                huiyuan = Huiyuan.objects.get(huiyuan_id=huiyuan_id)
+                target_price = huiyuan.jiage
+            except Huiyuan.DoesNotExist:
+                return Response({'code': 404, 'msg': '会员不存在'}, status=status.HTTP_404_NOT_FOUND)
+        elif leixing == 2:
+            # 押金
+            target_price = yajin_jine
+
+        elif leixing == 4:
+            from dingdan.models import Fadan  # 罚单模型
+            # 其他 UserDashou、UserGuanshi、UserZuzhang、Lilubiao、Czjilu 等已有
+            # 罚款缴纳
+            fadan_id = request.data.get('fadan_id')
+            if not fadan_id:
+                return Response({'code': 400, 'msg': '缺少罚单ID'}, status=status.HTTP_400_BAD_REQUEST)
+            try:
+                fadan = Fadan.objects.get(id=fadan_id, beichufa_id=request.user.yonghuid)
+                target_price = fadan.fakuanjine
+            except Fadan.DoesNotExist:
+                return Response({'code': 404, 'msg': '罚单不存在或不属于当前用户'}, status=status.HTTP_404_NOT_FOUND)
+        else:  # leixing == 3
+            # 积分（固定价格）
+            target_price = INTEGRAL_PRICE
+
+        # 获取所有费率（打手、管事、组长）
+        rates = {}
+        for key in ['5', '6', '8']:
+            try:
+                rate_obj = Lilubiao.objects.get(fadanpingtai=key)
+                rates[key] = rate_obj.lilu
+            except Lilubiao.DoesNotExist:
+                # 如果某个费率不存在，则跳过该身份（后续不会返回）
+                rates[key] = None
+
+        # 构建可用身份列表
+        available_list = []
+
+        for ident in self.IDENTITY_CONFIG:
+            # 检查用户是否有该扩展表
+            profile = getattr(user, ident['profile_attr'], None)
+            if not profile:
+                continue
+
+            # 获取余额
+            balance = getattr(profile, ident['balance_field'], decimal.Decimal('0.00'))
+
+            # 获取费率
+            rate = rates.get(ident['rate_key'])
+            if rate is None:
+                continue  # 费率未配置，跳过该身份
+
+            # 计算所需抵扣金额： target_price / (1 - rate) ，向上取整到分
+            # 注意 rate 是小数，如 0.08 表示 8%
+            try:
+                # 防止除零
+                if rate >= 1:
+                    continue
+                required = target_price / (decimal.Decimal('1.0') - rate)
+                # 向上取整到分（保留两位小数，最后一位进位）
+                # 使用 quantize 向上舍入： ROUND_CEILING
+                required = required.quantize(decimal.Decimal('0.01'), rounding=decimal.ROUND_CEILING)
+            except Exception as e:
+                continue  # 计算异常，跳过
+
+            # 余额是否足够
+            if balance >= required:
+                available_list.append({
+                    'id': ident['id'],
+                    'jieshao': ident['name'],
+                    'xuyao': str(required),
+                })
+
+        return Response({
+            'code': 200,
+            'msg': 'success',
+            'data': available_list
+        })
+
+
+
+from dingdan.models import Fadan
+
+
+from decimal import Decimal, ROUND_CEILING
+# 常量定义（可根据需要调整）
+INTEGRAL_PRICE = Decimal('10.00')  # 积分购买固定价格（元）
+INTEGRAL_INCREMENT = 5  # 每次积分补充增加5分
+MAX_INTEGRAL = 10  # 最大积分限制
+
+# 身份映射配置
+IDENTITY_CONFIG = {
+    1: {
+        'name': '打手佣金',
+        'model': UserDashou,
+        'balance_field': 'yue',
+        'status_field': 'zhanghaozhuangtai',  # 1正常
+        'rate_key': '5',
+    },
+    2: {
+        'name': '管事分红',
+        'model': UserGuanshi,
+        'balance_field': 'yue',
+        'status_field': 'zhuangtai',  # 1正常
+        'rate_key': '6',
+    },
+    3: {
+        'name': '组长分红',
+        'model': UserZuzhang,
+        'balance_field': 'ketixian_jine',
+        'status_field': 'zhuangtai',  # 1正常
+        'rate_key': '8',
+    },
+}
+
+
+class DsqrgmdhView(APIView):
+    """
+    余额抵扣支付接口
+    路径：/shangpin/dsqrgmdh
+    方法：POST
+    权限：JWT认证
+    请求参数：
+        leixing: int      # 购买类型：1会员 2押金 3积分
+        shenfen_id: int   # 抵扣身份：1打手 2管事 3组长
+        huiyuan_id: str   # 当 leixing=1 时必传，会员ID
+        yajin_jine: decimal  # 当 leixing=2 时必传，押金金额（元）
+    返回：
+        {
+            "code": 200,
+            "msg": "success",
+            "data": {
+                # 根据购买类型返回对应字段
+                "yajin": 1000,               # 押金更新后（leixing=2）
+                "jifen": 10,                  # 积分更新后（leixing=3）
+                "huiyuan": { ... }             # 会员购买记录（leixing=1）
+                # 以及其他可能需要的数据
+            }
+        }
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        # 获取参数
+        leixing = request.data.get('leixing')
+        shenfen_id = request.data.get('shenfen_id')
+        huiyuan_id = request.data.get('huiyuan_id')
+        yajin_jine = request.data.get('yajin_jine')
+
+        # ----- 参数基本校验 -----
+        if leixing not in [1, 2, 3,4]:
+            return Response({'code': 400, 'msg': 'leixing 必须为 1/2/3/4'}, status=status.HTTP_400_BAD_REQUEST)
+        if shenfen_id not in [1, 2, 3]:
+            return Response({'code': 400, 'msg': 'shenfen_id 必须为 1/2/3'}, status=status.HTTP_400_BAD_REQUEST)
+
+        if leixing == 1 and not huiyuan_id:
+            return Response({'code': 400, 'msg': '购买会员时必须提供 huiyuan_id'}, status=status.HTTP_400_BAD_REQUEST)
+        if leixing == 2:
+            if not yajin_jine:
+                return Response({'code': 400, 'msg': '购买押金时必须提供 yajin_jine'}, status=status.HTTP_400_BAD_REQUEST)
+            try:
+                yajin_jine = Decimal(str(yajin_jine))
+                if yajin_jine <= 0:
+                    raise ValueError
+                if yajin_jine > Decimal('10000'):
+                    return Response({'code': 400, 'msg': '押金金额不能超过10000元'}, status=status.HTTP_400_BAD_REQUEST)
+            except:
+                return Response({'code': 400, 'msg': 'yajin_jine 必须为正数'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # ----- 获取目标价格（需支付的原价） -----
+        target_price = None
+        if leixing == 1:
+            try:
+                huiyuan = Huiyuan.objects.get(huiyuan_id=huiyuan_id)
+                target_price = huiyuan.jiage
+            except Huiyuan.DoesNotExist:
+                return Response({'code': 404, 'msg': '会员不存在'}, status=status.HTTP_404_NOT_FOUND)
+        elif leixing == 2:
+            target_price = yajin_jine
+
+        elif leixing == 4:
+            action_desc = "罚款缴纳"
+        else:  # leixing == 3
+            target_price = INTEGRAL_PRICE
+
+        # ----- 获取对应身份费率 -----
+        identity = IDENTITY_CONFIG.get(shenfen_id)
+        try:
+            rate_obj = Lilubiao.objects.get(fadanpingtai=identity['rate_key'])
+            rate = rate_obj.lilu  # Decimal
+            if rate >= 1:
+                return Response({'code': 400, 'msg': f"{identity['name']}费率异常"}, status=status.HTTP_400_BAD_REQUEST)
+        except Lilubiao.DoesNotExist:
+            return Response({'code': 400, 'msg': f"{identity['name']}费率未配置"}, status=status.HTTP_400_BAD_REQUEST)
+
+        # ----- 计算所需抵扣金额（向上取整到分） -----
+        try:
+            required = target_price / (Decimal('1.0') - rate)
+            required = required.quantize(Decimal('0.01'), rounding=ROUND_CEILING)
+        except Exception as e:
+            return Response({'code': 500, 'msg': f'金额计算错误: {str(e)}'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # ----- 获取当前用户 -----
+        user = request.user
+        yonghuid = user.yonghuid
+
+        # ----- 获取对应身份扩展表并验证状态和余额 -----
+        try:
+            profile = identity['model'].objects.get(user=user)
+        except identity['model'].DoesNotExist:
+            return Response({'code': 403, 'msg': f'您不是{identity["name"]}身份'})
+
+        # 验证账号状态
+        status_value = getattr(profile, identity['status_field'])
+        if status_value != 1:
+            return Response({'code': 403, 'msg': f'{identity["name"]}账号状态异常，无法使用'})
+
+        # 验证余额是否足够
+        balance = getattr(profile, identity['balance_field'])
+        if balance < required:
+            return Response({'code': 400, 'msg': f'{identity["name"]}余额不足，需要{required}元，当前{balance}元'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # ----- 开始事务处理 -----
+        try:
+            with transaction.atomic():
+                # 锁定扩展表记录（防止并发扣除）
+                locked_profile = identity['model'].objects.select_for_update().get(id=profile.id)
+
+                # 再次验证余额（安全）
+                current_balance = getattr(locked_profile, identity['balance_field'])
+                if current_balance < required:
+                    raise ValueError(f"{identity['name']}余额不足，需要{required}元，当前{current_balance}元")
+
+                # 扣除余额
+                setattr(locked_profile, identity['balance_field'], current_balance - required)
+                locked_profile.save(update_fields=[identity['balance_field']])
+
+                # ----- 生成订单ID -----
+                timestamp = str(int(time.time() * 1000))[-12:]
+                rand_str = ''.join(random.choices(string.ascii_uppercase + string.digits, k=4))
+                dingdan_id = f"CZ{timestamp}{rand_str}"
+
+                # 构建订单说明
+                if leixing == 1:
+                    action_desc = f"购买会员 {huiyuan.jieshao}"
+                elif leixing == 2:
+                    action_desc = f"充值押金 {yajin_jine}元"
+
+                elif leixing == 4:
+                    from dingdan.models import Fadan
+                    fadan_id = request.data.get('fadan_id')
+                    if not fadan_id:
+                        return Response({'code': 400, 'msg': '缺少罚单ID'}, status=status.HTTP_400_BAD_REQUEST)
+                    try:
+                        fadan = Fadan.objects.get(id=fadan_id, beichufa_id=request.user.yonghuid)
+                        target_price = fadan.fakuanjine
+                    except Fadan.DoesNotExist:
+                        return Response({'code': 404, 'msg': '罚单不存在'}, status=status.HTTP_404_NOT_FOUND)
+
+                else:
+                    action_desc = "补充积分"
+
+                shuoming = f"{identity['name']}抵扣 {action_desc}，抵扣金额{required}元"
+
+                # 创建充值记录
+                czjilu = Czjilu.objects.create(
+                    dingdan_id=dingdan_id,
+                    huiyuan_id=huiyuan_id if leixing == 1 else None,
+                    zhuangtai=1,  # 已完成
+                    yonghuid=yonghuid,
+                    jine=required,  # 实际扣除的金额
+                    leixing=leixing,
+                    shuoming=shuoming,
+                )
+
+                # ----- 根据购买类型执行具体业务逻辑 -----
+                response_data = {}
+
+                if leixing == 1:  # 会员
+                    # 处理会员购买/续费
+                    huiyuan_record, is_first_buy = self._process_member_purchase(yonghuid, huiyuan_id, huiyuan)
+                    response_data['huiyuan'] = {
+                        'huiyuanid': huiyuan_id,
+                        'huiyuanming': huiyuan.jieshao,
+                        'daoqi': huiyuan_record.daoqi_time.strftime('%Y-%m-%d %H:%M:%S') if hasattr(huiyuan_record, 'daoqi_time') else '',
+                    }
+
+                    # 如果首次购买任何会员，给打手加10积分
+                    if is_first_buy:
+                        try:
+                            dashou = UserDashou.objects.get(user=user)
+                            dashou.jifen += 10
+                            dashou.save(update_fields=['jifen'])
+                            response_data['jifen'] = dashou.jifen
+                        except UserDashou.DoesNotExist:
+                            pass
+
+                elif leixing == 2:  # 押金
+                    # 更新打手押金
+                    try:
+                        dashou = UserDashou.objects.select_for_update().get(user=user)
+                        dashou.yajin += yajin_jine  # 注意：增加的是原价，不是抵扣金额
+                        dashou.save(update_fields=['yajin'])
+                        response_data['yajin'] = dashou.yajin
+                    except UserDashou.DoesNotExist:
+                        return Response({'code': 500, 'msg': '打手信息不存在，无法充值押金'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+                elif leixing == 4:  # 🔥 罚款：只更新罚单状态，不重复扣款
+
+                    fadan_id = request.data.get('fadan_id')
+
+                    if not fadan_id:
+                        return Response({'code': 400, 'msg': '缺少罚单ID'}, status=status.HTTP_400_BAD_REQUEST)
+
+                    try:
+
+                        fadan = Fadan.objects.get(id=fadan_id, beichufa_id=request.user.yonghuid)
+
+                    except Fadan.DoesNotExist:
+
+                        return Response({'code': 404, 'msg': '罚单不存在或不属于当前用户'},
+                                        status=status.HTTP_404_NOT_FOUND)
+
+                    if fadan.zhuangtai not in [1, 3]:
+                        return Response({'code': 400, 'msg': '罚单状态不可缴纳'}, status=status.HTTP_400_BAD_REQUEST)
+
+                    fadan.zhuangtai = 2  # 已缴纳
+
+                    fadan.save(update_fields=['zhuangtai'])
+
+                    response_data['fadan_id'] = fadan.id
+
+                    response_data['fadan_status'] = fadan.zhuangtai
+                    from utils.fadan_utils import fadan_fenhong
+                    fadan_fenhong(fadan.id)
+
+                else:  # leixing == 3 积分
+                    # 更新打手积分
+                    try:
+                        dashou = UserDashou.objects.select_for_update().get(user=user)
+                        new_jifen = dashou.jifen + INTEGRAL_INCREMENT
+                        dashou.jifen = min(new_jifen, MAX_INTEGRAL)  # 不超过10分
+                        dashou.save(update_fields=['jifen'])
+                        response_data['jifen'] = dashou.jifen
+                    except UserDashou.DoesNotExist:
+                        return Response({'code': 500, 'msg': '打手信息不存在，无法补充积分'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+        except Exception as e:
+            import traceback
+            traceback.print_exc()
+            return Response({'code': 500, 'msg': f'支付处理失败: {str(e)}'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # ----- 返回成功响应，附带更新后的数据 -----
+        # 补充其他可能需要的数据（如更新后的余额等）
+        # 可以查询最新的余额返回
+        final_profile = identity['model'].objects.get(user=user)
+        response_data['balance'] = str(getattr(final_profile, identity['balance_field']))
+
+        return Response({
+            'code': 200,
+            'msg': 'success',
+            'data': response_data,
+        })
+
+    def _process_member_purchase(self, yonghuid, huiyuan_id, huiyuan_obj):
+        """
+        处理会员购买/续费
+        返回 (Huiyuangoumai对象, is_first_buy_any)
+        """
+        is_first_buy_any = False
+        try:
+            # 检查是否已有该会员记录
+            record = Huiyuangoumai.objects.filter(
+                yonghu_id=yonghuid,
+                huiyuan_id=huiyuan_id
+            ).first()
+
+            if record:
+                # 续费
+                record.daoqi_time += timedelta(days=30)
+                record.huiyuan_zhuangtai = 1
+                record.save(update_fields=['daoqi_time', 'huiyuan_zhuangtai'])
+            else:
+                # 新购
+                # 检查用户是否购买过任何会员（用于判断是否首次购买）
+                other_count = Huiyuangoumai.objects.filter(yonghu_id=yonghuid).exclude(huiyuan_id=huiyuan_id).count()
+                if other_count == 0:
+                    is_first_buy_any = True
+
+                record = Huiyuangoumai.objects.create(
+                    yonghu_id=yonghuid,
+                    huiyuan_id=huiyuan_id,
+                    jieshao=huiyuan_obj.jieshao,
+                    huiyuan_zhuangtai=1,
+                    daoqi_time=timezone.now() + timedelta(days=30)
+                )
+            return record, is_first_buy_any
+        except Exception as e:
+            # 如果出现唯一性冲突（极低概率），重试一次
+            if 'unique' in str(e).lower() or 'duplicate' in str(e).lower():
+                # 直接查询已存在的记录
+                record = Huiyuangoumai.objects.get(yonghu_id=yonghuid, huiyuan_id=huiyuan_id)
+                return record, False
+            raise'''
+
+
+
+from dingdan.models import Fadan  # 用于罚款类型
+class CzhqdyView(APIView):
+    """
+    获取可用抵扣身份接口
+    路径：/shangpin/czhqdy
+    方法：POST
+    权限：JWT认证
+    请求参数：
+        leixing: int  # 1=会员，2=押金，3=积分，4=罚款
+        huiyuan_id: str  # 当 leixing=1 时必传，会员ID
+        yajin_jine: decimal  # 当 leixing=2 时必传，押金金额（元）
+        fadan_id: int      # 当 leixing=4 时必传，罚单ID
+    返回：
+        {
+            "code": 200,
+            "msg": "success",
+            "data": [
+                {
+                    "id": 1,               # 身份ID：1打手佣金 2管事分红 3组长分红 4打手押金
+                    "jieshao": "打手佣金抵扣",
+                    "xuyao": "22.22"         # 所需抵扣金额（保留两位小数）
+                },
+                ...
+            ]
+        }
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    # 身份ID与对应扩展表模型、余额字段、费率查询条件的映射
+    IDENTITY_CONFIG = [
+        {
+            'id': 1,
+            'name': '打手佣金抵扣',
+            'profile_attr': 'dashou_profile',  # UserMain 的反向 related_name
+            'balance_field': 'yue',
+            'rate_key': '5',
+            'model': UserDashou,
+        },
+        {
+            'id': 2,
+            'name': '管事分红抵扣',
+            'profile_attr': 'guanshi_profile',
+            'balance_field': 'yue',
+            'rate_key': '6',
+            'model': UserGuanshi,
+        },
+        {
+            'id': 3,
+            'name': '组长分红抵扣',
+            'profile_attr': 'zuzhang_profile',
+            'balance_field': 'ketixian_jine',
+            'rate_key': '8',
+            'model': UserZuzhang,
+        },
+        # 新增打手押金抵扣
+        {
+            'id': 4,
+            'name': '打手押金抵扣',
+            'profile_attr': 'dashou_profile',   # 与打手佣金共用扩展表
+            'balance_field': 'yajin',           # 押金字段
+            'rate_key': '11',                   # 押金提现费率对应的 fadanpingtai
+            'model': UserDashou,
+        },
+    ]
+
+    def post(self, request):
+        # 获取参数
+        leixing = request.data.get('leixing')
+        huiyuan_id = request.data.get('huiyuan_id')
+        yajin_jine = request.data.get('yajin_jine')
+        fadan_id = request.data.get('fadan_id')
+
+        # 参数校验
+        if leixing not in [1, 2, 3, 4]:
+            return Response({'code': 400, 'msg': 'leixing 必须为 1,2,3,4'}, status=status.HTTP_400_BAD_REQUEST)
+
+        if leixing == 1 and not huiyuan_id:
+            return Response({'code': 400, 'msg': '购买会员时必须提供 huiyuan_id'}, status=status.HTTP_400_BAD_REQUEST)
+
+        if leixing == 2:
+            if not yajin_jine:
+                return Response({'code': 400, 'msg': '购买押金时必须提供 yajin_jine'}, status=status.HTTP_400_BAD_REQUEST)
+            try:
+                yajin_jine = decimal.Decimal(str(yajin_jine))
+                if yajin_jine <= 0:
+                    raise ValueError
+            except:
+                return Response({'code': 400, 'msg': 'yajin_jine 必须为正数'}, status=status.HTTP_400_BAD_REQUEST)
+
+        if leixing == 4 and not fadan_id:
+            return Response({'code': 400, 'msg': '缴纳罚款时必须提供 fadan_id'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 获取当前用户
+        user = request.user
+
+        # 获取目标价格（需支付的原价）
+        target_price = None
+        if leixing == 1:
+            # 会员
+            try:
+                huiyuan = Huiyuan.objects.get(huiyuan_id=huiyuan_id)
+                target_price = huiyuan.jiage
+            except Huiyuan.DoesNotExist:
+                return Response({'code': 404, 'msg': '会员不存在'}, status=status.HTTP_404_NOT_FOUND)
+        elif leixing == 2:
+            # 押金
+            target_price = yajin_jine
+        elif leixing == 3:
+            # 积分（固定价格）
+            target_price = INTEGRAL_PRICE
+        elif leixing == 4:
+            # 罚款缴纳
+            try:
+                fadan = Fadan.objects.get(id=fadan_id, beichufa_id=user.yonghuid)
+                target_price = fadan.fakuanjine
+            except Fadan.DoesNotExist:
+                return Response({'code': 404, 'msg': '罚单不存在或不属于当前用户'}, status=status.HTTP_404_NOT_FOUND)
+
+        # 获取所有费率（打手佣金、管事分红、组长分红、打手押金）
+        rates = {}
+        for key in ['5', '6', '8', '11']:
+            try:
+                rate_obj = Lilubiao.objects.get(fadanpingtai=key)
+                rates[key] = rate_obj.lilu
+            except Lilubiao.DoesNotExist:
+                rates[key] = None  # 未配置则跳过
+
+        # 构建可用身份列表
+        available_list = []
+
+        for ident in self.IDENTITY_CONFIG:
+            # 检查用户是否有该扩展表
+            profile = getattr(user, ident['profile_attr'], None)
+            if not profile:
+                continue
+
+            # 获取余额
+            balance = getattr(profile, ident['balance_field'], decimal.Decimal('0.00'))
+
+            # 获取费率
+            rate = rates.get(ident['rate_key'])
+            if rate is None:
+                continue  # 费率未配置，跳过该身份
+
+            # 计算所需抵扣金额： target_price / (1 - rate) ，向上取整到分
+            try:
+                if rate >= 1:
+                    continue  # 防止除零及不合理费率
+                required = target_price / (decimal.Decimal('1.0') - rate)
+                # 向上取整到分（保留两位小数，最后一位进位）
+                required = required.quantize(decimal.Decimal('0.01'), rounding=decimal.ROUND_CEILING)
+            except Exception:
+                continue  # 计算异常，跳过
+
+            # 余额是否足够
+            if balance >= required:
+                available_list.append({
+                    'id': ident['id'],
+                    'jieshao': ident['name'],
+                    'xuyao': str(required),
+                })
+
+        return Response({
+            'code': 200,
+            'msg': 'success',
+            'data': available_list
+        })
+
+from decimal import Decimal, ROUND_CEILING
+# ========== 修改点1: 导入最新的分红处理方法 ==========
+from yonghu.fadan_fenhong_utils import process_fadan_fenhong
+
+INTEGRAL_INCREMENT = 5
+MAX_INTEGRAL = 10
+
+IDENTITY_CONFIG = {
+    1: {
+        'name': '打手佣金',
+        'model': UserDashou,
+        'balance_field': 'yue',
+        'status_field': 'zhanghaozhuangtai',
+        'rate_key': '5',
+    },
+    2: {
+        'name': '管事分红',
+        'model': UserGuanshi,
+        'balance_field': 'yue',
+        'status_field': 'zhuangtai',
+        'rate_key': '6',
+    },
+    3: {
+        'name': '组长分红',
+        'model': UserZuzhang,
+        'balance_field': 'ketixian_jine',
+        'status_field': 'zhuangtai',
+        'rate_key': '8',
+    },
+    4: {
+        'name': '打手押金',
+        'model': UserDashou,
+        'balance_field': 'yajin',
+        'status_field': 'zhanghaozhuangtai',
+        'rate_key': '11',
+    },
+}
+
+
+class DsqrgmdhView(APIView):
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        try:
+            leixing = request.data.get('leixing')
+            shenfen_id = request.data.get('shenfen_id')
+            huiyuan_id = request.data.get('huiyuan_id')
+            yajin_jine = request.data.get('yajin_jine')
+            fadan_id = request.data.get('fadan_id')
+
+            logger.info(f"抵扣支付请求: leixing={leixing}, shenfen_id={shenfen_id}, huiyuan_id={huiyuan_id}, yajin_jine={yajin_jine}, fadan_id={fadan_id}")
+
+            if leixing not in [1, 2, 3, 4]:
+                return Response({'code': 400, 'msg': 'leixing 必须为 1/2/3/4'}, status=status.HTTP_400_BAD_REQUEST)
+            if shenfen_id not in [1, 2, 3, 4]:
+                return Response({'code': 400, 'msg': 'shenfen_id 必须为 1/2/3/4'}, status=status.HTTP_400_BAD_REQUEST)
+
+            if leixing == 1 and not huiyuan_id:
+                return Response({'code': 400, 'msg': '购买会员时必须提供 huiyuan_id'}, status=status.HTTP_400_BAD_REQUEST)
+            if leixing == 2:
+                if not yajin_jine:
+                    return Response({'code': 400, 'msg': '购买押金时必须提供 yajin_jine'}, status=status.HTTP_400_BAD_REQUEST)
+                try:
+                    yajin_jine = Decimal(str(yajin_jine))
+                    if yajin_jine <= 0:
+                        raise ValueError
+                    if yajin_jine > Decimal('10000'):
+                        return Response({'code': 400, 'msg': '押金金额不能超过10000元'}, status=status.HTTP_400_BAD_REQUEST)
+                except:
+                    return Response({'code': 400, 'msg': 'yajin_jine 必须为正数'}, status=status.HTTP_400_BAD_REQUEST)
+
+            target_price = None
+            if leixing == 1:
+                try:
+                    huiyuan = Huiyuan.objects.get(huiyuan_id=huiyuan_id)
+                    target_price = huiyuan.jiage
+                except Huiyuan.DoesNotExist:
+                    return Response({'code': 404, 'msg': '会员不存在'}, status=status.HTTP_404_NOT_FOUND)
+            elif leixing == 2:
+                target_price = yajin_jine
+            elif leixing == 3:
+                target_price = INTEGRAL_PRICE
+            elif leixing == 4:
+                if not fadan_id:
+                    return Response({'code': 400, 'msg': '缺少罚单ID'}, status=status.HTTP_400_BAD_REQUEST)
+                try:
+                    fadan_obj = Fadan.objects.get(id=fadan_id, beichufa_id=request.user.yonghuid)
+                    target_price = fadan_obj.fakuanjine
+                except Fadan.DoesNotExist:
+                    return Response({'code': 404, 'msg': '罚单不存在或不属于当前用户'}, status=status.HTTP_404_NOT_FOUND)
+
+            identity = IDENTITY_CONFIG.get(shenfen_id)
+            try:
+                rate_obj = Lilubiao.objects.get(fadanpingtai=identity['rate_key'])
+                rate = rate_obj.lilu
+                if rate >= 1:
+                    return Response({'code': 400, 'msg': f"{identity['name']}费率异常"}, status=status.HTTP_400_BAD_REQUEST)
+            except Lilubiao.DoesNotExist:
+                return Response({'code': 400, 'msg': f"{identity['name']}费率未配置"}, status=status.HTTP_400_BAD_REQUEST)
+
+            logger.info(f"目标价格={target_price}, 费率={rate}")
+
+            try:
+                required = target_price / (Decimal('1.0') - rate)
+                required = required.quantize(Decimal('0.01'), rounding=ROUND_CEILING)
+                logger.info(f"所需抵扣金额={required}")
+            except Exception as e:
+                logger.error(f"金额计算错误: {str(e)}", exc_info=True)
+                return Response({'code': 500, 'msg': f'金额计算错误: {str(e)}'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            user = request.user
+            yonghuid = user.yonghuid
+
+            try:
+                profile = identity['model'].objects.get(user=user)
+            except identity['model'].DoesNotExist:
+                return Response({'code': 403, 'msg': f'您不是{identity["name"]}身份'})
+
+            status_value = getattr(profile, identity['status_field'])
+            if status_value != 1:
+                return Response({'code': 403, 'msg': f'{identity["name"]}账号状态异常，无法使用'})
+
+            balance = getattr(profile, identity['balance_field'])
+            if balance < required:
+                return Response({'code': 400, 'msg': f'{identity["name"]}余额不足，需要{required}元，当前{balance}元'}, status=status.HTTP_400_BAD_REQUEST)
+
+            try:
+                with transaction.atomic():
+                    locked_profile = identity['model'].objects.select_for_update().get(id=profile.id)
+                    current_balance = getattr(locked_profile, identity['balance_field'])
+                    if current_balance < required:
+                        raise ValueError(f"{identity['name']}余额不足，需要{required}元，当前{current_balance}元")
+
+                    setattr(locked_profile, identity['balance_field'], current_balance - required)
+                    locked_profile.save(update_fields=[identity['balance_field']])
+                    logger.info(f"扣款成功: {identity['name']} 扣除 {required} 元，剩余 {current_balance - required} 元")
+
+                    timestamp = str(int(time.time() * 1000))[-12:]
+                    rand_str = ''.join(random.choices(string.ascii_uppercase + string.digits, k=4))
+                    dingdan_id = f"CZ{timestamp}{rand_str}"
+
+                    if leixing == 1:
+                        action_desc = f"购买会员 {huiyuan.jieshao}"
+                    elif leixing == 2:
+                        action_desc = f"充值押金 {yajin_jine}元"
+                    elif leixing == 3:
+                        action_desc = "补充积分"
+                    elif leixing == 4:
+                        action_desc = f"缴纳罚款 {target_price}元"
+
+                    shuoming = f"{identity['name']}抵扣 {action_desc}，抵扣金额{required}元"
+
+                    czjilu = Czjilu.objects.create(
+                        dingdan_id=dingdan_id,
+                        huiyuan_id=huiyuan_id if leixing == 1 else None,
+                        zhuangtai=1,
+                        yonghuid=yonghuid,
+                        jine=required,
+                        leixing=leixing,
+                        shuoming=shuoming,
+                    )
+
+                    response_data = {}
+
+                    if leixing == 1:
+                        huiyuan_record, is_first_buy = self._process_member_purchase(yonghuid, huiyuan_id, huiyuan)
+                        response_data['huiyuan'] = {
+                            'huiyuanid': huiyuan_id,
+                            'huiyuanming': huiyuan.jieshao,
+                            'daoqi': huiyuan_record.daoqi_time.strftime('%Y-%m-%d %H:%M:%S') if hasattr(huiyuan_record, 'daoqi_time') else '',
+                        }
+                        if is_first_buy:
+                            try:
+                                dashou = UserDashou.objects.get(user=user)
+                                dashou.jifen += 10
+                                dashou.save(update_fields=['jifen'])
+                                response_data['jifen'] = dashou.jifen
+                            except UserDashou.DoesNotExist:
+                                pass
+
+                    elif leixing == 2:
+                        try:
+                            dashou = UserDashou.objects.select_for_update().get(user=user)
+                            dashou.yajin += yajin_jine
+                            dashou.save(update_fields=['yajin'])
+                            response_data['yajin'] = dashou.yajin
+                        except UserDashou.DoesNotExist:
+                            return Response({'code': 500, 'msg': '打手信息不存在，无法充值押金'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+                    elif leixing == 4:
+                        if fadan_obj.zhuangtai not in [1, 3]:
+                            return Response({'code': 400, 'msg': '罚单状态不可缴纳'}, status=status.HTTP_400_BAD_REQUEST)
+                        fadan_obj.zhuangtai = 2
+                        fadan_obj.save(update_fields=['zhuangtai'])
+                        response_data['fadan_id'] = fadan_obj.id
+                        response_data['fadan_status'] = fadan_obj.zhuangtai
+
+                        # ========== 修改点2: 使用最新的分红处理方法 ==========
+                        success, msg = process_fadan_fenhong(fadan_obj.id)
+                        if not success:
+                            logger.error(f"罚单 {fadan_obj.id} 分红处理失败: {msg}")
+                        else:
+                            logger.info(f"罚单 {fadan_obj.id} 分红处理成功: {msg}")
+
+                    else:  # leixing == 3
+                        try:
+                            dashou = UserDashou.objects.select_for_update().get(user=user)
+                            new_jifen = dashou.jifen + INTEGRAL_INCREMENT
+                            dashou.jifen = min(new_jifen, MAX_INTEGRAL)
+                            dashou.save(update_fields=['jifen'])
+                            response_data['jifen'] = dashou.jifen
+                        except UserDashou.DoesNotExist:
+                            return Response({'code': 500, 'msg': '打手信息不存在，无法补充积分'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            except Exception as e:
+                logger.error(f"事务处理异常: {str(e)}", exc_info=True)
+                return Response({'code': 500, 'msg': f'支付处理失败: {str(e)}'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            final_profile = identity['model'].objects.get(user=user)
+            response_data['balance'] = str(getattr(final_profile, identity['balance_field']))
+
+            return Response({
+                'code': 200,
+                'msg': 'success',
+                'data': response_data,
+            })
+
+        except Exception as e:
+            logger.error(f"接口顶层异常: {str(e)}", exc_info=True)
+            return Response({'code': 500, 'msg': f'系统错误: {str(e)}'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def _process_member_purchase(self, yonghuid, huiyuan_id, huiyuan_obj):
+        is_first_buy_any = False
+        try:
+            record = Huiyuangoumai.objects.filter(
+                yonghu_id=yonghuid,
+                huiyuan_id=huiyuan_id
+            ).first()
+
+            if record:
+                record.daoqi_time += timedelta(days=30)
+                record.huiyuan_zhuangtai = 1
+                record.save(update_fields=['daoqi_time', 'huiyuan_zhuangtai'])
+            else:
+                other_count = Huiyuangoumai.objects.filter(yonghu_id=yonghuid).exclude(huiyuan_id=huiyuan_id).count()
+                if other_count == 0:
+                    is_first_buy_any = True
+                record = Huiyuangoumai.objects.create(
+                    yonghu_id=yonghuid,
+                    huiyuan_id=huiyuan_id,
+                    jieshao=huiyuan_obj.jieshao,
+                    huiyuan_zhuangtai=1,
+                    daoqi_time=timezone.now() + timedelta(days=30)
+                )
+            return record, is_first_buy_any
+        except Exception as e:
+            if 'unique' in str(e).lower() or 'duplicate' in str(e).lower():
+                record = Huiyuangoumai.objects.get(yonghu_id=yonghuid, huiyuan_id=huiyuan_id)
+                return record, False
+            raise
\ No newline at end of file
diff --git a/sitemap.json b/sitemap.json
new file mode 100644
index 0000000..cd24f35
--- /dev/null
+++ b/sitemap.json
@@ -0,0 +1,7 @@
+{
+    "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+    "rules": [{
+    "action": "allow",
+    "page": "*"
+    }]
+}
\ No newline at end of file
diff --git a/static/lib/EmojiDecoder.js b/static/lib/EmojiDecoder.js
new file mode 100644
index 0000000..039fb0b
--- /dev/null
+++ b/static/lib/EmojiDecoder.js
@@ -0,0 +1,25 @@
+class EmojiDecoder {
+    emojiMap = null;
+    url = "";
+    patterns = [];
+    metaChars = /[[\]{}()*+?.\\|^$\-,&#\s]/g;
+    decode = this.decode;
+
+    constructor(url,emojiMap) {
+        this.url = url || '';
+        this.emojiMap = emojiMap || {};
+        for (let i in this.emojiMap) {
+            if (this.emojiMap.hasOwnProperty(i)){
+                this.patterns.push('('+i.replace(this.metaChars, "\\$&")+')');
+            }
+        }
+    }
+
+    decode (text) {
+        return text.replace(new RegExp(this.patterns.join('|'),'g'),  (match) => {
+            return typeof this.emojiMap[match] != 'undefined' ? '<img height="20rpx" width="20rpx" src="'+this.url+this.emojiMap[match]+'" />' : match;
+        });
+    }
+}
+
+export default EmojiDecoder
\ No newline at end of file
diff --git a/static/lib/goeasy-2.13.24.esm.min.js b/static/lib/goeasy-2.13.24.esm.min.js
new file mode 100644
index 0000000..33035a2
--- /dev/null
+++ b/static/lib/goeasy-2.13.24.esm.min.js
@@ -0,0 +1 @@
+var e,t;!function(e){e.UNIAPP="uniapp",e.REACT_NATIVE="rn",e.COCOS="cocos",e.UNKNOWN="unknown"}(e||(e={}));class s{constructor(){this.framework=null,this.methods={[e.UNIAPP]:this.isUniApp,[e.REACT_NATIVE]:this.isReactNative,[e.COCOS]:this.isCocos};const t=this.methods,s=Object.keys(t);for(const e of s){if((0,t[e])()){this.framework=e;break}}this.framework=this.framework||e.UNKNOWN,this.framework}static currentFramework(){return this.instance||(this.instance=new s),this.instance.framework}isUniApp(){try{return"function"==typeof uni.getSystemInfoSync}catch(e){return!1}}isReactNative(){try{return"object"==typeof navigator&&"ReactNative"===navigator.product}catch(e){return!1}}isTaro(){try{return void 0!==process.env.TARO_ENV}catch(e){return!1}}isCocos(){try{return void 0!==cc.sys.localStorage}catch(e){return!1}}}class i{static init(t){if(s.currentFramework()===e.REACT_NATIVE){if(!t)throw new Error("'reactNativeOptions' is missing when calling GoEasy.getInstance()");this.platform=t.platform,this.asyncStorage=t.asyncStorage}}}!function(e){e.DISCONNECTED="disconnected",e.DISCONNECTING="disconnecting",e.CONNECTING="connecting",e.CONNECTED="connected",e.RECONNECTING="reconnecting",e.RECONNECTED="reconnected",e.EXPIRED_RECONNECTED="reconnected",e.CONNECT_FAILED="connect_failed"}(t||(t={}));const n="2.13.24";var o,r;!function(e){e.PRIVATE="private",e.GROUP="group",e.SYSTEM="system",e.CS="cs"}(o||(o={})),function(e){e.NEW="new",e.SENDING="sending",e.SUCCESS="success",e.FAIL="fail"}(r||(r={}));class a{}class c{constructor(e,t){this.id=e,this.data=t}}let u=new class{isDef(e){return!this.isUndef(e)}isUndef(e){return null==e}isPrimitive(e){return"string"==typeof e||"number"==typeof e||"symbol"==typeof e||"boolean"==typeof e}isObject(e){return null!==e&&"object"==typeof e}isPlainObject(e){return"[object Object]"===Object.prototype.toString.call(e)}isRegExp(e){return"[object RegExp]"===Object.prototype.toString.call(e)}isValidArrayIndex(e){let t=parseFloat(String(e));return t>=0&&Math.floor(t)===t&&isFinite(e)}isString(e){return"string"==typeof e}isNumber(e){return"number"==typeof e}isStringOrNumber(e){return this.isString(e)||this.isNumber(e)}isArray(e){return"[object Array]"===Object.prototype.toString.call(e)}isEmpty(e){return this.isArray(e)?0===e.length:this.isObject(e)?!this.isDef(e):!this.isNumber(e)&&(this.isString(e)?""===e.trim():!this.isDef(e))}isNative(e){return"function"==typeof e&&/native code/.test(e.toString())}isFunction(e){return"function"==typeof e}isBoolean(e){return"boolean"==typeof e}isTrue(e){return!0===e}isFalse(e){return!1===e}isNull(e){return null===e}};var l;!function(e){e.MP_WX="mp-wx",e.MP_WGAME="mp-wgame",e.MP_BYTE="mp-byte",e.MP_BAIDU="mp-baidu",e.MP_ALI="mp-ali",e.BROWSER="browser",e.NODE="node",e.UNI_IOS="uni-ios",e.UNI_ANDROID="uni-android",e.UNI_HARMONY="uni-harmony",e.COCOS_IOS="cocos-ios",e.COCOS_ANDROID="cocos-android",e.RN_IOS="rn-ios",e.RN_ANDROID="rn-android",e.UNKNOWN="unknown"}(l||(l={}));class d{constructor(){this.platform=null,this.methods={[l.BROWSER]:this.isBrowser,[l.MP_WX]:this.isMPWX,[l.MP_WGAME]:this.isMPWeGame,[l.MP_BYTE]:this.isMPByte,[l.MP_BAIDU]:this.isMPBaidu,[l.MP_ALI]:this.isMPAli,[l.NODE]:this.isNode,[l.UNI_IOS]:this.isUniAppIOS,[l.UNI_ANDROID]:this.isUniAppAndroid,[l.UNI_HARMONY]:this.isUniAppHarmony,[l.COCOS_IOS]:this.isCocosIOS,[l.COCOS_ANDROID]:this.isCocosAndroid,[l.RN_IOS]:this.isRNiOS,[l.RN_ANDROID]:this.isRNAndroid};const e=this.methods,t=Object.keys(e);for(const s of t){if((0,e[s])()){this.platform=s;break}}this.platform=this.platform||l.UNKNOWN,this.platform}static currentPlatform(){return this.instance||(this.instance=new d),d.instance.platform}isBrowser(){return"undefined"!=typeof navigator&&"Taro"!==navigator.product&&"ReactNative"!==navigator.product&&"undefined"==typeof GameGlobal&&("undefined"==typeof cc||null!==cc.sys.browserType)&&"undefined"==typeof my&&"undefined"==typeof tt&&"undefined"==typeof swan}isMPWX(){return"object"==typeof wx&&"function"==typeof wx.getSystemInfoSync&&"undefined"==typeof WebSocket&&"undefined"==typeof XMLHttpRequest&&"undefined"==typeof plus&&"undefined"==typeof tt}isMPWeGame(){return"object"==typeof GameGlobal}isMPByte(){return"object"==typeof tt&&"function"==typeof tt.getSystemInfoSync}isMPBaidu(){return"object"==typeof swan&&"function"==typeof swan.getSystemInfoSync}isMPAli(){return"object"==typeof my&&"function"==typeof my.getSystemInfoSync}isNode(){try{return"node"===process.release.name}catch(e){return!1}}isUniAppIOS(){try{return"ios"===uni.getSystemInfoSync().platform&&"app"===uni.getSystemInfoSync().uniPlatform}catch(e){return!1}}isUniAppAndroid(){try{return"android"===uni.getSystemInfoSync().platform&&"app"===uni.getSystemInfoSync().uniPlatform}catch(e){return!1}}isUniAppHarmony(){try{return"harmonyos"===uni.getSystemInfoSync().platform&&"app"===uni.getSystemInfoSync().uniPlatform}catch(e){return!1}}isCocosIOS(){try{return"iOS"===cc.sys.os}catch(e){return!1}}isCocosAndroid(){try{return"Android"===cc.sys.os}catch(e){return!1}}isRNiOS(){try{return"ios"===i.platform.OS}catch(e){return!1}}isRNAndroid(){try{return"android"===i.platform.OS}catch(e){return!1}}}class h{}h.type=l,h.current=d.currentPlatform();class p{onFrontend(e){this.onFrontendCallback=e}}class m extends p{constructor(){super(...arguments),this.runningBackend=!1}startCheck(){"object"==typeof plus&&(plus.globalEvent.addEventListener("resume",(()=>{this.runningBackend=!1,this.runningBackend,this.onFrontendCallback&&this.onFrontendCallback()}),!1),plus.globalEvent.addEventListener("pause",(()=>{this.runningBackend=!0,this.runningBackend}),!1))}isBackend(){return this.runningBackend}support(){const e=d.currentPlatform();return[l.UNI_IOS,l.UNI_ANDROID].includes(e)}}class f extends p{constructor(){super(...arguments),this.runningBackend=!1}startCheck(){wx.onAppShow((()=>{this.runningBackend=!1})),wx.onAppHide((()=>{this.runningBackend=!0}))}isBackend(){return this.runningBackend}support(){return d.currentPlatform()===l.MP_WX}}const g=new class{constructor(){[new m,new f].forEach((e=>{if(e.support())return this.checker=e,void this.checker.startCheck()}))}isBackend(){return this.checker&&this.checker.isBackend()}onFrontend(e){this.checker.onFrontend(e)}};var y,S,E=Object.freeze({__proto__:null,runStatus:g});!function(e){e.authorize="authorize",e.manualDisconnect="manualDisconnect",e.subscribe="subscribe",e.unsubscribe="unsubscribe",e.publish="publish",e.ack="ack",e.historyMessages="historyMessages",e.hereNow="hereNow",e.hereNowByUserIds="hereNowByUserIds",e.PUBSUB_PRESENCE_SUBSCRIBE="PUBSUB_PRESENCE_SUBSCRIBE",e.PUBSUB_PRESENCE_UNSUBSCRIBE="PUBSUB_PRESENCE_UNSUBSCRIBE",e.PUBSUB_PRESENCE_HERENOW="PUBSUB_PRESENCE_HERENOW",e.imLastConversations="imLastConversations",e.markPrivateMessageAsRead="markPrivateMessageAsRead",e.markGroupMessageAsRead="markGroupMessageAsRead",e.imGroupOnlineCount="imGroupOnlineCount",e.imHereNow="imHereNow",e.imGroupHereNow="imGroupHereNow",e.publishIM="publishIM",e.subscribeUserPresence="subscribeUserPresence",e.unsubscribeUserPresence="unsubscribeUserPresence",e.subscribeGroupPresence="subscribeGroupPresence",e.unsubscribeGroupPresence="unsubscribeGroupPresence",e.removeConversation="removeConversation",e.topConversation="topConversation",e.imData="imData",e.subscribeGroups="subscribeGroups",e.unsubscribeGroup="unsubscribeGroup",e.IM_DELETE_MESSAGE="IM_DELETE_MESSAGE",e.IM_HISTORY="IM_HISTORY",e.IM_HISTORY_CHANGE="IM_HISTORY_CHANGE",e.IM_RECALL_MESSAGE="IM_RECALL_MESSAGE",e.IM_MARK_AS_READ="IM_MARK_AS_READ",e.CS_PENDING_CONVERSATION="CS_PENDING_CONVERSATION",e.CS_ACCEPT="CS_ACCEPT",e.CS_END="CS_END",e.CS_TRANSFER="CS_TRANSFER",e.CS_AGENTS="CS_AGENTS",e.CS_CUSTOMER_STATUS="CS_CUSTOMER_STATUS",e.CS_MY_TEAMS="CS_MY_TEAMS",e.CS_ONLINE="CS_ONLINE",e.CS_OFFLINE="CS_OFFLINE",e.CS_LIVE_SESSION="CS_LIVE_SESSION",e.CS_QUIT_LIVE="CS_QUIT_LIVE",e.SET_IOS_BADGE="SET_IOS_BADGE",e.MD_CMD="MD_CMD"}(y||(y={})),function(e){e[e.connect=3e3]="connect",e[e.reconnectionDelayMax=3e3]="reconnectionDelayMax",e[e.commonQuerySingle=2500]="commonQuerySingle",e[e.commonQueryTotal=12e3]="commonQueryTotal",e[e.commonRequestSingle=1700]="commonRequestSingle",e[e.commonRequestTotal=12e3]="commonRequestTotal",e[e.commonInfiniteSingle=1700]="commonInfiniteSingle",e[e.commonInfiniteTotal=864e5]="commonInfiniteTotal"}(S||(S={}));class v{static onSuccess(e,t){u.isFunction(e.onSuccess)&&e.onSuccess(t)}static onFailed(e,t){if(!u.isObject(e)||!u.isFunction(e.onFailed))throw t;e.onFailed(t)}}function b(e,t,s,i){return new(s||(s=Promise))((function(n,o){function r(e){try{c(i.next(e))}catch(e){o(e)}}function a(e){try{c(i.throw(e))}catch(e){o(e)}}function c(e){var t;e.done?n(e.value):(t=e.value,t instanceof s?t:new s((function(e){e(t)}))).then(r,a)}c((i=i.apply(e,t||[])).next())}))}"function"==typeof SuppressedError&&SuppressedError;var C="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function M(e){if(e.__esModule)return e;var t=Object.defineProperty({},"__esModule",{value:!0});return Object.keys(e).forEach((function(s){var i=Object.getOwnPropertyDescriptor(e,s);Object.defineProperty(t,s,i.get?i:{enumerable:!0,get:function(){return e[s]}})})),t}var w={exports:{}};!function(e){function t(e){if(e)return function(e){for(var s in t.prototype)e[s]=t.prototype[s];return e}(e)}w.exports=t,t.prototype.on=t.prototype.addEventListener=function(e,t){return this._callbacks=this._callbacks||{},(this._callbacks["$"+e]=this._callbacks["$"+e]||[]).push(t),this},t.prototype.once=function(e,t){function s(){this.off(e,s),t.apply(this,arguments)}return s.fn=t,this.on(e,s),this},t.prototype.off=t.prototype.removeListener=t.prototype.removeAllListeners=t.prototype.removeEventListener=function(e,t){if(this._callbacks=this._callbacks||{},0==arguments.length)return this._callbacks={},this;var s,i=this._callbacks["$"+e];if(!i)return this;if(1==arguments.length)return delete this._callbacks["$"+e],this;for(var n=0;n<i.length;n++)if((s=i[n])===t||s.fn===t){i.splice(n,1);break}return this},t.prototype.emit=function(e){this._callbacks=this._callbacks||{};var t=[].slice.call(arguments,1),s=this._callbacks["$"+e];if(s)for(var i=0,n=(s=s.slice(0)).length;i<n;++i)s[i].apply(this,t);return this},t.prototype.listeners=function(e){return this._callbacks=this._callbacks||{},this._callbacks["$"+e]||[]},t.prototype.hasListeners=function(e){return!!this.listeners(e).length}}();var I=w.exports,N={exports:{}},T="undefined"!=typeof crypto&&crypto.getRandomValues&&crypto.getRandomValues.bind(crypto)||"undefined"!=typeof msCrypto&&"function"==typeof window.msCrypto.getRandomValues&&msCrypto.getRandomValues.bind(msCrypto);if(T){var R=new Uint8Array(16);N.exports=function(){return T(R),R}}else{var A=new Array(16);N.exports=function(){for(var e,t=0;t<16;t++)0==(3&t)&&(e=4294967296*Math.random()),A[t]=e>>>((3&t)<<3)&255;return A}}for(var k=[],O=0;O<256;++O)k[O]=(O+256).toString(16).substr(1);var P,_,D=function(e,t){var s=t||0,i=k;return[i[e[s++]],i[e[s++]],i[e[s++]],i[e[s++]],"-",i[e[s++]],i[e[s++]],"-",i[e[s++]],i[e[s++]],"-",i[e[s++]],i[e[s++]],"-",i[e[s++]],i[e[s++]],i[e[s++]],i[e[s++]],i[e[s++]],i[e[s++]]].join("")},x=N.exports,U=D,G=0,F=0;var L=function(e,t,s){var i=t&&s||0,n=t||[],o=(e=e||{}).node||P,r=void 0!==e.clockseq?e.clockseq:_;if(null==o||null==r){var a=x();null==o&&(o=P=[1|a[0],a[1],a[2],a[3],a[4],a[5]]),null==r&&(r=_=16383&(a[6]<<8|a[7]))}var c=void 0!==e.msecs?e.msecs:(new Date).getTime(),u=void 0!==e.nsecs?e.nsecs:F+1,l=c-G+(u-F)/1e4;if(l<0&&void 0===e.clockseq&&(r=r+1&16383),(l<0||c>G)&&void 0===e.nsecs&&(u=0),u>=1e4)throw new Error("uuid.v1(): Can't create more than 10M uuids/sec");G=c,F=u,_=r;var d=(1e4*(268435455&(c+=122192928e5))+u)%4294967296;n[i++]=d>>>24&255,n[i++]=d>>>16&255,n[i++]=d>>>8&255,n[i++]=255&d;var h=c/4294967296*1e4&268435455;n[i++]=h>>>8&255,n[i++]=255&h,n[i++]=h>>>24&15|16,n[i++]=h>>>16&255,n[i++]=r>>>8|128,n[i++]=255&r;for(var p=0;p<6;++p)n[i+p]=o[p];return t||U(n)},B=N.exports,q=D;var j=function(e,t,s){var i=t&&s||0;"string"==typeof e&&(t="binary"===e?new Array(16):null,e=null);var n=(e=e||{}).random||(e.rng||B)();if(n[6]=15&n[6]|64,n[8]=63&n[8]|128,t)for(var o=0;o<16;++o)t[i+o]=n[o];return t||q(n)},V=L,H=j,z=H;z.v1=V,z.v4=H;var W=z;class J{support(){return!0}getParams(){return this.params}setData(e){this.active=e.a,this.data=e.d}preConnect(e){}postConnect(){}}class X{static initModule(e){e.support()&&this.modules.set(e.name,e)}static getParams(){return b(this,void 0,void 0,(function*(){let e={};for(const[t,s]of this.modules)e[t]=(yield s.getParams())||null;return e}))}static setDatas(e){Object.keys(e).forEach((t=>{this.modules.get(t).setData(e[t])}))}static preConnect(e){this.modules.forEach(((t,s)=>{t.preConnect(e)}))}static postConnect(){this.modules.forEach(((e,t)=>{e.postConnect()}))}}X.Module=J,X.modules=new Map;const $=I;class Y{constructor(){this.emitter=new $}on(e,t){return this.emitter.on(e,t),this}once(e,t){return this.emitter.once(e,t),this}off(e,t){return this.emitter.off(e,t),this}fire(e,t){return this.emitter.emit(e,t),this}}class Q{constructor(){this.eventDriver=new Y}on(e,t){this.eventDriver.on(e,t)}off(e,t){this.eventDriver.off(e,t)}fire(e,t){this.eventDriver.fire(e,t)}}let K=new class{isDef(e){return!this.isUndef(e)}isUndef(e){return null==e}isPrimitive(e){return"string"==typeof e||"number"==typeof e||"symbol"==typeof e||"boolean"==typeof e}isObject(e){return null!==e&&"object"==typeof e}isPlainObject(e){return"[object Object]"===Object.prototype.toString.call(e)}isRegExp(e){return"[object RegExp]"===Object.prototype.toString.call(e)}isValidArrayIndex(e){let t=parseFloat(String(e));return t>=0&&Math.floor(t)===t&&isFinite(e)}isString(e){return"string"==typeof e}isNumber(e){return"number"==typeof e}isStringOrNumber(e){return this.isString(e)||this.isNumber(e)}isArray(e){return"[object Array]"===Object.prototype.toString.call(e)}isEmpty(e){return this.isArray(e)?0===e.length:this.isObject(e)?!this.isDef(e):!this.isNumber(e)&&(this.isString(e)?""===e.trim():!this.isDef(e))}isNative(e){return"function"==typeof e&&/native code/.test(e.toString())}isFunction(e){return"function"==typeof e}isBoolean(e){return"boolean"==typeof e}isTrue(e){return!0===e}isFalse(e){return!1===e}isNull(e){return null===e}};const Z=I;class ee{constructor(){this.emitter=new Z}on(e,t){if(!K.isString(e))throw Error("event require a string.");if(!K.isFunction(t))throw Error("callback must be a function");this.emitter.on(e,t)}fire(e,t){this.emitter.emit(e,t)}off(e,t){this.emitter.off(e,t)}}class te{static init(e,t,s,i,n,o){this.Socket=e,this.N=t,this.Member=s,this.v=i,this.Platform=n,this.GModules=o}}const se=W;class ie{static get(){return se.v1().replace(/-/g,"")}}var ne,oe,re,ae,ce,ue;(oe=ne||(ne={})).WRITE="WRITE",oe.READ="READ",oe.NONE="NONE";class le{constructor(e){this.permission=ne.NONE,this.singleTimeout=0,this.totalTimeout=0,this.startTime=0,this.complete=!1,this.retried=0,this.unique=!1,this.uuid=ie.get(),this.name=e.name,this.params=e.params,this.permission=e.permission,this.totalTimeout=e.totalTimeout,this.singleTimeout=e.singleTimeout,e.unique&&(this.unique=e.unique),this.success=t=>{this.complete||(this.end(),e.success(t))},this.fail=t=>{this.complete||(this.end(),e.fail(t))}}start(){this.startTime=Date.now(),this.initAutoTimeout()}end(){this.complete=!0,clearTimeout(this.timeoutHandler)}initAutoTimeout(){this.timeoutHandler=setTimeout((()=>{this.complete||this.fail({resultCode:408,content:"Host unreachable or timeout"})}),this.totalTimeout)}}class de extends J{static init(){return this.module=new de,this.module.name=this.GN_MODULE_NAME,this.module}static setRegId(e,t){if(e){this.module.regIdPromise=e;let s=t;this.module.params={v:{npv:s}}}}preConnect(e){this.wxmpId=e.wxmpId}getParams(){return b(this,void 0,void 0,(function*(){if(this.params=this.params||{},this.regIdPromise)try{const e=new Promise(((e,t)=>{setTimeout((()=>t("timeout")),1e3)}));this.params.regId=yield Promise.race([this.regIdPromise,e])}catch(e){console.warn("Failed to register the Manufacturers Push service:"+JSON.stringify(e))}return this.params.wxmpId=this.wxmpId,this.params}))}}de.GN_MODULE_NAME="GN";class he{static init(e){this.allowNotification=!0===e;let t=de.init();X.initModule(t),this.supportAppNotification()&&(this.uniappPlugin=uni.requireNativePlugin("GoEasy-Uniapp"),this.uniappPlugin?(this.regIdPromise=this.askRegId(),this.v=this.uniappPlugin.v(),de.setRegId(this.regIdPromise,this.v)):console.warn("No GoEasy-Uniapp Native Plugin."),this.setClientBadge(0))}static addAssembler(e){this.payloadAssemblers.push(e)}static assemblePayload(e){let t=this.payloadAssemblers.find((t=>t.support(e)));return t?t.assemble(e):e}static createLocalNotification(e,t,s,i,n){g.isBackend()&&(s.g=1,"undefined"!=typeof plus&&(i?(this.uniappPlugin&&this.uniappPlugin.playSound(i),plus.push.createMessage(t,JSON.stringify(s),{title:e,sound:"none"})):plus.push.createMessage(t,JSON.stringify(s),{title:e}),"+1"===n&&this.setClientBadge(he.badge+1)))}static setBadge(e){if(!Number.isInteger(e.badge)||e.badge<0)v.onFailed(e,"badge must be an integer greater than or equal to 0.");else if(he.supportAppNotification())if(this.uniappPlugin&&d.currentPlatform()===l.UNI_IOS){let t=new le({name:y.SET_IOS_BADGE,params:{badge:e.badge},unique:!0,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,permission:ne.WRITE,success:()=>{v.onSuccess(e),this.setClientBadge(e.badge)},fail:t=>{v.onFailed(e,t.content)}});te.Socket.e(t)}else v.onSuccess(e),this.setClientBadge(e.badge)}static setClientBadge(e){"vivo"!==plus.device.vendor&&(he.badge=e,plus.runtime.setBadgeNumber(e))}static askRegId(){let e=null,t=0;const s=()=>new Promise(((i,n)=>{this.uniappPlugin.regId((e=>{i(e)}),(i=>{if(!(1e6===i.data.code&&t<=10))return clearTimeout(e),n(i);e=setTimeout((()=>{t++,this.regIdPromise=s()}),3500)}))}));return s()}static getRegIdPromise(){return this.regIdPromise}static supportAppNotification(){const e=d.currentPlatform();return this.allowNotification&&(e===l.UNI_ANDROID||e===l.UNI_IOS)}static listenPlusClickNotification(){plus.push.addEventListener("click",(e=>{try{if(e){const t="string"==typeof e.payload?JSON.parse(e.payload):e.payload;if(this.availableIntent(t)){let e=this.assemblePayload(t);plus.push.clear(),this.onClickNotificationCallback(e)}}}catch(e){}}))}static availableIntent(e){return e&&Object.keys(e).length&&e.g&&1===parseInt(e.g)}static getIntentData(){this.uniappPlugin.getIntentData((e=>{if(!this.availableIntent(e))return;let t=this.assemblePayload(e);const s=d.currentPlatform();plus.push.clear(),s===l.UNI_ANDROID&&this.uniappPlugin.clearAll(),this.onClickNotificationCallback(t)}))}static listenClick(){this.listenPlusClickNotification();const e=d.currentPlatform();this.uniappPlugin&&e===l.UNI_ANDROID&&(this.getIntentData(),g.onFrontend((()=>{this.getIntentData()})))}static onClickNotification(e){if(he.supportAppNotification()){if(!u.isFunction(e))throw new Error("The arguments must be a function.");null===this.onClickNotificationCallback?(this.onClickNotificationCallback=e,this.listenClick()):console.warn("The onClickNotification event has been listened on. Please do not listen to it more than once.")}else console.warn("The current environment doesn't support or allowNotification is false.")}}function pe(e){if(null===e||"object"!=typeof e||"isActiveClone"in e)return e;let t=e instanceof Array?[]:{};for(let s in e)"object"==typeof e[s]?t[s]=pe(e[s]):t[s]=e[s];return t}function me(e){return{lang:e?.lang??re?.lang,message:e?.message,abortEarly:e?.abortEarly??re?.abortEarly,abortPipeEarly:e?.abortPipeEarly??re?.abortPipeEarly}}function fe(e){const t=typeof e;return"string"===t?`"${e}"`:"number"===t||"bigint"===t||"boolean"===t?`${e}`:"object"===t||"function"===t?(e&&Object.getPrototypeOf(e)?.constructor?.name)??"null":t}function ge(e,t,s,i,n){const o=n&&"input"in n?n.input:s.value,r=n?.expected??e.expects??null,a=n?.received??fe(o),c={kind:e.kind,type:e.type,input:o,expected:r,received:a,message:`Invalid ${t}: ${r?`Expected ${r} but r`:"R"}eceived ${a}`,requirement:e.requirement,path:n?.path,issues:n?.issues,lang:i.lang,abortEarly:i.abortEarly,abortPipeEarly:i.abortPipeEarly},u="schema"===e.kind,l=n?.message??e.message??(d=e.reference,h=c.lang,ue?.get(d)?.get(h))??(u?function(e){return ce?.get(e)}(c.lang):null)??i.message??function(e){return ae?.get(e)}(c.lang);var d,h;void 0!==l&&(c.message="function"==typeof l?l(c):l),u&&(s.typed=!1),s.issues?s.issues.push(c):s.issues=[c]}function ye(e){return{version:1,vendor:"valibot",validate:t=>e["~run"]({value:t},me())}}function Se(e,t){const s=[...new Set(e)];return s.length>1?`(${s.join(` ${t} `)})`:s[0]??"never"}he.uniappPlugin=null,he.v=null,he.regIdPromise=null,he.onClickNotificationCallback=null,he.payloadAssemblers=new Array;var Ee,ve=class extends Error{constructor(e){super(e[0].message),this.name="ValiError",this.issues=e}};function be(e,t){return{kind:"validation",type:"max_length",reference:be,async:!1,expects:`<=${e}`,requirement:e,message:t,"~run"(e,t){return e.typed&&e.value.length>this.requirement&&ge(this,"length",e,t,{received:`${e.value.length}`}),e}}}function Ce(e){return{kind:"validation",type:"non_empty",reference:Ce,async:!1,expects:"!0",message:e,"~run"(e,t){return e.typed&&0===e.value.length&&ge(this,"length",e,t,{received:"0"}),e}}}function Me(e,t,s){return{kind:"validation",type:"partial_check",reference:Me,async:!1,expects:null,paths:e,requirement:t,message:s,"~run"(t,s){return!t.typed&&!function(e,t){if(e.issues)for(const s of t)for(const t of e.issues){let e=!1;const i=Math.min(s.length,t.path?.length??0);for(let n=0;n<i;n++)if(s[n]!==t.path[n].key&&("$"!==s[n]||"array"!==t.path[n].type)){e=!0;break}if(!e)return!1}return!0}(t,e)||this.requirement(t.value)||ge(this,"input",t,s),t}}}function we(e,t,s){return"function"==typeof e.fallback?e.fallback(t,s):e.fallback}function Ie(e,t){return{...e,"~run"(s,i){const n=s.issues&&[...s.issues];if((s=e["~run"](s,i)).issues)for(const e of s.issues)if(!n?.includes(e)){let i=s.value;for(const s of t){const t=i[s],n={type:"unknown",origin:"value",input:i,key:s,value:t};if(e.path?e.path.push(n):e.path=[n],!t)break;i=t}}return s}}}function Ne(e,t,s){return"function"==typeof e.default?e.default(t,s):e.default}function Te(){return{kind:"schema",type:"any",reference:Te,expects:"any",async:!1,get"~standard"(){return ye(this)},"~run":e=>(e.typed=!0,e)}}function Re(e,t){return{kind:"schema",type:"array",reference:Re,expects:"Array",async:!1,item:e,message:t,get"~standard"(){return ye(this)},"~run"(e,t){const s=e.value;if(Array.isArray(s)){e.typed=!0,e.value=[];for(let i=0;i<s.length;i++){const n=s[i],o=this.item["~run"]({value:n},t);if(o.issues){const r={type:"array",origin:"value",input:s,key:i,value:n};for(const t of o.issues)t.path?t.path.unshift(r):t.path=[r],e.issues?.push(t);if(e.issues||(e.issues=o.issues),t.abortEarly){e.typed=!1;break}}o.typed||(e.typed=!1),e.value.push(o.value)}}else ge(this,"type",e,t);return e}}}function Ae(e){return{kind:"schema",type:"boolean",reference:Ae,expects:"boolean",async:!1,message:e,get"~standard"(){return ye(this)},"~run"(e,t){return"boolean"==typeof e.value?e.typed=!0:ge(this,"type",e,t),e}}}function ke(e,t){return{kind:"schema",type:"custom",reference:ke,expects:"unknown",async:!1,check:e,message:t,get"~standard"(){return ye(this)},"~run"(e,t){return this.check(e.value)?e.typed=!0:ge(this,"type",e,t),e}}}function Oe(e){return{kind:"schema",type:"function",reference:Oe,expects:"Function",async:!1,message:e,get"~standard"(){return ye(this)},"~run"(e,t){return"function"==typeof e.value?e.typed=!0:ge(this,"type",e,t),e}}}function Pe(e,t){return{kind:"schema",type:"instance",reference:Pe,expects:e.name,async:!1,class:e,message:t,get"~standard"(){return ye(this)},"~run"(e,t){return e.value instanceof this.class?e.typed=!0:ge(this,"type",e,t),e}}}function _e(e,t){return{kind:"schema",type:"literal",reference:_e,expects:fe(e),async:!1,literal:e,message:t,get"~standard"(){return ye(this)},"~run"(e,t){return e.value===this.literal?e.typed=!0:ge(this,"type",e,t),e}}}function De(e){return{kind:"schema",type:"number",reference:De,expects:"number",async:!1,message:e,get"~standard"(){return ye(this)},"~run"(e,t){return"number"!=typeof e.value||isNaN(e.value)?ge(this,"type",e,t):e.typed=!0,e}}}function xe(e,t){return{kind:"schema",type:"object",reference:xe,expects:"Object",async:!1,entries:e,message:t,get"~standard"(){return ye(this)},"~run"(e,t){const s=e.value;if(s&&"object"==typeof s){e.typed=!0,e.value={};for(const i in this.entries){const n=this.entries[i];if(i in s||("exact_optional"===n.type||"optional"===n.type||"nullish"===n.type)&&void 0!==n.default){const o=i in s?s[i]:Ne(n),r=n["~run"]({value:o},t);if(r.issues){const n={type:"object",origin:"value",input:s,key:i,value:o};for(const t of r.issues)t.path?t.path.unshift(n):t.path=[n],e.issues?.push(t);if(e.issues||(e.issues=r.issues),t.abortEarly){e.typed=!1;break}}r.typed||(e.typed=!1),e.value[i]=r.value}else if(void 0!==n.fallback)e.value[i]=we(n);else if("exact_optional"!==n.type&&"optional"!==n.type&&"nullish"!==n.type&&(ge(this,"key",e,t,{input:void 0,expected:`"${i}"`,path:[{type:"object",origin:"key",input:s,key:i,value:s[i]}]}),t.abortEarly))break}}else ge(this,"type",e,t);return e}}}function Ue(e,t){return{kind:"schema",type:"optional",reference:Ue,expects:`(${e.expects} | undefined)`,async:!1,wrapped:e,default:t,get"~standard"(){return ye(this)},"~run"(e,t){return void 0===e.value&&(void 0!==this.default&&(e.value=Ne(this,e,t)),void 0===e.value)?(e.typed=!0,e):this.wrapped["~run"](e,t)}}}function Ge(e,t){return{kind:"schema",type:"picklist",reference:Ge,expects:Se(e.map(fe),"|"),async:!1,options:e,message:t,get"~standard"(){return ye(this)},"~run"(e,t){return this.options.includes(e.value)?e.typed=!0:ge(this,"type",e,t),e}}}function Fe(e){return{kind:"schema",type:"string",reference:Fe,expects:"string",async:!1,message:e,get"~standard"(){return ye(this)},"~run"(e,t){return"string"==typeof e.value?e.typed=!0:ge(this,"type",e,t),e}}}function Le(e){let t;if(e)for(const s of e)t?t.push(...s.issues):t=s.issues;return t}function Be(e,t){return{kind:"schema",type:"union",reference:Be,expects:Se(e.map((e=>e.expects)),"|"),async:!1,options:e,message:t,get"~standard"(){return ye(this)},"~run"(e,t){let s,i,n;for(const o of this.options){const r=o["~run"]({value:e.value},t);if(r.typed){if(!r.issues){s=r;break}i?i.push(r):i=[r]}else n?n.push(r):n=[r]}if(s)return s;if(i){if(1===i.length)return i[0];ge(this,"type",e,t,{issues:Le(i)}),e.typed=!0}else{if(1===n?.length)return n[0];ge(this,"type",e,t,{issues:Le(n)})}return e}}}function qe(...e){return{...e[0],pipe:e,get"~standard"(){return ye(this)},"~run"(t,s){for(const i of e)if("metadata"!==i.kind){if(t.issues&&("schema"===i.kind||"transformation"===i.kind)){t.typed=!1;break}t.issues&&(s.abortEarly||s.abortPipeEarly)||(t=i["~run"](t,s))}return t}}}!function(e){e.TEXT="text",e.IMAGE="image",e.FILE="file",e.VIDEO="video",e.AUDIO="audio"}(Ee||(Ee={}));class je{constructor(e,t,s){this.scene=e,this.id=t,u.isDef(s)&&(this.teamId=s)}toString(){return o.PRIVATE===this.scene||o.GROUP===this.scene?this.scene+"#"+this.id:this.scene+"#"+this.id+"#"+this.teamId}customerId(){if(o.CS===this.scene)return this.id===this.teamId?te.Socket.user().id:this.id}static byScene(e,t,s){return new je(e,t,s)}static byIMMessage(e){let t,s,i=e.scene();if(i===o.PRIVATE){let t=e.senderId,i=e.targetId();s=te.Socket.user().id===t?i:t}else if(i===o.GROUP)s=e.targetId();else{if(i!==o.CS)throw{code:400,content:`scene ${i} not exists`};s=e.targetId(),t=e.teamId}return new je(i,s,t)}static byMessageReadRemoteEvent(e){let t,s=e.scene,i=e.targetId,n=e.markerId,r=e.teamId;return s===o.PRIVATE?t=te.Socket.user().id===n?i:n:s===o.GROUP?t=i:s===o.CS&&(t=i===r?n===te.Socket.user().id?r:n:n===te.Socket.user().id?i:r),new je(s,t,r)}static byIMMessageDeletedEvent(e){let t=e.scene,s=e.deleterId;if(t===o.PRIVATE){let i=te.Socket.user().id===s?e.targetId:s;return new je(t,i)}if(t===o.GROUP)return new je(t,e.targetId)}static byConversationDTO(e){let t=e.lastMessage;return this.byIMMessage(t)}static byConversationId(e,t){let s;if(e===o.PRIVATE){let e=t.split(":",2);s=e[0]===te.Socket.user().id?e[1]:e[0]}else s=t;return new je(e,s)}}class Ve{clearUseLessAttribute(){delete this.buildOptions}isOtherSent(){return this.senderId!==te.Socket.user().id}}class He extends Ve{constructor(){super(...arguments),this.read=!1}scene(){return o.PRIVATE}targetId(){return this.receiverId}}class ze extends Ve{scene(){return o.GROUP}targetId(){return this.groupId}}class We extends Ve{constructor(){super(...arguments),this.accepted=!1}scene(){return o.CS}targetId(){return te.Socket.user().id===this.customerId()?this.teamId:this.customerId()}sendByCustomer(){return this.to===this.teamId}customerId(){return this.sendByCustomer()?this.senderId:this.to}isOtherSent(){return te.Socket.user().id===this.customerId()?this.senderId!==te.Socket.user().id:this.senderId===this.customerId()}}const Je={maxString:e=>qe(Fe(),Ce(),be(e)),nonEmptyString:qe(Fe(),Ce()),object:ke((e=>"object"==typeof e&&null!==e&&!Array.isArray(e)),"must be an object."),userId:qe(Fe(),Ce(),be(60),ke((e=>{if(te.Socket.user().id===e)throw new Error("id can not be the same as your id");return e}))),sceneType:qe(Fe(),Ge([o.PRIVATE,o.GROUP,o.CS]))},Xe={onSuccess:Ue(Oe()),onFailed:Ue(Oe())},$e=xe({appkey:Je.nonEmptyString,host:Je.nonEmptyString,modules:Re(Je.nonEmptyString),allowNotification:Ue(Ae()),forceTLS:Ue(Ae()),supportOldBrowser:Ue(Ae()),reactNativeOptions:Ue(xe({platform:Te(),asyncStorage:Te()})),customProvider:Ue(xe({loadConversations:Oe(),loadHistory:Oe()}))}),Ye=qe(xe(Object.assign({id:Ue(Je.nonEmptyString),data:Ue(Je.object),otp:Ue(Je.nonEmptyString),wxmpId:Ue(xe({appid:Je.nonEmptyString,openid:Je.nonEmptyString})),onProgress:Ue(Oe())},Xe)),Ie(Me([["id"],["data"]],(e=>!X.modules.get("GIM")||e.id&&e.data),"id and data are required for IM module"),["data"])),Qe=xe({id:Je.userId,data:Je.object}),Ke=qe(Be([xe({type:Je.sceneType,id:Je.userId,data:Je.object}),xe({type:Je.sceneType,receivers:Re(Qe)})]),ke((e=>{if(!e.receivers)return!0;const t=e.receivers.map((e=>e.id));if(Array.from(new Set(t)).length<t.length)throw new Error("receivers cannot have duplicate ids");if(e.type===o.PRIVATE&&e.receivers.length>200)throw new Error("private message cannot have more than 200 receivers");if(e.type===o.GROUP&&e.receivers.length>3)throw new Error("group message cannot have more than 3 receivers");return!0}))),Ze=Ue(xe({template_id:Fe(),url:Ue(Fe()),miniprogram:Ue(xe({appid:Fe(),pagepath:Fe()})),data:Je.object})),et=qe(xe({channel_id:Ue(Fe()),category:Ue(Fe())}),ke((e=>{if(!e.channel_id&&!e.category)throw{code:400,content:"Must provide at least one of channel_id or category."};return!0}))),st=Ue(xe({title:Je.maxString(32),body:Je.maxString(50),sound:Ue(Fe()),badge:Ue(Fe()),vendorOptions:Ue(xe({huawei:Ue(xe({category:Fe()})),xiaomi:Ue(xe({channel_id:Fe()})),oppo:Ue(et),vivo:Ue(xe({classification:De(),category:Fe()}))}))})),it={image:["gif","jpg","png","jpeg"],video:["avi","mov","rmvb","rm","flv","mp4","3gp","quicktime"],audio:["mp3","ogg","wav","wma","ape","acc","mpeg"]},nt=(e=30,t)=>qe(Te(),Ce(),ke((s=>{var i;if(s.size&&s.size>1024*e*1024)throw new Error(`File size must be <= ${e}MB.`);if(t){const e=s.type||s.tempFile&&s.tempFile.type;if(!e)return!0;const n=null===(i=e.split("/")[1])||void 0===i?void 0:i.toLowerCase();if(n&&!it[t].includes(n))throw new Error(`Only ${it[t].join(",")} is supported for ${t}.`)}return!0})));function ot(e){return xe(Object.assign(Object.assign(Object.assign({},e),{to:Ke,notification:st,wxmpTemplateMsg:Ze,beforeSend:Ue(Oe()),onProgress:Ue(Oe())}),Xe))}const rt=function e(t,s,i){return{kind:"schema",type:"variant",reference:e,expects:"Object",async:!1,key:t,options:s,message:i,get"~standard"(){return ye(this)},"~run"(e,t){const s=e.value;if(s&&"object"==typeof s){let i,n=0,o=this.key,r=[];const a=(e,c)=>{for(const u of e.options){if("variant"===u.type)a(u,new Set(c).add(u.key));else{let e=!0,a=0;for(const i of c){const c=u.entries[i];if(i in s?c["~run"]({typed:!1,value:s[i]},t).issues:"exact_optional"!==c.type&&"optional"!==c.type&&"nullish"!==c.type){e=!1,o!==i&&(n<a||n===a&&i in s&&!(o in s))&&(n=a,o=i,r=[]),o===i&&r.push(u.entries[i].expects);break}a++}if(e){const e=u["~run"]({value:s},t);(!i||!i.typed&&e.typed)&&(i=e)}}if(i&&!i.issues)break}};if(a(this,new Set([this.key])),i)return i;ge(this,"type",e,t,{input:s[o],expected:Se(r,"|"),path:[{type:"object",origin:"value",input:s,key:o,value:s[o]}]})}else ge(this,"type",e,t);return e}}}("type",[ot({type:_e(Ee.TEXT),text:Je.maxString(2500)}),ot({type:_e(Ee.IMAGE),file:nt(30,"image")}),ot({type:_e(Ee.VIDEO),file:nt(30,"video")}),ot({type:_e(Ee.AUDIO),file:nt(30,"audio")}),ot({type:_e(Ee.FILE),file:nt(500)}),ot({type:Fe(),payload:Be([Je.maxString(2500),Je.object])})]),at=xe(Object.assign({messages:qe(Re(Be([Pe(He),Pe(ze)])),Ce(),be(20),ke((e=>{const t=je.byIMMessage(e[0]);for(let s=1;s<e.length;s++){const i=je.byIMMessage(e[s]);if(i.scene!==t.scene||i.id!==t.id)throw new Error("each message must be from the same friend or group");const n=e[s];if(n.status!==r.SUCCESS)throw new Error(`message[${s}] is '${n.status}' and cannot be recalled`);if(n.recalled)throw new Error(`message[${s}] has been recalled`);if(n.senderId!==te.Socket.user().id)throw new Error("it is not allowed to recall messages sent by others")}return!0})))},Xe)),ct=xe(Object.assign({messages:qe(Re(Be([Pe(He),Pe(ze),Pe(We)])),Ce(),be(20),ke((e=>{const t=je.byIMMessage(e[0]);for(let s=1;s<e.length;s++){const i=je.byIMMessage(e[s]);if(i.scene!==t.scene||i.id!==t.id)throw new Error("each message must be from the same friend or group");const n=e[s];if(n.status===r.SENDING)throw new Error(`message[${s}] is '${n.status}' and cannot be deleted`)}return!0})))},Xe)),ut=e=>qe(Fe(),Ce(),ke((t=>{if(!t)throw new Error(`${e} is required.`);return t}))),lt=ut("customId"),dt=ut("id"),ht=xe({userId:Je.nonEmptyString}),pt=xe({groupId:Je.nonEmptyString}),mt=xe({type:Je.sceneType,id:Je.nonEmptyString}),ft=Be([ht,pt,mt]),gt=xe({customer:Qe}),yt=xe({customerId:Je.nonEmptyString,agentId:Je.nonEmptyString}),St=qe(Be([Fe(),De()]),ke((e=>{if(!e&&0!==e)throw new Error("param require string or number.");return!0}))),Et=(e=100)=>qe(Re(St),Ce(),be(e),ke((e=>{if(e.some((e=>0===e.length)))throw new Error("array has empty item.");if(Array.from(new Set(e)).length<e.length)throw new Error("Duplicate element found in array");return!0}))),vt=xe(Object.assign({channel:St,message:Je.maxString(2500),qos:Ue(Ge([-1,0,1])),notification:st,wxmpTemplateMsg:Ze,accessToken:Ue(Fe())},Xe)),bt=qe(xe({channel:Ue(St),channels:Ue(Et(100)),presence:Ue(xe({enable:Ae()})),accessToken:Ue(Fe()),onMessage:Oe()}),Ie(Me([["channel"],["channels"]],(e=>!e.channel!=!e.channels),"Must provide either channel or channels, but not both or neither"),["channels"]),Ie(Me([["channel"],["presence"]],(e=>{var t;return!(null===(t=e.presence)||void 0===t?void 0:t.enable)||!!te.Socket.user().id}),"Subscription failed. If presence is enable, the id must be specified when calling the connect method"),["presence"])),Ct=xe({userIds:Et(100)}),Mt=xe({groupIds:Et(100)}),wt=xe({channel:St}),It=xe({channel:St,membersLimit:Ue(qe(De(),function e(t,s){return{kind:"validation",type:"max_value",reference:e,async:!1,expects:`<=${t instanceof Date?t.toJSON():fe(t)}`,requirement:t,message:s,"~run"(e,t){return!e.typed||e.value<=this.requirement||ge(this,"value",e,t,{received:e.value instanceof Date?e.value.toJSON():fe(e.value)}),e}}}(100))),onPresence:Oe()}),Nt=xe({groupId:St});function Tt(e,t){var s;try{return function(e,t,s){const i=e["~run"]({value:t},me(s));if(i.issues)throw new ve(i.issues);return i.value}(e,t)}catch(e){if(e instanceof ve){const t=e.issues[0],i=null===(s=t.path)||void 0===s?void 0:s.map((e=>e.key)).filter(Boolean),n=(null==i?void 0:i.join("."))||"value";throw{code:400,content:{string:`TypeError: ${n} must be a string.`,number:`TypeError: ${n} must be a number.`,non_empty:`${n} cannot be empty.`,max_length:`${n} over max length.`,picklist:`${n} has invalid value.`}[t.type]||`${n}: ${t.message}`}}throw e}}const Rt=e=>Tt(lt,e),At=e=>Tt(dt,e),kt=e=>Tt(ht,e),Ot=e=>Tt(pt,e),Pt=e=>Tt(Ct,e),_t=e=>Tt(Mt,e),Dt=e=>Tt(wt,e);class xt{publish(e){Tt(vt,e),e.channel=e.channel.toString();let t={channel:e.channel,content:e.message,nt:e.notification,at:e.accessToken,guid:ie.get(),q:e.qos};e.wxmpTemplateMsg&&(t.wxmpTemplateMsg=pe(e.wxmpTemplateMsg),t.wxmpTemplateMsg.data=JSON.stringify(t.wxmpTemplateMsg.data));let s=new le({name:y.publish,params:t,unique:!0,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,permission:ne.WRITE,success:function(t){v.onSuccess(e,{code:200,content:"ok"})},fail:function(t){v.onFailed(e,{code:t.resultCode,content:t.content})}});te.Socket.e(s)}}class Ut{constructor(e){if(this.options=e,this.channels=e.channels||[e.channel],!u.isEmpty(e.channel)){let t=e.channel.toString();this.channels=[t]}u.isEmpty(e.channels)||(this.channels=e.channels.toString().split(","))}}var Gt,Ft,Lt;!function(e){e.message="message",e.imMessage="imMessage",e.IM_MSG_SYNC="im:msg:sync",e.IM_MSG_NEW="im:msg:new",e.userPresence="userPresence",e.groupPresence="groupPresence",e.PS_PRESENCE_EVENT="PS_PRESENCE_EVENT",e.IM_MSG_READ="IM_MSG_READ",e.IM_MSG_DELETED="IM_MSG_DELETED",e.IM_MSG_RECALLED="IM_MSG_RECALLED",e.CS_ONLINE_CHANGED="CS_ONLINE_CHANGED"}(Gt||(Gt={})),function(e){e.CONNECTED="CONNECTED",e.RECONNECTED="RECONNECTED",e.DISCONNECTED="DISCONNECTED",e.LOST="LOST",e.EXPIRED_RECONNECTED="EXPIRED_RECONNECTED",e.NEW_MESSAGE="NEW_MESSAGE",e.CONNECTING="CONNECTING"}(Ft||(Ft={}));class Bt{constructor(){this.subscriptions=[],te.Socket.onMessage(Gt.message,this.onNewMessage.bind(this)),te.Socket.on(Ft.EXPIRED_RECONNECTED,this.expiredResubscribe.bind(this)),te.Socket.on(Ft.RECONNECTED,this.resubscribePresenceChannel.bind(this))}expiredResubscribe(){this.subscriptions.forEach((e=>{this.doSubscribe(e,!1)}))}resubscribePresenceChannel(){this.subscriptions.forEach((e=>{let t=e.options;t.presence&&t.presence.enable&&this.doSubscribe(e,!0)}))}onNewMessage(e){if(e.n.indexOf("_presence")>-1)return;e.a&&te.Socket.sendAck("ack",{i:e.i,c:e.n});let t={time:e.t,channel:e.n,content:e.c};this.createNotification(e);let s=this.findSubscriptionByChannel(t.channel);null==s||s.options.onMessage(t)}createNotification(e){const t=te.N.supportAppNotification();if(!u.isObject(e.nt)||!t)return;const s={ch:e.n,ctt:e.c};te.N.createLocalNotification(e.nt.t,e.nt.c,s,e.nt.sound,e.nt.badge)}subscribe(e){Tt(bt,e);let t=new Ut(e);this.doSubscribe(t,!1).then((()=>{this.subscriptions.push(t),v.onSuccess(e,{code:200,content:"ok"})})).catch((t=>{v.onFailed(e,{code:t.resultCode,content:t.content})}))}doSubscribe(e,t){let s=e.options;return new Promise(((i,n)=>{let o=new le({name:y.subscribe,permission:ne.READ,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,params:{channels:e.channels,accessToken:s.accessToken,presence:s.presence,resubscribe:t},success:()=>{i()},fail:e=>{n(e)}});te.Socket.e(o)}))}unsubscribe(e){Dt(e),e.channel=e.channel.toString();const t=this.findSubscriptionByChannel(e.channel);if(!t)return void e.onFailed({code:400,content:"channel["+e.channel+"] is not subscribed"});let s=new le({name:y.unsubscribe,params:{channel:e.channel,presence:t.options.presence},permission:ne.READ,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,success:()=>{e.onSuccess({code:200,content:"ok"}),this.removeChannel(e.channel)},fail:function(t){e.onFailed({code:t.resultCode,content:t.content})}});te.Socket.e(s)}removeChannel(e){for(let t=this.subscriptions.length-1;t>=0;t--){const s=this.subscriptions[t].channels,i=s.indexOf(e);if(i>-1){s.splice(i,1),0===s.length&&this.subscriptions.splice(t,1);break}}}findSubscriptionByChannel(e){let t=!1,s=null;for(let i=this.subscriptions.length-1;i>=0;i--){let n=this.subscriptions[i].channels;for(let o=0;o<n.length;o++)if(n[o]==e){t=!0,s=this.subscriptions[i];break}if(t)break}return s}}class qt{get(e){Dt(e),e.channel=e.channel.toString();let t=new le({name:y.historyMessages,permission:ne.READ,params:e,singleTimeout:S.commonQuerySingle,totalTimeout:S.commonQueryTotal,success:t=>{v.onSuccess(e,{code:t.resultCode||t.code||200,content:t.content})},fail:t=>{v.onFailed(e,{code:t.resultCode||t.code,content:t.content})}});te.Socket.e(t)}}class jt{constructor(){this.channelPresenceMap=new Map,this.onPresenceEvent=e=>{let t=this.channelPresenceMap.get(e.channel);null==t||t.onPresence(e)},this.expireAllChannelPresences=()=>{this.channelPresenceMap.forEach(((e,t)=>{e.expire()}))},this.resubscribe=()=>{this.channelPresenceMap.forEach(((e,t)=>{e.subscribed()&&e.doSubscribe()}))},te.Socket.on(Ft.LOST,this.expireAllChannelPresences),te.Socket.on(Ft.RECONNECTED,this.resubscribe),te.Socket.onMessage(Gt.PS_PRESENCE_EVENT,this.onPresenceEvent)}hereNow(e){Dt(e);let t,s=this.channelPresenceMap.get(e.channel.toString());s&&s.queryPromise?(e.limit&&e.limit>s.membersLimit&&s.doQuery(e.limit),t=s.queryPromise):t=Ht(e.channel,e.limit),t.then((t=>{e.onSuccess(t)})).catch((t=>{e.onFailed(t)}))}subscribe(e){Tt(It,e);let t=e.channel.toString(),s=this.channelPresenceMap.get(t);s||(s=new Vt(t),this.channelPresenceMap.set(t,s)),s.subscribe(e)}unsubscribe(e){Dt(e);let t=e.channel.toString();if(this.channelPresenceMap.get(t)){let s=new le({name:y.PUBSUB_PRESENCE_UNSUBSCRIBE,permission:ne.READ,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,params:{channel:t},success:s=>{this.channelPresenceMap.delete(t),e.onSuccess()},fail:t=>{e.onFailed(t)}});te.Socket.e(s)}else e.onSuccess()}}class Vt{constructor(e){this.membersLimit=10,this.queried=!1,this.channel=e}onPresence(e){return b(this,void 0,void 0,(function*(){this.queried?this.update(e):yield this.queryPromise,this.on({channel:this.channel,action:e.action,member:e.member,time:e.time,amount:this.amount,members:this.membersByLimit()})}))}membersByLimit(){return this.members.slice(0,this.membersLimit)}subscribe(e){return b(this,void 0,void 0,(function*(){if(e.membersLimit&&(this.membersLimit=Math.min(e.membersLimit,300)),!this.subscribed())try{yield this.doSubscribe()}catch(t){return void e.onFailed(t)}this.on=e.onPresence,e.onSuccess()}))}doSubscribe(){return this.doQuery(this.membersLimit),new Promise(((e,t)=>{let s=new le({name:y.PUBSUB_PRESENCE_SUBSCRIBE,permission:ne.READ,params:{channel:this.channel},singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,success:t=>{e()},fail:e=>{t(e)}});te.Socket.e(s)}))}doQuery(e){this.queryPromise=Ht(this.channel,e),this.queryPromise.then((e=>{this.members=e.content.members,this.amount=e.content.amount,this.queried=!0})).catch((e=>{throw e}))}update(e){if(["join","back"].includes(e.action))this.members.unshift(e.member);else if(["leave","timeout"].includes(e.action)){let t=this.members.findIndex((t=>t.id===e.member.id));t>-1&&this.members.splice(t,1)}this.amount=e.amount}expire(){this.queried=!1,this.queryPromise=null}subscribed(){return void 0!==this.on}}function Ht(e,t){return t||(t=10),new Promise(((s,i)=>{let n={channel:e,limit:t},o=new le({name:y.PUBSUB_PRESENCE_HERENOW,permission:ne.READ,params:n,singleTimeout:S.commonQuerySingle,totalTimeout:S.commonQueryTotal,success:e=>{s(e)},fail:e=>{i(e)}});te.Socket.e(o)}))}class zt{constructor(){this.publisher=new xt,this.subscriber=new Bt,this.presence2=new jt,this.histories=new qt}static init(){this.instance=new zt}publish(e){this.publisher.publish(e)}subscribe(e){this.subscriber.subscribe(e)}unsubscribe(e){this.subscriber.unsubscribe(e)}subscribePresence(e){this.presence2.subscribe(e)}unsubscribePresence(e){this.presence2.unsubscribe(e)}history(e){this.histories.get(e)}hereNow(e){this.presence2.hereNow(e)}}class Wt extends J{static init(){return this.module=new Wt,this.module.name=this.GWS_MODULE_NAME,this.initGN(),this.module}static initGN(){he.addAssembler(new class{assemble(e){return{channel:e.ch,content:e.ctt}}support(e){return!!e.ch}})}postConnect(){zt.init()}static check(){if(!this.module)throw{code:400,content:"PubSub not initialized. Please include 'PUBSUB' in the 'modules' during GoEasy initialization."}}}Wt.GWS_MODULE_NAME="GWS";class Jt{constructor(){}}!function(e){e.aliYun="ALI",e.qiNiu="QN",e.tencent="TX",e.s3="S3"}(Lt||(Lt={}));let Xt=new class extends Jt{constructor(){super()}upload(e,t){try{return e.storageLocation===Lt.s3?this.uploadToS3(e,t):(delete e.parameters.fileRes,new Promise(((s,i)=>{uni.uploadFile({url:e.host,filePath:this.getTempFilePath(e),name:"file",formData:e.parameters,success(e){200===e.statusCode?s():i({code:e.statusCode,content:e.errMsg})},fail(e){i({code:500,content:e.errMsg})}}).onProgressUpdate((e=>{t&&t(e)}))})))}catch(e){return new Promise(((t,s)=>{s({code:500,content:e})}))}}getTempFilePath(e){let t=e.file;return t.tempFilePath||t.fullPath||t.path}uploadToS3(e,t){return new Promise(((t,s)=>b(this,void 0,void 0,(function*(){const i=yield this.fileToArrayBuffer(e);uni.request({url:e.url,method:"PUT",header:e.headers,data:i,success(i){200===i.statusCode?(e.storageLocation===Lt.s3&&(e.url=e.url.split("?")[0]),t()):s({code:i.statusCode,content:i.errMsg})},fail(e){s({code:500,content:e.errMsg})}})}))))}fileToArrayBuffer(e){return new Promise(((t,s)=>{const i=this.getTempFilePath(e);if("undefined"!=typeof plus)plus.io.resolveLocalFileSystemURL(i,(e=>{e.file((e=>{let i=new plus.io.FileReader;i.onloadend=e=>{const s=uni.base64ToArrayBuffer(e.target.result.split(",")[1]);t(s)},i.onerror=function(e){s(e)},i.readAsDataURL(e)}))}),(e=>{s("Resolve file URL failed: "+e.message)}));else if("undefined"!=typeof FileReader){const i=new FileReader;i.onload=()=>{t(i.result)},i.onerror=e=>{s(e)},i.readAsArrayBuffer(e.file)}else if("object"==typeof wx&&wx.canIUse("getFileSystemManager"))try{const e=wx.getFileSystemManager().readFileSync(i);t(e)}catch(e){s(e)}}))}};const $t=new class extends Jt{upload(e,t){try{return e.storageLocation===Lt.s3?this.uploadToS3(e,t):new Promise(((s,i)=>{wx.uploadFile({url:e.host,filePath:this.getTempFilePath(e),name:"file",formData:e.parameters,success(e){200===e.statusCode?s():i({code:e.statusCode,content:e.errMsg})},fail(e){i({code:500,content:e.errMsg})}}).onProgressUpdate((e=>{t&&t(e)}))}))}catch(e){return new Promise(((t,s)=>{s({code:500,content:e})}))}}getTempFilePath(e){let t=e.file||e.fileRes;return t.path||t.tempFilePath}uploadToS3(e,t){return new Promise(((t,s)=>b(this,void 0,void 0,(function*(){const i=yield this.fileToArrayBuffer(this.getTempFilePath(e));wx.request({url:e.url,method:"PUT",header:e.headers,data:i,success(i){200===i.statusCode?(e.storageLocation===Lt.s3&&(e.url=e.url.split("?")[0]),t()):s({code:i.statusCode,content:i.errMsg})},fail(e){s({code:500,content:e.errMsg})}})}))))}fileToArrayBuffer(e){return new Promise(((t,s)=>{try{const s=wx.getFileSystemManager();t(s.readFileSync(e))}catch(e){s(e)}}))}};const Yt=new class extends Jt{constructor(){super()}upload(e,t){return new Promise(((s,i)=>{try{const n=new XMLHttpRequest,o=e.storageLocation===Lt.s3,r=o?"PUT":"POST",a=o?e.url:e.host;n.open(r,a,!0);for(let t in e.headers)n.setRequestHeader(t,e.headers[t]);n.upload.onprogress=function(e){t&&t(e)},n.upload.onloadstart=function(e){t&&t(e)},n.upload.onloadend=function(e){t&&t(e)};let c=new FormData;for(let t in e.parameters)"fileRes"==t?c.append("file",e.parameters[t]):c.append(t,e.parameters[t]);const u=o?e.file:c;n.send(u),n.onreadystatechange=function(){4==n.readyState&&(n.status>=200&&n.status<300||304==n.status?(o&&(e.url=e.url.split("?")[0]),s()):i({code:n.status,content:n.responseText}))}}catch(e){i({code:500,content:e})}}))}fileToArrayBuffer(e){return new Promise(((t,s)=>{const i=new FileReader;i.onload=()=>{t(i.result)},i.onerror=e=>{s(e)},i.readAsArrayBuffer(e)}))}};const Qt=new class extends Jt{upload(e,t){try{return e.storageLocation===Lt.s3?this.uploadToS3(e,t):(delete e.parameters.fileRes,new Promise(((s,i)=>{my.uploadFile({url:e.host,filePath:this.getTempFilePath(e),fileType:"image",name:"file",formData:e.parameters,success(e){200===e.statusCode?s():i({code:e.statusCode,content:e.errMsg})},fail(e){i({code:500,content:e.errMsg})}}).onProgressUpdate((e=>{t&&t(e)}))})))}catch(e){return new Promise(((t,s)=>{s({code:500,content:e})}))}}getTempFilePath(e){let t=e.file;return t.path||t.tempFilePath}uploadToS3(e,t){return new Promise(((t,s)=>b(this,void 0,void 0,(function*(){const i=yield this.fileToArrayBuffer(this.getTempFilePath(e));my.request({url:e.url,method:"PUT",header:e.headers,data:i,success(i){200===i.statusCode?(e.storageLocation===Lt.s3&&(e.url=e.url.split("?")[0]),t()):s({code:i.statusCode,content:i.errMsg})},fail(e){s({code:500,content:e.errMsg})}})}))))}fileToArrayBuffer(e){return new Promise(((t,s)=>{my.getFileSystemManager().readFile({filePath:e,success:e=>{t(e.data)},fail(e){s(e)}})}))}};const Kt=new class extends Jt{upload(e,t){try{return e.storageLocation===Lt.s3?this.uploadToS3(e,t):(delete e.parameters.fileRes,new Promise(((s,i)=>{swan.uploadFile({url:e.host,filePath:this.getTempFilePath(e),name:"file",formData:e.parameters,success(e){200===e.statusCode?s():i({code:e.statusCode,content:e.errMsg})},fail(e){i({code:500,content:e.errMsg})}}).onProgressUpdate((e=>{t&&t(e)}))})))}catch(e){return new Promise(((t,s)=>{s({code:500,content:e})}))}}getTempFilePath(e){let t=e.file;return t.path||t.tempFilePath}uploadToS3(e,t){return new Promise(((t,s)=>b(this,void 0,void 0,(function*(){const i=yield this.fileToArrayBuffer(this.getTempFilePath(e));swan.request({url:e.url,method:"PUT",header:e.headers,data:i,success(i){200===i.statusCode?(e.storageLocation===Lt.s3&&(e.url=e.url.split("?")[0]),t()):s({code:i.statusCode,content:i.errMsg})},fail(e){s({code:500,content:e.errMsg})}})}))))}fileToArrayBuffer(e){return new Promise(((t,s)=>{swan.getFileSystemManager().readFile({filePath:e,success:e=>{t(e.data)},fail:e=>{s(e)}})}))}};class Zt{constructor(e,t,s){this.storageLocation=e,this.url=t,this.name=s}}const es=new class{constructor(){this.uploader={[e.UNIAPP]:Xt,[l.MP_WX]:$t,[l.BROWSER]:Yt,[l.MP_ALI]:Qt,[l.MP_BAIDU]:Kt,[e.REACT_NATIVE]:Yt,[l.MP_BYTE]:$t}}upload(t,i){return b(this,void 0,void 0,(function*(){const n=s.currentFramework(),o=d.currentPlatform(),r=n===e.UNKNOWN?o:n;let a=this.uploader[r];return yield a.upload(t,i),new Zt(t.storageLocation,t.url,t.newFileName)}))}};class ts{resolve(e){return new Promise(((t,s)=>{let i=new le({name:"uploadToken",params:{filename:e},permission:ne.WRITE,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,fail(e){s(e.content)},success(e){200===e.code?t(e.content):s(e.content)}});te.Socket.e(i)}))}}class ss{constructor(e,t,s,i,n,o,r){this.storageLocation=e,this.host=t,this.headers=s,this.parameters=i,this.file=n,this.newFileName=o,this.url=r}}class is{constructor(){}newFileName(e){return e&&e.newFilename||""}}let ns=new class extends is{constructor(){super()}url(e){return e.host+"/"+e.dir+"/"+this.newFileName(e)}build(e,t,s){let i,n=this.newFileName(e);return i={key:e.dir+"/"+n,OSSAccessKeyId:e.accessKeyId,policy:e.policy,signature:e.signature,success_action_status:"200",fileRes:t},s&&(i={key:e.dir+"/"+n,OSSAccessKeyId:e.accessKeyId,policy:e.policy,signature:e.signature,success_action_status:"200","Content-Disposition":"attachment;filename="+t.name,fileRes:t}),new ss(Lt.aliYun,e.host,null,i,t,n,this.url(e))}};let os=new class extends is{constructor(){super()}url(e){return e.host+"/"+e.key}build(e,t,s){let i={"q-sign-algorithm":e.qSignAlgorithm,"q-ak":e.qAk,"q-key-time":e.qKeyTime,"q-signature":e.qSignature,policy:e.policy,"x-cos-security-token":e.xCosSecurityToken,success_action_status:"200",key:e.key,fileRes:t};return s&&(i={"q-sign-algorithm":e.qSignAlgorithm,"q-ak":e.qAk,"q-key-time":e.qKeyTime,"q-signature":e.qSignature,policy:e.policy,"x-cos-security-token":e.xCosSecurityToken,success_action_status:"200",key:e.key,"Content-Disposition":`attachment;filename=${t.name}`,fileRes:t}),new ss(Lt.tencent,e.host,null,i,t,e.key,this.url(e))}};let rs=new class extends is{constructor(){super()}url(e){return e.uploadUrl}build(e,t,s){const i={file:t};return new ss(Lt.s3,null,{"Content-Type":"application/octet-stream"},i,t,t.name,this.url(e))}};class as{constructor(){this.uploadTokenResolver=new ts}builder(e){if(e===Lt.aliYun)return ns;if(e===Lt.tencent)return os;if(e===Lt.s3)return rs;throw new Error("Only Ali OSS and Tencent COS are supported, unknown storage location:"+e)}build(e,t,s){return b(this,void 0,void 0,(function*(){try{let i=yield this.uploadTokenResolver.resolve(t),n=this.builder(i.vendor).build(i,e,s);return Promise.resolve(n)}catch(e){return Promise.reject(e)}}))}}class cs{constructor(){this.requestBuilder=new as,this.fileUploader=es}upload(e,t,s,i){return b(this,void 0,void 0,(function*(){try{let n=yield this.requestBuilder.build(e,t,i);return this.fileUploader.upload(n,s)}catch(e){return Promise.reject(e)}}))}}var us,ls,ds;!function(e){e.MESSAGE_SENDING="IM_INTERNAL_MESSAGE_SENDING",e.MESSAGE_SEND_SUCCESS="IM_INTERNAL_MESSAGE_SEND_SUCCESS",e.MESSAGE_SEND_FAILED="IM_INTERNAL_MESSAGE_SEND_FAILED",e.MESSAGE_RECEIVED="IM_INTERNAL_MESSAGE_RECEIVED",e.MESSAGE_RECALLED="IM_INTERNAL_MESSAGE_RECALLED",e.MAX_MESSAGE_CHANGED="IM_INTERNAL_MAX_MESSAGE_CHANGED",e.MAX_MESSAGE_DELETED="IM_INTERNAL_MAX_MESSAGE_DELETED",e.UNREAD_AMOUNT_CHANGED="IM_INTERNAL_UNREAD_MESSAGE_CHANGED",e.CS_ONLINE_SUCCESS="CS_ONLINE_SUCCESS",e.CS_OFFLINE_SUCCESS="CS_OFFLINE_SUCCESS",e.CS_ACCEPTED="CS_ACCEPTED",e.CS_ENDED="CS_ENDED",e.CS_TRANSFER="CS_TRANSFER",e.CS_AGENT_MESSAGE_RECEIVED="CS_AGENT_MESSAGE_RECEIVED"}(us||(us={}));class hs{}class ps extends hs{constructor(){super(...arguments),this.goEasyUploader=new cs}improve(e){let t=e.message;return new Promise(((e,s)=>{let i,n,o=t.buildOptions.createOptions;t.type===Ee.VIDEO?(n=t.payload,i=n.video.name):(n=t.payload,i=n.name),this.goEasyUploader.upload(o.file,i,o.onProgress,t.type===Ee.FILE).then((s=>{s.storageLocation!==Lt.s3&&(s.url=encodeURI(s.url)),this.setPayload(s,t),e()})).catch((e=>{s(e)}))}))}setPayload(e,t){t.payload.url=e.url}}class ms extends ps{setPayload(e,t){let s,i=t.payload;switch(i.video.url=e.url,i.video.name=e.name,i.thumbnail.height>200&&(i.thumbnail.height=200,i.thumbnail.width=200*i.video.width/i.video.height),e.storageLocation){case Lt.aliYun:s="?x-oss-process=video/snapshot,t_0000,f_jpg,h_"+i.thumbnail.height+",m_fast,ar_auto";break;case Lt.tencent:s="?ci-process=snapshot&time=1&format=jpg&height="+i.thumbnail.height;break;case Lt.s3:s="?process=video&height="+i.thumbnail.height;break;default:throw new Error("Only Ali OSS and Tencent COS are supported, unknown storage location:"+e.storageLocation)}i.thumbnail.url=e.url+s}}class fs extends ps{setPayload(e,t){let s,i=t.payload;i.url=e.url;const n=i.height>200?200:i.height;switch(e.storageLocation){case Lt.aliYun:s="?x-oss-process=image/resize,m_lfit,h_"+n;break;case Lt.tencent:s=`?imageMogr2/thumbnail/x${n}`;break;case Lt.s3:s=`?process=image&height=${n}`;break;default:throw new Error("Only Ali OSS and Tencent COS are supported, unknown storage location:"+e.storageLocation)}i.thumbnail=e.url+s}}class gs{constructor(){this.improvers={[Ee.FILE]:new ps,[Ee.AUDIO]:new ps,[Ee.IMAGE]:new fs,[Ee.VIDEO]:new ms}}improve(e){let t=this.improvers[e.message.type];if(t)try{return t.improve(e)}catch(e){return Promise.reject(e)}return Promise.resolve()}}class ys extends Q{static init(){this.i=new ys}}class Ss{constructor(e,t,s,i,n){this.validate(e),this.mt=e.type,"receivers"in t?this.receivers=t.receivers:(this.to=t.id,this.d=JSON.stringify(t.data)),this.p=JSON.stringify(e.payload),s&&(this.nt=s),n&&(this.at=n),i&&(this.wxmpTemplateMsg=pe(i),this.wxmpTemplateMsg.data=JSON.stringify(this.wxmpTemplateMsg.data));let r=t.type;if(this.t=r,r===o.CS){let t=e;this.tid=t.teamId}this.guid=e.messageId}validate(e){if(e.type===Ee.TEXT){if(JSON.stringify(e.payload).length>3072)throw Error("message-length limit 3kb")}}}class Es{constructor(){this.payloadImprover=new gs}send(e){this.validate(e);let t=e.message,s=e.accessToken,i=t.buildOptions,n=i.createOptions,a=n.notification,c=n.wxmpTemplateMsg,u=n.to;t.status=r.SENDING;let l=i.complete,d=this.payloadImprover.improve(e);Promise.all([l,d]).then((()=>b(this,void 0,void 0,(function*(){if(n.beforeSend){const e=JSON.parse(JSON.stringify(t));yield n.beforeSend(e)}if("receivers"in n.to){const i=new Array;u.receivers.forEach((e=>{const s=Object.assign(Object.create(Object.getPrototypeOf(t)),t);u.type===o.PRIVATE?s.receiverId=e.id:u.type===o.GROUP&&(s.groupId=e.id),i.push(s);const n={message:s,receiver:e.data};ys.i.fire(us.MESSAGE_SENDING,n)})),this.doSend(u,a,c,s,e,i,t)}else{const i={message:t,receiver:u.data};ys.i.fire(us.MESSAGE_SENDING,i),this.doSend(u,a,c,s,e,[t])}})))).catch((s=>{t.status=r.FAIL,v.onFailed(e,{code:s&&s.code||400,content:s&&s.content||s})}))}doSend(e,t,s,i,n,a,c){let u=new Ss(a[0],e,t,s,i),l=new le({name:y.publishIM,params:u,unique:!0,permission:ne.WRITE,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,fail:e=>{a.forEach((e=>{e.status=r.FAIL,ys.i.fire(us.MESSAGE_SEND_FAILED,e)})),c&&(c.status=r.FAIL),v.onFailed(n,{code:e.resultCode,content:e.content})},success:e=>{a.forEach((t=>{if(t.status=r.SUCCESS,t.timestamp=e.content.timestamp,t.messageId=JSON.stringify(e.content.id),t.scene()===o.CS){let s=t;s.customerId()!==te.Socket.user().id&&(s.sessionId=e.content.sessionId)}t.clearUseLessAttribute(),ys.i.fire(us.MESSAGE_SEND_SUCCESS,t)})),c&&(c.status=r.SUCCESS,c.timestamp=e.content.timestamp,c.messageId=JSON.stringify(e.content.id),c.clearUseLessAttribute()),v.onSuccess(n)}});te.Socket.e(l)}validate(e){let t=e.message;if(!(t instanceof Ve))throw new Error("it is invalid message");if(t.status!==r.NEW)throw new Error("Please create a new message, a message can only be sent once")}}class vs{insert(e,t){let s=this.binarySearch(e,t);if(s>=0)e.splice(s,1,t);else{let i=-s-1;e.splice(i,0,t)}}binarySearch(e,t){let s=0,i=e.length-1;for(;s<=i;){let n=i+s>>1,o=this.compare(t,e[n]);if(o>0)s=n+1;else{if(!(o<0))return n;i=n-1}}return-s-1}}class bs{constructor(e){this.messages=new Array,this.allLoaded=!1,this.target=e}all(){return this.messages}sliceOverLengthMessages(){this.messages.length>bs.CACHE_MAX_LENGTH&&(this.messages=this.messages.slice(-bs.CACHE_MAX_LENGTH),!0===this.allLoaded&&(this.allLoaded=!1))}getMaxMessage(){return this.messages[this.messages.length-1]}loadLocalMessages(e,t){let s=[],i=this.messages.length;if(t){if(i>0){let n=this.messages[0].timestamp,o=this.messages[i-1].timestamp;if(t>=n&&t<=o)for(let n=i-1;n>=0;n--){let i=this.messages[n];if(i.timestamp<t){if(!(s.length<e))break;s.unshift(i)}}}}else s=this.messages.slice(-e);return s}cacheServerMessages(e,t){let s=this.messages[0];this.messages.length<bs.CACHE_MAX_LENGTH&&(!e.lastTimestamp||this.messages.length>0&&s.timestamp===e.lastTimestamp)&&(t.forEach((e=>{bs.sortedInserter.insert(this.messages,e)})),t.length<e.limit&&(this.allLoaded=!0))}findMessageByTime(e){return this.messages.find((t=>e===t.timestamp))}findMessagesByTimes(e){let t=[];return e.forEach((e=>{let s=this.findMessageByTime(e);u.isDef(s)&&t.push(s)})),t}existsMessage(e){return this.findMessageIndexById(e)>-1}findMessageIndexById(e){return this.messages.findIndex((t=>e===t.messageId))}deleteMessage(e){let t=this.findMessageIndexById(e);t>=0&&this.messages.splice(t,1)}recallMessage(e){return e.times.map((e=>this.findMessageByTime(e))).filter((e=>u.isDef(e))).map((t=>(t.recalled=!0,t.recaller=e.recaller,t)))}isEmpty(){return 0===this.messages.length}deleteMessages(e){e.forEach((e=>{this.deleteMessage(e.messageId)}))}saveMessage(e){bs.sortedInserter.insert(this.messages,e),this.deleteGroupConversationMessage(),this.sliceOverLengthMessages()}deleteGroupConversationMessage(){this.target.scene===o.GROUP&&this.messages.length>=2&&1===this.messages[0].x&&this.messages.shift()}maxSuccessMessageTime(){for(let e=this.messages.length-1;e>=0;e--)if(this.messages[e].status===r.SUCCESS)return this.messages[e].timestamp;return 0}minTime(){return this.isEmpty()?0:this.messages[0].timestamp}correctPosition(e){this.deleteMessage(e.messageId),this.saveMessage(e)}}bs.CACHE_MAX_LENGTH=200,bs.sortedInserter=new class extends vs{compare(e,t){let s=e.timestamp-t.timestamp;return s>0?1:0===s?0:-1}};class Cs{constructor(e){this.times=new Array;let t=e[0],s=je.byIMMessage(t);this.scene=s.scene,this.targetId=s.id,e.forEach((e=>{e.status===r.SUCCESS&&this.times.push(e.timestamp)})),this.times.sort(((e,t)=>e<t?-1:e==t?0:1))}}class Ms{static deleteServerMessages(e){let t=new Cs(e);return t.times.length<0?Promise.resolve():new Promise(((e,s)=>{let i=new le({name:y.IM_DELETE_MESSAGE,params:t,permission:ne.WRITE,singleTimeout:S.commonQuerySingle,totalTimeout:S.commonQueryTotal,success:t=>{200===t.code?e(t):s(t)},fail:e=>{s(e)}});te.Socket.e(i)}))}}class ws{constructor(e,t,s,i,n){this.scene=e,this.id=t,this.after=s,this.min=i,this.teamId=n}}class Is{constructor(e,t,s,i){this.id=e,this.scene=t,this.lastTimestamp=s,this.teamId=i}}!function(e){e.ACCEPT="CS_ACCEPT",e.END="CS_END",e.TRANSFER="CS_TRANSFER"}(ls||(ls={}));class Ns{build(e){let t,s=e.t;s===o.PRIVATE?(t=new He,t.read=!1,e.r?t.receiverId=e.r:t.receiverId=te.Socket.user().id):s===o.GROUP?(t=new ze,t.groupId=e.r,t.senderData=e.d?JSON.parse(e.d):{}):s===o.CS&&(t=new We,t.to=e.r,t.teamId=e.tid,t.senderData=e.d?JSON.parse(e.d):{},t.accepted=e.accepted,t.customerId()!==te.Socket.user().id&&(t.sessionId=e.sessionId)),t.senderId=e.s,t.messageId=e.i,t.timestamp=e.ts,t.type=e.mt;let i=e.p;if(u.isDef(i))if(s===o.CS&&t.type===ls.TRANSFER){let e=JSON.parse(i);e.transferTo.data=JSON.parse(e.transferTo.data),t.payload=e}else t.payload=JSON.parse(i);let n=e.rc;return u.isDef(n)&&!0===n?(t.recalled=n,t.recaller=e.recaller):t.recalled=!1,t.status=r.SUCCESS,t}}class Ts{constructor(){this.builder=new Ns}sync(e,t,s,i,n){let o=new ws(e,t,s,i,n);return new Promise(((e,t)=>{let s=new le({name:y.IM_HISTORY_CHANGE,params:o,permission:ne.READ,singleTimeout:S.commonQuerySingle,totalTimeout:S.commonQueryTotal,fail:e=>{t(e)},success:t=>{let s=t.content;e(s)}});te.Socket.e(s)}))}loadServerMessages(e,t){return new Promise(((s,i)=>{let n=new le({name:y.IM_HISTORY,params:t,permission:ne.READ,singleTimeout:S.commonQuerySingle,totalTimeout:S.commonQueryTotal,fail:e=>{s({messages:[],userOffsets:[]})},success:t=>{let i=t.content;i.messages=this.convertServerMessages(e,i.messages),s(i)}});te.Socket.e(n)}))}convertServerMessages(e,t){let s=[],i=e.scene,n=e.id;return t.forEach((t=>{if(t.t=i,o.PRIVATE===i)t.r=t.s===te.Socket.user().id?n:te.Socket.user().id;else if(o.GROUP===i)t.r=n;else if(o.CS===i){let s=e.customerId(),i=e.teamId;s===te.Socket.user().id?t.r=i:t.r=s}let r=this.builder.build(t);s.push(r)})),s}updateServerOffsets(e,t){return b(this,void 0,void 0,(function*(){let s=new Is(t.id,t.scene,e,t.teamId);return new Promise(((e,t)=>{let i=new le({name:y.IM_MARK_AS_READ,params:s,permission:ne.WRITE,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,success:t=>{e(t)},fail:e=>{t(e)}});te.Socket.e(i)}))}))}}Ts.instance=new Ts;class Rs{constructor(){this.offsetMap=new Map,this.markingTime=0,this.userId=te.Socket.user().id}updateOffset(e,t){let s=this.offsetMap.get(e);return u.isDef(s)?t>s&&(this.offsetMap.set(e,t),!0):(this.offsetMap.set(e,t),!0)}updateUserOffsets(e){e.forEach((e=>{let t=e.userId,s=e.offset;this.updateOffset(t,s)}))}updateMyOffset(e){return this.updateOffset(this.userId,e)}myOffset(){return this.getOffset(this.userId)}getOffset(e){let t=this.offsetMap.get(e);return t||0}}class As{constructor(e,t,s,i,n){this.id=e,this.scene=t,this.lastTimestamp=s,this.limit=i,this.teamId=n}}class ks{constructor(e){this.history=e}pre(){this.oldLastMessage=this.history.getMaxMessage(),this.oldUnreadAmount=this.history.unreadAmount(),this.oldLastMessage&&(this.oldLastMessageRecalled=this.oldLastMessage.recalled,this.oldLastMessageRead=this.oldLastMessage.read,this.oldLastMessageStatus=this.oldLastMessage.status)}post(){let e,t,s,i=this.history.unreadAmount(),n=this.history.getMaxMessage();n&&(s=n.status,e=n.read,t=n.recalled);let o=this.history.target;if(this.oldLastMessage!==n||this.oldLastMessageRead!==e||this.oldLastMessageRecalled!==t||this.oldLastMessageStatus!==s)if(n){const e={message:n,receiver:this.history.to};ys.i.fire(us.MAX_MESSAGE_CHANGED,e)}else ys.i.fire(us.MAX_MESSAGE_DELETED,o);else this.oldUnreadAmount!==i&&ys.i.fire(us.UNREAD_AMOUNT_CHANGED,o)}}class Os{constructor(e,t,s,i){this.scene=e,this.conversationId=t,this.recaller=s,this.times=i}}class Ps{static init(){this.eventCenter=new ee}static on(e,t){this.eventCenter.on(e,t)}static fire(e,t){this.eventCenter.fire(e,t)}static off(e,t){this.eventCenter.off(e,t)}}!function(e){e.PRIVATE_MESSAGE_RECEIVED="PRIVATE_MESSAGE_RECEIVED",e.GROUP_MESSAGE_RECEIVED="GROUP_MESSAGE_RECEIVED",e.SYSTEM_MESSAGE_RECEIVED="SYSTEM_MESSAGE_RECEIVED",e.CONVERSATIONS_UPDATED="CONVERSATIONS_UPDATED",e.HISTORY_EXPIRED="HISTORY_EXPIRED",e.USER_PRESENCE="USER_PRESENCE",e.GROUP_PRESENCE="GROUP_PRESENCE",e.MESSAGE_DELETED="MESSAGE_DELETED",e.MESSAGE_READ="MESSAGE_READ",e.MESSAGE_RECALLED="MESSAGE_RECALLED",e.CS_MESSAGE_RECEIVED="CS_MESSAGE_RECEIVED",e.PENDING_CONVERSATIONS_UPDATED="PENDING_CONVERSATIONS_UPDATED"}(ds||(ds={}));class _s{static init(e){_s.instance=e}static loadCustomMessages(e,t,s){return b(this,void 0,void 0,(function*(){let i=t?t.messageId:"";return(yield this.instance.loadHistory(te.Socket.user().id,e.scene,e.id,i,s)).map((e=>this.convertAbstractMessage(e)))}))}static convertAbstractMessage(e){const t={type:e.type,timestamp:e.timestamp,senderId:e.senderId,messageId:e.messageId,payload:e.payload};if(e.groupId){const s=new ze;return s.groupId=e.groupId,s.senderData=e.senderData,Object.assign(s,Object.assign(Object.assign({},t),{recalled:!1,status:r.SUCCESS})),s}{const s=new He;return s.receiverId=e.receiverId,Object.assign(s,Object.assign(Object.assign({},t),{read:!0,recalled:!1,status:r.SUCCESS})),s}}}class Ds{constructor(e){this.expiredTime=0,this.remoteHistory=Ts.instance,this.target=e,this.userOffsets=new Rs,this.messageCache=new bs(e)}initMaxMessageAndOffsets(e,t){this.existsMessage(e)||(this.messageCache.saveMessage(e),t.forEach((e=>{this.markLocalMessagesRead(this.messageCache.all(),e.userId,e.offset,!1)})))}existsMessage(e){return this.messageCache.existsMessage(e.messageId)}loadHistory(e,t){return b(this,void 0,void 0,(function*(){return this.expiredTime>0&&!this.messageCache.isEmpty()&&(yield this.updateByServerChange()),u.isUndef(t)?t=10:t>30&&(t=30),yield this.loadServerMessages(e,t)}))}loadCustomMessages(e,t,s){return b(this,void 0,void 0,(function*(){if(s>0&&void 0!==_s.instance){let i=e;return t&&(i=this.messageCache.findMessageByTime(t)),yield _s.loadCustomMessages(this.target,i,s)}return[]}))}loadServerMessages(e,t){return b(this,void 0,void 0,(function*(){let s=this.messageCache.loadLocalMessages(t,e);if(!1===this.messageCache.allLoaded&&s.length!==t){let i=t-s.length,n=s[0]?s[0].timestamp:e,o=new As(this.target.id.toString(),this.target.scene,n,i,this.target.teamId),r=yield this.remoteHistory.loadServerMessages(this.target,o),a=r.messages;s=a.concat(s);const c=yield this.loadCustomMessages(s[0],e,t-s.length);a=a.concat(c),s=[...c,...s],this.messageCache.cacheServerMessages(o,a),r.userOffsets.forEach((e=>{this.userOffsets.updateOffset(e.userId,e.offset)})),this.userOffsets.offsetMap.forEach(((e,t)=>{this.markLocalMessagesRead(a,t,e,!1)}))}return s}))}deleteMessages(e){return b(this,void 0,void 0,(function*(){yield this.aopUnreadAmountMaxMessage((()=>b(this,void 0,void 0,(function*(){let t=e.messages;yield Ms.deleteServerMessages(t),this.messageCache.deleteMessages(t),v.onSuccess(e)}))))}))}syncDeletedMessage(e,t){this.aopUnreadAmountMaxMessage((()=>{this.doSyncDeletedMessage(e,t)}))}doSyncDeletedMessage(e,t){if(e===te.Socket.user().id){let e=this.messageCache.findMessagesByTimes(t);this.messageCache.deleteMessages(e),e.length>0&&Ps.fire(ds.MESSAGE_DELETED,e)}}recallMessages(e){return b(this,void 0,void 0,(function*(){yield this.aopUnreadAmountMaxMessage((()=>b(this,void 0,void 0,(function*(){this.doRecall(e)}))))}))}doRecall(e){let t=this.messageCache.recallMessage(e);t.length>0&&Ps.fire(ds.MESSAGE_RECALLED,t)}expire(){this.messageCache.isEmpty()||(this.expiredTime=this.messageCache.maxSuccessMessageTime())}updateByServerChange(){return b(this,void 0,void 0,(function*(){yield this.aopUnreadAmountMaxMessage((()=>b(this,void 0,void 0,(function*(){let e=yield this.remoteHistory.sync(this.target.scene,this.target.id,this.expiredTime,this.messageCache.minTime(),this.target.teamId);e.userOffsets.forEach((e=>{this.markLocalMessagesRead(this.messageCache.all(),e.userId,e.offset,!0)}));let t=e.deletedMessageTimes;t.length>0&&this.doSyncDeletedMessage(te.Socket.user().id,t);let s=e.recalledMessages;s.length>0&&s.forEach((e=>{let t=new Os(this.target.scene,this.target.id,e.recaller,e.times);this.doRecall(t)})),this.expiredTime=0}))))}))}markRead(){return b(this,void 0,void 0,(function*(){yield this.aopUnreadAmountMaxMessage((()=>b(this,void 0,void 0,(function*(){let e=this.messageCache.maxSuccessMessageTime();e>this.userOffsets.myOffset()&&(this.userOffsets.markingTime=e,yield this.remoteHistory.updateServerOffsets(e,this.target),e===this.userOffsets.markingTime&&this.markLocalMessagesRead(this.messageCache.all(),te.Socket.user().id,e,!0))}))))}))}syncMarkedMessage(e){this.aopUnreadAmountMaxMessage((()=>{this.markLocalMessagesRead(this.messageCache.all(),e.markerId,e.time,!0)}))}onMessageSending(e){this.aopUnreadAmountMaxMessage((()=>{this.messageCache.saveMessage(e)}))}onMessageSendSuccess(e){this.aopUnreadAmountMaxMessage((()=>{this.messageCache.correctPosition(e),this.markLocalMessagesRead(this.messageCache.all(),te.Socket.user().id,e.timestamp,!0)}))}onMessageSendFailed(e){this.getMaxMessage()===e&&ys.i.fire(us.MAX_MESSAGE_CHANGED,{message:e,receiver:this.to})}onMessageReceived(e){this.aopUnreadAmountMaxMessage((()=>{this.messageCache.saveMessage(e),this.markLocalMessagesRead(this.messageCache.all(),e.senderId,e.timestamp,!0)}))}aopUnreadAmountMaxMessage(e,t){return b(this,void 0,void 0,(function*(){try{let t=new ks(this);t.pre(),yield e(),t.post()}catch(e){v.onFailed(t,e)}}))}markLocalMessagesRead(e,t,s,i){if(this.userOffsets.updateOffset(t,s),this.isOtherUserId(t)){let t=this.markMySentRead(e,s);i&&t.length>0&&Ps.fire(ds.MESSAGE_READ,t)}else t===te.Socket.user().id&&this.markOthersSentRead(e,s)}markOthersSentRead(e,t){if(this.target.scene===o.PRIVATE)for(let s=e.length-1;s>=0;s--){let i=e[s];if(i.isOtherSent()&&i.timestamp<=t){if(i.read)break;i.read=!0}}}markMySentRead(e,t){let s=new Array;if(this.target.scene===o.PRIVATE)for(let i=e.length-1;i>=0;i--){let n=e[i];if(!n.isOtherSent()&&n.timestamp<=t&&n.status===r.SUCCESS){if(n.read)break;n.read=!0,s.push(n)}}return s}isOtherUserId(e){if(this.target.scene===o.CS){let t=this.target.customerId();return te.Socket.user().id===t?e!==te.Socket.user().id:e===t}return e!==te.Socket.user().id}unreadAmount(e){let t=0,s=this.userOffsets.myOffset(),i=this.messageCache.all();for(const e of i)e.isOtherSent()&&!1===e.recalled&&e.timestamp>s&&(t+=1);return t}getMaxMessage(e){return this.messageCache.getMaxMessage()}maxTime(e){let t=this.getMaxMessage();return u.isDef(t)?t.timestamp:0}}class xs{constructor(e,t){this.teamId=e,this.customerId=t}}class Us{}class Gs{constructor(e,t,s){this.teamId=e,this.teamData=JSON.stringify(t),this.agentData=JSON.stringify(s)}}class Fs{constructor(e){this.teamId=e}}class Ls{constructor(e){this.teamId=e}}var Bs={exports:{}},qs=/^(?:(?![^:@]+:[^:@\/]*@)(http|https|ws|wss):\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?((?:[a-f0-9]{0,4}:){2,7}[a-f0-9]{0,4}|[^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/,js=["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],Vs=function(e){var t=e,s=e.indexOf("["),i=e.indexOf("]");-1!=s&&-1!=i&&(e=e.substring(0,s)+e.substring(s,i).replace(/:/g,";")+e.substring(i,e.length));for(var n=qs.exec(e||""),o={},r=14;r--;)o[js[r]]=n[r]||"";return-1!=s&&-1!=i&&(o.source=t,o.host=o.host.substring(1,o.host.length-1).replace(/;/g,":"),o.authority=o.authority.replace("[","").replace("]","").replace(/;/g,":"),o.ipv6uri=!0),o},Hs={exports:{}},zs={exports:{}},Ws=1e3,Js=60*Ws,Xs=60*Js,$s=24*Xs,Ys=365.25*$s,Qs=function(e,t){t=t||{};var s=typeof e;if("string"===s&&e.length>0)return function(e){if(e=String(e),e.length>100)return;var t=/^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(e);if(!t)return;var s=parseFloat(t[1]);switch((t[2]||"ms").toLowerCase()){case"years":case"year":case"yrs":case"yr":case"y":return s*Ys;case"days":case"day":case"d":return s*$s;case"hours":case"hour":case"hrs":case"hr":case"h":return s*Xs;case"minutes":case"minute":case"mins":case"min":case"m":return s*Js;case"seconds":case"second":case"secs":case"sec":case"s":return s*Ws;case"milliseconds":case"millisecond":case"msecs":case"msec":case"ms":return s;default:return}}(e);if("number"===s&&!1===isNaN(e))return t.long?function(e){return Ks(e,$s,"day")||Ks(e,Xs,"hour")||Ks(e,Js,"minute")||Ks(e,Ws,"second")||e+" ms"}(e):function(e){if(e>=$s)return Math.round(e/$s)+"d";if(e>=Xs)return Math.round(e/Xs)+"h";if(e>=Js)return Math.round(e/Js)+"m";if(e>=Ws)return Math.round(e/Ws)+"s";return e+"ms"}(e);throw new Error("val is not a non-empty string or a valid number. val="+JSON.stringify(e))};function Ks(e,t,s){if(!(e<t))return e<1.5*t?Math.floor(e/t)+" "+s:Math.ceil(e/t)+" "+s+"s"}!function(e,t){function s(e){var s;function n(){if(n.enabled){var e=n,i=+new Date,o=i-(s||i);e.diff=o,e.prev=s,e.curr=i,s=i;for(var r=new Array(arguments.length),a=0;a<r.length;a++)r[a]=arguments[a];r[0]=t.coerce(r[0]),"string"!=typeof r[0]&&r.unshift("%O");var c=0;r[0]=r[0].replace(/%([a-zA-Z%])/g,(function(s,i){if("%%"===s)return s;c++;var n=t.formatters[i];if("function"==typeof n){var o=r[c];s=n.call(e,o),r.splice(c,1),c--}return s})),t.formatArgs.call(e,r),(n.log||t.log||console.log.bind(console)).apply(e,r)}}return n.namespace=e,n.enabled=t.enabled(e),n.useColors=t.useColors(),n.color=function(e){var s,i=0;for(s in e)i=(i<<5)-i+e.charCodeAt(s),i|=0;return t.colors[Math.abs(i)%t.colors.length]}(e),n.destroy=i,"function"==typeof t.init&&t.init(n),t.instances.push(n),n}function i(){var e=t.instances.indexOf(this);return-1!==e&&(t.instances.splice(e,1),!0)}(t=zs.exports=s.debug=s.default=s).coerce=function(e){return e instanceof Error?e.stack||e.message:e},t.disable=function(){t.enable("")},t.enable=function(e){var s;t.save(e),t.names=[],t.skips=[];var i=("string"==typeof e?e:"").split(/[\s,]+/),n=i.length;for(s=0;s<n;s++)i[s]&&("-"===(e=i[s].replace(/\*/g,".*?"))[0]?t.skips.push(new RegExp("^"+e.substr(1)+"$")):t.names.push(new RegExp("^"+e+"$")));for(s=0;s<t.instances.length;s++){var o=t.instances[s];o.enabled=t.enabled(o.namespace)}},t.enabled=function(e){if("*"===e[e.length-1])return!0;var s,i;for(s=0,i=t.skips.length;s<i;s++)if(t.skips[s].test(e))return!1;for(s=0,i=t.names.length;s<i;s++)if(t.names[s].test(e))return!0;return!1},t.humanize=Qs,t.instances=[],t.names=[],t.skips=[],t.formatters={}}(0,zs.exports),function(e,t){function s(){var e;try{e=t.storage.debug}catch(e){}return!e&&"undefined"!=typeof process&&"env"in process&&(e=process.env.DEBUG),e}(t=e.exports=zs.exports).log=function(){return"object"==typeof console&&console.log&&Function.prototype.apply.call(console.log,console,arguments)},t.formatArgs=function(e){var s=this.useColors;if(e[0]=(s?"%c":"")+this.namespace+(s?" %c":" ")+e[0]+(s?"%c ":" ")+"+"+t.humanize(this.diff),!s)return;var i="color: "+this.color;e.splice(1,0,i,"color: inherit");var n=0,o=0;e[0].replace(/%[a-zA-Z%]/g,(function(e){"%%"!==e&&(n++,"%c"===e&&(o=n))})),e.splice(o,0,i)},t.save=function(e){try{null==e?t.storage.removeItem("debug"):t.storage.debug=e}catch(e){}},t.load=s,t.useColors=function(){if("undefined"!=typeof window&&window.process&&"renderer"===window.process.type)return!0;if("undefined"!=typeof navigator&&navigator.userAgent&&navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/))return!1;return"undefined"!=typeof document&&document.documentElement&&document.documentElement.style&&document.documentElement.style.WebkitAppearance||"undefined"!=typeof window&&window.console&&(window.console.firebug||window.console.exception&&window.console.table)||"undefined"!=typeof navigator&&navigator.userAgent&&navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/)&&parseInt(RegExp.$1,10)>=31||"undefined"!=typeof navigator&&navigator.userAgent&&navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/)},t.storage="undefined"!=typeof chrome&&void 0!==chrome.storage?chrome.storage.local:function(){try{return window.localStorage}catch(e){}}(),t.colors=["#0000CC","#0000FF","#0033CC","#0033FF","#0066CC","#0066FF","#0099CC","#0099FF","#00CC00","#00CC33","#00CC66","#00CC99","#00CCCC","#00CCFF","#3300CC","#3300FF","#3333CC","#3333FF","#3366CC","#3366FF","#3399CC","#3399FF","#33CC00","#33CC33","#33CC66","#33CC99","#33CCCC","#33CCFF","#6600CC","#6600FF","#6633CC","#6633FF","#66CC00","#66CC33","#9900CC","#9900FF","#9933CC","#9933FF","#99CC00","#99CC33","#CC0000","#CC0033","#CC0066","#CC0099","#CC00CC","#CC00FF","#CC3300","#CC3333","#CC3366","#CC3399","#CC33CC","#CC33FF","#CC6600","#CC6633","#CC9900","#CC9933","#CCCC00","#CCCC33","#FF0000","#FF0033","#FF0066","#FF0099","#FF00CC","#FF00FF","#FF3300","#FF3333","#FF3366","#FF3399","#FF33CC","#FF33FF","#FF6600","#FF6633","#FF9900","#FF9933","#FFCC00","#FFCC33"],t.formatters.j=function(e){try{return JSON.stringify(e)}catch(e){return"[UnexpectedJSONParseError]: "+e.message}},t.enable(s())}(Hs,Hs.exports);var Zs=Vs,ei=Hs.exports("socket.io-client:url"),ti=function(e,t){var s=e;t=t||"undefined"!=typeof location&&location,null==e&&(e=t.protocol+"//"+t.host);"string"==typeof e&&("/"===e.charAt(0)&&(e="/"===e.charAt(1)?t.protocol+e:t.host+e),/^(https?|wss?):\/\//.test(e)||(ei("protocol-less url %s",e),e=void 0!==t?t.protocol+"//"+e:"https://"+e),ei("parse %s",e),s=Zs(e));s.port||(/^(http|ws)$/.test(s.protocol)?s.port="80":/^(http|ws)s$/.test(s.protocol)&&(s.port="443"));s.path=s.path||"/";var i=-1!==s.host.indexOf(":")?"["+s.host+"]":s.host;return s.id=s.protocol+"://"+i+":"+s.port,s.href=s.protocol+"://"+i+(t&&t.port===s.port?"":":"+s.port),s};var si={},ii={}.toString,ni=Array.isArray||function(e){return"[object Array]"==ii.call(e)};!function(e){Hs.exports("socket.io-parser");var t=w.exports,s=ni;function i(){}e.protocol=4,e.types=["CONNECT","DISCONNECT","EVENT","ACK","ERROR","BINARY_EVENT","BINARY_ACK"],e.CONNECT=0,e.DISCONNECT=1,e.EVENT=2,e.ACK=3,e.ERROR=4,e.BINARY_EVENT=5,e.BINARY_ACK=6,e.Encoder=i,e.Decoder=o;var n=e.ERROR+'"encode error"';function o(){this.reconstructor=null}function r(t){return{type:e.ERROR,data:"parser error: "+t}}i.prototype.encode=function(t,s){var i=function(t){var s=""+t.type;e.BINARY_EVENT!==t.type&&e.BINARY_ACK!==t.type||(s+=t.attachments+"-");t.nsp&&"/"!==t.nsp&&(s+=t.nsp+",");null!=t.id&&(s+=t.id);if(null!=t.data){var i=function(e){try{return JSON.stringify(e)}catch(e){return!1}}(t.data);if(!1===i)return n;s+=i}return s}(t);s([i])},t(o.prototype),o.prototype.add=function(t){var i;if("string"!=typeof t)throw new Error("Unknown type: "+t);i=function(t){var i=0,n={type:Number(t.charAt(0))};if(null==e.types[n.type])return r("unknown packet type "+n.type);if(e.BINARY_EVENT===n.type||e.BINARY_ACK===n.type){for(var o="";"-"!==t.charAt(++i)&&(o+=t.charAt(i),i!=t.length););if(o!=Number(o)||"-"!==t.charAt(i))throw new Error("Illegal attachments");n.attachments=Number(o)}if("/"===t.charAt(i+1))for(n.nsp="";++i;){if(","===(c=t.charAt(i)))break;if(n.nsp+=c,i===t.length)break}else n.nsp="/";var a=t.charAt(i+1);if(""!==a&&Number(a)==a){for(n.id="";++i;){var c;if(null==(c=t.charAt(i))||Number(c)!=c){--i;break}if(n.id+=t.charAt(i),i===t.length)break}n.id=Number(n.id)}if(t.charAt(++i)){var u=function(e){try{return JSON.parse(e)}catch(e){return!1}}(t.substr(i));if(!(!1!==u&&(n.type===e.ERROR||s(u))))return r("invalid payload");n.data=u}return n}(t),this.emit("decoded",i)},o.prototype.destroy=function(){this.reconstructor&&this.reconstructor.finishedReconstruction()}}(si);var oi={exports:{}},ri={},ai={},ci=Object.keys||function(e){var t=[],s=Object.prototype.hasOwnProperty;for(var i in e)s.call(e,i)&&t.push(i);return t},ui=ni,li=Object.prototype.toString,di="function"==typeof Blob||"undefined"!=typeof Blob&&"[object BlobConstructor]"===li.call(Blob),hi="function"==typeof File||"undefined"!=typeof File&&"[object FileConstructor]"===li.call(File),pi=function e(t){if(!t||"object"!=typeof t)return!1;if(ui(t)){for(var s=0,i=t.length;s<i;s++)if(e(t[s]))return!0;return!1}if("function"==typeof Buffer&&Buffer.isBuffer&&Buffer.isBuffer(t)||"function"==typeof ArrayBuffer&&t instanceof ArrayBuffer||di&&t instanceof Blob||hi&&t instanceof File)return!0;if(t.toJSON&&"function"==typeof t.toJSON&&1===arguments.length)return e(t.toJSON(),!0);for(var n in t)if(Object.prototype.hasOwnProperty.call(t,n)&&e(t[n]))return!0;return!1};var mi=function(e,t,s){var i=!1;return s=s||fi,n.count=e,0===e?t():n;function n(e,o){if(n.count<=0)throw new Error("after called too many times");--n.count,e?(i=!0,t(e),t=s):0!==n.count||i||t(null,o)}};function fi(){}var gi,yi,Si,Ei=String.fromCharCode;function vi(e){for(var t,s,i=[],n=0,o=e.length;n<o;)(t=e.charCodeAt(n++))>=55296&&t<=56319&&n<o?56320==(64512&(s=e.charCodeAt(n++)))?i.push(((1023&t)<<10)+(1023&s)+65536):(i.push(t),n--):i.push(t);return i}function bi(e,t){if(e>=55296&&e<=57343){if(t)throw Error("Lone surrogate U+"+e.toString(16).toUpperCase()+" is not a scalar value");return!1}return!0}function Ci(e,t){return Ei(e>>t&63|128)}function Mi(e,t){if(0==(4294967168&e))return Ei(e);var s="";return 0==(4294965248&e)?s=Ei(e>>6&31|192):0==(4294901760&e)?(bi(e,t)||(e=65533),s=Ei(e>>12&15|224),s+=Ci(e,6)):0==(4292870144&e)&&(s=Ei(e>>18&7|240),s+=Ci(e,12),s+=Ci(e,6)),s+=Ei(63&e|128)}function wi(){if(Si>=yi)throw Error("Invalid byte index");var e=255&gi[Si];if(Si++,128==(192&e))return 63&e;throw Error("Invalid continuation byte")}function Ii(e){var t,s;if(Si>yi)throw Error("Invalid byte index");if(Si==yi)return!1;if(t=255&gi[Si],Si++,0==(128&t))return t;if(192==(224&t)){if((s=(31&t)<<6|wi())>=128)return s;throw Error("Invalid continuation byte")}if(224==(240&t)){if((s=(15&t)<<12|wi()<<6|wi())>=2048)return bi(s,e)?s:65533;throw Error("Invalid continuation byte")}if(240==(248&t)&&(s=(7&t)<<18|wi()<<12|wi()<<6|wi())>=65536&&s<=1114111)return s;throw Error("Invalid UTF-8 detected")}var Ni={version:"2.1.2",encode:function(e,t){for(var s=!1!==(t=t||{}).strict,i=vi(e),n=i.length,o=-1,r="";++o<n;)r+=Mi(i[o],s);return r},decode:function(e,t){var s=!1!==(t=t||{}).strict;gi=vi(e),yi=gi.length,Si=0;for(var i,n=[];!1!==(i=Ii(s));)n.push(i);return function(e){for(var t,s=e.length,i=-1,n="";++i<s;)(t=e[i])>65535&&(n+=Ei((t-=65536)>>>10&1023|55296),t=56320|1023&t),n+=Ei(t);return n}(n)}},Ti=void 0!==Ti?Ti:"undefined"!=typeof WebKitBlobBuilder?WebKitBlobBuilder:"undefined"!=typeof MSBlobBuilder?MSBlobBuilder:"undefined"!=typeof MozBlobBuilder&&MozBlobBuilder,Ri=function(){try{return 2===new Blob(["hi"]).size}catch(e){return!1}}(),Ai=Ri&&function(){try{return 2===new Blob([new Uint8Array([1,2])]).size}catch(e){return!1}}(),ki=Ti&&Ti.prototype.append&&Ti.prototype.getBlob;function Oi(e){return e.map((function(e){if(e.buffer instanceof ArrayBuffer){var t=e.buffer;if(e.byteLength!==t.byteLength){var s=new Uint8Array(e.byteLength);s.set(new Uint8Array(t,e.byteOffset,e.byteLength)),t=s.buffer}return t}return e}))}function Pi(e,t){t=t||{};var s=new Ti;return Oi(e).forEach((function(e){s.append(e)})),t.type?s.getBlob(t.type):s.getBlob()}function _i(e,t){return new Blob(Oi(e),t||{})}"undefined"!=typeof Blob&&(Pi.prototype=Blob.prototype,_i.prototype=Blob.prototype);var Di=Ri?Ai?Blob:_i:ki?Pi:void 0;!function(e){var t=ci,s=pi,i=mi,n=Ni;"undefined"!=typeof navigator&&/Android/i.test(navigator.userAgent),"undefined"!=typeof navigator&&/PhantomJS/i.test(navigator.userAgent),e.protocol=3;var o=e.packets={open:0,close:1,ping:2,pong:3,message:4,upgrade:5,noop:6},r=t(o),a={type:"error",data:"parser error"},c=Di;e.encodePacket=function(e,t,s,i){"function"==typeof t&&(i=t,t=!1),"function"==typeof s&&(i=s,s=null),void 0===e.data||e.data.buffer||e.data;var r=o[e.type];return void 0!==e.data&&(r+=s?n.encode(String(e.data),{strict:!1}):String(e.data)),i(""+r)},e.decodePacket=function(e,t,s){if(void 0===e)return a;if("string"==typeof e){if(s&&!1===(e=function(e){try{e=n.decode(e,{strict:!1})}catch(e){return!1}return e}(e)))return a;var i=e.charAt(0);return Number(i)==i&&r[i]?e.length>1?{type:r[i],data:e.substring(1)}:{type:r[i]}:a}i=new Uint8Array(e)[0];var o=sliceBuffer(e,1);return c&&"blob"===t&&(o=new c([o])),{type:r[i],data:o}},e.encodePayload=function(t,n,o){"function"==typeof n&&(o=n,n=null);var r=s(t);if(!t.length)return o("0:");!function(e,t,s){for(var n=new Array(e.length),o=i(e.length,s),r=function(e,s,i){t(s,(function(t,s){n[e]=s,i(t,n)}))},a=0;a<e.length;a++)r(a,e[a],o)}(t,(function(t,s){e.encodePacket(t,!!r&&n,!0,(function(e){s(null,function(e){return e.length+":"+e}(e))}))}),(function(e,t){return o(t.join(""))}))},e.decodePayload=function(t,s,i){var n;if("function"==typeof s&&(i=s,s=null),""===t)return i(a,0,1);for(var o,r,c="",u=0,l=t.length;u<l;u++){var d=t.charAt(u);if(":"===d){if(""===c||c!=(o=Number(c)))return i(a,0,1);if(c!=(r=t.substr(u+1,o)).length)return i(a,0,1);if(r.length){if(n=e.decodePacket(r,s,!0),a.type===n.type&&a.data===n.data)return i(a,0,1);if(!1===i(n,u+o,l))return}u+=o,c=""}else c+=d}return""!==c?i(a,0,1):void 0}}(ai);var xi=ai,Ui=Gi;function Gi(e){this.path=e.path,this.hostname=e.hostname,this.port=e.port,this.secure=e.secure,this.query=e.query,this.timestampParam=e.timestampParam,this.timestampRequests=e.timestampRequests,this.readyState="",this.agent=e.agent||!1,this.socket=e.socket,this.enablesXDR=e.enablesXDR,this.pfx=e.pfx,this.key=e.key,this.passphrase=e.passphrase,this.cert=e.cert,this.ca=e.ca,this.ciphers=e.ciphers,this.rejectUnauthorized=e.rejectUnauthorized,this.forceNode=e.forceNode,this.isReactNative=e.isReactNative,this.extraHeaders=e.extraHeaders,this.localAddress=e.localAddress}(0,w.exports)(Gi.prototype),Gi.prototype.onError=function(e,t){var s=new Error(e);return s.type="TransportError",s.description=t,this.emit("error",s),this},Gi.prototype.open=function(){return"closed"!==this.readyState&&""!==this.readyState||(this.readyState="opening",this.doOpen()),this},Gi.prototype.close=function(){return"opening"!==this.readyState&&"open"!==this.readyState||(this.doClose(),this.onClose()),this},Gi.prototype.send=function(e){if("open"!==this.readyState)throw new Error("Transport not open");this.write(e)},Gi.prototype.onOpen=function(){this.readyState="open",this.writable=!0,this.emit("open")},Gi.prototype.onData=function(e){var t=xi.decodePacket(e,this.socket.binaryType);this.onPacket(t)},Gi.prototype.onPacket=function(e){this.emit("packet",e)},Gi.prototype.onClose=function(){this.readyState="closed",this.emit("close")};var Fi,Li={encode:function(e){var t="";for(var s in e)e.hasOwnProperty(s)&&(t.length&&(t+="&"),t+=encodeURIComponent(s)+"="+encodeURIComponent(e[s]));return t},decode:function(e){for(var t={},s=e.split("&"),i=0,n=s.length;i<n;i++){var o=s[i].split("=");t[decodeURIComponent(o[0])]=decodeURIComponent(o[1])}return t}},Bi=function(e,t){var s=function(){};s.prototype=t.prototype,e.prototype=new s,e.prototype.constructor=e},qi="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_".split(""),ji=64,Vi={},Hi=0,zi=0;function Wi(e){var t="";do{t=qi[e%ji]+t,e=Math.floor(e/ji)}while(e>0);return t}function Ji(){var e=Wi(+new Date);return e!==Fi?(Hi=0,Fi=e):e+"."+Wi(Hi++)}for(;zi<ji;zi++)Vi[qi[zi]]=zi;Ji.encode=Wi,Ji.decode=function(e){var t=0;for(zi=0;zi<e.length;zi++)t=t*ji+Vi[e.charAt(zi)];return t};var Xi=Ji,$i={exports:{}};try{$i.exports="undefined"!=typeof XMLHttpRequest&&"withCredentials"in new XMLHttpRequest}catch(e){$i.exports=!1}var Yi=$i.exports,Qi=function(e){var t=e.xdomain,s=e.xscheme,i=e.enablesXDR;try{if("undefined"!=typeof XMLHttpRequest&&(!t||Yi))return new XMLHttpRequest}catch(e){}try{if("undefined"!=typeof XDomainRequest&&!s&&i)return new XDomainRequest}catch(e){}if(!t)try{return new(self[["Active"].concat("Object").join("X")])("Microsoft.XMLHTTP")}catch(e){}},Ki=Ui,Zi=Li,en=ai,tn=Bi,sn=Xi,nn=Hs.exports("engine.io-client:polling"),on=an,rn=null!=new Qi({xdomain:!1}).responseType;function an(e){var t=e&&e.forceBase64;rn&&!t||(this.supportsBinary=!1),Ki.call(this,e)}tn(an,Ki),an.prototype.name="polling",an.prototype.doOpen=function(){this.poll()},an.prototype.pause=function(e){var t=this;function s(){nn("paused"),t.readyState="paused",e()}if(this.readyState="pausing",this.polling||!this.writable){var i=0;this.polling&&(nn("we are currently polling - waiting to pause"),i++,this.once("pollComplete",(function(){nn("pre-pause polling complete"),--i||s()}))),this.writable||(nn("we are currently writing - waiting to pause"),i++,this.once("drain",(function(){nn("pre-pause writing complete"),--i||s()})))}else s()},an.prototype.poll=function(){nn("polling"),this.polling=!0,this.doPoll(),this.emit("poll")},an.prototype.onData=function(e){var t=this;nn("polling got data %s",e);en.decodePayload(e,this.socket.binaryType,(function(e,s,i){if("opening"===t.readyState&&t.onOpen(),"close"===e.type)return t.onClose(),!1;t.onPacket(e)})),"closed"!==this.readyState&&(this.polling=!1,this.emit("pollComplete"),"open"===this.readyState?this.poll():nn('ignoring poll - transport state "%s"',this.readyState))},an.prototype.doClose=function(){var e=this;function t(){nn("writing close packet"),e.write([{type:"close"}])}"open"===this.readyState?(nn("transport open - closing"),t()):(nn("transport not open - deferring close"),this.once("open",t))},an.prototype.write=function(e){var t=this;this.writable=!1;var s=function(){t.writable=!0,t.emit("drain")};en.encodePayload(e,this.supportsBinary,(function(e){t.doWrite(e,s)}))},an.prototype.uri=function(){var e=this.query||{},t=this.secure?"https":"http",s="";return!1!==this.timestampRequests&&(e[this.timestampParam]=sn()),this.supportsBinary||e.sid||(e.b64=1),e=Zi.encode(e),this.port&&("https"===t&&443!==Number(this.port)||"http"===t&&80!==Number(this.port))&&(s=":"+this.port),e.length&&(e="?"+e),t+"://"+(-1!==this.hostname.indexOf(":")?"["+this.hostname+"]":this.hostname)+s+this.path+e};var cn,un=on,ln=fn,dn=/\n/g,hn=/\\n/g;function pn(){}function mn(){return"undefined"!=typeof self?self:"undefined"!=typeof window?window:void 0!==C?C:{}}function fn(e){if(un.call(this,e),this.query=this.query||{},!cn){var t=mn();cn=t.___eio=t.___eio||[]}this.index=cn.length;var s=this;cn.push((function(e){s.onData(e)})),this.query.j=this.index,"function"==typeof addEventListener&&addEventListener("beforeunload",(function(){s.script&&(s.script.onerror=pn)}),!1)}Bi(fn,un),fn.prototype.supportsBinary=!1,fn.prototype.doClose=function(){this.script&&(this.script.parentNode.removeChild(this.script),this.script=null),this.form&&(this.form.parentNode.removeChild(this.form),this.form=null,this.iframe=null),un.prototype.doClose.call(this)},fn.prototype.doPoll=function(){var e=this,t=document.createElement("script");this.script&&(this.script.parentNode.removeChild(this.script),this.script=null),t.async=!0,t.src=this.uri(),t.onerror=function(t){e.onError("jsonp poll error",t)};var s=document.getElementsByTagName("script")[0];s?s.parentNode.insertBefore(t,s):(document.head||document.body).appendChild(t),this.script=t,"undefined"!=typeof navigator&&/gecko/i.test(navigator.userAgent)&&setTimeout((function(){var e=document.createElement("iframe");document.body.appendChild(e),document.body.removeChild(e)}),100)},fn.prototype.doWrite=function(e,t){var s=this;if(!this.form){var i,n=document.createElement("form"),o=document.createElement("textarea"),r=this.iframeId="eio_iframe_"+this.index;n.className="socketio",n.style.position="absolute",n.style.top="-1000px",n.style.left="-1000px",n.target=r,n.method="POST",n.setAttribute("accept-charset","utf-8"),o.name="d",n.appendChild(o),document.body.appendChild(n),this.form=n,this.area=o}function a(){c(),t()}function c(){if(s.iframe)try{s.form.removeChild(s.iframe)}catch(e){s.onError("jsonp polling iframe removal error",e)}try{var e='<iframe src="javascript:0" name="'+s.iframeId+'">';i=document.createElement(e)}catch(e){(i=document.createElement("iframe")).name=s.iframeId,i.src="javascript:0"}i.id=s.iframeId,s.form.appendChild(i),s.iframe=i}this.form.action=this.uri(),c(),e=e.replace(hn,"\\\n"),this.area.value=e.replace(dn,"\\n");try{this.form.submit()}catch(e){}this.iframe.attachEvent?this.iframe.onreadystatechange=function(){"complete"===s.iframe.readyState&&a()}:this.iframe.onload=a};var gn,yn,Sn=Ui,En=ai,vn=Li,bn=Bi,Cn=Xi,Mn=Hs.exports("engine.io-client:websocket");("undefined"==typeof uni&&"undefined"==typeof wx&&"undefined"==typeof my&&"undefined"==typeof swan||"undefined"!=typeof WebSocket)&&("undefined"!=typeof WebSocket?gn=WebSocket:"undefined"!=typeof self&&(gn=self.WebSocket||self.MozWebSocket));var wn=gn||yn,In="undefined"!=typeof uni&&"harmonyos"===uni.getSystemInfoSync().platform;(("undefined"!=typeof uni||"undefined"!=typeof wx||"undefined"!=typeof my||"undefined"!=typeof swan)&&"undefined"==typeof WebSocket||"undefined"!=typeof GameGlobal||In)&&(wn=function(e){var t=this;if(t.onopen=function(){},t.onclose=function(){},t.onmessage=function(e){},t.onerror=function(e){},"object"==typeof tt&&tt.getSystemInfo){let s=tt.connectSocket({url:e});t.send=function(e){s.send({data:e})},t.close=function(){s.close()},s.onOpen((function(){t.onopen()})),s.onError((function(e){t.onerror(e)})),s.onMessage((function(e){t.onmessage(e)})),s.onClose((function(){t.onclose()}))}else if("undefined"!=typeof my)my.connectSocket({url:e}),t.send=function(e){my.sendSocketMessage({data:e})},t.close=function(e){my.closeSocket()},my.onSocketOpen((function(e){t.onopen()})),my.onSocketError((function(e){t.onerror(e)})),my.onSocketMessage((function(e){t.onmessage(e)})),my.onSocketClose((e=>{t.onclose(e)}));else if("undefined"!=typeof swan)swan.connectSocket({url:e}),t.send=function(e){swan.sendSocketMessage({data:e})},t.close=function(e){swan.closeSocket()},swan.onSocketOpen((function(e){t.onopen()})),swan.onSocketError((function(e){t.onerror(e)})),swan.onSocketMessage((function(e){t.onmessage(e)})),swan.onSocketClose((e=>{t.onclose(e)}));else if("undefined"!=typeof uni){var s=uni.connectSocket({url:e,complete:()=>{}});t.send=function(e){s.send({data:e})},t.close=function(){s.close()},s.onOpen((function(e){t.onopen()})),s.onError((function(e){t.onerror(e)})),s.onMessage((function(e){t.onmessage(e)})),s.onClose((function(e){t.onclose()}))}else{var i=wx.connectSocket({url:e});t.send=function(e){i.send({data:e})},t.close=function(e){i.close({code:1e3})},i.onOpen((function(){t.onopen()})),i.onError((function(e){t.onerror(e)})),i.onMessage((function(e){t.onmessage(e)})),i.onClose((function(e){t.onclose(e)}))}});var Nn=Tn;function Tn(e){e&&e.forceBase64&&(this.supportsBinary=!1),("undefined"==typeof uni&&"undefined"==typeof wx&&"undefined"==typeof my&&"undefined"==typeof swan||"undefined"!=typeof WebSocket)&&(this.perMessageDeflate=e.perMessageDeflate,this.usingBrowserWebSocket=gn&&!e.forceNode,this.protocols=e.protocols,this.usingBrowserWebSocket||(wn=yn)),Sn.call(this,e)}bn(Tn,Sn),Tn.prototype.name="websocket",Tn.prototype.supportsBinary=!1,Tn.prototype.doOpen=function(){if(this.check()){var e,t,s=this.uri();if(("undefined"==typeof uni&&"undefined"==typeof wx&&"undefined"==typeof my&&"undefined"==typeof swan||"undefined"!=typeof WebSocket)&&(e=this.protocols),(t=("undefined"!=typeof uni||"undefined"!=typeof wx||"undefined"!=typeof my||"undefined"!=typeof swan)&&"undefined"==typeof WebSocket||In?{agent:this.agent}:{agent:this.agent,perMessageDeflate:this.perMessageDeflate}).pfx=this.pfx,t.key=this.key,t.passphrase=this.passphrase,t.cert=this.cert,t.ca=this.ca,t.ciphers=this.ciphers,t.rejectUnauthorized=this.rejectUnauthorized,"object"==typeof navigator&&"ReactNative"===navigator.product&&(t={}),this.extraHeaders&&(t.headers=this.extraHeaders),this.localAddress&&(t.localAddress=this.localAddress),"undefined"!=typeof cc&&"Windows"===cc.sys.os)cc.resources.load("cacert",((e,t)=>{const i=t.nativeUrl;this.ws=new wn(s,[],i),this.ws.binaryType="arraybuffer",this.addEventListeners()}));else{try{("undefined"!=typeof uni||"undefined"!=typeof wx||"undefined"!=typeof my||"undefined"!=typeof swan)&&"undefined"==typeof WebSocket||In?this.ws=new wn(s):this.ws=this.usingBrowserWebSocket&&!this.isReactNative?e?new wn(s,e):new wn(s):new wn(s,e,t)}catch(e){return this.emit("error",e)}void 0===this.ws.binaryType&&(this.supportsBinary=!1),this.ws.supports&&this.ws.supports.binary?(this.supportsBinary=!0,this.ws.binaryType="nodebuffer"):this.ws.binaryType="arraybuffer",this.addEventListeners()}}},Tn.prototype.addEventListeners=function(){var e=this;this.ws.onopen=function(){e.onOpen()},this.ws.onclose=function(){e.onClose()},this.ws.onmessage=function(t){e.onData(t.data)},this.ws.onerror=function(t){e.onError("websocket error",t)}},Tn.prototype.write=function(e){var t=this;this.writable=!1;for(var s=e.length,i=0,n=s;i<n;i++)!function(e){En.encodePacket(e,t.supportsBinary,(function(i){if(("undefined"!=typeof uni||"undefined"!=typeof wx||"undefined"!=typeof my||"undefined"!=typeof swan)&&"undefined"==typeof WebSocket||In)try{t.ws.send(i)}catch(e){Mn("websocket closed before onclose event")}else{if(!t.usingBrowserWebSocket){var n={};if(e.options&&(n.compress=e.options.compress),t.perMessageDeflate)("string"==typeof i?Buffer.byteLength(i):i.length)<t.perMessageDeflate.threshold&&(n.compress=!1)}try{t.usingBrowserWebSocket?t.ws.send(i):t.ws.send(i,n)}catch(e){Mn("websocket closed before onclose event")}}--s||o()}))}(e[i]);function o(){t.emit("flush"),setTimeout((function(){t.writable=!0,t.emit("drain")}),0)}},Tn.prototype.onClose=function(){Sn.prototype.onClose.call(this)},Tn.prototype.doClose=function(){void 0!==this.ws&&this.ws.close()},Tn.prototype.uri=function(){var e=this.query||{},t=this.secure?"wss":"ws",s="";return this.port&&("wss"===t&&443!==Number(this.port)||"ws"===t&&80!==Number(this.port))&&(s=":"+this.port),this.timestampRequests&&(e[this.timestampParam]=Cn()),this.supportsBinary||(e.b64=1),(e=vn.encode(e)).length&&(e="?"+e),t+"://"+(-1!==this.hostname.indexOf(":")?"["+this.hostname+"]":this.hostname)+s+this.path+e},Tn.prototype.check=function(){return!(!wn||"__initialize"in wn&&this.name===Tn.prototype.name)};var Rn=ln,An=Nn;ri.polling=function(e){var t=!1,s=!1;if(e.jsonp,"undefined"!=typeof location){var i="https:"===location.protocol,n=location.port;n||(n=i?443:80),t=e.hostname!==location.hostname||n!==e.port,s=e.secure!==i}return e.xdomain=t,e.xscheme=s,new Rn(e)},ri.websocket=An;var kn=[].indexOf,On=function(e,t){if(kn)return e.indexOf(t);for(var s=0;s<e.length;++s)if(e[s]===t)return s;return-1},Pn=ri,_n=w.exports,Dn=Hs.exports("engine.io-client:socket"),xn=On,Un=ai,Gn=Vs,Fn=Li,Ln=Bn;function Bn(e,t){if(!(this instanceof Bn))return new Bn(e,t);t=t||{},e&&"object"==typeof e&&(t=e,e=null),e?(e=Gn(e),t.hostname=e.host,t.secure="https"===e.protocol||"wss"===e.protocol,t.port=e.port,e.query&&(t.query=e.query)):t.host&&(t.hostname=Gn(t.host).host),this.secure=null!=t.secure?t.secure:"undefined"!=typeof location&&"https:"===location.protocol,t.hostname&&!t.port&&(t.port=this.secure?"443":"80"),this.agent=t.agent||!1,this.hostname=t.hostname||("undefined"!=typeof location?location.hostname:"localhost"),this.port=t.port||("undefined"!=typeof location&&location.port?location.port:this.secure?443:80),this.query=t.query||{},"string"==typeof this.query&&(this.query=Fn.decode(this.query)),this.upgrade=!1!==t.upgrade,this.path=(t.path||"/engine.io").replace(/\/$/,"")+"/",this.forceJSONP=!!t.forceJSONP,this.jsonp=!1!==t.jsonp,this.forceBase64=!!t.forceBase64,this.enablesXDR=!!t.enablesXDR,this.timestampParam=t.timestampParam||"t",this.timestampRequests=t.timestampRequests,this.transports=t.transports||["polling","websocket"],this.transportOptions=t.transportOptions||{},this.readyState="",this.writeBuffer=[],this.prevBufferLen=0,this.policyPort=t.policyPort||843,this.rememberUpgrade=t.rememberUpgrade||!1,this.binaryType=null,this.onlyBinaryUpgrades=t.onlyBinaryUpgrades,this.perMessageDeflate=!1!==t.perMessageDeflate&&(t.perMessageDeflate||{}),!0===this.perMessageDeflate&&(this.perMessageDeflate={}),this.perMessageDeflate&&null==this.perMessageDeflate.threshold&&(this.perMessageDeflate.threshold=1024),this.pfx=t.pfx||null,this.key=t.key||null,this.passphrase=t.passphrase||null,this.cert=t.cert||null,this.ca=t.ca||null,this.ciphers=t.ciphers||null,this.rejectUnauthorized=void 0===t.rejectUnauthorized||t.rejectUnauthorized,this.forceNode=!!t.forceNode,this.isReactNative="undefined"!=typeof navigator&&"string"==typeof navigator.product&&"reactnative"===navigator.product.toLowerCase(),("undefined"==typeof self||this.isReactNative)&&(t.extraHeaders&&Object.keys(t.extraHeaders).length>0&&(this.extraHeaders=t.extraHeaders),t.localAddress&&(this.localAddress=t.localAddress)),this.id=null,this.upgrades=null,this.pingInterval=null,this.pingTimeout=null,this.pingIntervalTimer=null,this.pingTimeoutTimer=null,this.open()}Bn.priorWebsocketSuccess=!1,_n(Bn.prototype),Bn.protocol=Un.protocol,Bn.Socket=Bn,Bn.Transport=Ui,Bn.transports=ri,Bn.parser=ai,Bn.prototype.createTransport=function(e){Dn('creating transport "%s"',e);var t=function(e){var t={};for(var s in e)e.hasOwnProperty(s)&&(t[s]=e[s]);return t}(this.query);t.EIO=Un.protocol,t.transport=e;var s=this.transportOptions[e]||{};return this.id&&(t.sid=this.id),new Pn[e]({query:t,socket:this,agent:s.agent||this.agent,hostname:s.hostname||this.hostname,port:s.port||this.port,secure:s.secure||this.secure,path:s.path||this.path,forceJSONP:s.forceJSONP||this.forceJSONP,jsonp:s.jsonp||this.jsonp,forceBase64:s.forceBase64||this.forceBase64,enablesXDR:s.enablesXDR||this.enablesXDR,timestampRequests:s.timestampRequests||this.timestampRequests,timestampParam:s.timestampParam||this.timestampParam,policyPort:s.policyPort||this.policyPort,pfx:s.pfx||this.pfx,key:s.key||this.key,passphrase:s.passphrase||this.passphrase,cert:s.cert||this.cert,ca:s.ca||this.ca,ciphers:s.ciphers||this.ciphers,rejectUnauthorized:s.rejectUnauthorized||this.rejectUnauthorized,perMessageDeflate:s.perMessageDeflate||this.perMessageDeflate,extraHeaders:s.extraHeaders||this.extraHeaders,forceNode:s.forceNode||this.forceNode,localAddress:s.localAddress||this.localAddress,requestTimeout:s.requestTimeout||this.requestTimeout,protocols:s.protocols||void 0,isReactNative:this.isReactNative})},Bn.prototype.open=function(){var e;if(this.rememberUpgrade&&Bn.priorWebsocketSuccess&&-1!==this.transports.indexOf("websocket"))e="websocket";else{if(0===this.transports.length){var t=this;return void setTimeout((function(){t.emit("error","No transports available")}),0)}e=this.transports[0]}this.readyState="opening";try{e=this.createTransport(e)}catch(e){return this.transports.shift(),void this.open()}e.open(),this.setTransport(e)},Bn.prototype.setTransport=function(e){Dn("setting transport %s",e.name);var t=this;this.transport&&(Dn("clearing existing transport %s",this.transport.name),this.transport.removeAllListeners()),this.transport=e,e.on("drain",(function(){t.onDrain()})).on("packet",(function(e){t.onPacket(e)})).on("error",(function(e){t.onError(e)})).on("close",(function(){t.onClose("transport close")}))},Bn.prototype.probe=function(e){Dn('probing transport "%s"',e);var t=this.createTransport(e,{probe:1}),s=!1,i=this;function n(){if(i.onlyBinaryUpgrades){var n=!this.supportsBinary&&i.transport.supportsBinary;s=s||n}s||(Dn('probe transport "%s" opened',e),t.send([{type:"ping",data:"probe"}]),t.once("packet",(function(n){if(!s)if("pong"===n.type&&"probe"===n.data){if(Dn('probe transport "%s" pong',e),i.upgrading=!0,i.emit("upgrading",t),!t)return;Bn.priorWebsocketSuccess="websocket"===t.name,Dn('pausing current transport "%s"',i.transport.name),i.transport.pause((function(){s||"closed"!==i.readyState&&(Dn("changing transport and sending upgrade packet"),l(),i.setTransport(t),t.send([{type:"upgrade"}]),i.emit("upgrade",t),t=null,i.upgrading=!1,i.flush())}))}else{Dn('probe transport "%s" failed',e);var o=new Error("probe error");o.transport=t.name,i.emit("upgradeError",o)}})))}function o(){s||(s=!0,l(),t.close(),t=null)}function r(s){var n=new Error("probe error: "+s);n.transport=t.name,o(),Dn('probe transport "%s" failed because of error: %s',e,s),i.emit("upgradeError",n)}function a(){r("transport closed")}function c(){r("socket closed")}function u(e){t&&e.name!==t.name&&(Dn('"%s" works - aborting "%s"',e.name,t.name),o())}function l(){t.removeListener("open",n),t.removeListener("error",r),t.removeListener("close",a),i.removeListener("close",c),i.removeListener("upgrading",u)}Bn.priorWebsocketSuccess=!1,t.once("open",n),t.once("error",r),t.once("close",a),this.once("close",c),this.once("upgrading",u),t.open()},Bn.prototype.onOpen=function(){if(Dn("socket open"),this.readyState="open",Bn.priorWebsocketSuccess="websocket"===this.transport.name,this.emit("open"),this.flush(),"open"===this.readyState&&this.upgrade&&this.transport.pause){Dn("starting upgrade probes");for(var e=0,t=this.upgrades.length;e<t;e++)this.probe(this.upgrades[e])}},Bn.prototype.onPacket=function(e){if("opening"===this.readyState||"open"===this.readyState||"closing"===this.readyState)switch(Dn('socket receive: type "%s", data "%s"',e.type,e.data),this.emit("packet",e),this.emit("heartbeat"),e.type){case"open":this.onHandshake(JSON.parse(e.data));break;case"pong":this.setPing(),this.emit("pong");break;case"error":var t=new Error("server error");t.code=e.data,this.onError(t);break;case"message":this.emit("data",e.data),this.emit("message",e.data)}else Dn('packet received with socket readyState "%s"',this.readyState)},Bn.prototype.onHandshake=function(e){this.emit("handshake",e),this.id=e.sid,this.transport.query.sid=e.sid,this.upgrades=this.filterUpgrades(e.upgrades),this.pingInterval=e.pingInterval,this.pingTimeout=e.pingTimeout,this.onOpen(),"closed"!==this.readyState&&(this.setPing(),this.removeListener("heartbeat",this.onHeartbeat),this.on("heartbeat",this.onHeartbeat))},Bn.prototype.onHeartbeat=function(e){clearTimeout(this.pingTimeoutTimer);var t=this;t.pingTimeoutTimer=setTimeout((function(){"closed"!==t.readyState&&t.onClose("ping timeout")}),e||t.pingInterval+t.pingTimeout)},Bn.prototype.setPing=function(){var e=this;clearTimeout(e.pingIntervalTimer),e.pingIntervalTimer=setTimeout((function(){Dn("writing ping packet - expecting pong within %sms",e.pingTimeout),e.ping(),e.onHeartbeat(e.pingTimeout)}),e.pingInterval)},Bn.prototype.ping=function(){var e=this;this.sendPacket("ping",(function(){e.emit("ping")}))},Bn.prototype.onDrain=function(){this.writeBuffer.splice(0,this.prevBufferLen),this.prevBufferLen=0,0===this.writeBuffer.length?this.emit("drain"):this.flush()},Bn.prototype.flush=function(){"closed"!==this.readyState&&this.transport.writable&&!this.upgrading&&this.writeBuffer.length&&(Dn("flushing %d packets in socket",this.writeBuffer.length),this.transport.send(this.writeBuffer),this.prevBufferLen=this.writeBuffer.length,this.emit("flush"))},Bn.prototype.write=Bn.prototype.send=function(e,t,s){return this.sendPacket("message",e,t,s),this},Bn.prototype.sendPacket=function(e,t,s,i){if("function"==typeof t&&(i=t,t=void 0),"function"==typeof s&&(i=s,s=null),"closing"!==this.readyState&&"closed"!==this.readyState){(s=s||{}).compress=!1!==s.compress;var n={type:e,data:t,options:s};this.emit("packetCreate",n),this.writeBuffer.push(n),i&&this.once("flush",i),this.flush()}},Bn.prototype.close=function(){if("opening"===this.readyState||"open"===this.readyState){this.readyState="closing";var e=this;this.writeBuffer.length?this.once("drain",(function(){this.upgrading?i():t()})):this.upgrading?i():t()}function t(){e.onClose("forced close"),Dn("socket closing - telling transport to close"),e.transport.close()}function s(){e.removeListener("upgrade",s),e.removeListener("upgradeError",s),t()}function i(){e.once("upgrade",s),e.once("upgradeError",s)}return this},Bn.prototype.onError=function(e){Dn("socket error %j",e),Bn.priorWebsocketSuccess=!1,this.emit("error",e),this.onClose("transport error",e)},Bn.prototype.onClose=function(e,t){if("opening"===this.readyState||"open"===this.readyState||"closing"===this.readyState){Dn('socket close with reason: "%s"',e);clearTimeout(this.pingIntervalTimer),clearTimeout(this.pingTimeoutTimer),this.transport.removeAllListeners("close"),this.transport.close(),this.transport.removeAllListeners(),this.readyState="closed",this.id=null,this.emit("close",e,t),this.writeBuffer=[],this.prevBufferLen=0}},Bn.prototype.filterUpgrades=function(e){for(var t=[],s=0,i=e.length;s<i;s++)~xn(this.transports,e[s])&&t.push(e[s]);return t},oi.exports=Ln,oi.exports.parser=ai;var qn={exports:{}},jn=function(e,t){for(var s=[],i=(t=t||0)||0;i<e.length;i++)s[i-t]=e[i];return s};var Vn=function(e,t,s){return e.on(t,s),{destroy:function(){e.removeListener(t,s)}}};var Hn=[].slice,zn=function(e,t){if("string"==typeof t&&(t=e[t]),"function"!=typeof t)throw new Error("bind() requires a function");var s=Hn.call(arguments,2);return function(){return t.apply(e,s.concat(Hn.call(arguments)))}};!function(e,t){var s=si,i=w.exports,n=jn,o=Vn,r=zn,a=(Hs.exports("socket.io-client:socket"),Li),c=pi;e.exports=d;var u={connect:1,connect_error:1,connect_timeout:1,connecting:1,disconnect:1,error:1,reconnect:1,reconnect_attempt:1,reconnect_failed:1,reconnect_error:1,reconnecting:1,ping:1,pong:1},l=i.prototype.emit;function d(e,t,s){this.io=e,this.nsp=t,this.json=this,this.ids=0,this.acks={},this.receiveBuffer=[],this.sendBuffer=[],this.connected=!1,this.disconnected=!0,this.flags={},s&&s.query&&(this.query=s.query),this.io.autoConnect&&this.open()}i(d.prototype),d.prototype.subEvents=function(){if(!this.subs){var e=this.io;this.subs=[o(e,"open",r(this,"onopen")),o(e,"packet",r(this,"onpacket")),o(e,"close",r(this,"onclose"))]}},d.prototype.open=d.prototype.connect=function(){return this.connected||(this.subEvents(),this.io.open(),"open"===this.io.readyState&&this.onopen(),this.emit("connecting")),this},d.prototype.send=function(){var e=n(arguments);return e.unshift("message"),this.emit.apply(this,e),this},d.prototype.emit=function(e){if(u.hasOwnProperty(e))return l.apply(this,arguments),this;var t=n(arguments),i={type:(void 0!==this.flags.binary?this.flags.binary:c(t))?s.BINARY_EVENT:s.EVENT,data:t,options:{}};return i.options.compress=!this.flags||!1!==this.flags.compress,"function"==typeof t[t.length-1]&&(this.ids,this.acks[this.ids]=t.pop(),i.id=this.ids++),this.connected?this.packet(i):this.sendBuffer.push(i),this.flags={},this},d.prototype.packet=function(e){e.nsp=this.nsp,this.io.packet(e)},d.prototype.onopen=function(){if("/"!==this.nsp)if(this.query){var e="object"==typeof this.query?a.encode(this.query):this.query;this.packet({type:s.CONNECT,query:e})}else this.packet({type:s.CONNECT})},d.prototype.onclose=function(e){this.connected=!1,this.disconnected=!0,delete this.id,this.emit("disconnect",e)},d.prototype.onpacket=function(e){var t=e.nsp===this.nsp,i=e.type===s.ERROR&&"/"===e.nsp;if(t||i)switch(e.type){case s.CONNECT:this.onconnect();break;case s.EVENT:case s.BINARY_EVENT:this.onevent(e);break;case s.ACK:case s.BINARY_ACK:this.onack(e);break;case s.DISCONNECT:this.ondisconnect();break;case s.ERROR:this.emit("error",e.data)}},d.prototype.onevent=function(e){var t=e.data||[];null!=e.id&&t.push(this.ack(e.id)),this.connected?l.apply(this,t):this.receiveBuffer.push(t)},d.prototype.ack=function(e){var t=this,i=!1;return function(){if(!i){i=!0;var o=n(arguments);t.packet({type:c(o)?s.BINARY_ACK:s.ACK,id:e,data:o})}}},d.prototype.onack=function(e){var t=this.acks[e.id];"function"==typeof t?(e.id,e.data,t.apply(this,e.data),delete this.acks[e.id]):e.id},d.prototype.onconnect=function(){this.connected=!0,this.disconnected=!1,this.emit("connect"),this.emitBuffered()},d.prototype.emitBuffered=function(){var e;for(e=0;e<this.receiveBuffer.length;e++)l.apply(this,this.receiveBuffer[e]);for(this.receiveBuffer=[],e=0;e<this.sendBuffer.length;e++)this.packet(this.sendBuffer[e]);this.sendBuffer=[]},d.prototype.ondisconnect=function(){this.nsp,this.destroy(),this.onclose("io server disconnect")},d.prototype.destroy=function(){if(this.subs){for(var e=0;e<this.subs.length;e++)this.subs[e].destroy();this.subs=null}this.io.destroy(this)},d.prototype.close=d.prototype.disconnect=function(){return this.connected&&(this.nsp,this.packet({type:s.DISCONNECT})),this.destroy(),this.connected&&this.onclose("io client disconnect"),this},d.prototype.compress=function(e){return this.flags.compress=e,this},d.prototype.binary=function(e){return this.flags.binary=e,this}}(qn);var Wn=Jn;function Jn(e){e=e||{},this.ms=e.min||100,this.max=e.max||1e4,this.factor=e.factor||2,this.jitter=e.jitter>0&&e.jitter<=1?e.jitter:0,this.attempts=0}Jn.prototype.duration=function(){var e=this.ms*Math.pow(this.factor,this.attempts++);if(this.jitter){var t=Math.random(),s=Math.floor(t*this.jitter*e);e=0==(1&Math.floor(10*t))?e-s:e+s}return 0|Math.min(e,this.max)},Jn.prototype.reset=function(){this.attempts=0},Jn.prototype.setMin=function(e){this.ms=e},Jn.prototype.setMax=function(e){this.max=e},Jn.prototype.setJitter=function(e){this.jitter=e};class Xn{static init(e,t,s){this.host=e,(void 0!==t&&!1===t||!0===s)&&(this.https=!1)}static isMP(){return[l.MP_WX,l.MP_ALI,l.MP_BYTE,l.MP_WGAME,l.MP_BAIDU].includes(d.currentPlatform())}static uri(){let e="http";return this.https&&(e+="s"),e+"://"+this.index()+this.host}static index(){return 0==this.i?this.i=Math.floor(Math.random()*this.max)+1:this.i=this.i%this.max+1,this.i}}Xn.i=0,Xn.max=5,Xn.https=!0;var $n=M(Object.freeze({__proto__:null,URIResolver:Xn})),Yn=M(E),Qn=oi.exports,Kn=qn.exports,Zn=w.exports,eo=si,to=Vn,so=zn,io=(Hs.exports("socket.io-client:manager"),On),no=Wn;const{URIResolver:oo}=$n;var ro=Yn.runStatus,ao=Object.prototype.hasOwnProperty,co=uo;function uo(e,t){if(!(this instanceof uo))return new uo(e,t);e&&"object"==typeof e&&(t=e,e=void 0),(t=t||{}).path=t.path||"/socket.io",this.nsps={},this.subs=[],this.opts=t,this.reconnection(!1!==t.reconnection),this.reconnectionAttempts(t.reconnectionAttempts||1/0),this.reconnectionDelay(t.reconnectionDelay||1e3),this.reconnectionDelayMax(t.reconnectionDelayMax||5e3),this.randomizationFactor(t.randomizationFactor||.5),this.backoff=new no({min:this.reconnectionDelay(),max:this.reconnectionDelayMax(),jitter:this.randomizationFactor()}),this.timeout(null==t.timeout?2e4:t.timeout),this.readyState="closed",this.uri=e,this.connecting=[],this.lastPing=null,this.encoding=!1,this.packetBuffer=[];var s=t.parser||eo;this.encoder=new s.Encoder,this.decoder=new s.Decoder,this.autoConnect=!1!==t.autoConnect,this.autoConnect&&this.open()}uo.prototype.emitAll=function(){for(var e in this.emit.apply(this,arguments),this.nsps)ao.call(this.nsps,e)&&this.nsps[e].emit.apply(this.nsps[e],arguments)},uo.prototype.updateSocketIds=function(){for(var e in this.nsps)ao.call(this.nsps,e)&&(this.nsps[e].id=this.generateId(e))},uo.prototype.generateId=function(e){return("/"===e?"":e+"#")+this.engine.id},Zn(uo.prototype),uo.prototype.reconnection=function(e){return arguments.length?(this._reconnection=!!e,this):this._reconnection},uo.prototype.reconnectionAttempts=function(e){return arguments.length?(this._reconnectionAttempts=e,this):this._reconnectionAttempts},uo.prototype.reconnectionDelay=function(e){return arguments.length?(this._reconnectionDelay=e,this.backoff&&this.backoff.setMin(e),this):this._reconnectionDelay},uo.prototype.randomizationFactor=function(e){return arguments.length?(this._randomizationFactor=e,this.backoff&&this.backoff.setJitter(e),this):this._randomizationFactor},uo.prototype.reconnectionDelayMax=function(e){return arguments.length?(this._reconnectionDelayMax=e,this.backoff&&this.backoff.setMax(e),this):this._reconnectionDelayMax},uo.prototype.timeout=function(e){return arguments.length?(this._timeout=e,this):this._timeout},uo.prototype.maybeReconnectOnOpen=function(){!this.reconnecting&&this._reconnection&&0===this.backoff.attempts&&this.reconnect()},uo.prototype.open=uo.prototype.connect=function(e,t){if(this.readyState,~this.readyState.indexOf("open"))return this;this.uri,this.engine=Qn(this.uri,this.opts);var s=this.engine,i=this;this.readyState="opening",this.skipReconnect=!1;var n=to(s,"open",(function(){i.onopen(),e&&e()})),o=to(s,"error",(async function(t){if(i.uri=oo.uri(),i.cleanup(),i.readyState="closed",i.emitAll("connect_error",t),e){var s=new Error("Connection error");s.data=t,e(s)}else i.maybeReconnectOnOpen()}));if(!1!==this._timeout){var r=this._timeout,a=setTimeout((function(){n.destroy(),s.close(),s.emit("error","timeout"),i.emitAll("connect_timeout",r)}),r);this.subs.push({destroy:function(){clearTimeout(a)}})}return this.subs.push(n),this.subs.push(o),this},uo.prototype.onopen=function(){this.cleanup(),this.readyState="open",this.emit("open");var e=this.engine;this.subs.push(to(e,"data",so(this,"ondata"))),this.subs.push(to(e,"ping",so(this,"onping"))),this.subs.push(to(e,"pong",so(this,"onpong"))),this.subs.push(to(e,"error",so(this,"onerror"))),this.subs.push(to(e,"close",so(this,"onclose"))),this.subs.push(to(this.decoder,"decoded",so(this,"ondecoded")))},uo.prototype.onping=function(){this.lastPing=new Date,this.emitAll("ping")},uo.prototype.onpong=function(){this.emitAll("pong",new Date-this.lastPing)},uo.prototype.ondata=function(e){this.decoder.add(e)},uo.prototype.ondecoded=function(e){this.emit("packet",e)},uo.prototype.onerror=function(e){this.emitAll("error",e)},uo.prototype.socket=function(e,t){var s=this.nsps[e];if(!s){s=new Kn(this,e,t),this.nsps[e]=s;var i=this;s.on("connecting",n),s.on("connect",(function(){s.id=i.generateId(e)})),this.autoConnect&&n()}function n(){~io(i.connecting,s)||i.connecting.push(s)}return s},uo.prototype.destroy=function(e){var t=io(this.connecting,e);~t&&this.connecting.splice(t,1),this.connecting.length||this.close()},uo.prototype.packet=function(e){var t=this;e.query&&0===e.type&&(e.nsp+="?"+e.query),t.encoding?t.packetBuffer.push(e):(t.encoding=!0,this.encoder.encode(e,(function(s){for(var i=0;i<s.length;i++)t.engine.write(s[i],e.options);t.encoding=!1,t.processPacketQueue()})))},uo.prototype.processPacketQueue=function(){if(this.packetBuffer.length>0&&!this.encoding){var e=this.packetBuffer.shift();this.packet(e)}},uo.prototype.cleanup=function(){for(var e=this.subs.length,t=0;t<e;t++){this.subs.shift().destroy()}this.packetBuffer=[],this.encoding=!1,this.lastPing=null,this.decoder.destroy()},uo.prototype.close=uo.prototype.disconnect=function(){this.skipReconnect=!0,this.reconnecting=!1,"opening"===this.readyState&&this.cleanup(),this.backoff.reset(),this.readyState="closed",this.engine&&this.engine.close()},uo.prototype.onclose=function(e){this.cleanup(),this.backoff.reset(),this.readyState="closed",this.emit("close",e),this._reconnection&&!this.skipReconnect&&this.reconnect()},uo.prototype.reconnect=function(){if(ro.isBackend(),this.reconnecting||this.skipReconnect)return this;var e=this;if(this.backoff.attempts>=this._reconnectionAttempts)this.backoff.reset(),this.emitAll("reconnect_failed"),this.reconnecting=!1;else{var t=this.backoff.duration();this.reconnecting=!0;var s=setTimeout((function(){if(ro.isBackend())return e.reconnecting=!1,e.reconnect(),void e.emitAll("reconnect_error","Uniapp running backend, skipped reconnect...");e.skipReconnect||(e.emitAll("reconnect_attempt",e.backoff.attempts),e.emitAll("reconnecting",e.backoff.attempts),e.skipReconnect||e.open((function(t){t?(e.reconnecting=!1,e.reconnect(),e.emitAll("reconnect_error",t.data)):e.onreconnect()})))}),t);this.subs.push({destroy:function(){clearTimeout(s)}})}},uo.prototype.onreconnect=function(){var e=this.backoff.attempts;this.reconnecting=!1,this.backoff.reset(),this.updateSocketIds(),this.emitAll("reconnect",e)},function(e,t){var s=ti,i=si,n=co;Hs.exports("socket.io-client");e.exports=t=r;var o=t.managers={};function r(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var i,r=s(e),a=r.source,c=r.id,u=r.path,l=o[c]&&u in o[c].nsps;return t.forceNew||t["force new connection"]||!1===t.multiplex||l?i=n(a,t):(o[c]||(o[c]=n(a,t)),i=o[c]),r.query&&!t.query&&(t.query=r.query),i.socket(r.path,t)}t.protocol=i.protocol,t.connect=r,t.Manager=co,t.Socket=qn.exports}(Bs,Bs.exports);const lo=Bs.exports;class ho{constructor(){this.io=lo,this.status=t.DISCONNECTED,this.permissions=[ne.NONE],this.connectedObservers=[],this.disconnectedObservers=[]}connect(){this.status=t.CONNECTING}socketio(){return this.io}on(e,t){this.io.on(e,t)}disconnect(){this.io.disconnect()}getStatus(){return this.status}addConnectedObserver(e){u.isFunction(e)&&this.connectedObservers.push(e)}addDisconnectedObserver(e){u.isFunction(e)&&this.disconnectedObservers.push(e)}notify(e,t){for(let s=0;s<e.length;s++)e[s](t)}}class po extends ho{constructor(e){super(),this.reconnectingObservers=[],this.addReconnectingObserver(e.onReconnecting),this.addDisconnectedObserver(e.onDisconnected)}connect(e){super.connect(),this.io=this.io.connect(e.uri,e.opts),this.initListener()}initListener(){this.io.on("connect",(()=>{this.status=t.CONNECTED,this.notify(this.connectedObservers)})),this.io.on("reconnecting",(e=>{this.status=t.CONNECTING,this.notify(this.reconnectingObservers,e)})),this.io.on("disconnect",(()=>{this.status=t.DISCONNECTED,this.notify(this.disconnectedObservers)})),this.io.on("connect_error",(function(e){}))}addReconnectingObserver(e){this.reconnectingObservers.push(e)}}class mo{static get(e){const t=encodeURIComponent(e)+"=",s=document.cookie.split("; ");for(const e of s)if(e.startsWith(t))return decodeURIComponent(e.substring(t.length));return null}static set(e,t,s,i,n="/",o=!1){let r=encodeURIComponent(e)+"="+encodeURIComponent(t);s instanceof Date&&(r+="; expires="+s.toGMTString()),n&&(r+="; path="+n),i&&(r+="; domain="+i),o&&(r+="; secure"),document.cookie=r}static remove(e,t,s="/",i=!1){mo.set(e,"",new Date(0),t,s,i)}}class fo{asyncGet(e){let t=this.get(e);return Promise.resolve(t)}asyncPut(e,t){return this.put(e,t),Promise.resolve()}get(e){let t=this.doGet(e);return t=JSON.parse(t),t}put(e,t){this.doPut(e,JSON.stringify(t))}}class go extends fo{constructor(){super(),this.domain=null;this.domain="undefined"!=typeof location&&/^(?:[A-za-z0-9-]+\.)+[A-za-z]{2,4}(?:[\/\?#][\/=\?%\-&~`@[\]\':+!\.#\w]*)?$/.test(location.host)?location.host.split(".").slice(-2).join("."):null}doGet(e){return mo.get(e)||null}doPut(e,t){const s=new Date(2030,12,31,0,0,0,0),i=this.domain;mo.set(e,t,s,i)}remove(e){const t=this.domain;mo.remove(e,t)}support(){return"undefined"!=typeof navigator&&!0===navigator.cookieEnabled}}class yo extends fo{doGet(e){return localStorage.getItem(e)||null}doPut(e,t){localStorage.setItem(e,t)}remove(e){localStorage.removeItem(e)}support(){return!("undefined"!=typeof GameGlobal||"undefined"==typeof localStorage||!localStorage.setItem)}}class So extends fo{doGet(e){return uni.getStorageSync(e)||null}doPut(e,t){uni.setStorageSync(e,t)}remove(e){uni.removeStorageSync(e)}support(){return!("object"!=typeof uni||!uni.getStorageSync)}}class Eo extends fo{doGet(e){return cc.sys.localStorage.getItem(e)||null}doPut(e,t){cc.sys.localStorage.setItem(e,t)}remove(e){cc.sys.localStorage.removeItem(e)}support(){return"undefined"!=typeof cc&&void 0!==cc.sys.localStorage}}class vo extends fo{doGet(e){return wx.getStorageSync(e)||null}doPut(e,t){wx.setStorageSync(e,t)}remove(e){wx.removeStorageSync(e)}support(){return!("object"!=typeof wx||!wx.getStorageSync||"undefined"!=typeof tt)}}class bo extends fo{asyncGet(e){return b(this,void 0,void 0,(function*(){const t=yield i.asyncStorage.getItem(e);return JSON.parse(t)}))}asyncPut(e,t){return i.asyncStorage.setItem(e,JSON.stringify(t))}doPut(e,t){throw new Error("Method not implemented.")}remove(e){i.asyncStorage.removeItem(e)}support(){return s.currentFramework()===e.REACT_NATIVE}doGet(e){throw new Error("Method not implemented.")}}class Co extends fo{doGet(e){const t=my.getStorageSync({key:e}).data||null;return"string"==typeof JSON.parse(t)?JSON.parse(t):t}doPut(e,t){my.setStorageSync({key:e,data:JSON.stringify(t)})}remove(e){my.removeStorageSync({key:e})}support(){return!("undefined"==typeof my||!my.getStorageSync)}}class Mo extends fo{doGet(e){return tt.getStorageSync(e)||null}doPut(e,t){tt.setStorageSync(e,t)}remove(e){tt.removeStorageSync(e)}support(){return!("object"!=typeof tt||!tt.getStorageSync)}}class wo extends fo{doGet(e){return swan.getStorageSync(e)||null}doPut(e,t){swan.setStorageSync(e,t)}remove(e){swan.removeStorageSync(e)}support(){return!("undefined"==typeof swan||!swan.getStorageSync)}}class Io{constructor(){this.supportedStorage=null;const e=Io.storages;e.push(new So),e.push(new Eo),e.push(new yo),e.push(new vo),e.push(new bo),e.push(new Co),e.push(new wo),e.push(new Mo),e.push(new go),this.dispatch(),this.supportedStorage}static localStorage(){return this.instance.supportedStorage}dispatch(){for(let e of Io.storages)if(e.support()){this.supportedStorage=e;break}}}Io.storages=new Array,Io.instance=new Io;class No{static get(){return b(this,void 0,void 0,(function*(){let e,t=Io.localStorage();return null!==t&&(e=yield t.asyncGet(No.SM_KEY)),e}))}static put(e){return b(this,void 0,void 0,(function*(){var t=Io.localStorage();let s=e.sm;null!==t&&s&&t.asyncPut(No.SM_KEY,s)}))}}No.SM_KEY="GE-SM";class To{static e(e,t){function s(e){return function(e){return e>=32&&e<=126}(e)?String.fromCharCode(function(e){let s=e+t;return s>126?s-126+32:s}(e)):String.fromCharCode(e)}let i="";for(let t=0;t<e.length;t++){i+=s(e.charCodeAt(t))}return i}}class Ro{static initRNUniqueId(){if(s.currentFramework()===e.REACT_NATIVE){let e=i.platform,t=e.constants,s={os:e.OS};return"android"===s.os?s.f=t.Fingerprint:s.v=e.Version,JSON.stringify(s)}return null}static initPlusDeviceId(){return new Promise(((e,t)=>{"undefined"!=typeof plus?plus.device.getInfo({success:t=>{e(t.uuid)},fail:e=>{t(e)}}):e(null)}))}static getVideoCard(){var e;if(d.currentPlatform()===l.BROWSER&&"undefined"!=typeof document){const t=document.createElement("canvas"),s=null!==(e=t.getContext("webgl"))&&void 0!==e?e:t.getContext("experimental-webgl");if(s&&"getExtension"in s){let e=0,t=0;if(navigator.userAgent.indexOf("Firefox")>-1)t=s.VENDOR,e=s.RENDERER;else{let i=s.getExtension("WEBGL_debug_renderer_info");if(!i)return null;t=i.UNMASKED_VENDOR_WEBGL,e=i.UNMASKED_RENDERER_WEBGL}const i={vendor:(s.getParameter(t)||"").toString(),renderer:(s.getParameter(e)||"").toString()};return JSON.stringify(i)}}return null}static z(){return b(this,void 0,void 0,(function*(){const e={p:d.currentPlatform(),f:s.currentFramework(),vc:this.getVideoCard(),rfp:this.initRNUniqueId()};return To.e(JSON.stringify(e),5)}))}}class Ao{constructor(e){this.rocketsBuffer=new Set,this.socket=e,this.socket.addConnectedObserver(this.onSocketConnected.bind(this))}emit(e){this.socket.status!==t.DISCONNECTED?(e.start(),this.doEmit(e)):e.fail({resultCode:"409",content:"Please connect first"})}doEmit(e){if(!e.complete)if(this.socket.status!==t.CONNECT_FAILED)if(this.isConnected())if(this.hasPermission(e)){let t=setTimeout((()=>{this.doEmit(e)}),e.singleTimeout);e.unique&&(e.params.retried=e.retried),this.socket.socketio().emit(e.name,e.params,(s=>{clearTimeout(t),200===s.resultCode||200==s.code?e.success(s):e.fail(s)})),e.retried++}else e.fail({resultCode:401,content:"No permission"});else this.isConnecting()&&this.rocketsBuffer.add(e);else e.fail({resultCode:408,content:"Failed to connect GoEasy."})}hasPermission(e){return!!this.socket.permissions.find((t=>t===e.permission))}isConnected(){return[t.CONNECTED,t.RECONNECTED,t.EXPIRED_RECONNECTED,t.DISCONNECTING].includes(this.socket.status)}isConnecting(){return[t.CONNECTING,t.RECONNECTING].includes(this.socket.status)}onSocketConnected(){this.emitBuffer()}emitBuffer(){Array.from(this.rocketsBuffer).forEach((e=>{this.rocketsBuffer.delete(e),this.doEmit(e)}))}}class ko extends Q{static init(){ko.i=new ko}static fire(e,t){this.i.fire(e,t)}static on(e,t){this.i.on(e,t)}static off(e,t){this.i.off(e,t)}}class Oo extends ho{constructor(e,t){super(),this.ioSocket=null,this.sid=null,this.anonymous=!1,this.userId=null,this.artifactVersion=n,this.vname=null,this.uri=null,this.ioOpts=null,this.reconnectingTimes=0,this.messageObservers=new Map,this.connectFailedObservers=[],this.connectingObservers=[],this.expiredReconnectedObservers=[],this.options=e,this.ioSocket=new po({onDisconnected:this.onIoDisconnected.bind(this),onReconnecting:this.onIoReconnecting.bind(this)}),this.ioSocketEmitter=new Ao(this.ioSocket),this.ioSocket.addConnectedObserver(this.onIoReconnected.bind(this)),this.initOptions(t),this.connect()}initUserId(){let e=this.connectOptions.id;u.isEmpty(e)?this.anonymous=!0:this.userId=e.toString()}socketio(){return this.ioSocket.socketio()}extendOptions(){let e=this.connectOptions;if(u.isNull(e.data)||u.isDef(e.data)&&!u.isObject(e.data))throw{code:400,content:"TypeError: data requires an object."};if((u.isDef(e.data)?String(e.data).length:0)>300&&u.isObject(e)&&u.isFunction(e.onFailed))throw{code:400,content:"user.data-length limit 300 byte."};if(u.isObject(e.wxmpId)){if(u.isEmpty(e.wxmpId.appid))throw{code:400,content:"wxmpId.appid is required."};if(u.isEmpty(e.wxmpId.openid))throw{code:400,content:"wxmpId.openid is required. requires string."}}else if(u.isPrimitive(e.wxmpId))throw{code:400,content:"TypeError: wxmpId requires an object."}}initUriAndOpts(){let e=this.options;Xn.init(e.host,e.forceTLS,e.supportOldBrowser),this.uri=Xn.uri();let t=["websocket"];!0===e.supportOldBrowser&&t.push("polling"),this.ioOpts={transports:t,timeout:S.connect,reconnectionDelayMax:S.reconnectionDelayMax}}onIoReconnected(){this.status===t.RECONNECTING&&this.authorize()}sendAck(e,t){this.ioSocket.io.emit(e,t)}initOptions(e){this.connectOptions=e,this.addConnectedObserver(e.onSuccess),this.addConnectFailedObserver(e.onFailed),this.addConnectingObserver(e.onProgress),this.initUserId()}connect(){this.initUriAndOpts(),this.extendOptions(),super.connect(),this.onConnecting(),this.ioSocket.connect({uri:this.uri,opts:this.ioOpts}),this.authorize()}disconnect(){return new Promise(((e,s)=>{this.status=t.DISCONNECTING;let i=()=>{this.ioSocket.disconnect(),this.status=t.DISCONNECTED,ko.fire(Ft.DISCONNECTED),e()};const n=X.modules.get("GN");if(n&&(n.params.regId||this.connectOptions.wxmpId)){let e=e=>{s(e)},t=new le({name:y.manualDisconnect,params:{},permission:ne.READ,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,fail:e,success:i});te.Socket.e(t)}else i()}))}authorize(){return b(this,void 0,void 0,(function*(){let e=this.connectOptions,t={appkey:this.options.appkey,userId:this.userId,userData:JSON.stringify(e.data),otp:e.otp,artifactVersion:this.artifactVersion,sid:this.sid,mP:yield X.getParams(),a:this.anonymous,z:yield Ro.z(),sm:yield No.get(),c:{n:this.vname,v:this.artifactVersion}};JSON.stringify(t);let s=new le({name:y.authorize,params:t,permission:ne.NONE,singleTimeout:S.commonInfiniteSingle,totalTimeout:S.commonInfiniteTotal,success:e=>{this.onAuthorizeSuccess(e)},fail:e=>{this.onAuthorizeFailed(e)}});this.ioSocketEmitter.emit(s)}))}onConnecting(){ko.fire(Ft.CONNECTING,this.reconnectingTimes),this.notify(this.connectingObservers,this.reconnectingTimes)}onIoReconnecting(){this.reconnectingTimes++,this.status==t.CONNECTED||this.status==t.EXPIRED_RECONNECTED||this.status==t.RECONNECTING?this.status=t.RECONNECTING:this.status=t.CONNECTING,this.onConnecting()}onIoDisconnected(){this.status!==t.DISCONNECTING&&(this.status=t.RECONNECTING,ko.fire(Ft.LOST),this.notify(this.disconnectedObservers))}onAuthorizeSuccess(e){if(No.put(e),X.setDatas(e.mD),this.status===t.RECONNECTING){this.sid!==e.sid?(this.status=t.EXPIRED_RECONNECTED,this.sid=e.sid,ko.fire(Ft.EXPIRED_RECONNECTED),this.notify(this.expiredReconnectedObservers)):(this.status=t.RECONNECTED,ko.fire(Ft.RECONNECTED))}else this.status=t.CONNECTED,this.sid=e.sid;e.enablePublish&&(this.permissions.find((e=>e==ne.WRITE))||this.permissions.push(ne.WRITE)),e.enableSubscribe&&(this.permissions.find((e=>e==ne.READ))||this.permissions.push(ne.READ)),this.reconnectingTimes=0,ko.fire(Ft.CONNECTED),this.notify(this.connectedObservers)}onAuthorizeFailed(e){this.ioSocket.disconnect(),this.status=t.CONNECT_FAILED;let s={code:e.resultCode||408,content:e.content||"Host unreachable or timeout"};this.notify(this.connectFailedObservers,s)}addConnectingObserver(e){u.isFunction(e)&&this.connectingObservers.push(e)}addConnectFailedObserver(e){u.isFunction(e)&&this.connectFailedObservers.push(e)}addExpiredReconnectedObserver(e){u.isFunction(e)&&this.expiredReconnectedObservers.push(e)}onMessage(e,t){this.ioSocket.io._callbacks.hasOwnProperty("$"+e)||this.ioSocket.io.on(e,t)}user(){let e=this.connectOptions;return e?{id:e.id,data:e.data}:null}}class Po{constructor(e){this.guidList=[],this.socket=e}offMessage(e,t){ko.off(Ft.NEW_MESSAGE+"_"+e,t)}onMessage(e,t){ko.on(Ft.NEW_MESSAGE+"_"+e,t),this.socket.onMessage(e,(t=>{this.fire(e,t)}))}fire(e,t){let s=this.filter(t);s&&ko.fire(Ft.NEW_MESSAGE+"_"+e,s)}filter(e){if("string"==typeof e&&(e=JSON.parse(e)),e.i){const t=`${e.i}_${e.r}`;if(this.guidList.findIndex((e=>e===t))>-1)return;this.guidList.unshift(t),this.guidList.length>300&&this.guidList.pop()}return e}}class _o{static init(e){this.i=new _o(e)}constructor(e){this.goeasyOptions=e}static connect(e,s){if(this.status()!==t.DISCONNECTED&&u.isObject(e)&&u.isFunction(e.onFailed))return void e.onFailed({code:408,content:"It is already connected, don't try again until disconnect() is called. "});Tt(Ye,e),ko.init();let i=this.i;X.preConnect(e),i.socket=new Oo(i.goeasyOptions,e),i.socket.vname=s,i.emitter=new Ao(i.socket),i.messageListener=new Po(i.socket),X.postConnect()}static e(e){this.i.emitter.emit(e)}static sendAck(e,t){this.i.socket.sendAck(e,t)}static status(){return this.i&&this.i.socket?this.i.socket.getStatus():t.DISCONNECTED}static on(e,t){ko.on(e,t)}static off(e,t){ko.off(e,t)}static offMessage(e,t){this.i.messageListener.offMessage(e,t)}static onMessage(e,t){this.i.messageListener.onMessage(e,t)}static disconnect(e){this.status()===t.CONNECTED||this.status()===t.RECONNECTED?this.i.socket.disconnect().then((()=>{v.onSuccess(e)})).catch((t=>{v.onFailed(e,t)})):v.onFailed(e,{code:408,content:"Host unreachable or timeout"})}static user(){return this.i.socket.user()}}_o.EVENT=Ft;class Do{static getInstance(){return Do.instance||(Do.instance=new Do),Do.instance}constructor(){this.synchronized=!0,this.onlineChanged=e=>{e.online?this.teamIds.add(e.teamId):this.teamIds.delete(e.teamId)},this.onDisconnected=()=>{this.queryMyTeamPromise=null,this.teamIds=null},this.onConnected=()=>{this.synchronized&&(this.queryMyTeamPromise=this.queryTeams())},_o.on(_o.EVENT.LOST,this.onDisconnected),_o.on(_o.EVENT.RECONNECTED,this.onConnected),_o.onMessage(Gt.CS_ONLINE_CHANGED,this.onlineChanged)}queryTeams(){return this.queryMyTeamPromise||(this.queryMyTeamPromise=new Promise(((e,t)=>{let s=new le({name:y.CS_MY_TEAMS,params:{},permission:ne.READ,singleTimeout:S.commonQuerySingle,totalTimeout:S.commonQueryTotal,fail:e=>{t(e)},success:t=>{this.teamIds=new Set(t.content),this.synchronized=!0,e(this.teamIds)}});te.Socket.e(s)}))),this.queryMyTeamPromise}myTeams(){if(this.synchronized&&this.queryMyTeamPromise)return this.teamIds;throw"please query team first."}isOnline(e,t){return b(this,void 0,void 0,(function*(){yield this.queryTeams(),v.onSuccess(t,this.teamIds.has(e))}))}online(e,t){if(!u.isObject(t.agentData)||!u.isObject(t.teamData))throw{code:400,content:"agentData and teamData require an object"};let s=new Gs(e,t.teamData,t.agentData),i=new le({name:y.CS_ONLINE,params:s,permission:ne.WRITE,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,fail:e=>{v.onFailed(t,e)},success:s=>{this.teamIds.add(e),v.onSuccess(t),ys.i.fire(us.CS_ONLINE_SUCCESS)}});te.Socket.e(i)}offline(e,t){let s=new Fs(e),i=new le({name:y.CS_OFFLINE,params:s,permission:ne.WRITE,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,fail:e=>{v.onFailed(t,e)},success:s=>{this.teamIds.delete(e),v.onSuccess(t),ys.i.fire(us.CS_OFFLINE_SUCCESS)}});te.Socket.e(i)}agents(e,t){let s=new Ls(e),i=new le({name:y.CS_AGENTS,params:s,permission:ne.READ,singleTimeout:S.commonQuerySingle,totalTimeout:S.commonQueryTotal,fail:e=>{v.onFailed(t,e)},success:e=>{e.content.forEach((e=>{e.data=JSON.parse(e.data)})),v.onSuccess(t,e)}});te.Socket.e(i)}}class xo{constructor(e){this.onMessageReceived=e=>{let t=xo.session;if(e.scene()===o.CS&&t.liveOptions){let s=e,i=t.liveOptions.customerId;t.teamId===s.teamId&&s.customerId()===i&&(t.tryUpdateStatus(s),t.liveOptions.onNewMessage(s))}},this.teamId=e,ys.i.on(us.CS_AGENT_MESSAGE_RECEIVED,this.onMessageReceived),ys.i.on(us.CS_ACCEPTED,this.onMessageReceived),ys.i.on(us.CS_ENDED,this.onMessageReceived),ys.i.on(us.CS_TRANSFER,this.onMessageReceived),_o.on(Ft.DISCONNECTED,xo.destroy)}static live(e,t){return b(this,void 0,void 0,(function*(){let s=t.customerId;Rt(s);let i=new xs(e,s);yield Do.getInstance().queryTeams();let n=new le({name:y.CS_LIVE_SESSION,params:i,permission:ne.WRITE,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,fail:e=>{v.onFailed(t,e)},success:s=>{xo.destroy(),this.session=new xo(e),this.session.liveOptions=t;let i=s.content.customerStatus;"ACCEPTED"===i.status&&(i.agent.data=JSON.parse(i.agent.data)),this.session.status=i,this.session.liveOptions.onStatusUpdated(this.session.status),v.onSuccess(t)}});te.Socket.e(n)}))}customerId(){return this.liveOptions.customerId}static isMyCustomer(e){let t=xo.session;if(t&&t.teamId===e.teamId&&t.customerId()===e.customerId()){let s=Do.getInstance().myTeams(),i=t.status.agent;return s.has(e.teamId)&&(!i||i.id===te.Socket.user().id)}return!0}static isMyMessage(e){let t=je.byIMMessage(e);return e.type===ls.TRANSFER&&e.payload.transferTo.id===te.Socket.user().id||this.isMyCustomer(t)}static quit(e){let t=xo.session;if(t){let s=t.liveOptions.customerId;Rt(s);let i=new xs(t.teamId,s),n=new le({name:y.CS_QUIT_LIVE,params:i,permission:ne.WRITE,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,fail:t=>{v.onFailed(e,t)},success:t=>{xo.destroy(),v.onSuccess(e)}});te.Socket.e(n)}}tryUpdateStatus(e){if("FREE"!==this.status.status&&this.status.sessionId>e.sessionId)return;let t;switch(e.type){case ls.ACCEPT:t=new Us,t.status="ACCEPTED",t.start=e.payload.sessionStart,t.sessionId=e.sessionId,t.agent=new c(e.senderId,e.senderData);break;case ls.END:t=new Us,t.status="FREE";break;case ls.TRANSFER:t=new Us,t.status="ACCEPTED",t.start=e.payload.sessionStart,t.sessionId=e.sessionId,t.agent=e.payload.transferTo;break;default:"FREE"===this.status.status&&(t=new Us,t.status="PENDING",t.start=e.timestamp,t.sessionId=e.sessionId)}t&&(this.status=t,this.liveOptions.onStatusUpdated(t))}}xo.destroy=()=>{let e=xo.session;e&&(ys.i.off(us.CS_AGENT_MESSAGE_RECEIVED,e.onMessageReceived),ys.i.off(us.CS_ACCEPTED,e.onMessageReceived),ys.i.off(us.CS_ENDED,e.onMessageReceived),ys.i.off(us.CS_TRANSFER,e.onMessageReceived),_o.off(Ft.DISCONNECTED,xo.destroy),xo.session=null)};class Uo extends Ds{constructor(e){super(e),this.unread=0,this.markingAmount=0}loadHistory(e,t){return b(this,void 0,void 0,(function*(){return u.isUndef(t)?t=10:t>30&&(t=30),yield this.loadServerMessages(e,t)}))}loadServerMessages(e,t){return b(this,void 0,void 0,(function*(){let s=new As(this.target.id.toString(),this.target.scene,e,t,this.target.teamId),i=yield this.remoteHistory.loadServerMessages(this.target,s);return i.userOffsets.forEach((e=>{this.userOffsets.updateOffset(e.userId,e.offset)})),i.messages}))}deleteMessages(e){return b(this,void 0,void 0,(function*(){v.onFailed(e,"Delete CS message is not supported yet")}))}initMaxMessageAndOffsets(e,t){t.forEach((e=>{this.userOffsets.updateOffset(e.userId,e.offset)})),(u.isUndef(this.acceptedMaxMessage)||this.acceptedMaxMessage.timestamp<e.timestamp)&&this.increaseUnreadAmount(e),this.saveAcceptedMessage(e)}initPendingMaxMessageAndOffsets(e,t){t.forEach((e=>{this.userOffsets.updateOffset(e.userId,e.offset)})),this.savePendingMessage(e)}savePendingMessage(e){this.pendingMaxMessage?this.pendingMaxMessage.timestamp<e.timestamp&&(this.pendingMaxMessage=e):this.pendingMaxMessage=e}saveAcceptedMessage(e){this.acceptedMaxMessage?this.acceptedMaxMessage.timestamp<e.timestamp&&(this.acceptedMaxMessage=e):this.acceptedMaxMessage=e}onMessageSending(e){this.saveAcceptedMessage(e),ys.i.fire(us.MAX_MESSAGE_CHANGED,{message:e,receiver:this.to})}onMessageSendSuccess(e){this.saveAcceptedMessage(e),this.userOffsets.updateOffset(e.senderId,e.timestamp),this.acceptedMaxMessage===e&&ys.i.fire(us.MAX_MESSAGE_CHANGED,{message:e,receiver:this.to})}onMessageSendFailed(e){this.acceptedMaxMessage===e&&ys.i.fire(us.MAX_MESSAGE_CHANGED,{message:e,receiver:this.to})}onMessageReceived(e){xo.isMyMessage(e)&&(!e.accepted||e.senderId!==te.Socket.user().id&&e.type===ls.ACCEPT?this.savePendingMessage(e):this.saveAcceptedMessage(e),this.userOffsets.updateOffset(e.senderId,e.timestamp),this.increaseUnreadAmount(e),ys.i.fire(us.MAX_MESSAGE_CHANGED,{message:e,receiver:this.to}))}increaseUnreadAmount(e){if(e.sendByCustomer()||e.type===ls.TRANSFER&&e.senderId!==te.Socket.user().id){this.userOffsets.myOffset()<e.timestamp&&e.accepted&&(this.unread+=1)}}markRead(){return b(this,void 0,void 0,(function*(){let e=this.maxAcceptedMessageTime();xo.isMyCustomer(this.target)&&this.preMark(e)&&(yield this.remoteHistory.updateServerOffsets(e,this.target),this.postMark(e))}))}preMark(e){let t=this.userOffsets.myOffset();return e>this.userOffsets.markingTime&&e>t&&(this.userOffsets.markingTime=e,this.markingAmount=this.unread,!0)}postMark(e){e===this.userOffsets.markingTime&&(this.unread-=this.markingAmount,this.markingAmount=0,this.userOffsets.updateOffset(te.Socket.user().id,e),ys.i.fire(us.UNREAD_AMOUNT_CHANGED,this.target))}syncMarkedMessage(e){}getMaxMessage(e){return e?this.acceptedMaxMessage:this.pendingMaxMessage}unreadAmount(e){return e?this.unread:0}existsMessage(e){return this.acceptedMaxMessage&&this.acceptedMaxMessage.messageId===e.messageId||this.pendingMaxMessage&&this.pendingMaxMessage.messageId===e.messageId}maxAcceptedMessageTime(){return this.acceptedMaxMessage?this.acceptedMaxMessage.timestamp:0}maxTime(e){let t=this.getMaxMessage(e);return t?t.timestamp:0}}class Go extends Ds{constructor(e){super(e)}deleteMessages(e){return b(this,void 0,void 0,(function*(){v.onFailed(e,"Delete CS message is not supported yet")}))}}class Fo{static init(){return Fo.instance=new Fo,Fo.instance}constructor(){this.map=new Map,this.onMessageSending=e=>{let t=je.byIMMessage(e.message),s=this.findOrCreateHistory(t);s.to=e.receiver,s.onMessageSending(e.message)},this.onMessageSendSuccess=e=>{let t=je.byIMMessage(e);this.findHistory(t).onMessageSendSuccess(e)},this.onMessageSendFailed=e=>{let t=je.byIMMessage(e);this.findHistory(t).onMessageSendFailed(e)},this.onMessageReceived=e=>{let t=je.byIMMessage(e),s=this.findOrCreateHistory(t);s.expiredTime>0&&(this.map.delete(t.toString()),s=this.findOrCreateHistory(t)),s.onMessageReceived(e)},this.onRemoteMarkRead=e=>{let t=je.byMessageReadRemoteEvent(e),s=this.findHistory(t);s&&s.syncMarkedMessage(e)},this.onRemoteMessageDeleted=e=>{let t=je.byIMMessageDeletedEvent(e),s=this.findHistory(t);s&&s.syncDeletedMessage(e.deleterId,e.times)},this.onMessageRecalled=e=>{let t=je.byConversationId(e.scene,e.conversationId),s=this.findHistory(t);s&&s.recallMessages(e)},this.onDisconnected=()=>{this.map.forEach(((e,t)=>{e.expire()}))},this.onReconnected=()=>{Ps.fire(ds.HISTORY_EXPIRED)},this.destroy=()=>{},this.initialListeners()}initialListeners(){ys.i.on(us.MESSAGE_SENDING,this.onMessageSending),ys.i.on(us.MESSAGE_SEND_SUCCESS,this.onMessageSendSuccess),ys.i.on(us.MESSAGE_SEND_FAILED,this.onMessageSendFailed),ys.i.on(us.MESSAGE_RECEIVED,this.onMessageReceived),ys.i.on(us.CS_AGENT_MESSAGE_RECEIVED,this.onMessageReceived),ys.i.on(us.CS_ACCEPTED,this.onMessageReceived),ys.i.on(us.CS_ENDED,this.onMessageReceived),ys.i.on(us.CS_TRANSFER,this.onMessageReceived),ys.i.on(us.MESSAGE_RECALLED,this.onMessageRecalled),_o.onMessage(Gt.IM_MSG_READ,this.onRemoteMarkRead),_o.onMessage(Gt.IM_MSG_DELETED,this.onRemoteMessageDeleted),_o.on(_o.EVENT.LOST,this.onDisconnected),_o.on(_o.EVENT.RECONNECTED,this.onReconnected)}loadHistory(e,t){return b(this,void 0,void 0,(function*(){Tt(ft,e);let s=this.queryToTarget(e,t),i=this.findOrCreateHistory(s);i.expiredTime>0&&(this.map.delete(s.toString()),i=this.findOrCreateHistory(s));let n=yield i.loadHistory(e.lastTimestamp,e.limit);v.onSuccess(e,{code:200,content:n})}))}queryToTarget(e,t){return e.userId?new je(o.PRIVATE,e.userId):e.groupId?new je(o.GROUP,e.groupId):(o.CS===e.type&&u.isUndef(t)&&(t=e.id),new je(e.type,e.id,t))}privateMarkAsRead(e){return b(this,void 0,void 0,(function*(){kt(e);let t=je.byScene(o.PRIVATE,e.userId);yield this.markAsRead(t,e)}))}groupMarkAsRead(e){return b(this,void 0,void 0,(function*(){Ot(e);let t=je.byScene(o.GROUP,e.groupId);yield this.markAsRead(t,e)}))}markMessageAsRead(e,t){return b(this,void 0,void 0,(function*(){Tt(mt,e),o.CS==e.type&&u.isUndef(t)&&(t=e.id);let s=je.byScene(e.type,e.id,t);yield this.markAsRead(s,e)}))}markAsRead(e,t){return b(this,void 0,void 0,(function*(){let s=this.findHistory(e);s&&(yield s.markRead()),v.onSuccess(t)}))}deleteMessage(e){return b(this,void 0,void 0,(function*(){Tt(ct,e);let t=e.messages[0],s=je.byIMMessage(t),i=this.findHistory(s);if(!i)throw{code:400,content:"No message that could be deleted"};yield i.deleteMessages(e)}))}findOrCreateHistory(e){let t=this.findHistory(e);return t||(t=e.scene===o.CS?te.Socket.user().id===e.customerId()?new Go(e):new Uo(e):new Ds(e),this.map.set(e.toString(),t),t)}static get(e){return Fo.instance.findOrCreateHistory(e)}findHistory(e){return this.map.get(e.toString())}}class Lo{constructor(e){this.top=!1,this.data=null,this.dataLoaded=!1,this.target=e}toDto(){let e=this.target.scene,t=this.target.id,s=new a;return e===o.PRIVATE?s.userId=t:e===o.GROUP?s.groupId=t:e===o.CS&&(s.id=this.target.teamId),s.type=e,s.lastMessage=this.getMaxMessage(),s.unread=this.getUnreadAmount(),s.top=this.top,s.data=this.data,s}getMaxMessage(){return Fo.get(this.target).getMaxMessage()}getUnreadAmount(){return Fo.get(this.target).unreadAmount()}maxMessageTime(){return Fo.get(this.target).maxTime()}}class Bo extends Lo{constructor(e){super(e),this.accepted=!1}toDto(){let e=new a,t=this.target.scene,s=this.target.id,i=this.target.teamId;return e.id=s,e.teamId=i,e.type=t,e.lastMessage=this.getMaxMessage(),e.unread=this.getUnreadAmount(),e.top=this.top,e.data=this.data,e.ended=this.isEnded(),e}isEnded(){let e=this.getMaxMessage(),t=e.type,s=e.payload;return t===ls.END||t===ls.TRANSFER&&s.transferTo.id!==te.Socket.user().id}getMaxMessage(){return Fo.get(this.target).getMaxMessage(this.accepted)}getUnreadAmount(){return Fo.get(this.target).unreadAmount(this.accepted)}maxMessageTime(){return Fo.get(this.target).maxTime(this.accepted)}}class qo{constructor(e,t,s,i){this.type=e,this.top=t,this.targetId=s,this.teamId=i}}class jo{constructor(e,t,s){this.type=e,this.targetId=t,this.teamId=s}}class Vo{constructor(e,t,s){this.type=e,this.targetId=t,this.teamId=s}}class Ho{top(e,t){let s=new qo(e.scene,t,e.id,e.teamId);return new Promise(((e,t)=>{let i=new le({name:y.topConversation,params:s,permission:ne.WRITE,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,success:s=>{200===s.code?e(s):t(s)},fail:e=>{t(e)}});te.Socket.e(i)}))}remove(e){let t=new jo(e.scene,e.id,e.teamId);return new Promise(((e,s)=>{let i=new le({name:y.removeConversation,params:t,permission:ne.WRITE,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,success:t=>{200==t.code?e(t):s(t)},fail:e=>{s(e)}});te.Socket.e(i)}))}query(e){return new Promise(((t,s)=>{let i=new le({name:e,params:{},permission:ne.READ,singleTimeout:S.commonQuerySingle,totalTimeout:S.commonQueryTotal,fail:e=>{s(e)},success:e=>b(this,void 0,void 0,(function*(){t(e)}))});te.Socket.e(i)}))}loadData(e){let t=new Vo(e.scene,e.id,e.teamId);return new Promise(((e,s)=>{let i=new le({name:y.imData,params:t,permission:ne.READ,singleTimeout:S.commonQuerySingle,totalTimeout:S.commonQueryTotal,success:t=>{let s=JSON.parse(t.content);e(s)},fail:e=>{s(e)}});te.Socket.e(i)}))}}Ho.instance=new Ho;class zo{constructor(){this.list=new Array,this.builder=new Ns,this.remoteConversations=Ho.instance,this.synchronized=!1,ys.i.on(us.MAX_MESSAGE_CHANGED,this.onMaxMessageChanged.bind(this)),ys.i.on(us.UNREAD_AMOUNT_CHANGED,this.onUnreadMessageChanged.bind(this)),ys.i.on(us.MAX_MESSAGE_DELETED,this.onMaxMessageDeleted.bind(this))}onUnreadMessageChanged(e){this.findConversation(e)&&this.fireUpdated()}fireUpdated(){this.debounce(this.triggerUpdate.bind(this))}triggerUpdate(){let e=this.loadLocalConversations(),t=this.getUpdatedEventName();Ps.fire(t,{unreadTotal:e.content.unreadTotal,conversations:e.content.conversations})}getUpdatedEventName(){return ds.CONVERSATIONS_UPDATED}latestConversations(e){return b(this,void 0,void 0,(function*(){this.synchronized||(yield this.loadServerConversations());let t=this.loadLocalConversations();v.onSuccess(e,t)}))}loadServerConversations(){return b(this,void 0,void 0,(function*(){var e,t;let s=this.rocketName(),i=yield this.remoteConversations.query(s);this.convertAbbrConversation(i.content);const n=null===(t=null===(e=i.content[i.content.length-1])||void 0===e?void 0:e.lmsg)||void 0===t?void 0:t.i;yield this.loadCustomConversation(n),this.synchronized=!0}))}loadCustomConversation(e){return b(this,void 0,void 0,(function*(){if(void 0!==_s.instance){const t=yield _s.instance.loadConversations(te.Socket.user().id,e);for(const e of t){e.lastMessage=_s.convertAbstractMessage(e.lastMessage);const t=e.lastMessage,s=je.byIMMessage(t);let i=this.findConversation(s);u.isUndef(i)&&(i=new Lo(s),i.dataLoaded=!0,i.top=e.top,i.data=e.data,this.insertOne(i)),Fo.get(s).initMaxMessageAndOffsets(t,[]),this.correctPosition(i)}}}))}rocketName(){return y.imLastConversations}convertAbbrConversation(e){let t=e;for(const e of t){let t=e.t,s=e.top,i=e.d?JSON.parse(e.d):{},n=e.userOffsets;e.lmsg.t=t;let r=e.lmsg,a=this.builder.build(r),c=je.byIMMessage(a),l=this.findConversation(c);u.isUndef(l)?(l=this.buildByAbbr(e,a),this.insertOne(l)):(l.top=s,l.data=i),c.scene===o.GROUP&&(a.x=1),Fo.get(c).initMaxMessageAndOffsets(a,n),this.correctPosition(l)}}onMaxMessageDeleted(e){this.removeConversation(e)}onMaxMessageChanged(e){return b(this,void 0,void 0,(function*(){const t=e.message;if(t.scene()===o.CS){let e=t;if(te.Socket.user().id!=e.customerId()&&(!1===e.accepted||e.type===ls.ACCEPT&&e.senderId!=te.Socket.user().id))return}yield this.saveOrUpdateConversation(e)}))}saveOrUpdateConversation(e){return b(this,void 0,void 0,(function*(){const t=e.message;let s=t.status,i=je.byIMMessage(t),n=this.findConversation(i);u.isUndef(n)&&s!==r.FAIL&&(n=this.buildByMessage(t),this.insertOne(n),s===r.SUCCESS&&(n.data=yield this.remoteConversations.loadData(i),n.dataLoaded=!0)),s===r.SENDING&&(n.data=e.receiver,n.dataLoaded=!0),n&&n.dataLoaded&&(this.correctPosition(n),this.fireUpdated())}))}debounce(e){clearTimeout(this.timer),this.timer=setTimeout((()=>{e()}),500)}loadLocalConversations(){let e=0,t=new Array;for(const s of this.list)if(s.dataLoaded&&s.getMaxMessage()){e+=s.getUnreadAmount();let i=s.toDto();t.push(i)}return{code:200,content:{unreadTotal:e,conversations:t}}}findConversationIndex(e){return this.list.findIndex((t=>e.toString()===t.target.toString()))}findConversation(e){let t=this.findConversationIndex(e);return this.list[t]}removeLocalConversation(e){let t=this.findConversationIndex(e.target);this.list.splice(t,1)}insertOne(e){zo.sortedInserter.insert(this.list,e)}correctPosition(e){this.removeLocalConversation(e),this.insertOne(e)}removeConversation(e){let t=this.findConversation(e);t&&(this.removeLocalConversation(t),this.fireUpdated())}top(e,t,s){return b(this,void 0,void 0,(function*(){if(!u.isBoolean(t))throw new Error("top must be boolean.");let i=this.findConversation(e);if(!i)throw new Error("conversation does not exist.");i.top!=t&&(yield this.remoteConversations.top(e,t),i.top=t,this.correctPosition(i)),this.fireUpdated(),v.onSuccess(s)}))}remove(e,t){return b(this,void 0,void 0,(function*(){let s=this.findConversation(e);if(!s)throw new Error("conversation does not exist.");if(s instanceof Bo&&!s.isEnded())throw new Error("CS conversation can only be deleted after it ends");yield this.remoteConversations.remove(e),this.removeLocalConversation(s),this.fireUpdated(),v.onSuccess(t)}))}buildByAbbr(e,t){let s,i=je.byIMMessage(t);if(e.t===o.CS){let e=t;te.Socket.user().id===e.customerId()?s=new Lo(i):(s=new Bo(i),s.accepted=e.accepted)}else s=new Lo(i);return s.dataLoaded=!0,s.top=e.top,s.data=e.d?JSON.parse(e.d):{},s}buildByMessage(e){let t,s=je.byIMMessage(e);if(e.scene()===o.CS){let i=e;te.Socket.user().id===i.customerId()?t=new Lo(s):(t=new Bo(s),t.accepted=i.accepted)}else t=new Lo(s);return t}}zo.sortedInserter=new class extends vs{compare(e,t){if(e.target.scene===t.target.scene&&e.target.id===t.target.id)return 0;let s;if(e.top==t.top){let i=e.maxMessageTime();s=t.maxMessageTime()-i}else s=e.top?-1:1;return s>0?1:-1}};class Wo extends J{static init(){return this.module=new Wo,this.module.name=this.GIM_MODULE_NAME,this.initGN(),this.module}static initGN(){he.addAssembler(new class{assemble(e){let t={messageId:e.id,timestamp:e.tm,type:e.t,senderId:e.sid,toType:e.tt};return e.tt===o.GROUP&&(t.groupId=e.gid),t}support(e){return!!e.sid}})}postConnect(){Yr.init()}static check(){if(!this.module)throw{code:400,content:"IM not initialized. Please include 'IM' in the 'modules' during GoEasy initialization."}}}Wo.GIM_MODULE_NAME="GIM";class Jo extends zo{constructor(){super(),this.expired=!1,ys.i.on(us.CS_ONLINE_SUCCESS,this.onCSOnlineSuccess.bind(this)),ys.i.on(us.CS_OFFLINE_SUCCESS,this.onCSOfflineSuccess.bind(this)),_o.on(_o.EVENT.LOST,this.onDisconnected.bind(this)),_o.on(_o.EVENT.RECONNECTED,this.onConnected.bind(this))}onMaxMessageChanged(e){return b(this,void 0,void 0,(function*(){const t=e.message;if(t.scene()===o.CS){let s=t;if(s.customerId()!=te.Socket.user().id&&(!1===s.accepted||s.type===ls.ACCEPT))if(ls.ACCEPT===t.type){let e=je.byIMMessage(t);this.removeConversation(e)}else yield this.saveOrUpdateConversation(e)}}))}latestConversations(e){const t=Object.create(null,{latestConversations:{get:()=>super.latestConversations}});return b(this,void 0,void 0,(function*(){let s=this.synchronized;yield t.latestConversations.call(this,e),this.list.length>0&&!s&&this.fireUpdated()}))}onUnreadMessageChanged(e){}onCSOnlineSuccess(){return b(this,void 0,void 0,(function*(){yield this.loadServerConversations(),this.fireUpdated()}))}onCSOfflineSuccess(){this.list=[],this.fireUpdated()}getUpdatedEventName(){return ds.PENDING_CONVERSATIONS_UPDATED}rocketName(){return y.CS_PENDING_CONVERSATION}convertAbbrConversation(e){return b(this,void 0,void 0,(function*(){let t=e;for(const e of t){e.lastMessage.t=o.CS;let t=e.customerData,s=e.lastMessage,i=e.userOffsets,n=t?JSON.parse(t):{},r=this.builder.build(s),a=je.byIMMessage(r),c=this.findConversation(a);u.isUndef(c)&&(c=new Bo(a),c.accepted=r.accepted,c.dataLoaded=!0,this.insertOne(c)),c.top=!1,c.data=n,Fo.get(a).initPendingMaxMessageAndOffsets(r,i),this.correctPosition(c)}}))}onDisconnected(){this.expired=!0}onConnected(){return b(this,void 0,void 0,(function*(){this.expired&&Wo.module&&Wo.module.active&&(this.expired=!1,this.list=[],yield this.loadServerConversations(),this.fireUpdated())}))}}class Xo{constructor(){this.conversations=new zo,this.pendingConversations=new Jo}latestConversations(e){this.conversations.latestConversations(e)}latestPendingConversations(e){this.pendingConversations.latestConversations(e)}topPrivateConversation(e){let t=je.byScene(o.PRIVATE,e.userId);this.conversations.top(t,e.top,e)}topGroupConversation(e){let t=je.byScene(o.GROUP,e.groupId);this.conversations.top(t,e.top,e)}topConversation(e){let t=e.conversation;this.validateConversationDTO(t);let s=je.byConversationDTO(t);this.conversations.top(s,e.top,e)}removePrivateConversation(e){let t=je.byScene(o.PRIVATE,e.userId);this.conversations.remove(t,e)}removeGroupConversation(e){let t=je.byScene(o.GROUP,e.groupId);this.conversations.remove(t,e)}removeConversation(e){let t=e.conversation;this.validateConversationDTO(t);let s=je.byConversationDTO(t);this.conversations.remove(s,e)}validateConversationDTO(e){if(!(e instanceof a))throw new Error("Incorrect conversation object.");{let t=e.lastMessage;if(t instanceof We&&t.customerId()!==te.Socket.user().id&&!1===t.accepted)throw new Error("pending conversation cannot be topped or removed.")}}}class $o{constructor(){this.builder=new Ns,te.Socket.onMessage(Gt.imMessage,this.onMessageReceived.bind(this))}sendAck(e){te.Socket.sendAck("imAck",{publishGuid:e})}createNotification(e){const t=te.N.supportAppNotification();if(!u.isObject(e.nt)||e.s===te.Socket.user().id||!t)return;let s={id:e.i,tm:e.ts,t:e.mt,sid:e.s,tt:e.t};s.tt===o.GROUP&&(s.gid=e.r),te.N.createLocalNotification(e.nt.t,e.nt.c,s,e.nt.sound,e.nt.badge)}}class Yo extends $o{constructor(){super(),te.Socket.onMessage(Gt.IM_MSG_SYNC,this.onSyncMessageReceived.bind(this)),te.Socket.onMessage(Gt.IM_MSG_NEW,this.onNewMessageReceived.bind(this))}onMessageReceived(e){if(e.t!==o.CS){let t=this.builder.build(e);this.sendAck(t.messageId);let s=je.byIMMessage(t),i=s.scene;Fo.get(s).existsMessage(t)||(this.createNotification(e),ys.i.fire(us.MESSAGE_RECEIVED,t),i===o.PRIVATE?Ps.fire(ds.PRIVATE_MESSAGE_RECEIVED,t):i===o.GROUP&&Ps.fire(ds.GROUP_MESSAGE_RECEIVED,t))}}onSyncMessageReceived(e){this.sendAck(e.i),e.rs.forEach((t=>{const s=Object.assign({},e);s.t=o.PRIVATE,s.r=t,s.s=te.Socket.user().id,delete s.rs;let i=this.builder.build(s),n=je.byIMMessage(i),r=n.scene;Fo.get(n).existsMessage(i)||(this.createNotification(s),ys.i.fire(us.MESSAGE_RECEIVED,i),r===o.PRIVATE?Ps.fire(ds.PRIVATE_MESSAGE_RECEIVED,i):r===o.GROUP&&Ps.fire(ds.GROUP_MESSAGE_RECEIVED,i))}))}onNewMessageReceived(e){let t=this.builder.build(e);this.sendAck(t.messageId);let s=je.byIMMessage(t),i=s.scene;Fo.get(s).existsMessage(t)||(this.createNotification(e),ys.i.fire(us.MESSAGE_RECEIVED,t),i===o.PRIVATE?Ps.fire(ds.PRIVATE_MESSAGE_RECEIVED,t):i===o.GROUP&&Ps.fire(ds.GROUP_MESSAGE_RECEIVED,t))}}class Qo{constructor(){this.subscribedGroups=[],te.Socket.on(Ft.EXPIRED_RECONNECTED,this.expiredResubscribeGroups.bind(this))}expiredResubscribeGroups(){this.subscribedGroups.forEach((e=>b(this,void 0,void 0,(function*(){yield this.doSubscribeGroup(e)}))))}subscribe(e){_t(e);let t=new Ko(e.groupIds,e.accessToken);this.doSubscribeGroup(t).then((()=>{this.subscribedGroups.push(t),v.onSuccess(e,{code:200,content:"ok"})})).catch((t=>{v.onFailed(e,{code:t.resultCode||408,content:t.content||"Failed to subscribe group message"})}))}doSubscribeGroup(e){return new Promise(((t,s)=>{let i=e.groupIds.toString().split(","),n=new le({name:y.subscribeGroups,params:{groupIds:i,at:e.accessToken},permission:ne.WRITE,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,success:()=>{t()},fail:e=>{s(e)}});te.Socket.e(n)}))}unsubscribe(e){Ot(e),e.groupId=e.groupId.toString();let t=new le({name:y.unsubscribeGroup,params:{groupId:e.groupId},permission:ne.READ,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,success:()=>{this.deleteSubscriptionByGroupId(e.groupId),v.onSuccess(e,{code:200,content:"ok"})},fail:t=>{v.onFailed(e,{code:t.resultCode||408,content:t.content||"Failed to unsubscribe group message"})}});te.Socket.e(t)}deleteSubscriptionByGroupId(e){this.subscribedGroups=this.subscribedGroups.filter((t=>{const s=t.groupIds.findIndex((t=>t==e));return s>-1&&t.groupIds.splice(s,1),t.groupIds.length>0}))}}class Ko{constructor(e,t){this.groupIds=e,this.accessToken=t}}class Zo{constructor(){this.newMessageReceived=e=>{let t=null;e.c&&(t=JSON.parse(e.c)),t&&t.events&&t.events.map((e=>{let s=e.userData?JSON.parse(e.userData):{},i={time:e.time,action:e.action,groupOnlineCount:t.userAmount,groupId:t.groupId,id:e.userId,data:s};Ps.fire(ds.GROUP_PRESENCE,i)}))},_o.onMessage(Gt.groupPresence,this.newMessageReceived)}presence(e){_t(e),e.groupIds.toString().split(",");let t={groupIds:e.groupIds};this.emitRocket(y.subscribeGroupPresence,t,(()=>{v.onSuccess(e,{code:200,content:"ok"})}),(t=>{v.onFailed(e,{code:t.code||408,content:t.content||"Failed to subscribe group message"})}),S.commonRequestSingle,S.commonRequestTotal)}unPresence(e){Tt(Nt,e),e.groupId=e.groupId.toString();let t={groupId:e.groupId};this.emitRocket(y.unsubscribeGroupPresence,t,(()=>{v.onSuccess(e,{code:200,content:"ok"})}),(t=>{v.onFailed(e,{code:t.code||408,content:t.content||"Failed to unsubscribe presence"})}),S.commonRequestSingle,S.commonRequestTotal)}emitRocket(e,t,s,i,n,o){let r=new le({name:e,params:t,singleTimeout:n,totalTimeout:o,permission:ne.WRITE,success:s,fail:i});te.Socket.e(r)}}class er{get(e){Ot(e),e.groupId=e.groupId.toString();let t=new le({name:y.imGroupOnlineCount,params:{groupId:e.groupId},permission:ne.READ,singleTimeout:S.commonQuerySingle,totalTimeout:S.commonQueryTotal,fail:function(t){v.onFailed(e,t||{code:408,content:"Failed to query online group users"})},success:function(t){200==t.code?v.onSuccess(e,t):v.onFailed(e,t)}});te.Socket.e(t)}}class tr{doHereNow(e,t,s){let i=new le({name:e,params:t,permission:ne.READ,singleTimeout:S.commonQuerySingle,totalTimeout:S.commonQueryTotal,fail:e=>{v.onFailed(s,e)},success:e=>{let t=e.content;e.content=t.map((e=>{let t=e.userData?JSON.parse(e.userData):{};return{id:e.userId,data:t}})),v.onSuccess(s,e)}});te.Socket.e(i)}}class sr extends tr{hereNow(e){Ot(e),e.groupId=e.groupId.toString();let t={groupId:e.groupId};this.doHereNow(y.imGroupHereNow,t,e)}}class ir{constructor(){this.newMessageReceived=e=>{let t=[];e.c&&(t=JSON.parse(e.c).events||[]),t.map((e=>{let t=e.userData?JSON.parse(e.userData):{},s={time:e.time,action:e.action,id:e.userId,data:t};Ps.fire(ds.USER_PRESENCE,s)}))},_o.onMessage(Gt.userPresence,this.newMessageReceived)}presence(e){Pt(e),e.userIds.toString().split(",");let t={userIds:e.userIds};this.emitRocket(y.subscribeUserPresence,t,(()=>{v.onSuccess(e,{code:200,content:"ok"})}),(t=>{v.onFailed(e,{code:t.code||408,content:t.content||"Failed to subscribe group message"})}),S.commonRequestSingle,S.commonRequestTotal)}unPresence(e){kt(e),e.userId=e.userId.toString();let t={userId:e.userId};this.emitRocket(y.unsubscribeUserPresence,t,(()=>{v.onSuccess(e,{code:200,content:"ok"})}),(t=>{v.onFailed(e,{code:t.code||408,content:t.content||"Failed to unsubscribe presence"})}),S.commonRequestSingle,S.commonRequestTotal)}emitRocket(e,t,s,i,n,o){let r=new le({name:e,params:t,singleTimeout:n,totalTimeout:o,permission:ne.WRITE,success:s,fail:i});te.Socket.e(r)}}class nr extends tr{hereNow(e){Pt(e),e.userIds.toString().split(","),this.doHereNow(y.imHereNow,e,e)}}const or=new class{fileExtension(e,t){if(u.isString(e))try{let s=e.split(t);return s[s.length-1]}catch(e){throw Error(e)}}};class rr{}class ar extends rr{constructor(){super(...arguments),this.contentType="",this.name="",this.size=0,this.url=""}}class cr extends ar{constructor(){super(...arguments),this.width=0,this.height=0}}class ur{build(e){let t=this.create();return this.setPayload(e,t),t}}class lr extends ur{create(){return new ar}setPayload(e,t){let s=t,i=e.createOptions.file;s.url=i.path,s.name=i.name,s.size=i.size,s.contentType=i.type,e.complete=Promise.resolve()}}class dr extends lr{create(){return new cr}setPayload(e,t){super.setPayload(e,t);let s=e.createOptions.file,i=t,n=s.path||s.tempFilePath,o=u.isEmpty(s.name)||void 0===s.name?n:s.name;i.name="wx-image."+or.fileExtension(o,"."),i.contentType="image/"+or.fileExtension(o,"."),i.url=n,i.size=s.size,e.complete=new Promise(((e,t)=>{wx.getImageInfo({src:i.url,success(t){i.width=t.width,i.height=t.height,e()},fail(e){t(e)}})}))}}class hr extends ar{constructor(){super(...arguments),this.duration=0}}class pr extends lr{create(){return new hr}setPayload(e,t){super.setPayload(e,t);let s=e.createOptions.file,i=t,n=s.tempFilePath,o=u.isEmpty(s.name)||null==s.name?n:s.name,r=s.duration,a=s.fileSize;i.url=n,i.size=a,i.duration=r/1e3,i.name="wx-audio."+or.fileExtension(o,"."),i.contentType="audio/"+or.fileExtension(o,"."),e.complete=Promise.resolve()}}class mr extends rr{constructor(){super(...arguments),this.text=""}}class fr extends ur{create(){return new mr}setPayload(e,t){let s=t,i=e.createOptions;s.text=i.text,e.complete=Promise.resolve()}}class gr extends rr{constructor(){super(...arguments),this.video=new Sr,this.thumbnail=new yr}}class yr{constructor(){this.name="",this.url="",this.width=0,this.height=0,this.contentType=""}initURL(e){d.currentPlatform()===l.BROWSER&&this.htmlUrl(e)}htmlUrl(e){let t=document.createElement("canvas");t.width=e.videoWidth,t.height=e.videoHeight,t.getContext("2d").drawImage(e,0,0,t.width,t.height),this.url=t.toDataURL("image/png")}}class Sr{constructor(){this.name="",this.url="",this.width=0,this.height=0,this.contentType="",this.size=0,this.duration=0}}class Er extends ur{create(){return new gr}setPayload(e,t){let s=e.createOptions.file,i=t,n=i.video,o=i.thumbnail,{duration:r,height:a,size:c,tempFilePath:l,thumbTempFilePath:d,width:h,name:p=""}=s,m=u.isEmpty(p)?l:p;n.contentType="video/"+or.fileExtension(m,"."),n.name="wx-video."+or.fileExtension(m,"."),n.url=l,n.width=o.width=h,n.height=o.height=a,n.size=c,n.duration=r,o.url=d,o.contentType="image/jpg",o.name="wx-thumbnail.jpg",e.complete=Promise.resolve()}}class vr extends ur{create(){return new ar}setPayload(e,t){let s=t,i=e.createOptions.file;s.url=i.fullPath||i.path,s.name=i.name,s.size=i.size,s.contentType=i.type,i.type,e.complete=Promise.resolve()}}class br extends vr{create(){return new cr}setPayload(e,t){let s=t,i=e.createOptions.file;s.url=i.path,s.size=i.size;let n=u.isEmpty(i.name)||void 0===i.name?i.path:i.name;s.contentType="image/"+or.fileExtension(n,"."),s.name="uni-image."+or.fileExtension(n,"."),e.complete=new Promise(((e,t)=>{uni.getImageInfo({src:i.path,success(t){s.width=t.width,s.height=t.height,e()},fail(e){t(e)}})}))}}class Cr extends vr{create(){return new hr}setPayload(e,t){let s=e.createOptions,i=t,n=s.file,o=n.tempFilePath,r=u.isEmpty(n.name)||null==n.name?o:n.name;i.url=o,i.name="uni-audio."+or.fileExtension(r,"."),i.contentType="audio/"+or.fileExtension(r,"."),e.complete=new Promise(((e,t)=>{uni.getFileInfo({filePath:o,success:n=>{let r=n.size;if(i.size=r,0===r)e();else if(u.isDef(s.file.duration))i.duration=s.file.duration/1e3,e();else{const s=uni.createInnerAudioContext();s.src=o,s.onCanplay((function(n){n.errCode?(s.destroy(),t(n)):(i.duration=s.duration,s.destroy(),e())})),s.onError((i=>{s.destroy(),-99===i.errCode?e():t(i)}))}},fail(e){t(e)}})}))}}class Mr extends ur{create(){return new gr}setPayload(e,t){let s=e.createOptions.file,i=t,n=i.video,o=i.thumbnail,{duration:r,height:a,size:c,tempFilePath:l,width:d,name:h=""}=s,p=u.isEmpty(h)?l:h;n.size=c,n.width=d,n.height=a,n.url=l,n.duration=r,n.contentType="video/"+or.fileExtension(p,"."),n.name="uni-video."+or.fileExtension(p,"."),o.url=l,o.height=200,o.width=Number((n.width*o.height/n.height).toFixed(0)),o.contentType="image/jpg",o.name="uni-thumbnail.jpg",e.complete=Promise.resolve()}}class wr extends ur{create(){return new ar}setPayload(e,t){let s=t,i=e.createOptions.file,n=window.URL||window.webkitURL;s.url=n.createObjectURL(i),s.name=i.name,s.size=i.size,s.contentType=i.type,e.complete=Promise.resolve()}}class Ir extends wr{create(){return new cr}setPayload(e,t){super.setPayload(e,t);let s=e.createOptions.file,i=t,n=window.URL||window.webkitURL,o=new Image;o.src=n.createObjectURL(s),e.complete=new Promise(((e,t)=>{o.onload=function(){i.width=o.width,i.height=o.height,n.revokeObjectURL(o.src),e()},o.onerror=function(e){n.revokeObjectURL(o.src),t(e)}}))}}class Nr extends wr{create(){return new hr}setPayload(e,t){super.setPayload(e,t);let s=e.createOptions.file,i=t,n=window.URL||window.webkitURL,o=document.createElement("audio");o.src=n.createObjectURL(s),e.complete=new Promise(((e,t)=>{o.onloadedmetadata=()=>{i.duration=o.duration,n.revokeObjectURL(o.src),e()},o.onerror=e=>{n.revokeObjectURL(o.src),t(e)}}))}}class Tr extends ur{create(){return new gr}setPayload(e,t){let s=e.createOptions.file,i=t,n=i.video,o=i.thumbnail,r=window.URL||window.webkitURL,a=document.createElement("video");a.src=r.createObjectURL(s),n.size=s.size,n.name=s.name,n.contentType=s.type,n.url=a.src,o.name=s.name,o.contentType="image/jpg",e.complete=new Promise(((e,t)=>{a.onloadedmetadata=()=>{n.duration=a.duration,n.width=a.videoWidth,n.height=a.videoHeight,o.width=a.videoWidth,o.height=a.videoHeight,o.url=this.getThumbnailUrl(a),r.revokeObjectURL(a.src),e()},a.onerror=function(e){r.revokeObjectURL(a.src),t(e)}}))}getThumbnailUrl(e){let t=document.createElement("canvas");return t.width=e.videoWidth,t.height=e.videoHeight,t.getContext("2d").drawImage(e,0,0,t.width,t.height),t.toDataURL("image/png")}}class Rr extends ur{create(){return new gr}setPayload(e,t){let s=e.createOptions.file,i=t,n=i.video,o=i.thumbnail,{duration:r,height:a,size:c,tempFilePath:u,tempVideoThumbPath:l,width:d}=s;n.size=c,n.width=d,n.height=a,n.url=u,n.duration=r,n.contentType="video/mp4",n.name="ali-video.mp4",o.url=l,o.height=200,o.width=Number((n.width*o.height/n.height).toFixed(0)),o.contentType="image/jpg",o.name="ali-thumbnail.jpg",e.complete=Promise.resolve()}}class Ar extends ur{create(){return new ar}setPayload(e,t){e.complete=Promise.reject("Alipay not support file message.")}}class kr extends Ar{create(){return new cr}setPayload(e,t){let s=t,i=e.createOptions.file;s.url=i.path,s.size=i.size,e.complete=new Promise(((e,t)=>{my.getImageInfo({src:i.path,success(t){s.width=t.width,s.height=t.height,s.contentType="image/"+t.type,s.name="ali-image."+t.type,e()},fail(e){t(e)}})}))}}class Or extends Ar{create(){return new hr}setPayload(e,t){let s=t,i=e.createOptions.file,n=i.tempFilePath;s.url=n,s.name="ali-audio."+or.fileExtension(n,"."),s.contentType="audio/"+or.fileExtension(n,"."),s.duration=i.duration,s.size=i.fileSize,e.complete=Promise.resolve()}}class Pr extends ur{create(){return new gr}setPayload(e,t){let s=e.createOptions.file,i=t,n=i.video,o=i.thumbnail,{duration:r,height:a,size:c,tempFilePath:u,thumbTempFilePath:l,width:d}=s;n.size=c,n.width=d,n.height=a,n.url=u,n.duration=r,n.contentType="video/"+or.fileExtension(u,"."),n.name="baidu-video."+or.fileExtension(u,"."),o.url=l,o.height=200,o.width=Number((n.width*o.height/n.height).toFixed(0)),o.contentType="image/"+or.fileExtension(l,"."),o.name="baidu-thumbnail."+or.fileExtension(u,"."),e.complete=Promise.resolve()}}class _r extends ur{create(){return new ar}setPayload(e,t){e.complete=Promise.reject("Baidu app not support file message.")}}class Dr extends _r{create(){return new hr}setPayload(e,t){let s=t,i=e.createOptions.file,n=i.tempFilePath;s.url=n,s.name="baidu-audio."+or.fileExtension(n,"."),s.contentType="audio/"+or.fileExtension(n,"."),s.duration=i.duration/1e3,s.size=i.fileSize,e.complete=Promise.resolve()}}class xr extends _r{create(){return new cr}setPayload(e,t){let s=t,i=e.createOptions.file;s.url=i.path,s.size=i.size,e.complete=new Promise(((e,t)=>{swan.getImageInfo({src:i.path,success(t){s.width=t.width,s.height=t.height,s.contentType="image/"+t.type,s.name="baidu-image."+t.type,e()},fail(e){t(e)}})}))}}class Ur extends ur{create(){return new ar}setPayload(e,t){let s=t,i=e.createOptions.file;const{uri:n,type:o,size:r,name:a}=i;s.url=decodeURIComponent(n),s.name=a,s.size=r,s.contentType=o,e.complete=Promise.resolve()}}class Gr extends Ur{create(){return new cr}setPayload(e,t){let s=t,i=e.createOptions.file;const{uri:n,fileSize:o,type:r,fileName:a,width:c,height:u}=i;s.url=n,s.size=o,s.contentType=r,s.name=a,s.width=c,s.height=u,e.complete=Promise.resolve()}}class Fr extends ur{create(){return new gr}setPayload(e,t){let s=e.createOptions.file;const i=t,{video:n,thumbnail:o}=i,{uri:r,type:a,fileSize:c,fileName:u,duration:l,height:d,width:h}=s;n.size=c,n.width=h,n.height=d,n.url=r,n.duration=l,n.contentType=a,n.name=u,o.url=r,o.name="rn-thumbnail.jpg",o.height=200,o.width=Number((n.width*o.height/n.height).toFixed(0)),o.contentType="image/jpg",e.complete=Promise.resolve()}}class Lr extends Ur{create(){return new hr}setPayload(e,t){let s=e.createOptions,i=t,n=s.file;const{uri:o,name:r,duration:a,size:c}=n;i.url=o,i.duration=Number((a/1e3).toFixed(2)),i.size=c,i.name=r||"rn-audio."+or.fileExtension(o,"."),i.contentType="audio/"+or.fileExtension(o,"."),s.file={uri:o,type:i.contentType,name:i.name},e.complete=Promise.resolve()}}class Br extends rr{}class qr extends ur{create(){return new Br}setPayload(e,t){let s=e.createOptions;t.payload=s.payload,e.complete=Promise.resolve()}}class jr{constructor(e,t){this.type=e,this.createOptions=t}}class Vr{constructor(){this.framework=s.currentFramework(),this.platform=d.currentPlatform(),this.payloadBuilders={[e.UNIAPP]:{image:new br,file:new vr,audio:new Cr,video:new Mr,text:new fr},[l.MP_WX]:{image:new dr,file:new lr,audio:new pr,video:new Er,text:new fr},[l.BROWSER]:{image:new Ir,file:new wr,audio:new Nr,video:new Tr,text:new fr},[l.MP_ALI]:{image:new kr,file:new Ar,audio:new Or,video:new Rr,text:new fr},[l.MP_BAIDU]:{image:new xr,file:new _r,audio:new Dr,video:new Pr,text:new fr},[e.REACT_NATIVE]:{image:new Gr,file:new Ur,audio:new Lr,video:new Fr,text:new fr},[l.MP_BYTE]:{image:new dr,file:new lr,audio:new pr,video:new Er,text:new fr}}}buildMessage(t,s){this.validate(s,t);const i=this.framework===e.UNKNOWN?this.platform:this.framework;let n=this.payloadBuilders[i][t],o=new jr(t,s);if(n){let e=n.build(o);o.payload=e}else{let e=(new qr).build(o);o.payload=e.payload}let r=this.build(o);return o.complete.then((()=>{v.onSuccess(s,r)})).catch((e=>{v.onFailed(s,e)})),r}build(e){let t,s=e.type,i=e.payload,n=e.createOptions.to,a=n.type;return a===o.GROUP?(t=new ze,t.senderData=te.Socket.user().data,n.id&&(t.groupId=n.id)):a===o.PRIVATE?(t=new He,t.read=!1,n.id&&(t.receiverId=n.id)):a===o.CS&&(t=new We,t.to=n.id.toString(),t.teamId=n.id.toString(),t.senderData=te.Socket.user().data),t.senderId=te.Socket.user().id,t.messageId=ie.get(),t.payload=i,t.timestamp=Date.now(),t.type=s,t.recalled=!1,t.status=r.NEW,t.buildOptions=e,t}validate(e,t){var s;s=Object.assign(Object.assign({},e),{type:t}),Tt(rt,s)}}class Hr extends $o{onMessageReceived(e){if(e.t===o.CS){let t=this.builder.build(e);this.sendAck(t.messageId);let s=je.byIMMessage(t);if(!Fo.get(s).existsMessage(t)){if(t.customerId()===te.Socket.user().id)this.createNotification(e),ys.i.fire(us.MESSAGE_RECEIVED,t),Ps.fire(ds.CS_MESSAGE_RECEIVED,t);else{Do.getInstance().queryTeams().then((()=>{xo.isMyMessage(t)&&this.createNotification(e),ys.i.fire(us.CS_AGENT_MESSAGE_RECEIVED,t)}))}}}}}class zr{constructor(e){this.times=new Array;let t=e[0],s=je.byIMMessage(t);this.scene=s.scene,this.targetId=s.id,e.forEach((e=>{this.times.push(e.timestamp)})),this.times.sort(((e,t)=>e<t?-1:e==t?0:1))}}class Wr{constructor(){this.onRemoteRecalled=e=>{ys.i.fire(us.MESSAGE_RECALLED,e)},_o.onMessage(Gt.IM_MSG_RECALLED,this.onRemoteRecalled)}recallMessage(e){return b(this,void 0,void 0,(function*(){Tt(at,e);let t=e.messages;yield this.recallServerMessages(t);let s=t[0],i=s.scene(),n=this.toConversationId(i,s.senderId,s.targetId()),o={id:te.Socket.user().id,data:te.Socket.user().data},r=t.map((e=>e.timestamp)),a=new Os(i,n,o,r);ys.i.fire(us.MESSAGE_RECALLED,a),v.onSuccess(e)}))}toConversationId(e,t,s){if(o.PRIVATE===e)return function(e,t){return e.localeCompare(t)>0?`${e}:${t}`:`${t}:${e}`}(t,s);if(o.GROUP===e)return s;throw{code:400,content:`scene: ${e} not support`}}recallServerMessages(e){let t=new zr(e);return 0===t.times.length?Promise.resolve():new Promise(((e,s)=>{let i=new le({name:y.IM_RECALL_MESSAGE,params:t,permission:ne.WRITE,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,fail:e=>{s(e)},success:t=>{200===t.code?e(t):s(t)}});te.Socket.e(i)}))}}class Jr{constructor(){this.map=new Map}getData(e){return this.map.get(e)}setData(e,t){this.map.set(e,t)}}class Xr{constructor(){this.dataCache=new Jr}static init(){this.i=new Xr}getData(...e){return b(this,void 0,void 0,(function*(){let t=[],s=new Map;return e.forEach((e=>{let i=this.dataCache.getData(e);i?s.set(e,i):t.push(e)})),0===t.length||(yield this.fetchData(...t)).forEach(((e,t)=>{this.dataCache.setData(t,e),s.set(t,e)})),Promise.resolve(s)}))}fetchData(...e){return new Promise(((t,s)=>{let i=new le({name:y.MD_CMD,permission:ne.READ,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,params:{name:"GET",data:{ids:e}},success:e=>{if(200===e.code){const s=new Map;e.content.forEach((e=>{s.set(e.id,e.data)})),t(s)}else s(e)},fail:e=>{s(e)}});te.Socket.e(i)}))}setData(e,t){this.dataCache.setData(e,t)}}class $r{constructor(){ys.i.on(us.MESSAGE_RECEIVED,this.onMessageReceived),ys.i.on(us.MESSAGE_SENDING,this.onMessageSending)}onMessageSending(e){let t=je.byIMMessage(e.message);t.scene===o.PRIVATE&&Xr.i.setData(t.id,e.receiver)}onMessageReceived(e){if(je.byIMMessage(e).scene===o.GROUP){let t=e;Xr.i.setData(t.senderId,t.senderData)}}}class Yr{constructor(){this._iMReceiver=new Yo,this.csMessageReceiver=new Hr,this.memberDataUpdator=new $r,this._userHereNow=new nr,this.goEasyUploader=new cs,this._groupHereNow=new sr,this._groupOnlineCount=new er,this.groupMessageSubscriber=new Qo,this.messageBuilder=new Vr,this.messageSender=new Es,this.recaller=new Wr,this._groupPresenceSubscriber=new Zo,this._userPresenceSubscriber=new ir,this.conversations=new Xo,this.histories=Fo.init()}static init(){ys.init(),Ps.init(),Yr.instance=new Yr}static i(){if(Yr.instance)return Yr.instance;throw Error("Please connect first.")}validateModules(){if(_o.status()===t.DISCONNECTED)throw Error("Please call connect() first.");Wo.check()}catch(e,t){return b(this,void 0,void 0,(function*(){try{this.validateModules(),yield e()}catch(e){v.onFailed(t,e)}}))}on(e,t){Ps.on(e,t)}off(e,t){Ps.off(e,t)}createTextMessage(e){return this.validateModules(),this.messageBuilder.buildMessage(Ee.TEXT,e)}createImageMessage(e){return this.validateModules(),this.messageBuilder.buildMessage(Ee.IMAGE,e)}createFileMessage(e){return this.validateModules(),this.messageBuilder.buildMessage(Ee.FILE,e)}createAudioMessage(e){return this.validateModules(),this.messageBuilder.buildMessage(Ee.AUDIO,e)}createVideoMessage(e){return this.validateModules(),this.messageBuilder.buildMessage(Ee.VIDEO,e)}createCustomMessage(e){return this.validateModules(),this.messageBuilder.buildMessage(e.type,e)}sendMessage(e){this.catch((()=>{this.messageSender.send(e)}),e)}recallMessage(e){this.catch((()=>{this.recaller.recallMessage(e)}),e)}deleteMessage(e){this.catch((()=>{this.histories.deleteMessage(e)}),e)}markGroupMessageAsRead(e){this.catch((()=>b(this,void 0,void 0,(function*(){yield this.histories.groupMarkAsRead(e)}))),e)}markPrivateMessageAsRead(e){this.catch((()=>b(this,void 0,void 0,(function*(){yield this.histories.privateMarkAsRead(e)}))),e)}markMessageAsRead(e,t){this.catch((()=>b(this,void 0,void 0,(function*(){yield this.histories.markMessageAsRead(e,t)}))),e)}latestConversations(e){this.validateModules(),this.conversations.latestConversations(e)}removePrivateConversation(e){this.catch((()=>this.conversations.removePrivateConversation(e)),e)}removeGroupConversation(e){this.catch((()=>this.conversations.removeGroupConversation(e)),e)}topPrivateConversation(e){this.catch((()=>this.conversations.topPrivateConversation(e)),e)}topGroupConversation(e){this.catch((()=>this.conversations.topGroupConversation(e)),e)}history(e,t){this.catch((()=>{this.histories.loadHistory(e,t)}),e)}subscribeUserPresence(e){this.catch((()=>this._userPresenceSubscriber.presence(e)),e)}unsubscribeUserPresence(e){this.catch((()=>this._userPresenceSubscriber.unPresence(e)),e)}hereNow(e){this.catch((()=>this._userHereNow.hereNow(e)),e)}subscribeGroup(e){this.catch((()=>this.groupMessageSubscriber.subscribe(e)),e)}unsubscribeGroup(e){this.catch((()=>this.groupMessageSubscriber.unsubscribe(e)),e)}subscribeGroupPresence(e){this.catch((()=>this._groupPresenceSubscriber.presence(e)),e)}unsubscribeGroupPresence(e){this.catch((()=>this._groupPresenceSubscriber.unPresence(e)),e)}groupHereNow(e){this.catch((()=>this._groupHereNow.hereNow(e)),e)}groupOnlineCount(e){this.catch((()=>this._groupOnlineCount.get(e)),e)}latestPendingConversations(e){this.validateModules(),this.conversations.latestPendingConversations(e)}topConversation(e){this.validateModules(),this.conversations.topConversation(e)}removeConversation(e){this.validateModules(),this.conversations.removeConversation(e)}}class Qr{constructor(e,t){this.customerId=e,this.teamId=t}}class Kr{constructor(e,t){this.teamId=e;let s=new c(t.id.toString(),JSON.stringify(t.data));this.customer=s}}class Zr{constructor(e,t,s){this.customerId=e,this.teamId=t,this.agentId=s}}class ea{constructor(e,t){this.customerId=e,this.teamId=t}}class ta{constructor(e){this.builder=new Ns,this.teamId=e}accept(e,t){Tt(gt,t);let s=new Kr(e,t.customer),i=new le({name:y.CS_ACCEPT,params:s,permission:ne.WRITE,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,fail:e=>{v.onFailed(t,e)},success:e=>{let s=this.builder.build(e.content.message);ys.i.fire(us.CS_ACCEPTED,s),v.onSuccess(t)}});te.Socket.e(i)}end(e,t){At(t.id);let s=t.id.toString(),i=new ea(s,e),n=new le({name:y.CS_END,params:i,permission:ne.WRITE,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,fail:e=>{v.onFailed(t,e)},success:e=>{let s=this.builder.build(e.content.message);ys.i.fire(us.CS_ENDED,s),v.onSuccess(t)}});te.Socket.e(n)}queryCustomerStatus(e,t){return b(this,void 0,void 0,(function*(){At(t.id);let s=yield this.doCustomerStatus(e,t.id);this.activeCustomerStatus=s,this.activeCustomerStatusOptions=t,v.onSuccess(t,s)}))}doCustomerStatus(e,t){let s=t.toString(),i=new Qr(s,e);return new Promise(((e,t)=>{let s=new le({name:y.CS_CUSTOMER_STATUS,params:i,permission:ne.READ,singleTimeout:S.commonQuerySingle,totalTimeout:S.commonQueryTotal,fail:e=>{t(e)},success:t=>{let s=t.content;s.agent&&(s.agent.data=JSON.parse(s.agent.data)),e(s)}});te.Socket.e(s)}))}transfer(e,t){Tt(yt,t);let s=t.customerId.toString(),i=t.agentId.toString(),n=new Zr(s,e,i),o=new le({name:y.CS_TRANSFER,params:n,permission:ne.WRITE,singleTimeout:S.commonRequestSingle,totalTimeout:S.commonRequestTotal,fail:e=>{v.onFailed(t,e)},success:e=>{let s=this.builder.build(e.content.message);ys.i.fire(us.CS_TRANSFER,s),v.onSuccess(t)}});te.Socket.e(o)}}class sa{createTextMessage(e,t){let s=Yr.i().createTextMessage(t);this.extendProps(e,s)}createImageMessage(e,t){let s=Yr.i().createImageMessage(t);this.extendProps(e,s)}createFileMessage(e,t){let s=Yr.i().createFileMessage(t);this.extendProps(e,s)}createAudioMessage(e,t){let s=Yr.i().createAudioMessage(t);this.extendProps(e,s)}createVideoMessage(e,t){let s=Yr.i().createVideoMessage(t);this.extendProps(e,s)}createCustomMessage(e,t){let s=Yr.i().createCustomMessage(t);this.extendProps(e,s)}extendProps(e,t){if(t.scene()===o.CS){let s=t;s.teamId=e,s.accepted=!0}}}class ia{constructor(e){this.teamId=e,this.agentStatus=Do.getInstance(),this.conversationHandler=new ta(e),this.messageCreator=new sa}catch(e,t){return b(this,void 0,void 0,(function*(){try{yield e()}catch(e){v.onFailed(t,e)}}))}isOnline(e){this.catch((()=>{this.agentStatus.isOnline(this.teamId,e)}),e)}online(e){this.catch((()=>{this.agentStatus.online(this.teamId,e)}),e)}offline(e){this.catch((()=>{this.agentStatus.offline(this.teamId,e)}),e)}customerStatus(e){this.catch((()=>{this.conversationHandler.queryCustomerStatus(this.teamId,e)}),e)}accept(e){this.catch((()=>{this.conversationHandler.accept(this.teamId,e)}),e)}end(e){this.catch((()=>{this.conversationHandler.end(this.teamId,e)}),e)}history(e){Yr.i().history(e,this.teamId)}markMessageAsRead(e){Yr.i().markMessageAsRead(e,this.teamId)}createTextMessage(e){this.messageCreator.createTextMessage(this.teamId,e)}createImageMessage(e){this.messageCreator.createImageMessage(this.teamId,e)}createFileMessage(e){this.messageCreator.createFileMessage(this.teamId,e)}createAudioMessage(e){this.messageCreator.createAudioMessage(this.teamId,e)}createVideoMessage(e){this.messageCreator.createVideoMessage(this.teamId,e)}createCustomMessage(e){this.messageCreator.createCustomMessage(this.teamId,e)}transfer(e){this.catch((()=>{this.conversationHandler.transfer(this.teamId,e)}),e)}agents(e){this.catch((()=>{this.agentStatus.agents(this.teamId,e)}),e)}liveSession(e){this.catch((()=>{xo.live(this.teamId,e)}),e)}quitLiveSession(e){this.catch((()=>{xo.quit(e)}),e)}listenCustomer(e){let t={customerId:e.id,onNewMessage:e.onNewMessage,onStatusUpdated:e.onStatusUpdated,onFailed:e.onFailed,onSuccess:e.onSuccess};this.catch((()=>{xo.live(this.teamId,t)}),e)}cancelListenCustomer(e){this.catch((()=>{xo.quit(e)}),e)}}class na{static team(e){Rt(e);let t=this.teams.get(e);return t||(t=new ia(e.toString()),this.teams.set(e.toString(),t)),t}}na.teams=new Map;class oa{constructor(e){this.id=e}isOnline(e){na.team(this.id).isOnline(e)}online(e){na.team(this.id).online(e)}offline(e){na.team(this.id).offline(e)}customerStatus(e){na.team(this.id).customerStatus(e)}accept(e){na.team(this.id).accept(e)}end(e){na.team(this.id).end(e)}history(e){na.team(this.id).history(e)}markMessageAsRead(e){na.team(this.id).markMessageAsRead(e)}createTextMessage(e){na.team(this.id).createTextMessage(e)}createImageMessage(e){na.team(this.id).createImageMessage(e)}createFileMessage(e){na.team(this.id).createFileMessage(e)}createAudioMessage(e){na.team(this.id).createAudioMessage(e)}createVideoMessage(e){na.team(this.id).createVideoMessage(e)}createCustomMessage(e){na.team(this.id).createCustomMessage(e)}transfer(e){na.team(this.id).transfer(e)}agents(e){na.team(this.id).agents(e)}liveSession(e){na.team(this.id).liveSession(e)}quitLiveSession(e){na.team(this.id).quitLiveSession(e)}listenCustomer(e){na.team(this.id).listenCustomer(e)}cancelListenCustomer(e){na.team(this.id).cancelListenCustomer(e)}}class ra{static getInstance(e){return this.init(e),ra}static init(e){if(this.getConnectionStatus()!==t.DISCONNECTED)throw new Error("Initialization failed. Please disconnect and try again.");Tt($e,e),e.modules=e.modules.map((e=>e.toUpperCase())),i.init(e.reactNativeOptions),this.options=e,_o.init(e),e.allowNotification&&he.init(e.allowNotification),e.modules&&(e.modules.includes("PUBSUB")&&X.initModule(Wt.init()),e.modules.includes("IM")&&X.initModule(Wo.init())),Xr.init(),te.init(_o,he,Xr,n,h,X),this.options.customProvider&&_s.init(this.options.customProvider)}static setBadge(e){he.setBadge(e)}static connect(e){_o.connect(e,"JS")}static disconnect(e){_o.disconnect(e)}static getConnectionStatus(){return _o.status()}static onClickNotification(e){he.onClickNotification(e)}static c(e){e.init(te.Socket,te.N,te.Member,te.v,te.Platform,X)}}ra.version=n,ra.IM_EVENT=ds,ra.IM_SCENE=o,ra.im=class{static on(e,t){Yr.i().on(e,t)}static off(e,t){Yr.i().off(e,t)}static createTextMessage(e){return Yr.i().createTextMessage(e)}static createImageMessage(e){return Yr.i().createImageMessage(e)}static createFileMessage(e){return Yr.i().createFileMessage(e)}static createAudioMessage(e){return Yr.i().createAudioMessage(e)}static createVideoMessage(e){return Yr.i().createVideoMessage(e)}static createCustomMessage(e){return Yr.i().createCustomMessage(e)}static sendMessage(e){Yr.i().sendMessage(e)}static recallMessage(e){Yr.i().recallMessage(e)}static deleteMessage(e){Yr.i().deleteMessage(e)}static markGroupMessageAsRead(e){Yr.i().markGroupMessageAsRead(e)}static markPrivateMessageAsRead(e){Yr.i().markPrivateMessageAsRead(e)}static latestConversations(e){Yr.i().latestConversations(e)}static removePrivateConversation(e){Yr.i().removePrivateConversation(e)}static removeGroupConversation(e){Yr.i().removeGroupConversation(e)}static topPrivateConversation(e){Yr.i().topPrivateConversation(e)}static topGroupConversation(e){Yr.i().topGroupConversation(e)}static history(e){Yr.i().history(e)}static subscribeUserPresence(e){Yr.i().subscribeUserPresence(e)}static unsubscribeUserPresence(e){Yr.i().unsubscribeUserPresence(e)}static hereNow(e){Yr.i().hereNow(e)}static subscribeGroup(e){Yr.i().subscribeGroup(e)}static unsubscribeGroup(e){Yr.i().unsubscribeGroup(e)}static subscribeGroupPresence(e){Yr.i().subscribeGroupPresence(e)}static unsubscribeGroupPresence(e){Yr.i().unsubscribeGroupPresence(e)}static groupHereNow(e){Yr.i().groupHereNow(e)}static groupOnlineCount(e){Yr.i().groupOnlineCount(e)}static markMessageAsRead(e){Yr.i().markMessageAsRead(e)}static csteam(e){return new oa(e)}static pendingConversations(e){Yr.i().latestPendingConversations(e)}static topConversation(e){Yr.i().topConversation(e)}static removeConversation(e){Yr.i().removeConversation(e)}},ra.pubsub=class{static publish(e){this.catch((()=>{zt.instance.publish(e)}),e)}static subscribe(e){this.catch((()=>{zt.instance.subscribe(e)}),e)}static unsubscribe(e){this.catch((()=>{zt.instance.unsubscribe(e)}),e)}static subscribePresence(e){this.catch((()=>{zt.instance.subscribePresence(e)}),e)}static unsubscribePresence(e){this.catch((()=>{zt.instance.unsubscribePresence(e)}),e)}static history(e){this.catch((()=>{zt.instance.history(e)}),e)}static hereNow(e){this.catch((()=>{zt.instance.hereNow(e)}),e)}static catch(e,s){try{if(Wt.check(),[t.DISCONNECTED,t.DISCONNECTING,t.CONNECT_FAILED].includes(te.Socket.status()))throw new Error("Please call connect() first.");e()}catch(e){v.onFailed(s,e)}}};export{ra as default};
diff --git a/static/lib/restapi.js b/static/lib/restapi.js
new file mode 100644
index 0000000..3d671c2
--- /dev/null
+++ b/static/lib/restapi.js
@@ -0,0 +1,146 @@
+class RestApi {
+    //用户数据示例
+    users = [
+        {
+            id: '08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a',
+            name: 'Mattie',
+            password: '123',
+            avatar: '/static/images/Avatar-1.png',
+            email: 'Mattie@goeasy.io',
+            phone: '138xxxxxxxx',
+        },
+        {
+            id: '3bb179af-bcc5-4fe0-9dac-c05688484649',
+            name: 'Wallace',
+            password: '123',
+            avatar: '/static/images/Avatar-2.png',
+            email: 'Wallace@goeasy.io',
+            phone: '138xxxxxxxx',
+        },
+        {
+            id: 'fdee46b0-4b01-4590-bdba-6586d7617f95',
+            name: 'Tracy',
+            password: '123',
+            avatar: '/static/images/Avatar-3.png',
+            email: 'Tracy@goeasy.io',
+            phone: '138xxxxxxxx',
+        },
+        {
+            id: '33c3693b-dbb0-4bc9-99c6-fa77b9eb763f',
+            name: 'Juanita',
+            password: '123',
+            avatar: '/static/images/Avatar-4.png',
+            email: 'Juanita@goeasy.io',
+            phone: '138xxxxxxxx',
+        },
+    ];
+    //群数据示例
+    groups = [
+        {
+            id: 'group-a42b-47b2-bb1e-15e0f5f9a19a',
+            name: '小程序交流群',
+            avatar: '/static/images/wx.png',
+            userList: [
+                '08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a',
+                '3bb179af-bcc5-4fe0-9dac-c05688484649',
+                'fdee46b0-4b01-4590-bdba-6586d7617f95',
+                '33c3693b-dbb0-4bc9-99c6-fa77b9eb763f',
+            ],
+        },
+        {
+            id: 'group-4b01-4590-bdba-6586d7617f95',
+            name: 'UniApp交流群',
+            avatar: '/static/images/uniapp.png',
+            userList: [
+                '08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a',
+                'fdee46b0-4b01-4590-bdba-6586d7617f95',
+                '33c3693b-dbb0-4bc9-99c6-fa77b9eb763f',
+            ],
+        },
+        {
+            id: 'group-dbb0-4bc9-99c6-fa77b9eb763f',
+            name: 'GoEasy交流群',
+            avatar: '/static/images/goeasy.jpeg',
+            userList: ['08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a', '3bb179af-bcc5-4fe0-9dac-c05688484649'],
+        },
+    ];
+    // 订单
+    orders = [
+        {
+            id: '252364104325',
+            url: '/static/images/goods1-1.jpg',
+            name: '青桔柠檬气泡美式',
+            price: '￥23',
+            count: 1
+        },
+        {
+            id: '251662058022',
+            url: '/static/images/goods1-2.jpg',
+            name: '咸柠七',
+            price: '￥8',
+            count: 2
+        },
+        {
+            id: '250676186141',
+            url: '/static/images/goods1-3.jpg',
+            name: '黑糖波波鲜奶茶',
+            price: '￥12',
+            count: 1
+        }
+    ];
+
+    findUsers() {
+        return this.users;
+    };
+
+    findFriends(user) {
+        return this.users.filter((v) => v.id !== user.id);
+    }
+
+    findGroups(user) {
+        return this.groups.filter((v) => v.userList.find((id) => id === user.id));
+    }
+
+    findUser(username, password) {
+        return this.users.find((user) => user.name === username && user.password === password);
+    }
+
+    getOrderList() {
+        return this.orders;
+    }
+
+    findGroupById(groupId) {
+        return this.groups.find((group) => group.id === groupId);
+    }
+
+    findUserById(userId) {
+        return this.users.find((user) => user.id === userId);
+    }
+
+    findGroupMembers (groupId) {
+        let members = [];
+        let group = this.groups.find(v => v.id === groupId);
+        this.users.map(user => {
+            let userId = group.userList.find((id)=>{
+                return id === user.id;
+            });
+            members.push(user);
+        });
+        return members;
+    }
+
+    findGroupMemberAvatars (groupId) {
+        let avatars = [];
+        let group = this.groups.find((v) => v.id === groupId);
+        this.users.map((user) => {
+            group.userList.forEach((userId) => {
+                if (user.id === userId) {
+                    avatars.push(user.avatar);
+                }
+            });
+        });
+        return avatars;
+    }
+}
+
+export default new RestApi();
diff --git a/static/lib/utils.js b/static/lib/utils.js
new file mode 100644
index 0000000..6bdd9d8
--- /dev/null
+++ b/static/lib/utils.js
@@ -0,0 +1,49 @@
+/**
+ * 格式化日期
+ * @prama t 时间戳
+ * @return str MM-dd HH:mm
+ */
+export function formatDate(t) {
+    t = t || Date.now();
+    let time = new Date(t);
+    let str = time.getMonth() < 9 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1;
+    str += '-';
+    str += time.getDate() < 10 ? '0' + time.getDate() : time.getDate();
+    str += ' ';
+    str += time.getHours();
+    str += ':';
+    str += time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
+    return str;
+};
+
+/**
+ * 距当前时间点的时长
+ * @prama time 13位时间戳
+ * @return str x秒 / x分钟 / x小时
+ */
+export function formateTime(time) {
+    const second = 1000;
+    const minute = second * 60;
+    const hour = minute * 60;
+    const day = hour * 24;
+    const now = new Date().getTime();
+    const diffValue = now - time;
+
+    // 计算差异时间的量级
+    const secondC = diffValue / second;
+    const minC = diffValue / minute;
+    const hourC = diffValue / hour;
+    const dayC = diffValue / day;
+
+    if (dayC >= 1) {
+        return parseInt(dayC) + "天";
+    } else if (hourC >= 1) {
+        return parseInt(hourC) + "小时";
+    } else if (minC >= 1) {
+        return parseInt(minC) + "分钟";
+    } else if (secondC >= 1) {
+        return parseInt(secondC) + "秒";
+    } else {
+        return '0秒';
+    }
+}
\ No newline at end of file
diff --git a/utils/__init__.py b/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/utils/__pycache__/__init__.cpython-313.pyc b/utils/__pycache__/__init__.cpython-313.pyc
new file mode 100644
index 0000000..f453bc4
Binary files /dev/null and b/utils/__pycache__/__init__.cpython-313.pyc differ
diff --git a/utils/__pycache__/admin.cpython-313.pyc b/utils/__pycache__/admin.cpython-313.pyc
new file mode 100644
index 0000000..1f6d9b7
Binary files /dev/null and b/utils/__pycache__/admin.cpython-313.pyc differ
diff --git a/utils/__pycache__/apps.cpython-313.pyc b/utils/__pycache__/apps.cpython-313.pyc
new file mode 100644
index 0000000..8562f9e
Binary files /dev/null and b/utils/__pycache__/apps.cpython-313.pyc differ
diff --git a/utils/__pycache__/celery_utils.cpython-313.pyc b/utils/__pycache__/celery_utils.cpython-313.pyc
new file mode 100644
index 0000000..4adc936
Binary files /dev/null and b/utils/__pycache__/celery_utils.cpython-313.pyc differ
diff --git a/utils/__pycache__/goeasy_service.cpython-313.pyc b/utils/__pycache__/goeasy_service.cpython-313.pyc
new file mode 100644
index 0000000..cca2add
Binary files /dev/null and b/utils/__pycache__/goeasy_service.cpython-313.pyc differ
diff --git a/utils/__pycache__/models.cpython-313.pyc b/utils/__pycache__/models.cpython-313.pyc
new file mode 100644
index 0000000..1995b69
Binary files /dev/null and b/utils/__pycache__/models.cpython-313.pyc differ
diff --git a/utils/__pycache__/oss_utils.cpython-313.pyc b/utils/__pycache__/oss_utils.cpython-313.pyc
new file mode 100644
index 0000000..e39f5ef
Binary files /dev/null and b/utils/__pycache__/oss_utils.cpython-313.pyc differ
diff --git a/utils/__pycache__/wechat_v3.cpython-313.pyc b/utils/__pycache__/wechat_v3.cpython-313.pyc
new file mode 100644
index 0000000..da7fecf
Binary files /dev/null and b/utils/__pycache__/wechat_v3.cpython-313.pyc differ
diff --git a/utils/__pycache__/weixin_broadcast.cpython-313.pyc b/utils/__pycache__/weixin_broadcast.cpython-313.pyc
new file mode 100644
index 0000000..1f0fc55
Binary files /dev/null and b/utils/__pycache__/weixin_broadcast.cpython-313.pyc differ
diff --git a/utils/__pycache__/yaoqingma_utils.cpython-313.pyc b/utils/__pycache__/yaoqingma_utils.cpython-313.pyc
new file mode 100644
index 0000000..a543e71
Binary files /dev/null and b/utils/__pycache__/yaoqingma_utils.cpython-313.pyc differ
diff --git a/utils/admin.py b/utils/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/utils/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/utils/apps.py b/utils/apps.py
new file mode 100644
index 0000000..3e82e49
--- /dev/null
+++ b/utils/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class UtilsConfig(AppConfig):
+    name = "utils"
diff --git a/utils/celery_utils.py b/utils/celery_utils.py
new file mode 100644
index 0000000..07f900f
--- /dev/null
+++ b/utils/celery_utils.py
@@ -0,0 +1,110 @@
+"""
+阿龙电竞 - Celery工具函数
+提供通用的Celery辅助函数，确保数据安全和操作稳定
+"""
+
+import logging
+from django.db import transaction
+from datetime import datetime
+from decimal import Decimal, InvalidOperation
+
+# 配置日志
+logger = logging.getLogger(__name__)
+
+def safe_decimal_operation(value, default=Decimal('0.00')):
+    """
+    安全处理Decimal操作，防止类型转换错误
+    :param value: 输入值
+    :param default: 默认值
+    :return: Decimal对象
+    """
+    try:
+        if value is None:
+            return default
+
+        if isinstance(value, Decimal):
+            return value
+
+        if isinstance(value, (int, float)):
+            return Decimal(str(value))
+
+        if isinstance(value, str):
+            # 移除可能的空白字符和特殊字符
+            value = value.strip()
+            if not value:
+                return default
+            return Decimal(value)
+
+        # 其他类型尝试转换
+        return Decimal(str(value))
+    except (InvalidOperation, TypeError, ValueError) as e:
+        logger.warning(f"Decimal转换失败: {e}, 输入值: {value}, 类型: {type(value)}, 使用默认值: {default}")
+        return default
+    except Exception as e:
+        logger.error(f"Decimal转换发生未知错误: {e}, 输入值: {value}, 使用默认值: {default}")
+        return default
+
+def log_task_execution(task_name, success=True, details=""):
+    """
+    记录任务执行日志
+    :param task_name: 任务名称
+    :param success: 是否成功
+    :param details: 详细信息
+    """
+    try:
+        timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        status = "成功" if success else "失败"
+
+        log_message = f"[{timestamp}] {task_name} - {status}"
+        if details:
+            log_message += f" | {details}"
+
+        if success:
+            logger.info(log_message)
+        else:
+            logger.error(log_message)
+
+        return log_message
+    except Exception as e:
+        # 即使日志记录失败也不影响主流程
+        print(f"日志记录失败: {e}")
+        return f"日志记录失败: {e}"
+
+def rollback_on_failure(operation_name):
+    """
+    事务回滚装饰器
+    :param operation_name: 操作名称
+    """
+    def decorator(func):
+        def wrapper(*args, **kwargs):
+            try:
+                with transaction.atomic():
+                    return func(*args, **kwargs)
+            except Exception as e:
+                logger.error(f"{operation_name}事务执行失败: {str(e)}")
+                raise
+        return wrapper
+    return decorator
+
+def retry_on_failure(max_retries=3, delay=60):
+    """
+    重试装饰器（可用于Celery任务）
+    :param max_retries: 最大重试次数
+    :param delay: 重试延迟（秒）
+    """
+    def decorator(func):
+        def wrapper(*args, **kwargs):
+            retries = 0
+            while retries < max_retries:
+                try:
+                    return func(*args, **kwargs)
+                except Exception as e:
+                    retries += 1
+                    if retries == max_retries:
+                        logger.error(f"任务{func.__name__}重试{max_retries}次后失败: {str(e)}")
+                        raise
+                    logger.warning(f"任务{func.__name__}第{retries}次失败，{delay}秒后重试: {str(e)}")
+                    import time
+                    time.sleep(delay)
+        return wrapper
+    return decorator
\ No newline at end of file
diff --git a/utils/chat-core.js b/utils/chat-core.js
new file mode 100644
index 0000000..57856e8
--- /dev/null
+++ b/utils/chat-core.js
@@ -0,0 +1,662 @@
+// utils/chat-core.js
+import GoEasy from '../static/lib/goeasy-2.13.24.esm.min';
+import { jianquanxian } from './imAuth/jianquanxian';
+
+let _globalPrivateHandler = null;
+let _globalGroupHandler = null;
+let _globalConvHandler = null;
+
+function initGlobalMessageSystem(app) {
+  app.updateUnreadCount = (count) => updateUnreadCount(app, count);
+  app.disconnectGoEasy = () => disconnectGoEasy(app);
+  app.ensureConnection = () => ensureConnection(app);
+  app.connectWithIdentity = (identityType, userId, isAutoRestore) => connectWithIdentity(app, identityType, userId, isAutoRestore);
+  app.connectForCurrentRole = () => connectForCurrentRole(app);
+  app.switchRoleAndReconnect = (newRole) => switchRoleAndReconnect(app, newRole);
+  app.toggleDoNotDisturb = (enabled) => toggleDoNotDisturb(app, enabled);
+  app.toggleNotificationMute = (enabled) => toggleNotificationMute(app, enabled);
+  app.closeNotification = () => closeNotification(app);
+  app.loadConversations = () => loadConversations(app);
+  app.updateCurrentPageState = () => updateCurrentPageState(app);
+  app.getSavedConnection = () => getSavedConnection(app);
+  app.clearSavedConnection = () => clearSavedConnection(app);
+  app.saveConnectionState = () => saveConnectionState(app);
+  app.handleNewMessage = (message) => handleNewMessage(app, message);
+
+  loadUserSettings(app);
+  initNetworkListener(app);
+  initAppStateListener(app);
+  checkAndRestoreConnection(app);
+  setupEventSystem(app);
+  setupMessageListeners(app);
+}
+
+function getCurrentGoEasyUserId() {
+  return (wx.goEasy && wx.goEasy.im && wx.goEasy.im.userId) || null;
+}
+
+function loadUserSettings(app) {
+  try {
+    const messageSettings = wx.getStorageSync(app.globalData.messageManager.cacheKeys.messageSettings);
+    if (messageSettings) {
+      app.globalData.messageManager = { ...app.globalData.messageManager, ...messageSettings };
+    }
+    const connectionSettings = wx.getStorageSync(app.globalData.goEasyConnection.cacheKeys.savedConnection);
+    if (connectionSettings) {
+      app.globalData.goEasyConnection = { ...app.globalData.goEasyConnection, ...connectionSettings };
+    }
+    const savedUnread = wx.getStorageSync(app.globalData.messageManager.cacheKeys.unreadTotal);
+    if (savedUnread !== '') {
+      app.globalData.messageManager.unreadTotal = savedUnread;
+      updateTabBarBadge(app, savedUnread);
+    }
+    const savedMessages = wx.getStorageSync(app.globalData.messageManager.cacheKeys.latestMessages);
+    if (savedMessages) {
+      app.globalData.messageManager.latestMessages = savedMessages;
+    }
+    const notificationMuted = wx.getStorageSync(app.globalData.messageManager.cacheKeys.notificationMuted);
+    if (notificationMuted !== '') {
+      app.globalData.messageManager.notificationMuted = notificationMuted;
+    }
+  } catch (error) {
+    console.warn('加载用户设置失败:', error);
+  }
+}
+
+function initNetworkListener(app) {
+  wx.onNetworkStatusChange((res) => {
+    if (res.isConnected) {
+      ensureConnection(app);
+    } else {
+      app.globalData.goEasyConnection.status = 'disconnected';
+      app.emitEvent('connectionChanged', { status: 'disconnected', reason: 'network' });
+    }
+  });
+}
+
+function initAppStateListener(app) {
+  wx.onAppShow(() => {
+    ensureConnection(app);
+    updateCurrentPageState(app);
+    // ✅ 连接正常时，主动刷一次未读角标
+    if (wx.goEasy.getConnectionStatus && wx.goEasy.getConnectionStatus() === 'connected') {
+        loadConversations(app);
+      }
+  });
+  wx.onAppHide(() => {
+    pauseHeartbeat(app);
+    saveConnectionState(app);
+  });
+}
+
+function checkAndRestoreConnection(app) {
+  try {
+    const savedConnection = wx.getStorageSync(app.globalData.goEasyConnection.cacheKeys.savedConnection);
+    if (savedConnection && savedConnection.userId && savedConnection.identityType) {
+      const now = Date.now();
+      const lastTime = savedConnection.lastConnectTime || 0;
+      const hoursDiff = (now - lastTime) / (1000 * 60 * 60);
+      const validityHours = app.globalData.goEasyConnection.config.cacheValidityHours || 12;
+      if (hoursDiff > validityHours) {
+        clearSavedConnection(app);
+      } else {
+        ensureConnection(app);
+      }
+    }
+  } catch (error) {
+    console.warn('检查保存的连接信息失败:', error);
+  }
+}
+
+function setupEventSystem(app) {
+  app.globalData.eventListeners = {};
+}
+
+// 🔥 修改点：不依赖 saved 缓存，只要连接状态正常就刷新角标
+function ensureConnection(app) {
+  const connectionStatus = wx.goEasy.getConnectionStatus ? wx.goEasy.getConnectionStatus() : 'disconnected';
+  if (connectionStatus === 'connected' || connectionStatus === 'reconnected') {
+    setupMessageListeners(app);
+    loadConversations(app);        // 每次进入前台都刷新未读
+    return;
+  }
+
+  // 连接不存在时尝试恢复
+  const saved = getSavedConnection(app);
+  if (!saved || !saved.userId || !saved.identityType) return;
+
+  connectWithIdentity(app, saved.identityType, saved.userId, true);
+}
+
+function getSavedConnection(app) {
+  try {
+    const saved = wx.getStorageSync(app.globalData.goEasyConnection.cacheKeys.savedConnection);
+    return saved ? JSON.parse(saved) : null;
+  } catch (error) {
+    console.error('获取保存的连接信息失败:', error);
+    return null;
+  }
+}
+
+function saveConnectionState(app) {
+  try {
+    const { goEasyConnection } = app.globalData;
+    const connectionState = {
+      userId: goEasyConnection.userId,
+      identityType: goEasyConnection.identityType,
+      lastConnectTime: Date.now(),
+      autoReconnect: goEasyConnection.autoReconnect,
+      status: goEasyConnection.status,
+    };
+    wx.setStorageSync(goEasyConnection.cacheKeys.savedConnection, JSON.stringify(connectionState));
+  } catch (error) {
+    console.warn('保存连接状态失败:', error);
+  }
+}
+
+function clearSavedConnection(app) {
+  const { cacheKeys } = app.globalData.goEasyConnection;
+  wx.removeStorageSync(cacheKeys.savedConnection);
+  wx.removeStorageSync(cacheKeys.userId);
+  wx.removeStorageSync(cacheKeys.identityType);
+  app.globalData.goEasyConnection.userId = '';
+  app.globalData.goEasyConnection.identityType = '';
+  app.globalData.goEasyConnection.lastConnectTime = 0;
+}
+
+function disconnectGoEasy(app) {
+  return new Promise((resolve) => {
+    app.globalData.goEasyConnection.status = 'disconnected';
+    app.globalData.goEasyConnection.autoReconnect = false;
+    stopHeartbeat(app);
+    removeGlobalMessageListeners();
+    if (wx.goEasy && wx.goEasy.disconnect) {
+      wx.goEasy.disconnect({
+        onSuccess: () => {
+          clearSavedConnection(app);
+          app.globalData.messageManager.unreadTotal = 0;
+          updateTabBarBadge(app, 0);
+          app.emitEvent('connectionChanged', { status: 'disconnected', manual: true });
+          resolve();
+        },
+        onFailed: () => {
+          clearSavedConnection(app);
+          app.globalData.messageManager.unreadTotal = 0;
+          updateTabBarBadge(app, 0);
+          resolve();
+        }
+      });
+    } else {
+      clearSavedConnection(app);
+      app.globalData.messageManager.unreadTotal = 0;
+      updateTabBarBadge(app, 0);
+      resolve();
+    }
+  });
+}
+
+async function connectWithIdentity(app, identityType, userId, isAutoRestore = false) {
+  const quanxian = await jianquanxian(app);
+  if (!quanxian.allowed) return Promise.reject(quanxian.reason);
+
+  app.globalData.goEasyConnection.autoReconnect = true;
+  app.globalData.goEasyConnection.status = 'connecting';
+  app.globalData.goEasyConnection.userId = userId;
+  app.globalData.goEasyConnection.identityType = identityType;
+  if (!isAutoRestore) app.globalData.goEasyConnection.reconnectAttempts = 0;
+  saveConnectionState(app);
+
+  const uid = wx.getStorageSync('uid');
+  const currentUser = app.globalData.currentUser || {
+    id: uid,
+    name: '用户' + (uid ? uid.substring(0, 6) : ''),
+    avatar: app.globalData.ossImageUrl + app.globalData.morentouxiang,
+  };
+
+  return new Promise((resolve, reject) => {
+    wx.goEasy.connect({
+      id: userId,
+      data: { name: currentUser.name, avatar: currentUser.avatar, identityType },
+      onSuccess: () => {
+        app.globalData.goEasyConnection.status = 'connected';
+        app.globalData.goEasyConnection.lastConnectTime = Date.now();
+        app.globalData.goEasyConnection.reconnectAttempts = 0;
+        saveConnectionState(app);
+        startHeartbeat(app);
+        setupMessageListeners(app);
+        loadConversations(app);   // 连接成功立刻拉未读数
+        app.emitEvent('connectionChanged', { status: 'connected', identityType, userId });
+        if (!isAutoRestore) {
+          wx.showToast({ title: '连接成功', icon: 'success', duration: 2000 });
+        }
+        resolve();
+      },
+      onFailed: (error) => {
+        console.error('GoEasy连接失败:', error);
+        if (error.code === 900) {
+          app.globalData.goEasyConnection.autoReconnect = false;
+          app.globalData.goEasyConnection.status = 'disconnected';
+          clearSavedConnection(app);
+          stopHeartbeat(app);
+          wx.showModal({
+            title: '消息功能暂不可用',
+            content: '当前使用人数爆满，消息功能暂时无法使用。请联系管理员升级套餐后重试。',
+            showCancel: false,
+            confirmText: '我知道了'
+          });
+          app.emitEvent('connectionChanged', { status: 'disconnected', error, reason: 'overcapacity' });
+          reject(error);
+          return;
+        }
+        app.globalData.goEasyConnection.status = 'disconnected';
+        app.emitEvent('connectionChanged', { status: 'disconnected', error, isAutoRestore });
+        const { autoReconnect, reconnectAttempts, maxReconnectAttempts } = app.globalData.goEasyConnection;
+        if (autoReconnect && reconnectAttempts < maxReconnectAttempts) {
+          app.globalData.goEasyConnection.reconnectAttempts++;
+          setTimeout(() => {
+            if (app.globalData.goEasyConnection.autoReconnect) {
+              connectWithIdentity(app, identityType, userId, true);
+            }
+          }, app.globalData.goEasyConnection.config.reconnectDelay);
+          reject(error);
+        } else {
+          reject(error);
+        }
+      },
+    });
+  });
+}
+
+function connectForCurrentRole(app) {
+  const uid = wx.getStorageSync('uid');
+  if (!uid) return;
+  const role = app.globalData.currentRole || 'normal';
+  const prefixMap = { normal: 'Boss', dashou: 'Ds', shangjia: 'Sj', guanshi: 'Gs', zuzhang: 'Zz' , kaoheguan: 'Kh'};
+  const prefix = prefixMap[role] || 'Boss';
+  const targetUserId = prefix + uid;
+
+  const currentUserId = getCurrentGoEasyUserId();
+  if (currentUserId === targetUserId) {
+    loadConversations(app);
+    setupMessageListeners(app);
+    return;
+  }
+  if (currentUserId) {
+    wx.goEasy.disconnect({ onSuccess: () => {}, onFailed: () => {} });
+  }
+  connectWithIdentity(app, role, targetUserId, false);
+}
+
+async function switchRoleAndReconnect(app, newRole) {
+  try {
+    await disconnectGoEasy(app);
+    app.globalData.currentRole = newRole;
+    wx.setStorageSync('currentRole', newRole);
+    const uid = wx.getStorageSync('uid');
+    const prefixMap = { normal: 'Boss', dashou: 'Ds', shangjia: 'Sj', guanshi: 'Gs', zuzhang: 'Zz' , kaoheguan: 'Kh'};
+    const prefix = prefixMap[newRole] || 'Boss';
+    const targetUserId = prefix + uid;
+    await connectWithIdentity(app, newRole, targetUserId, false);
+    return true;
+  } catch (error) {
+    wx.showToast({ title: '聊天功能不可用，可能是人数爆满或未充值会员', icon: 'none' });
+    throw error;
+  }
+}
+
+function startHeartbeat(app) {
+  const { goEasyConnection } = app.globalData;
+  stopHeartbeat(app);
+  goEasyConnection.heartbeatInterval = setInterval(() => {
+    if (goEasyConnection.status === 'connected' && wx.goEasy?.im) {
+      wx.goEasy.im.ping({
+        onSuccess: () => {},
+        onFailed: (error) => {
+          console.error('心跳失败:', error);
+          goEasyConnection.status = 'reconnecting';
+          attemptReconnect(app);
+        },
+      });
+    }
+  }, goEasyConnection.config.heartbeatInterval);
+}
+
+function stopHeartbeat(app) {
+  if (app.globalData.goEasyConnection.heartbeatInterval) {
+    clearInterval(app.globalData.goEasyConnection.heartbeatInterval);
+    app.globalData.goEasyConnection.heartbeatInterval = null;
+  }
+}
+
+function pauseHeartbeat(app) { stopHeartbeat(app); }
+
+function attemptReconnect(app) {
+  const { goEasyConnection } = app.globalData;
+  if (!goEasyConnection.autoReconnect) return;
+  if (goEasyConnection.userId && goEasyConnection.identityType) {
+    connectWithIdentity(app, goEasyConnection.identityType, goEasyConnection.userId, true);
+  }
+}
+
+/* ---------- 消息监听器 ---------- */
+function removeGlobalMessageListeners() {
+  if (_globalPrivateHandler) {
+    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, _globalPrivateHandler);
+    _globalPrivateHandler = null;
+  }
+  if (_globalGroupHandler) {
+    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, _globalGroupHandler);
+    _globalGroupHandler = null;
+  }
+  if (_globalConvHandler) {
+    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, _globalConvHandler);
+    _globalConvHandler = null;
+  }
+}
+
+function setupMessageListeners(app) {
+  removeGlobalMessageListeners();
+
+  _globalPrivateHandler = (message) => {
+    app.handleNewMessage(message);
+  };
+  _globalGroupHandler = (message) => {
+    app.handleNewMessage(message);
+  };
+  _globalConvHandler = (conversations) => {
+    const unreadTotal = conversations.unreadTotal || 0;
+    app.globalData.messageManager.unreadTotal = unreadTotal;
+    updateTabBarBadge(app, unreadTotal);
+    wx.setStorageSync(app.globalData.messageManager.cacheKeys.unreadTotal, unreadTotal);
+    if (typeof app.emitEvent === 'function') {
+      app.emitEvent('conversationsUpdated', conversations);
+    }
+  };
+
+  wx.goEasy.im.on(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, _globalPrivateHandler);
+  wx.goEasy.im.on(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, _globalGroupHandler);
+  wx.goEasy.im.on(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, _globalConvHandler);
+}
+
+function handleNewMessage(app, message) {
+  const messageId = message.messageId || message.id;
+  const fingerprint = `${message.senderId}_${message.timestamp}_${message.type}`;
+  const msgKey = messageId || fingerprint;
+
+  if (!app._processedMessages) app._processedMessages = new Set();
+  if (app._processedMessages.has(msgKey)) return;
+  app._processedMessages.add(msgKey);
+  if (app._processedMessages.size > 200) {
+    app._processedMessages.delete(app._processedMessages.values().next().value);
+  }
+
+  const now = Date.now();
+  const msgTime = message.timestamp || now;
+  if (now - msgTime > 60000) {
+    cacheMessage(app, message);
+    return;
+  }
+
+  cacheMessage(app, message);
+
+  if (shouldShowNotification(app)) {
+    let notificationType = 'private';
+    let extraData = {};
+    if (message.groupId) {
+      notificationType = 'group';
+      extraData = {
+        groupId: message.groupId,
+        orderId: message.orderId || '',
+        groupName: '',
+        groupAvatar: '',
+        isCross: message.isCross || 0
+      };
+      const groupInfo = app.globalData.groupInfoMap?.[message.groupId];
+      if (groupInfo) {
+        extraData.groupName = groupInfo.name || '';
+        extraData.groupAvatar = groupInfo.avatar || '';
+      }
+    } else if (message.teamId) {
+      notificationType = 'cs';
+      extraData = { teamId: message.teamId };
+    }
+    showNotificationDirect(app, {
+      senderId: message.senderId,
+      senderName: message.senderData?.name || '用户',
+      avatar: message.senderData?.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang),
+      content: formatMessageForNotification(message),
+      message,
+      notificationType,
+      ...extraData
+    });
+  }
+}
+
+function shouldShowNotification(app) {
+  if (app.globalData.messageManager.notificationMuted) return false;
+  if (isDoNotDisturbTime(app)) return false;
+  if (app.globalData.pageState.isInChatPage) {
+    const pages = getCurrentPages();
+    if (pages.length > 0) {
+      const currentPage = pages[pages.length - 1];
+      if (currentPage.data && currentPage.data.currentChatId) {
+        if (isMessageFromCurrentChat(app, currentPage.data.currentChatId)) return false;
+      }
+    }
+  }
+  return true;
+}
+
+function isDoNotDisturbTime(app) {
+  const { doNotDisturb, doNotDisturbStart, doNotDisturbEnd } = app.globalData.messageManager;
+  if (!doNotDisturb) return false;
+  const now = new Date();
+  const currentTime = now.getHours() * 60 + now.getMinutes();
+  const [sH, sM] = doNotDisturbStart.split(':').map(Number);
+  const [eH, eM] = doNotDisturbEnd.split(':').map(Number);
+  const startTime = sH * 60 + sM;
+  const endTime = eH * 60 + eM;
+  if (startTime < endTime) {
+    return currentTime >= startTime && currentTime < endTime;
+  } else {
+    return currentTime >= startTime || currentTime < endTime;
+  }
+}
+
+function isMessageFromCurrentChat(app, currentChatId) {
+  return false;
+}
+
+function showNotificationDirect(app, data) {
+  if (app.globalData.globalNotification?.show) {
+    try {
+      app.globalData.globalNotification.show(data);
+      return;
+    } catch (error) {
+      console.warn('全局通知显示失败:', error);
+    }
+  }
+  app.emitEvent('showNotification', data);
+}
+
+async function updateUnreadCount(app, customCount) {
+  let unreadTotal = customCount;
+  if (unreadTotal === undefined) {
+    try {
+      const result = await getUnreadCount(app);
+      unreadTotal = result.unreadTotal || 0;
+    } catch (error) {
+      console.error('获取未读数失败:', error);
+      return;
+    }
+  }
+  app.globalData.messageManager.unreadTotal = unreadTotal;
+  updateTabBarBadge(app, unreadTotal);
+  wx.setStorageSync(app.globalData.messageManager.cacheKeys.unreadTotal, unreadTotal);
+  app.emitEvent('unreadCountChanged', { unreadTotal });
+}
+
+function getUnreadCount(app) {
+  return new Promise((resolve, reject) => {
+    if (!getCurrentGoEasyUserId()) {
+      resolve({ unreadTotal: 0 });
+      return;
+    }
+    wx.goEasy.im.latestConversations({
+      onSuccess: (result) => resolve({
+        unreadTotal: result.unreadTotal || 0,
+        conversations: result.content?.conversations || [],
+      }),
+      onFailed: reject,
+    });
+  });
+}
+
+function formatMessageForNotification(message) {
+  switch (message.type) {
+    case 'text': return message.payload.text || '[文本]';
+    case 'image': return '[图片]';
+    case 'audio': return '[语音]';
+    case 'video': return '[视频]';
+    case 'file': return '[文件]';
+    case 'order': return '[订单]';
+    default: return '[新消息]';
+  }
+}
+
+function cacheMessage(app, message) {
+  const { latestMessages } = app.globalData.messageManager;
+  latestMessages.unshift({
+    id: message.messageId,
+    type: message.type,
+    senderId: message.senderId,
+    senderName: message.senderData?.name,
+    content: formatMessageForNotification(message),
+    timestamp: message.timestamp || Date.now(),
+    conversationId: message.conversationId,
+  });
+  if (latestMessages.length > 50) latestMessages.length = 50;
+  wx.setStorageSync(app.globalData.messageManager.cacheKeys.latestMessages, latestMessages);
+}
+
+function loadConversations(app) {
+  if (!getCurrentGoEasyUserId()) return;
+  wx.goEasy.im.latestConversations({
+    onSuccess: (result) => {
+      if (result.unreadTotal !== undefined) {
+        updateUnreadCount(app, result.unreadTotal);
+      }
+      app.emitEvent('conversationsUpdated', result);
+      const conversations = result?.content?.conversations || result?.conversations || [];
+      if (!app.globalData.groupInfoMap) app.globalData.groupInfoMap = {};
+      conversations.forEach(c => {
+        if (c.type === 'group' && c.groupId) {
+          app.globalData.groupInfoMap[c.groupId] = c.data || {};
+        }
+      });
+      _ensureGroupSubscriptions(app, conversations);
+    },
+    onFailed: (error) => console.error('加载会话列表失败:', error),
+  });
+}
+
+function _ensureGroupSubscriptions(app, conversations) {
+  const groupIds = conversations
+    .filter(c => c.type === 'group' && c.groupId)
+    .map(c => c.groupId);
+
+  if (groupIds.length === 0) return;
+  if (!wx.goEasy?.im || typeof wx.goEasy.im.subscribeGroup !== 'function') {
+    console.error('subscribeGroup 不可用');
+    return;
+  }
+
+  wx.goEasy.im.subscribeGroup({
+    groupIds: groupIds,
+    onSuccess: () => {},
+    onFailed: (error) => console.error('全局订阅群组失败:', error),
+  });
+}
+
+function updateCurrentPageState(app) {
+  try {
+    const pages = getCurrentPages();
+    if (pages.length > 0) {
+      const currentPage = pages[pages.length - 1];
+      app.globalData.pageState.currentPage = currentPage.route;
+      app.globalData.pageState.isInChatPage = currentPage.route === 'pages/liaotian/liaotian';
+      app.globalData.pageState.lastPageUpdate = Date.now();
+    }
+  } catch (error) {
+    console.warn('更新页面状态失败:', error);
+  }
+}
+
+function saveUserSettings(app) {
+  try {
+    wx.setStorageSync(app.globalData.messageManager.cacheKeys.messageSettings, {
+      soundEnabled: app.globalData.messageManager.soundEnabled,
+      vibrationEnabled: app.globalData.messageManager.vibrationEnabled,
+      doNotDisturb: app.globalData.messageManager.doNotDisturb,
+      doNotDisturbStart: app.globalData.messageManager.doNotDisturbStart,
+      doNotDisturbEnd: app.globalData.messageManager.doNotDisturbEnd,
+      notificationMuted: app.globalData.messageManager.notificationMuted,
+      notificationStyle: app.globalData.messageManager.notificationStyle,
+    });
+  } catch (error) {
+    console.warn('保存用户设置失败:', error);
+  }
+}
+
+function toggleDoNotDisturb(app, enabled) {
+  app.globalData.messageManager.doNotDisturb = enabled;
+  saveUserSettings(app);
+  wx.showToast({ title: `免打扰${enabled ? '开启' : '关闭'}`, icon: 'success', duration: 2000 });
+}
+
+function toggleNotificationMute(app, enabled) {
+  app.globalData.messageManager.notificationMuted = enabled;
+  wx.setStorageSync(app.globalData.messageManager.cacheKeys.notificationMuted, enabled);
+  saveUserSettings(app);
+  wx.showToast({ title: `通知${enabled ? '静音' : '开启'}`, icon: 'success', duration: 2000 });
+}
+
+function closeNotification(app) {
+  app.emitEvent('hideNotification');
+}
+
+function updateTabBarBadge(app, unreadCount) {
+  const { messageManager } = app.globalData;
+  if (!messageManager.showTabBarBadge) return;
+  let badgeText = '';
+  if (unreadCount > 0) {
+    badgeText = unreadCount > 99 ? '99+' : unreadCount.toString();
+  }
+  messageManager.tabBarBadgeText = badgeText;
+  app.emitEvent('tabBarBadgeChanged', {
+    index: messageManager.tabBarIndex,
+    badgeText,
+    showRedDot: unreadCount > 0,
+    forceUpdate: true,
+  });
+  updateTabBarDirectly(app, badgeText);
+  saveTabBarBadgeToStorage(app, badgeText);
+}
+
+function updateTabBarDirectly(app, badgeText) {
+  try {
+    const pages = getCurrentPages();
+    if (pages.length > 0) {
+      const tabBar = pages[pages.length - 1].selectComponent('#custom-tab-bar');
+      if (tabBar && tabBar.setData) tabBar.setData({ badgeText });
+    }
+  } catch (error) { console.warn('直接更新TabBar失败:', error); }
+}
+
+function saveTabBarBadgeToStorage(app, badgeText) {
+  try {
+    wx.setStorageSync('tabBarMessageBadge', badgeText);
+  } catch (error) { console.warn('保存TabBar徽章失败:', error); }
+}
+
+module.exports = { initGlobalMessageSystem };
\ No newline at end of file
diff --git a/utils/chat_utils.py b/utils/chat_utils.py
new file mode 100644
index 0000000..d6e6bed
--- /dev/null
+++ b/utils/chat_utils.py
@@ -0,0 +1,374 @@
+# utils/chat_utils.py
+import json
+import logging
+import requests
+from django.conf import settings
+from dingdan.models import Dingdan, DingdanPingtai, DingdanShangjia
+from peizhi.models import ClubConfig
+from yonghu.models import UserMain, UserDashou, UserBoss, UserShangjia
+
+logger = logging.getLogger('chat_utils')
+
+# ========== 辅助配置获取（从 ClubConfig） ==========
+def _get_self_club_config():
+    if not hasattr(_get_self_club_config, '_config'):
+        try:
+            _get_self_club_config._config = ClubConfig.objects.filter(is_self=1).first()
+        except Exception as e:
+            logger.warning(f"获取我方俱乐部配置失败: {e}")
+            _get_self_club_config._config = None
+    return _get_self_club_config._config
+
+def _get_self_goeasy_appkey():
+    cfg = _get_self_club_config()
+    if cfg and cfg.chat_api_key:
+        return cfg.chat_api_key
+    return getattr(settings, 'GOEASY_APPKEY', '')
+
+def _get_self_goeasy_secret():
+    cfg = _get_self_club_config()
+    if cfg and cfg.chat_api_id:
+        return cfg.chat_api_id
+    return getattr(settings, 'GOEASY_SECRET', '')
+
+def _get_self_storage_domain():
+    cfg = _get_self_club_config()
+    if cfg and cfg.storage_bucket_domain:
+        return cfg.storage_bucket_domain
+    return ''
+
+def _get_self_default_avatar():
+    cfg = _get_self_club_config()
+    if cfg and cfg.club_avatar:
+        return cfg.club_avatar
+    return ''
+
+# ========== 头像拼接 ==========
+def _full_local_avatar(relative_url):
+    storage_domain = _get_self_storage_domain()
+    default_avatar = _get_self_default_avatar()
+    if not relative_url:
+        return default_avatar or ''
+    if relative_url.startswith('http'):
+        return relative_url
+    if storage_domain.endswith('/'):
+        return storage_domain + relative_url.lstrip('/')
+    return storage_domain + '/' + relative_url if storage_domain else relative_url
+
+def _full_remote_avatar(storage_bucket_domain, relative_url):
+    if not relative_url:
+        return ''
+    if relative_url.startswith('http'):
+        return relative_url
+    if storage_bucket_domain.endswith('/'):
+        return storage_bucket_domain + relative_url.lstrip('/')
+    return storage_bucket_domain + '/' + relative_url if storage_bucket_domain else relative_url
+
+# ========== GoEasy 订阅 ==========
+def _subscribe_users_to_group(user_ids, group_ids, appkey=None, secret=None):
+    if not appkey:
+        appkey = _get_self_goeasy_appkey()
+    if not secret:
+        secret = _get_self_goeasy_secret()
+    if not appkey:
+        logger.error("GoEasy AppKey 未配置")
+        return False
+    url = 'https://rest-hangzhou.goeasy.io/v2/im/subscribe-groups'
+    body = {"appkey": appkey, "userIds": user_ids, "groupIds": group_ids}
+    headers = {"Content-Type": "application/json"}
+    if secret:
+        headers["Authorization"] = f"Bearer {secret}"
+    try:
+        resp = requests.post(url, headers=headers, json=body, timeout=10)
+        if resp.status_code == 200:
+            return True
+        logger.error(f"订阅失败: {resp.status_code} {resp.text}")
+        return False
+    except Exception as e:
+        logger.error(f"订阅异常: {e}", exc_info=True)
+        return False
+
+# ========== 发送群消息（完整参数） ==========
+def _send_group_message(appkey, secret, group_id, sender_id, sender_name, sender_avatar,
+                        message_text, custom_payload=None, group_name=None, order_id=None, is_cross=0):
+    if not appkey:
+        appkey = _get_self_goeasy_appkey()
+    if not secret:
+        secret = _get_self_goeasy_secret()
+    if not appkey:
+        logger.error("GoEasy AppKey 未配置")
+        return False
+
+    url = 'https://rest-hangzhou.goeasy.io/v2/im/message'
+
+    # to.data 包含群聊展示信息及业务字段
+    to_data = {
+        "name": group_name or group_id,
+        "avatar": sender_avatar or "",
+    }
+    if order_id:
+        to_data["orderId"] = order_id
+    to_data["isCross"] = is_cross
+
+    payload_str = custom_payload.get("text", message_text) if custom_payload else message_text
+
+    request_body = {
+        "appkey": appkey,
+        "senderId": sender_id,
+        "senderData": {"avatar": sender_avatar, "name": sender_name},
+        "to": {
+            "type": "group",
+            "id": group_id,
+            "data": to_data
+        },
+        "type": "text",
+        "payload": payload_str
+    }
+    headers = {"Content-Type": "application/json"}
+    if secret:
+        headers["Authorization"] = f"Bearer {secret}"
+    try:
+        resp = requests.post(url, headers=headers, json=request_body, timeout=10)
+        if resp.status_code == 200:
+            return True
+        logger.error(f"群聊消息发送失败，状态码:{resp.status_code}，响应:{resp.text}")
+        return False
+    except Exception as e:
+        logger.error(f"发送群聊消息异常: {e}", exc_info=True)
+        return False
+
+# ========== 核心入口 ==========
+def establish_order_chat(dingdan_id):
+    try:
+        order = Dingdan.objects.select_related('pingtai_kuozhan', 'shangjia_kuozhan').get(dingdan_id=dingdan_id)
+    except Dingdan.DoesNotExist:
+        logger.error(f"订单 {dingdan_id} 不存在")
+        return False
+
+    dashou_uid = order.jiedan_dashou_id
+    dashou_goeasy_id = f"Ds{dashou_uid}"
+    dashou_nickname = f'打手{dashou_uid[:6]}'
+    dashou_avatar_relative = ''
+    try:
+        dashou_user = UserMain.objects.get(yonghuid=dashou_uid)
+        dashou_avatar_relative = dashou_user.avatar or ''
+        dashou_profile = UserDashou.objects.get(user=dashou_user)
+        if dashou_profile.nicheng:
+            dashou_nickname = dashou_profile.nicheng
+    except Exception as e:
+        logger.warning(f"获取打手信息失败: {e}")
+    dashou_avatar = _full_local_avatar(dashou_avatar_relative)
+
+    appkey = _get_self_goeasy_appkey()
+    secret = _get_self_goeasy_secret()
+    if not appkey:
+        logger.error("GoEasy AppKey 未配置")
+        return False
+
+    # 判断是否跨平台
+    if order.is_cross != 1:
+        return _handle_local_order(order, dashou_goeasy_id, dashou_nickname, dashou_avatar, appkey, secret)
+    else:
+        if order.dispatch_type == 1:
+            # 我方派单，与普通订单处理一致
+            return _handle_local_order(order, dashou_goeasy_id, dashou_nickname, dashou_avatar, appkey, secret)
+        elif order.dispatch_type == 2:
+            return _handle_cross_partner_order(order, dashou_goeasy_id, dashou_nickname, dashou_avatar, appkey, secret)
+        else:
+            return False
+
+# ========== 普通订单 / 我方派单 ==========
+def _handle_local_order(order, dashou_goeasy_id, dashou_name, dashou_avatar, appkey, secret):
+    group_id = f"group_{order.dingdan_id}"
+    group_name = (order.jieshao[:20] + '…') if order.jieshao and len(order.jieshao) > 20 else (order.jieshao or f"订单{order.dingdan_id}")
+    group_avatar = _full_local_avatar(order.tupian) if order.tupian else _full_local_avatar('')
+
+    partner_goeasy_id, partner_name, partner_avatar = _get_local_partner_info(order)
+    if not partner_goeasy_id:
+        return False
+
+    # 订阅双方
+    if not _subscribe_users_to_group([dashou_goeasy_id, partner_goeasy_id], [group_id], appkey, secret):
+        return False
+
+    # 1. 打手发送初始化消息
+    init_msg_text = f"订单已接单，内容：{order.jieshao}，备注：{order.beizhu}，游戏ID：{order.nicheng}"
+    success1 = _send_group_message(
+        appkey, secret, group_id, dashou_goeasy_id, dashou_name, group_avatar,
+        init_msg_text, None, group_name=group_name, order_id=order.dingdan_id,
+        is_cross=order.is_cross
+    )
+
+    # 2. 【新增】派单方也发一条消息，确保他也能看到群聊
+    partner_msg = f"订单已确认，请开始服务。"
+    success2 = _send_group_message(
+        appkey, secret, group_id, partner_goeasy_id, partner_name, partner_avatar,
+        partner_msg, None, group_name=group_name, order_id=order.dingdan_id,
+        is_cross=order.is_cross
+    )
+
+    return success1 and success2
+
+def _get_local_partner_info(order):
+    """本地订单下单方：老板或商家"""
+    if order.fadan_pingtai == 1:  # 老板
+        try:
+            ext = order.pingtai_kuozhan
+            laoban_id = ext.laoban_id
+            avatar_full = _full_local_avatar('')
+            nickname = f'老板{laoban_id[:6]}'
+            try:
+                boss_user = UserMain.objects.get(yonghuid=laoban_id)
+                avatar_full = _full_local_avatar(boss_user.avatar or '')
+                boss_profile = UserBoss.objects.get(user=boss_user)
+                if boss_profile.nickname:
+                    nickname = boss_profile.nickname
+            except Exception:
+                pass
+            return f"Boss{laoban_id}", nickname, avatar_full
+        except Exception as e:
+            logger.error(f"获取老板信息失败: {e}")
+            return None, None, None
+    elif order.fadan_pingtai == 2:  # 商家
+        try:
+            ext = order.shangjia_kuozhan
+            shangjia_id = ext.shangjia_id
+            nickname = ext.sjnicheng or f'商家{shangjia_id[:6]}'
+            avatar_full = _full_local_avatar('')
+            try:
+                sj_user = UserMain.objects.get(yonghuid=shangjia_id)
+                avatar_full = _full_local_avatar(sj_user.avatar or '')
+            except Exception:
+                pass
+            return f"Sj{shangjia_id}", nickname, avatar_full
+        except Exception as e:
+            logger.error(f"获取商家信息失败: {e}")
+            return None, None, None
+    else:
+        if order.user1_id:
+            return order.user1_id, "用户", _full_local_avatar('')
+        return None, None, None
+
+# ========== 跨平台 + 对方派单 ==========
+def _handle_cross_partner_order(order, dashou_goeasy_id, dashou_name, dashou_avatar, appkey, secret):
+    partner_club_id = order.partner_club_id
+    if not partner_club_id:
+        logger.warning("缺少 partner_club_id")
+        return _create_local_group_only(order, dashou_goeasy_id, dashou_name, dashou_avatar, appkey, secret)
+
+    try:
+        partner_config = ClubConfig.objects.get(club_id=partner_club_id, is_self=0)
+    except ClubConfig.DoesNotExist:
+        logger.error(f"未找到对方俱乐部配置: {partner_club_id}")
+        return _create_local_group_only(order, dashou_goeasy_id, dashou_name, dashou_avatar, appkey, secret)
+
+    partner_order_id = order.partner_order_id
+    if not partner_order_id:
+        logger.error("partner_order_id 为空")
+        return _create_local_group_only(order, dashou_goeasy_id, dashou_name, dashou_avatar, appkey, secret)
+
+    # 推断对方下单方标识
+    target_partner_goeasy_id = _get_cross_partner_identity(order, partner_order_id)
+    if not target_partner_goeasy_id:
+        logger.error("无法推断对方下单方标识")
+        return _create_local_group_only(order, dashou_goeasy_id, dashou_name, dashou_avatar, appkey, secret)
+
+    # 对方默认头像
+    partner_default_avatar = _full_remote_avatar(partner_config.storage_bucket_domain or '', partner_config.club_avatar or '') or _full_local_avatar('')
+
+    # ---- 1. 在我方建群 ----
+    local_group_id = f"group_{order.dingdan_id}"
+    local_group_name = (order.jieshao[:20] + '…') if order.jieshao and len(order.jieshao) > 20 else f"跨平台订单{order.dingdan_id}"
+    local_group_avatar = _full_local_avatar(order.tupian) if order.tupian else _full_local_avatar('')
+    proxy_partner_id = f"{partner_order_id}_{target_partner_goeasy_id}"
+    proxy_partner_name = f"对方用户({partner_club_id})"
+    # 对方代理头像使用对方默认头像
+    proxy_partner_avatar = partner_default_avatar
+
+    if not _subscribe_users_to_group([dashou_goeasy_id, proxy_partner_id], [local_group_id], appkey, secret):
+        return False
+
+    # 1. 打手发送初始化消息
+    init_msg_text = f"跨平台订单已接单，内容：{order.jieshao}，备注：{order.beizhu}"
+    _send_group_message(
+        appkey, secret, local_group_id, dashou_goeasy_id, dashou_name, local_group_avatar,
+        init_msg_text, None, group_name=local_group_name, order_id=order.dingdan_id,
+        is_cross=1
+    )
+
+    # 2. 【新增】对方代理也发一条消息，确保对方能看到群聊
+    partner_msg = f"订单已确认，请等待服务。"
+    _send_group_message(
+        appkey, secret, local_group_id, proxy_partner_id, proxy_partner_name, proxy_partner_avatar,
+        partner_msg, None, group_name=local_group_name, order_id=order.dingdan_id,
+        is_cross=1
+    )
+
+    # ---- 2. 在对方建群 ----
+    partner_appkey = partner_config.chat_api_key
+    partner_secret = partner_config.chat_api_id or ''
+    if not partner_appkey:
+        return True  # 无对方 key，仅完成我方建群
+
+    partner_group_id = f"group_{partner_order_id}"
+    partner_group_name = f"跨平台订单-我方打手已接单"
+    # 代理我方打手 ID
+    our_agent_id = f"{order.dingdan_id}_{dashou_goeasy_id}"
+    our_agent_name = f"[我方]{dashou_name}"
+    # 对方频道头像用对方俱乐部默认头像
+    partner_group_avatar = partner_default_avatar
+
+    if not _subscribe_users_to_group([our_agent_id, target_partner_goeasy_id], [partner_group_id], partner_appkey, partner_secret):
+        logger.error("向对方频道订阅失败")
+        return True
+
+    # 我方打手在对方频道发消息
+    cross_msg_text = f"我方打手已接单，订单：{order.jieshao}，请确认"
+    _send_group_message(
+        partner_appkey, partner_secret, partner_group_id, our_agent_id, our_agent_name, partner_group_avatar,
+        cross_msg_text, None, group_name=partner_group_name, order_id=partner_order_id,
+        is_cross=1
+    )
+
+    # 【新增】对方用户在对方频道也发一条消息（以对方原始身份）
+    target_partner_name = f"用户{target_partner_goeasy_id}"  # 简单命名，可按需优化
+    _send_group_message(
+        partner_appkey, partner_secret, partner_group_id, target_partner_goeasy_id, target_partner_name, partner_default_avatar,
+        "订单信息已收到。", None, group_name=partner_group_name, order_id=partner_order_id,
+        is_cross=1
+    )
+
+    return True
+
+def _get_cross_partner_identity(order, partner_order_id):
+    """
+    获取对方下单方的 GoEasy 标识。
+    优先从商家扩展表取 partner_yonghu_id，否则按 partner_order_id 前缀推断。
+    """
+    # 尝试从商家扩展表取（仅当发单平台为商家且存在 partner_yonghu_id）
+    if order.fadan_pingtai == 2 and hasattr(order, 'shangjia_kuozhan'):
+        ext = order.shangjia_kuozhan
+        if ext and ext.partner_yonghu_id:
+            # 直接根据订单前缀构造标识
+            prefix = partner_order_id[:2].upper()
+            if prefix == 'SJ':
+                return f"Sj{ext.partner_yonghu_id}"
+            elif prefix == 'PT':
+                return f"Boss{ext.partner_yonghu_id}"
+            else:
+                return f"User{ext.partner_yonghu_id}"
+
+    # 后备：根据 partner_order_id 前缀推断
+    prefix = partner_order_id[:2].upper()
+    uid = partner_order_id[2:] if len(partner_order_id) > 2 else ''
+    if prefix == 'SJ':
+        return f"Sj{uid}"
+    elif prefix == 'PT':
+        return f"Boss{uid}"
+    else:
+        return f"User{uid}"
+
+def _create_local_group_only(order, dashou_goeasy_id, dashou_name, dashou_avatar, appkey, secret):
+    group_id = f"group_{order.dingdan_id}"
+    _subscribe_users_to_group([dashou_goeasy_id], [group_id], appkey, secret)
+    return False
\ No newline at end of file
diff --git a/utils/cos-wx-sdk-v5.js b/utils/cos-wx-sdk-v5.js
new file mode 100644
index 0000000..2f46dc9
--- /dev/null
+++ b/utils/cos-wx-sdk-v5.js
@@ -0,0 +1,13296 @@
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(typeof exports === 'object' && typeof module === 'object')
+		module.exports = factory();
+	else if(typeof define === 'function' && define.amd)
+		define([], factory);
+	else if(typeof exports === 'object')
+		exports["COS"] = factory();
+	else
+		root["COS"] = factory();
+})(window, function() {
+return /******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "/Users/chrisftian/Documents/projects/cos-sdk/cos-wx-sdk-v5/dist";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = "./index.js");
+/******/ })
+/************************************************************************/
+/******/ ({
+
+/***/ "./index.js":
+/*!******************!*\
+  !*** ./index.js ***!
+  \******************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var COS = __webpack_require__(/*! ./src/cos */ "./src/cos.js");
+module.exports = COS;
+
+/***/ }),
+
+/***/ "./lib/base64.js":
+/*!***********************!*\
+  !*** ./lib/base64.js ***!
+  \***********************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+/*
+ * $Id: base64.js,v 2.15 2014/04/05 12:58:57 dankogai Exp dankogai $
+ *
+ *  Licensed under the BSD 3-Clause License.
+ *    http://opensource.org/licenses/BSD-3-Clause
+ *
+ *  References:
+ *    http://en.wikipedia.org/wiki/Base64
+ */
+
+var Base64 = function (global) {
+  global = global || {};
+  'use strict';
+  // existing version for noConflict()
+  var _Base64 = global.Base64;
+  var version = "2.1.9";
+  // if node.js, we use Buffer
+  var buffer;
+  // constants
+  var b64chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+  var b64tab = function (bin) {
+    var t = {};
+    for (var i = 0, l = bin.length; i < l; i++) t[bin.charAt(i)] = i;
+    return t;
+  }(b64chars);
+  var fromCharCode = String.fromCharCode;
+  // encoder stuff
+  var cb_utob = function cb_utob(c) {
+    if (c.length < 2) {
+      var cc = c.charCodeAt(0);
+      return cc < 0x80 ? c : cc < 0x800 ? fromCharCode(0xc0 | cc >>> 6) + fromCharCode(0x80 | cc & 0x3f) : fromCharCode(0xe0 | cc >>> 12 & 0x0f) + fromCharCode(0x80 | cc >>> 6 & 0x3f) + fromCharCode(0x80 | cc & 0x3f);
+    } else {
+      var cc = 0x10000 + (c.charCodeAt(0) - 0xD800) * 0x400 + (c.charCodeAt(1) - 0xDC00);
+      return fromCharCode(0xf0 | cc >>> 18 & 0x07) + fromCharCode(0x80 | cc >>> 12 & 0x3f) + fromCharCode(0x80 | cc >>> 6 & 0x3f) + fromCharCode(0x80 | cc & 0x3f);
+    }
+  };
+  var re_utob = /[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g;
+  var utob = function utob(u) {
+    return u.replace(re_utob, cb_utob);
+  };
+  var cb_encode = function cb_encode(ccc) {
+    var padlen = [0, 2, 1][ccc.length % 3],
+      ord = ccc.charCodeAt(0) << 16 | (ccc.length > 1 ? ccc.charCodeAt(1) : 0) << 8 | (ccc.length > 2 ? ccc.charCodeAt(2) : 0),
+      chars = [b64chars.charAt(ord >>> 18), b64chars.charAt(ord >>> 12 & 63), padlen >= 2 ? '=' : b64chars.charAt(ord >>> 6 & 63), padlen >= 1 ? '=' : b64chars.charAt(ord & 63)];
+    return chars.join('');
+  };
+  var btoa = global.btoa ? function (b) {
+    return global.btoa(b);
+  } : function (b) {
+    return b.replace(/[\s\S]{1,3}/g, cb_encode);
+  };
+  var _encode = buffer ? function (u) {
+    return (u.constructor === buffer.constructor ? u : new buffer(u)).toString('base64');
+  } : function (u) {
+    return btoa(utob(u));
+  };
+  var encode = function encode(u, urisafe) {
+    return !urisafe ? _encode(String(u)) : _encode(String(u)).replace(/[+\/]/g, function (m0) {
+      return m0 == '+' ? '-' : '_';
+    }).replace(/=/g, '');
+  };
+  var encodeURI = function encodeURI(u) {
+    return encode(u, true);
+  };
+  // decoder stuff
+  var re_btou = new RegExp(['[\xC0-\xDF][\x80-\xBF]', '[\xE0-\xEF][\x80-\xBF]{2}', '[\xF0-\xF7][\x80-\xBF]{3}'].join('|'), 'g');
+  var cb_btou = function cb_btou(cccc) {
+    switch (cccc.length) {
+      case 4:
+        var cp = (0x07 & cccc.charCodeAt(0)) << 18 | (0x3f & cccc.charCodeAt(1)) << 12 | (0x3f & cccc.charCodeAt(2)) << 6 | 0x3f & cccc.charCodeAt(3),
+          offset = cp - 0x10000;
+        return fromCharCode((offset >>> 10) + 0xD800) + fromCharCode((offset & 0x3FF) + 0xDC00);
+      case 3:
+        return fromCharCode((0x0f & cccc.charCodeAt(0)) << 12 | (0x3f & cccc.charCodeAt(1)) << 6 | 0x3f & cccc.charCodeAt(2));
+      default:
+        return fromCharCode((0x1f & cccc.charCodeAt(0)) << 6 | 0x3f & cccc.charCodeAt(1));
+    }
+  };
+  var btou = function btou(b) {
+    return b.replace(re_btou, cb_btou);
+  };
+  var cb_decode = function cb_decode(cccc) {
+    var len = cccc.length,
+      padlen = len % 4,
+      n = (len > 0 ? b64tab[cccc.charAt(0)] << 18 : 0) | (len > 1 ? b64tab[cccc.charAt(1)] << 12 : 0) | (len > 2 ? b64tab[cccc.charAt(2)] << 6 : 0) | (len > 3 ? b64tab[cccc.charAt(3)] : 0),
+      chars = [fromCharCode(n >>> 16), fromCharCode(n >>> 8 & 0xff), fromCharCode(n & 0xff)];
+    chars.length -= [0, 0, 2, 1][padlen];
+    return chars.join('');
+  };
+  var atob = global.atob ? function (a) {
+    return global.atob(a);
+  } : function (a) {
+    return a.replace(/[\s\S]{1,4}/g, cb_decode);
+  };
+  var _decode = buffer ? function (a) {
+    return (a.constructor === buffer.constructor ? a : new buffer(a, 'base64')).toString();
+  } : function (a) {
+    return btou(atob(a));
+  };
+  var decode = function decode(a) {
+    return _decode(String(a).replace(/[-_]/g, function (m0) {
+      return m0 == '-' ? '+' : '/';
+    }).replace(/[^A-Za-z0-9\+\/]/g, ''));
+  };
+  var noConflict = function noConflict() {
+    var Base64 = global.Base64;
+    global.Base64 = _Base64;
+    return Base64;
+  };
+  // export Base64
+  var Base64 = {
+    VERSION: version,
+    atob: atob,
+    btoa: btoa,
+    fromBase64: decode,
+    toBase64: encode,
+    utob: utob,
+    encode: encode,
+    encodeURI: encodeURI,
+    btou: btou,
+    decode: decode,
+    noConflict: noConflict
+  };
+  return Base64;
+}();
+module.exports = Base64;
+
+/***/ }),
+
+/***/ "./lib/crypto.js":
+/*!***********************!*\
+  !*** ./lib/crypto.js ***!
+  \***********************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+/*
+ CryptoJS v3.1.2
+ code.google.com/p/crypto-js
+ (c) 2009-2013 by Jeff Mott. All rights reserved.
+ code.google.com/p/crypto-js/wiki/License
+ */
+var CryptoJS = CryptoJS || function (g, l) {
+  var e = {},
+    d = e.lib = {},
+    m = function m() {},
+    k = d.Base = {
+      extend: function extend(a) {
+        m.prototype = this;
+        var c = new m();
+        a && c.mixIn(a);
+        c.hasOwnProperty("init") || (c.init = function () {
+          c.$super.init.apply(this, arguments);
+        });
+        c.init.prototype = c;
+        c.$super = this;
+        return c;
+      },
+      create: function create() {
+        var a = this.extend();
+        a.init.apply(a, arguments);
+        return a;
+      },
+      init: function init() {},
+      mixIn: function mixIn(a) {
+        for (var c in a) a.hasOwnProperty(c) && (this[c] = a[c]);
+        a.hasOwnProperty("toString") && (this.toString = a.toString);
+      },
+      clone: function clone() {
+        return this.init.prototype.extend(this);
+      }
+    },
+    p = d.WordArray = k.extend({
+      init: function init(a, c) {
+        a = this.words = a || [];
+        this.sigBytes = c != l ? c : 4 * a.length;
+      },
+      toString: function toString(a) {
+        return (a || n).stringify(this);
+      },
+      concat: function concat(a) {
+        var c = this.words,
+          q = a.words,
+          f = this.sigBytes;
+        a = a.sigBytes;
+        this.clamp();
+        if (f % 4) for (var b = 0; b < a; b++) c[f + b >>> 2] |= (q[b >>> 2] >>> 24 - 8 * (b % 4) & 255) << 24 - 8 * ((f + b) % 4);else if (65535 < q.length) for (b = 0; b < a; b += 4) c[f + b >>> 2] = q[b >>> 2];else c.push.apply(c, q);
+        this.sigBytes += a;
+        return this;
+      },
+      clamp: function clamp() {
+        var a = this.words,
+          c = this.sigBytes;
+        a[c >>> 2] &= 4294967295 << 32 - 8 * (c % 4);
+        a.length = g.ceil(c / 4);
+      },
+      clone: function clone() {
+        var a = k.clone.call(this);
+        a.words = this.words.slice(0);
+        return a;
+      },
+      random: function random(a) {
+        for (var c = [], b = 0; b < a; b += 4) c.push(4294967296 * g.random() | 0);
+        return new p.init(c, a);
+      }
+    }),
+    b = e.enc = {},
+    n = b.Hex = {
+      stringify: function stringify(a) {
+        var c = a.words;
+        a = a.sigBytes;
+        for (var b = [], f = 0; f < a; f++) {
+          var d = c[f >>> 2] >>> 24 - 8 * (f % 4) & 255;
+          b.push((d >>> 4).toString(16));
+          b.push((d & 15).toString(16));
+        }
+        return b.join("");
+      },
+      parse: function parse(a) {
+        for (var c = a.length, b = [], f = 0; f < c; f += 2) b[f >>> 3] |= parseInt(a.substr(f, 2), 16) << 24 - 4 * (f % 8);
+        return new p.init(b, c / 2);
+      }
+    },
+    j = b.Latin1 = {
+      stringify: function stringify(a) {
+        var c = a.words;
+        a = a.sigBytes;
+        for (var b = [], f = 0; f < a; f++) b.push(String.fromCharCode(c[f >>> 2] >>> 24 - 8 * (f % 4) & 255));
+        return b.join("");
+      },
+      parse: function parse(a) {
+        for (var c = a.length, b = [], f = 0; f < c; f++) b[f >>> 2] |= (a.charCodeAt(f) & 255) << 24 - 8 * (f % 4);
+        return new p.init(b, c);
+      }
+    },
+    h = b.Utf8 = {
+      stringify: function stringify(a) {
+        try {
+          return decodeURIComponent(escape(j.stringify(a)));
+        } catch (c) {
+          throw Error("Malformed UTF-8 data");
+        }
+      },
+      parse: function parse(a) {
+        return j.parse(unescape(encodeURIComponent(a)));
+      }
+    },
+    r = d.BufferedBlockAlgorithm = k.extend({
+      reset: function reset() {
+        this._data = new p.init();
+        this._nDataBytes = 0;
+      },
+      _append: function _append(a) {
+        "string" == typeof a && (a = h.parse(a));
+        this._data.concat(a);
+        this._nDataBytes += a.sigBytes;
+      },
+      _process: function _process(a) {
+        var c = this._data,
+          b = c.words,
+          f = c.sigBytes,
+          d = this.blockSize,
+          e = f / (4 * d),
+          e = a ? g.ceil(e) : g.max((e | 0) - this._minBufferSize, 0);
+        a = e * d;
+        f = g.min(4 * a, f);
+        if (a) {
+          for (var k = 0; k < a; k += d) this._doProcessBlock(b, k);
+          k = b.splice(0, a);
+          c.sigBytes -= f;
+        }
+        return new p.init(k, f);
+      },
+      clone: function clone() {
+        var a = k.clone.call(this);
+        a._data = this._data.clone();
+        return a;
+      },
+      _minBufferSize: 0
+    });
+  d.Hasher = r.extend({
+    cfg: k.extend(),
+    init: function init(a) {
+      this.cfg = this.cfg.extend(a);
+      this.reset();
+    },
+    reset: function reset() {
+      r.reset.call(this);
+      this._doReset();
+    },
+    update: function update(a) {
+      this._append(a);
+      this._process();
+      return this;
+    },
+    finalize: function finalize(a) {
+      a && this._append(a);
+      return this._doFinalize();
+    },
+    blockSize: 16,
+    _createHelper: function _createHelper(a) {
+      return function (b, d) {
+        return new a.init(d).finalize(b);
+      };
+    },
+    _createHmacHelper: function _createHmacHelper(a) {
+      return function (b, d) {
+        return new s.HMAC.init(a, d).finalize(b);
+      };
+    }
+  });
+  var s = e.algo = {};
+  return e;
+}(Math);
+(function () {
+  var g = CryptoJS,
+    l = g.lib,
+    e = l.WordArray,
+    d = l.Hasher,
+    m = [],
+    l = g.algo.SHA1 = d.extend({
+      _doReset: function _doReset() {
+        this._hash = new e.init([1732584193, 4023233417, 2562383102, 271733878, 3285377520]);
+      },
+      _doProcessBlock: function _doProcessBlock(d, e) {
+        for (var b = this._hash.words, n = b[0], j = b[1], h = b[2], g = b[3], l = b[4], a = 0; 80 > a; a++) {
+          if (16 > a) m[a] = d[e + a] | 0;else {
+            var c = m[a - 3] ^ m[a - 8] ^ m[a - 14] ^ m[a - 16];
+            m[a] = c << 1 | c >>> 31;
+          }
+          c = (n << 5 | n >>> 27) + l + m[a];
+          c = 20 > a ? c + ((j & h | ~j & g) + 1518500249) : 40 > a ? c + ((j ^ h ^ g) + 1859775393) : 60 > a ? c + ((j & h | j & g | h & g) - 1894007588) : c + ((j ^ h ^ g) - 899497514);
+          l = g;
+          g = h;
+          h = j << 30 | j >>> 2;
+          j = n;
+          n = c;
+        }
+        b[0] = b[0] + n | 0;
+        b[1] = b[1] + j | 0;
+        b[2] = b[2] + h | 0;
+        b[3] = b[3] + g | 0;
+        b[4] = b[4] + l | 0;
+      },
+      _doFinalize: function _doFinalize() {
+        var d = this._data,
+          e = d.words,
+          b = 8 * this._nDataBytes,
+          g = 8 * d.sigBytes;
+        e[g >>> 5] |= 128 << 24 - g % 32;
+        e[(g + 64 >>> 9 << 4) + 14] = Math.floor(b / 4294967296);
+        e[(g + 64 >>> 9 << 4) + 15] = b;
+        d.sigBytes = 4 * e.length;
+        this._process();
+        return this._hash;
+      },
+      clone: function clone() {
+        var e = d.clone.call(this);
+        e._hash = this._hash.clone();
+        return e;
+      }
+    });
+  g.SHA1 = d._createHelper(l);
+  g.HmacSHA1 = d._createHmacHelper(l);
+})();
+(function () {
+  var g = CryptoJS,
+    l = g.enc.Utf8;
+  g.algo.HMAC = g.lib.Base.extend({
+    init: function init(e, d) {
+      e = this._hasher = new e.init();
+      "string" == typeof d && (d = l.parse(d));
+      var g = e.blockSize,
+        k = 4 * g;
+      d.sigBytes > k && (d = e.finalize(d));
+      d.clamp();
+      for (var p = this._oKey = d.clone(), b = this._iKey = d.clone(), n = p.words, j = b.words, h = 0; h < g; h++) n[h] ^= 1549556828, j[h] ^= 909522486;
+      p.sigBytes = b.sigBytes = k;
+      this.reset();
+    },
+    reset: function reset() {
+      var e = this._hasher;
+      e.reset();
+      e.update(this._iKey);
+    },
+    update: function update(e) {
+      this._hasher.update(e);
+      return this;
+    },
+    finalize: function finalize(e) {
+      var d = this._hasher;
+      e = d.finalize(e);
+      d.reset();
+      return d.finalize(this._oKey.clone().concat(e));
+    }
+  });
+})();
+(function () {
+  // Shortcuts
+  var C = CryptoJS;
+  var C_lib = C.lib;
+  var WordArray = C_lib.WordArray;
+  var C_enc = C.enc;
+
+  /**
+   * Base64 encoding strategy.
+   */
+  var Base64 = C_enc.Base64 = {
+    /**
+     * Converts a word array to a Base64 string.
+     *
+     * @param {WordArray} wordArray The word array.
+     *
+     * @return {string} The Base64 string.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var base64String = CryptoJS.enc.Base64.stringify(wordArray);
+     */
+    stringify: function stringify(wordArray) {
+      // Shortcuts
+      var words = wordArray.words;
+      var sigBytes = wordArray.sigBytes;
+      var map = this._map;
+
+      // Clamp excess bits
+      wordArray.clamp();
+
+      // Convert
+      var base64Chars = [];
+      for (var i = 0; i < sigBytes; i += 3) {
+        var byte1 = words[i >>> 2] >>> 24 - i % 4 * 8 & 0xff;
+        var byte2 = words[i + 1 >>> 2] >>> 24 - (i + 1) % 4 * 8 & 0xff;
+        var byte3 = words[i + 2 >>> 2] >>> 24 - (i + 2) % 4 * 8 & 0xff;
+        var triplet = byte1 << 16 | byte2 << 8 | byte3;
+        for (var j = 0; j < 4 && i + j * 0.75 < sigBytes; j++) {
+          base64Chars.push(map.charAt(triplet >>> 6 * (3 - j) & 0x3f));
+        }
+      }
+
+      // Add padding
+      var paddingChar = map.charAt(64);
+      if (paddingChar) {
+        while (base64Chars.length % 4) {
+          base64Chars.push(paddingChar);
+        }
+      }
+      return base64Chars.join('');
+    },
+    /**
+     * Converts a Base64 string to a word array.
+     *
+     * @param {string} base64Str The Base64 string.
+     *
+     * @return {WordArray} The word array.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var wordArray = CryptoJS.enc.Base64.parse(base64String);
+     */
+    parse: function parse(base64Str) {
+      // Shortcuts
+      var base64StrLength = base64Str.length;
+      var map = this._map;
+
+      // Ignore padding
+      var paddingChar = map.charAt(64);
+      if (paddingChar) {
+        var paddingIndex = base64Str.indexOf(paddingChar);
+        if (paddingIndex != -1) {
+          base64StrLength = paddingIndex;
+        }
+      }
+
+      // Convert
+      var words = [];
+      var nBytes = 0;
+      for (var i = 0; i < base64StrLength; i++) {
+        if (i % 4) {
+          var bits1 = map.indexOf(base64Str.charAt(i - 1)) << i % 4 * 2;
+          var bits2 = map.indexOf(base64Str.charAt(i)) >>> 6 - i % 4 * 2;
+          words[nBytes >>> 2] |= (bits1 | bits2) << 24 - nBytes % 4 * 8;
+          nBytes++;
+        }
+      }
+      return WordArray.create(words, nBytes);
+    },
+    _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
+  };
+})();
+module.exports = CryptoJS;
+
+/***/ }),
+
+/***/ "./lib/md5.js":
+/*!********************!*\
+  !*** ./lib/md5.js ***!
+  \********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+/* WEBPACK VAR INJECTION */(function(module) {var __WEBPACK_AMD_DEFINE_RESULT__;function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+/* https://github.com/emn178/js-md5 */
+(function () {
+  'use strict';
+
+  var ERROR = 'input is invalid type';
+  var WINDOW = (typeof window === "undefined" ? "undefined" : _typeof(window)) === 'object';
+  var root = WINDOW ? window : {};
+  if (root.JS_MD5_NO_WINDOW) {
+    WINDOW = false;
+  }
+  var WEB_WORKER = !WINDOW && (typeof self === "undefined" ? "undefined" : _typeof(self)) === 'object';
+  if (WEB_WORKER) {
+    root = self;
+  }
+  var COMMON_JS = !root.JS_MD5_NO_COMMON_JS && ( false ? undefined : _typeof(module)) === 'object' && module.exports;
+  var AMD =  true && __webpack_require__(/*! !webpack amd options */ "./node_modules/webpack/buildin/amd-options.js");
+  var ARRAY_BUFFER = !root.JS_MD5_NO_ARRAY_BUFFER && typeof ArrayBuffer !== 'undefined';
+  var HEX_CHARS = '0123456789abcdef'.split('');
+  var EXTRA = [128, 32768, 8388608, -2147483648];
+  var SHIFT = [0, 8, 16, 24];
+  var OUTPUT_TYPES = ['hex', 'array', 'digest', 'buffer', 'arrayBuffer', 'base64'];
+  var BASE64_ENCODE_CHAR = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split('');
+  var blocks = [],
+    buffer8;
+  if (ARRAY_BUFFER) {
+    var buffer = new ArrayBuffer(68);
+    buffer8 = new Uint8Array(buffer);
+    blocks = new Uint32Array(buffer);
+  }
+  if (root.JS_MD5_NO_NODE_JS || !Array.isArray) {
+    Array.isArray = function (obj) {
+      return Object.prototype.toString.call(obj) === '[object Array]';
+    };
+  }
+  if (ARRAY_BUFFER && (root.JS_MD5_NO_ARRAY_BUFFER_IS_VIEW || !ArrayBuffer.isView)) {
+    ArrayBuffer.isView = function (obj) {
+      return _typeof(obj) === 'object' && obj.buffer && obj.buffer.constructor === ArrayBuffer;
+    };
+  }
+
+  /**
+   * @method hex
+   * @memberof md5
+   * @description Output hash as hex string
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {String} Hex string
+   * @example
+   * md5.hex('The quick brown fox jumps over the lazy dog');
+   * // equal to
+   * md5('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method digest
+   * @memberof md5
+   * @description Output hash as bytes array
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {Array} Bytes array
+   * @example
+   * md5.digest('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method array
+   * @memberof md5
+   * @description Output hash as bytes array
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {Array} Bytes array
+   * @example
+   * md5.array('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method arrayBuffer
+   * @memberof md5
+   * @description Output hash as ArrayBuffer
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {ArrayBuffer} ArrayBuffer
+   * @example
+   * md5.arrayBuffer('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method buffer
+   * @deprecated This maybe confuse with Buffer in node.js. Please use arrayBuffer instead.
+   * @memberof md5
+   * @description Output hash as ArrayBuffer
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {ArrayBuffer} ArrayBuffer
+   * @example
+   * md5.buffer('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method base64
+   * @memberof md5
+   * @description Output hash as base64 string
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {String} base64 string
+   * @example
+   * md5.base64('The quick brown fox jumps over the lazy dog');
+   */
+  var createOutputMethod = function createOutputMethod(outputType) {
+    return function (message) {
+      return new Md5(true).update(message)[outputType]();
+    };
+  };
+
+  /**
+   * @method create
+   * @memberof md5
+   * @description Create Md5 object
+   * @returns {Md5} Md5 object.
+   * @example
+   * var hash = md5.create();
+   */
+  /**
+   * @method update
+   * @memberof md5
+   * @description Create and update Md5 object
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {Md5} Md5 object.
+   * @example
+   * var hash = md5.update('The quick brown fox jumps over the lazy dog');
+   * // equal to
+   * var hash = md5.create();
+   * hash.update('The quick brown fox jumps over the lazy dog');
+   */
+  var createMethod = function createMethod() {
+    var method = createOutputMethod('hex');
+    method.getCtx = method.create = function () {
+      return new Md5();
+    };
+    method.update = function (message) {
+      return method.create().update(message);
+    };
+    for (var i = 0; i < OUTPUT_TYPES.length; ++i) {
+      var type = OUTPUT_TYPES[i];
+      method[type] = createOutputMethod(type);
+    }
+    return method;
+  };
+
+  /**
+   * Md5 class
+   * @class Md5
+   * @description This is internal class.
+   * @see {@link md5.create}
+   */
+  function Md5(sharedMemory) {
+    if (sharedMemory) {
+      blocks[0] = blocks[16] = blocks[1] = blocks[2] = blocks[3] = blocks[4] = blocks[5] = blocks[6] = blocks[7] = blocks[8] = blocks[9] = blocks[10] = blocks[11] = blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
+      this.blocks = blocks;
+      this.buffer8 = buffer8;
+    } else {
+      if (ARRAY_BUFFER) {
+        var buffer = new ArrayBuffer(68);
+        this.buffer8 = new Uint8Array(buffer);
+        this.blocks = new Uint32Array(buffer);
+      } else {
+        this.blocks = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+      }
+    }
+    this.h0 = this.h1 = this.h2 = this.h3 = this.start = this.bytes = this.hBytes = 0;
+    this.finalized = this.hashed = false;
+    this.first = true;
+  }
+
+  /**
+   * @method update
+   * @memberof Md5
+   * @instance
+   * @description Update hash
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {Md5} Md5 object.
+   * @see {@link md5.update}
+   */
+  Md5.prototype.update = function (message) {
+    if (this.finalized) {
+      return;
+    }
+    var notString,
+      type = _typeof(message);
+    if (type !== 'string') {
+      if (type === 'object') {
+        if (message === null) {
+          throw ERROR;
+        } else if (ARRAY_BUFFER && (message.constructor === ArrayBuffer || message.constructor.name === 'ArrayBuffer')) {
+          message = new Uint8Array(message);
+        } else if (!Array.isArray(message)) {
+          if (!ARRAY_BUFFER || !ArrayBuffer.isView(message)) {
+            throw ERROR;
+          }
+        }
+      } else {
+        throw ERROR;
+      }
+      notString = true;
+    }
+    var code,
+      index = 0,
+      i,
+      length = message.length,
+      blocks = this.blocks;
+    var buffer8 = this.buffer8;
+    while (index < length) {
+      if (this.hashed) {
+        this.hashed = false;
+        blocks[0] = blocks[16];
+        blocks[16] = blocks[1] = blocks[2] = blocks[3] = blocks[4] = blocks[5] = blocks[6] = blocks[7] = blocks[8] = blocks[9] = blocks[10] = blocks[11] = blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
+      }
+      if (notString) {
+        if (ARRAY_BUFFER) {
+          for (i = this.start; index < length && i < 64; ++index) {
+            buffer8[i++] = message[index];
+          }
+        } else {
+          for (i = this.start; index < length && i < 64; ++index) {
+            blocks[i >> 2] |= message[index] << SHIFT[i++ & 3];
+          }
+        }
+      } else {
+        if (ARRAY_BUFFER) {
+          for (i = this.start; index < length && i < 64; ++index) {
+            code = message.charCodeAt(index);
+            if (code < 0x80) {
+              buffer8[i++] = code;
+            } else if (code < 0x800) {
+              buffer8[i++] = 0xc0 | code >> 6;
+              buffer8[i++] = 0x80 | code & 0x3f;
+            } else if (code < 0xd800 || code >= 0xe000) {
+              buffer8[i++] = 0xe0 | code >> 12;
+              buffer8[i++] = 0x80 | code >> 6 & 0x3f;
+              buffer8[i++] = 0x80 | code & 0x3f;
+            } else {
+              code = 0x10000 + ((code & 0x3ff) << 10 | message.charCodeAt(++index) & 0x3ff);
+              buffer8[i++] = 0xf0 | code >> 18;
+              buffer8[i++] = 0x80 | code >> 12 & 0x3f;
+              buffer8[i++] = 0x80 | code >> 6 & 0x3f;
+              buffer8[i++] = 0x80 | code & 0x3f;
+            }
+          }
+        } else {
+          for (i = this.start; index < length && i < 64; ++index) {
+            code = message.charCodeAt(index);
+            if (code < 0x80) {
+              blocks[i >> 2] |= code << SHIFT[i++ & 3];
+            } else if (code < 0x800) {
+              blocks[i >> 2] |= (0xc0 | code >> 6) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | code & 0x3f) << SHIFT[i++ & 3];
+            } else if (code < 0xd800 || code >= 0xe000) {
+              blocks[i >> 2] |= (0xe0 | code >> 12) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | code >> 6 & 0x3f) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | code & 0x3f) << SHIFT[i++ & 3];
+            } else {
+              code = 0x10000 + ((code & 0x3ff) << 10 | message.charCodeAt(++index) & 0x3ff);
+              blocks[i >> 2] |= (0xf0 | code >> 18) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | code >> 12 & 0x3f) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | code >> 6 & 0x3f) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | code & 0x3f) << SHIFT[i++ & 3];
+            }
+          }
+        }
+      }
+      this.lastByteIndex = i;
+      this.bytes += i - this.start;
+      if (i >= 64) {
+        this.start = i - 64;
+        this.hash();
+        this.hashed = true;
+      } else {
+        this.start = i;
+      }
+    }
+    if (this.bytes > 4294967295) {
+      this.hBytes += this.bytes / 4294967296 << 0;
+      this.bytes = this.bytes % 4294967296;
+    }
+    return this;
+  };
+  Md5.prototype.finalize = function () {
+    if (this.finalized) {
+      return;
+    }
+    this.finalized = true;
+    var blocks = this.blocks,
+      i = this.lastByteIndex;
+    blocks[i >> 2] |= EXTRA[i & 3];
+    if (i >= 56) {
+      if (!this.hashed) {
+        this.hash();
+      }
+      blocks[0] = blocks[16];
+      blocks[16] = blocks[1] = blocks[2] = blocks[3] = blocks[4] = blocks[5] = blocks[6] = blocks[7] = blocks[8] = blocks[9] = blocks[10] = blocks[11] = blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
+    }
+    blocks[14] = this.bytes << 3;
+    blocks[15] = this.hBytes << 3 | this.bytes >>> 29;
+    this.hash();
+  };
+  Md5.prototype.hash = function () {
+    var a,
+      b,
+      c,
+      d,
+      bc,
+      da,
+      blocks = this.blocks;
+    if (this.first) {
+      a = blocks[0] - 680876937;
+      a = (a << 7 | a >>> 25) - 271733879 << 0;
+      d = (-1732584194 ^ a & 2004318071) + blocks[1] - 117830708;
+      d = (d << 12 | d >>> 20) + a << 0;
+      c = (-271733879 ^ d & (a ^ -271733879)) + blocks[2] - 1126478375;
+      c = (c << 17 | c >>> 15) + d << 0;
+      b = (a ^ c & (d ^ a)) + blocks[3] - 1316259209;
+      b = (b << 22 | b >>> 10) + c << 0;
+    } else {
+      a = this.h0;
+      b = this.h1;
+      c = this.h2;
+      d = this.h3;
+      a += (d ^ b & (c ^ d)) + blocks[0] - 680876936;
+      a = (a << 7 | a >>> 25) + b << 0;
+      d += (c ^ a & (b ^ c)) + blocks[1] - 389564586;
+      d = (d << 12 | d >>> 20) + a << 0;
+      c += (b ^ d & (a ^ b)) + blocks[2] + 606105819;
+      c = (c << 17 | c >>> 15) + d << 0;
+      b += (a ^ c & (d ^ a)) + blocks[3] - 1044525330;
+      b = (b << 22 | b >>> 10) + c << 0;
+    }
+    a += (d ^ b & (c ^ d)) + blocks[4] - 176418897;
+    a = (a << 7 | a >>> 25) + b << 0;
+    d += (c ^ a & (b ^ c)) + blocks[5] + 1200080426;
+    d = (d << 12 | d >>> 20) + a << 0;
+    c += (b ^ d & (a ^ b)) + blocks[6] - 1473231341;
+    c = (c << 17 | c >>> 15) + d << 0;
+    b += (a ^ c & (d ^ a)) + blocks[7] - 45705983;
+    b = (b << 22 | b >>> 10) + c << 0;
+    a += (d ^ b & (c ^ d)) + blocks[8] + 1770035416;
+    a = (a << 7 | a >>> 25) + b << 0;
+    d += (c ^ a & (b ^ c)) + blocks[9] - 1958414417;
+    d = (d << 12 | d >>> 20) + a << 0;
+    c += (b ^ d & (a ^ b)) + blocks[10] - 42063;
+    c = (c << 17 | c >>> 15) + d << 0;
+    b += (a ^ c & (d ^ a)) + blocks[11] - 1990404162;
+    b = (b << 22 | b >>> 10) + c << 0;
+    a += (d ^ b & (c ^ d)) + blocks[12] + 1804603682;
+    a = (a << 7 | a >>> 25) + b << 0;
+    d += (c ^ a & (b ^ c)) + blocks[13] - 40341101;
+    d = (d << 12 | d >>> 20) + a << 0;
+    c += (b ^ d & (a ^ b)) + blocks[14] - 1502002290;
+    c = (c << 17 | c >>> 15) + d << 0;
+    b += (a ^ c & (d ^ a)) + blocks[15] + 1236535329;
+    b = (b << 22 | b >>> 10) + c << 0;
+    a += (c ^ d & (b ^ c)) + blocks[1] - 165796510;
+    a = (a << 5 | a >>> 27) + b << 0;
+    d += (b ^ c & (a ^ b)) + blocks[6] - 1069501632;
+    d = (d << 9 | d >>> 23) + a << 0;
+    c += (a ^ b & (d ^ a)) + blocks[11] + 643717713;
+    c = (c << 14 | c >>> 18) + d << 0;
+    b += (d ^ a & (c ^ d)) + blocks[0] - 373897302;
+    b = (b << 20 | b >>> 12) + c << 0;
+    a += (c ^ d & (b ^ c)) + blocks[5] - 701558691;
+    a = (a << 5 | a >>> 27) + b << 0;
+    d += (b ^ c & (a ^ b)) + blocks[10] + 38016083;
+    d = (d << 9 | d >>> 23) + a << 0;
+    c += (a ^ b & (d ^ a)) + blocks[15] - 660478335;
+    c = (c << 14 | c >>> 18) + d << 0;
+    b += (d ^ a & (c ^ d)) + blocks[4] - 405537848;
+    b = (b << 20 | b >>> 12) + c << 0;
+    a += (c ^ d & (b ^ c)) + blocks[9] + 568446438;
+    a = (a << 5 | a >>> 27) + b << 0;
+    d += (b ^ c & (a ^ b)) + blocks[14] - 1019803690;
+    d = (d << 9 | d >>> 23) + a << 0;
+    c += (a ^ b & (d ^ a)) + blocks[3] - 187363961;
+    c = (c << 14 | c >>> 18) + d << 0;
+    b += (d ^ a & (c ^ d)) + blocks[8] + 1163531501;
+    b = (b << 20 | b >>> 12) + c << 0;
+    a += (c ^ d & (b ^ c)) + blocks[13] - 1444681467;
+    a = (a << 5 | a >>> 27) + b << 0;
+    d += (b ^ c & (a ^ b)) + blocks[2] - 51403784;
+    d = (d << 9 | d >>> 23) + a << 0;
+    c += (a ^ b & (d ^ a)) + blocks[7] + 1735328473;
+    c = (c << 14 | c >>> 18) + d << 0;
+    b += (d ^ a & (c ^ d)) + blocks[12] - 1926607734;
+    b = (b << 20 | b >>> 12) + c << 0;
+    bc = b ^ c;
+    a += (bc ^ d) + blocks[5] - 378558;
+    a = (a << 4 | a >>> 28) + b << 0;
+    d += (bc ^ a) + blocks[8] - 2022574463;
+    d = (d << 11 | d >>> 21) + a << 0;
+    da = d ^ a;
+    c += (da ^ b) + blocks[11] + 1839030562;
+    c = (c << 16 | c >>> 16) + d << 0;
+    b += (da ^ c) + blocks[14] - 35309556;
+    b = (b << 23 | b >>> 9) + c << 0;
+    bc = b ^ c;
+    a += (bc ^ d) + blocks[1] - 1530992060;
+    a = (a << 4 | a >>> 28) + b << 0;
+    d += (bc ^ a) + blocks[4] + 1272893353;
+    d = (d << 11 | d >>> 21) + a << 0;
+    da = d ^ a;
+    c += (da ^ b) + blocks[7] - 155497632;
+    c = (c << 16 | c >>> 16) + d << 0;
+    b += (da ^ c) + blocks[10] - 1094730640;
+    b = (b << 23 | b >>> 9) + c << 0;
+    bc = b ^ c;
+    a += (bc ^ d) + blocks[13] + 681279174;
+    a = (a << 4 | a >>> 28) + b << 0;
+    d += (bc ^ a) + blocks[0] - 358537222;
+    d = (d << 11 | d >>> 21) + a << 0;
+    da = d ^ a;
+    c += (da ^ b) + blocks[3] - 722521979;
+    c = (c << 16 | c >>> 16) + d << 0;
+    b += (da ^ c) + blocks[6] + 76029189;
+    b = (b << 23 | b >>> 9) + c << 0;
+    bc = b ^ c;
+    a += (bc ^ d) + blocks[9] - 640364487;
+    a = (a << 4 | a >>> 28) + b << 0;
+    d += (bc ^ a) + blocks[12] - 421815835;
+    d = (d << 11 | d >>> 21) + a << 0;
+    da = d ^ a;
+    c += (da ^ b) + blocks[15] + 530742520;
+    c = (c << 16 | c >>> 16) + d << 0;
+    b += (da ^ c) + blocks[2] - 995338651;
+    b = (b << 23 | b >>> 9) + c << 0;
+    a += (c ^ (b | ~d)) + blocks[0] - 198630844;
+    a = (a << 6 | a >>> 26) + b << 0;
+    d += (b ^ (a | ~c)) + blocks[7] + 1126891415;
+    d = (d << 10 | d >>> 22) + a << 0;
+    c += (a ^ (d | ~b)) + blocks[14] - 1416354905;
+    c = (c << 15 | c >>> 17) + d << 0;
+    b += (d ^ (c | ~a)) + blocks[5] - 57434055;
+    b = (b << 21 | b >>> 11) + c << 0;
+    a += (c ^ (b | ~d)) + blocks[12] + 1700485571;
+    a = (a << 6 | a >>> 26) + b << 0;
+    d += (b ^ (a | ~c)) + blocks[3] - 1894986606;
+    d = (d << 10 | d >>> 22) + a << 0;
+    c += (a ^ (d | ~b)) + blocks[10] - 1051523;
+    c = (c << 15 | c >>> 17) + d << 0;
+    b += (d ^ (c | ~a)) + blocks[1] - 2054922799;
+    b = (b << 21 | b >>> 11) + c << 0;
+    a += (c ^ (b | ~d)) + blocks[8] + 1873313359;
+    a = (a << 6 | a >>> 26) + b << 0;
+    d += (b ^ (a | ~c)) + blocks[15] - 30611744;
+    d = (d << 10 | d >>> 22) + a << 0;
+    c += (a ^ (d | ~b)) + blocks[6] - 1560198380;
+    c = (c << 15 | c >>> 17) + d << 0;
+    b += (d ^ (c | ~a)) + blocks[13] + 1309151649;
+    b = (b << 21 | b >>> 11) + c << 0;
+    a += (c ^ (b | ~d)) + blocks[4] - 145523070;
+    a = (a << 6 | a >>> 26) + b << 0;
+    d += (b ^ (a | ~c)) + blocks[11] - 1120210379;
+    d = (d << 10 | d >>> 22) + a << 0;
+    c += (a ^ (d | ~b)) + blocks[2] + 718787259;
+    c = (c << 15 | c >>> 17) + d << 0;
+    b += (d ^ (c | ~a)) + blocks[9] - 343485551;
+    b = (b << 21 | b >>> 11) + c << 0;
+    if (this.first) {
+      this.h0 = a + 1732584193 << 0;
+      this.h1 = b - 271733879 << 0;
+      this.h2 = c - 1732584194 << 0;
+      this.h3 = d + 271733878 << 0;
+      this.first = false;
+    } else {
+      this.h0 = this.h0 + a << 0;
+      this.h1 = this.h1 + b << 0;
+      this.h2 = this.h2 + c << 0;
+      this.h3 = this.h3 + d << 0;
+    }
+  };
+
+  /**
+   * @method hex
+   * @memberof Md5
+   * @instance
+   * @description Output hash as hex string
+   * @returns {String} Hex string
+   * @see {@link md5.hex}
+   * @example
+   * hash.hex();
+   */
+  Md5.prototype.hex = function () {
+    this.finalize();
+    var h0 = this.h0,
+      h1 = this.h1,
+      h2 = this.h2,
+      h3 = this.h3;
+    return HEX_CHARS[h0 >> 4 & 0x0F] + HEX_CHARS[h0 & 0x0F] + HEX_CHARS[h0 >> 12 & 0x0F] + HEX_CHARS[h0 >> 8 & 0x0F] + HEX_CHARS[h0 >> 20 & 0x0F] + HEX_CHARS[h0 >> 16 & 0x0F] + HEX_CHARS[h0 >> 28 & 0x0F] + HEX_CHARS[h0 >> 24 & 0x0F] + HEX_CHARS[h1 >> 4 & 0x0F] + HEX_CHARS[h1 & 0x0F] + HEX_CHARS[h1 >> 12 & 0x0F] + HEX_CHARS[h1 >> 8 & 0x0F] + HEX_CHARS[h1 >> 20 & 0x0F] + HEX_CHARS[h1 >> 16 & 0x0F] + HEX_CHARS[h1 >> 28 & 0x0F] + HEX_CHARS[h1 >> 24 & 0x0F] + HEX_CHARS[h2 >> 4 & 0x0F] + HEX_CHARS[h2 & 0x0F] + HEX_CHARS[h2 >> 12 & 0x0F] + HEX_CHARS[h2 >> 8 & 0x0F] + HEX_CHARS[h2 >> 20 & 0x0F] + HEX_CHARS[h2 >> 16 & 0x0F] + HEX_CHARS[h2 >> 28 & 0x0F] + HEX_CHARS[h2 >> 24 & 0x0F] + HEX_CHARS[h3 >> 4 & 0x0F] + HEX_CHARS[h3 & 0x0F] + HEX_CHARS[h3 >> 12 & 0x0F] + HEX_CHARS[h3 >> 8 & 0x0F] + HEX_CHARS[h3 >> 20 & 0x0F] + HEX_CHARS[h3 >> 16 & 0x0F] + HEX_CHARS[h3 >> 28 & 0x0F] + HEX_CHARS[h3 >> 24 & 0x0F];
+  };
+
+  /**
+   * @method toString
+   * @memberof Md5
+   * @instance
+   * @description Output hash as hex string
+   * @returns {String} Hex string
+   * @see {@link md5.hex}
+   * @example
+   * hash.toString();
+   */
+  Md5.prototype.toString = Md5.prototype.hex;
+
+  /**
+   * @method digest
+   * @memberof Md5
+   * @instance
+   * @description Output hash as bytes array
+   * @returns {Array} Bytes array
+   * @see {@link md5.digest}
+   * @example
+   * hash.digest();
+   */
+  Md5.prototype.digest = function () {
+    this.finalize();
+    var h0 = this.h0,
+      h1 = this.h1,
+      h2 = this.h2,
+      h3 = this.h3;
+    return [h0 & 0xFF, h0 >> 8 & 0xFF, h0 >> 16 & 0xFF, h0 >> 24 & 0xFF, h1 & 0xFF, h1 >> 8 & 0xFF, h1 >> 16 & 0xFF, h1 >> 24 & 0xFF, h2 & 0xFF, h2 >> 8 & 0xFF, h2 >> 16 & 0xFF, h2 >> 24 & 0xFF, h3 & 0xFF, h3 >> 8 & 0xFF, h3 >> 16 & 0xFF, h3 >> 24 & 0xFF];
+  };
+
+  /**
+   * @method array
+   * @memberof Md5
+   * @instance
+   * @description Output hash as bytes array
+   * @returns {Array} Bytes array
+   * @see {@link md5.array}
+   * @example
+   * hash.array();
+   */
+  Md5.prototype.array = Md5.prototype.digest;
+
+  /**
+   * @method arrayBuffer
+   * @memberof Md5
+   * @instance
+   * @description Output hash as ArrayBuffer
+   * @returns {ArrayBuffer} ArrayBuffer
+   * @see {@link md5.arrayBuffer}
+   * @example
+   * hash.arrayBuffer();
+   */
+  Md5.prototype.arrayBuffer = function () {
+    this.finalize();
+    var buffer = new ArrayBuffer(16);
+    var blocks = new Uint32Array(buffer);
+    blocks[0] = this.h0;
+    blocks[1] = this.h1;
+    blocks[2] = this.h2;
+    blocks[3] = this.h3;
+    return buffer;
+  };
+
+  /**
+   * @method buffer
+   * @deprecated This maybe confuse with Buffer in node.js. Please use arrayBuffer instead.
+   * @memberof Md5
+   * @instance
+   * @description Output hash as ArrayBuffer
+   * @returns {ArrayBuffer} ArrayBuffer
+   * @see {@link md5.buffer}
+   * @example
+   * hash.buffer();
+   */
+  Md5.prototype.buffer = Md5.prototype.arrayBuffer;
+
+  /**
+   * @method base64
+   * @memberof Md5
+   * @instance
+   * @description Output hash as base64 string
+   * @returns {String} base64 string
+   * @see {@link md5.base64}
+   * @example
+   * hash.base64();
+   */
+  Md5.prototype.base64 = function () {
+    var v1,
+      v2,
+      v3,
+      base64Str = '',
+      bytes = this.array();
+    for (var i = 0; i < 15;) {
+      v1 = bytes[i++];
+      v2 = bytes[i++];
+      v3 = bytes[i++];
+      base64Str += BASE64_ENCODE_CHAR[v1 >>> 2] + BASE64_ENCODE_CHAR[(v1 << 4 | v2 >>> 4) & 63] + BASE64_ENCODE_CHAR[(v2 << 2 | v3 >>> 6) & 63] + BASE64_ENCODE_CHAR[v3 & 63];
+    }
+    v1 = bytes[i];
+    base64Str += BASE64_ENCODE_CHAR[v1 >>> 2] + BASE64_ENCODE_CHAR[v1 << 4 & 63] + '==';
+    return base64Str;
+  };
+  var exports = createMethod();
+  if (COMMON_JS) {
+    module.exports = exports;
+  } else {
+    /**
+     * @method md5
+     * @description Md5 hash function, export to global in browsers.
+     * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+     * @returns {String} md5 hashes
+     * @example
+     * md5(''); // d41d8cd98f00b204e9800998ecf8427e
+     * md5('The quick brown fox jumps over the lazy dog'); // 9e107d9d372bb6826bd81d3542a419d6
+     * md5('The quick brown fox jumps over the lazy dog.'); // e4d909c290d0fb1ca068ffaddf22cbd0
+     *
+     * // It also supports UTF-8 encoding
+     * md5('中文'); // a7bac2239fcdcb3a067903d8077c4a07
+     *
+     * // It also supports byte `Array`, `Uint8Array`, `ArrayBuffer`
+     * md5([]); // d41d8cd98f00b204e9800998ecf8427e
+     * md5(new Uint8Array([])); // d41d8cd98f00b204e9800998ecf8427e
+     */
+    root.md5 = exports;
+    if (AMD) {
+      !(__WEBPACK_AMD_DEFINE_RESULT__ = (function () {
+        return exports;
+      }).call(exports, __webpack_require__, exports, module),
+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+    }
+  }
+})();
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../node_modules/webpack/buildin/module.js */ "./node_modules/webpack/buildin/module.js")(module)))
+
+/***/ }),
+
+/***/ "./lib/request.js":
+/*!************************!*\
+  !*** ./lib/request.js ***!
+  \************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+function camSafeUrlEncode(str) {
+  return encodeURIComponent(str).replace(/!/g, '%21').replace(/'/g, '%27').replace(/$/g, '%28').replace(/$/g, '%29').replace(/\*/g, '%2A');
+}
+function getObjectKeys(obj, forKey) {
+  var list = [];
+  for (var key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      list.push(forKey ? camSafeUrlEncode(key).toLowerCase() : key);
+    }
+  }
+  return list.sort(function (a, b) {
+    a = a.toLowerCase();
+    b = b.toLowerCase();
+    return a === b ? 0 : a > b ? 1 : -1;
+  });
+}
+;
+var obj2str = function obj2str(obj, lowerCaseKey) {
+  var i, key, val;
+  var list = [];
+  var keyList = getObjectKeys(obj);
+  for (i = 0; i < keyList.length; i++) {
+    key = keyList[i];
+    val = obj[key] === undefined || obj[key] === null ? '' : '' + obj[key];
+    key = lowerCaseKey ? camSafeUrlEncode(key).toLowerCase() : camSafeUrlEncode(key);
+    val = camSafeUrlEncode(val) || '';
+    list.push(key + '=' + val);
+  }
+  return list.join('&');
+};
+var request = function request(params, callback) {
+  var filePath = params.filePath;
+  var headers = params.headers || {};
+  var url = params.url || params.Url;
+  var method = params.method;
+  var onProgress = params.onProgress;
+  var httpDNSServiceId = params.httpDNSServiceId;
+  var requestTask;
+  var cb = function cb(err, response) {
+    var H = response.header;
+    var headers = {};
+    if (H) for (var key in H) {
+      if (H.hasOwnProperty(key)) headers[key.toLowerCase()] = H[key];
+    }
+    callback(err, {
+      statusCode: response.statusCode,
+      headers: headers
+    }, response.data);
+  };
+  if (filePath) {
+    var fileKey;
+    var m = url.match(/^(https?:\/\/[^/]+\/)([^/]*\/?)(.*)$/);
+    if (params.pathStyle) {
+      fileKey = decodeURIComponent(m[3] || '');
+      url = m[1] + m[2];
+    } else {
+      fileKey = decodeURIComponent(m[2] + m[3] || '');
+      url = m[1];
+    }
+
+    // 整理 postObject 参数
+    var formData = {
+      'key': fileKey,
+      'success_action_status': 200,
+      'Signature': headers.Authorization
+    };
+    var headerKeys = ['Cache-Control', 'Content-Type', 'Content-Disposition', 'Content-Encoding', 'Expires', 'x-cos-storage-class', 'x-cos-security-token', 'x-ci-security-token'];
+    for (var i in params.headers) {
+      if (params.headers.hasOwnProperty(i) && (i.indexOf('x-cos-meta-') > -1 || headerKeys.indexOf(i) > -1)) {
+        formData[i] = params.headers[i];
+      }
+    }
+    headers['x-cos-acl'] && (formData.acl = headers['x-cos-acl']);
+    !formData['Content-Type'] && (formData['Content-Type'] = '');
+    requestTask = wx.uploadFile({
+      url: url,
+      method: method,
+      name: 'file',
+      header: headers,
+      filePath: filePath,
+      formData: formData,
+      timeout: params.timeout,
+      success: function success(response) {
+        cb(null, response);
+      },
+      fail: function fail(response) {
+        cb(response.errMsg, response);
+      }
+    });
+    requestTask.onProgressUpdate(function (res) {
+      onProgress && onProgress({
+        loaded: res.totalBytesSent,
+        total: res.totalBytesExpectedToSend,
+        progress: res.progress / 100
+      });
+    });
+  } else {
+    var qsStr = params.qs && obj2str(params.qs) || '';
+    if (qsStr) {
+      url += (url.indexOf('?') > -1 ? '&' : '?') + qsStr;
+    }
+    headers['Content-Length'] && delete headers['Content-Length'];
+    var requestParams = {
+      url: url,
+      method: method,
+      header: headers,
+      dataType: 'text',
+      data: params.body,
+      responseType: params.dataType || 'text',
+      timeout: params.timeout,
+      redirect: 'manual',
+      success: function success(response) {
+        cb(null, response);
+      },
+      fail: function fail(response) {
+        cb(response.errMsg, response);
+      }
+    };
+    if (httpDNSServiceId) {
+      Object.assign(requestParams, {
+        enableHttpDNS: true,
+        httpDNSServiceId: httpDNSServiceId
+      });
+    }
+    requestTask = wx.request(requestParams);
+  }
+  return requestTask;
+};
+module.exports = request;
+
+/***/ }),
+
+/***/ "./node_modules/base64-js/index.js":
+/*!*****************************************!*\
+  !*** ./node_modules/base64-js/index.js ***!
+  \*****************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+exports.byteLength = byteLength
+exports.toByteArray = toByteArray
+exports.fromByteArray = fromByteArray
+
+var lookup = []
+var revLookup = []
+var Arr = typeof Uint8Array !== 'undefined' ? Uint8Array : Array
+
+var code = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
+for (var i = 0, len = code.length; i < len; ++i) {
+  lookup[i] = code[i]
+  revLookup[code.charCodeAt(i)] = i
+}
+
+// Support decoding URL-safe base64 strings, as Node.js does.
+// See: https://en.wikipedia.org/wiki/Base64#URL_applications
+revLookup['-'.charCodeAt(0)] = 62
+revLookup['_'.charCodeAt(0)] = 63
+
+function getLens (b64) {
+  var len = b64.length
+
+  if (len % 4 > 0) {
+    throw new Error('Invalid string. Length must be a multiple of 4')
+  }
+
+  // Trim off extra bytes after placeholder bytes are found
+  // See: https://github.com/beatgammit/base64-js/issues/42
+  var validLen = b64.indexOf('=')
+  if (validLen === -1) validLen = len
+
+  var placeHoldersLen = validLen === len
+    ? 0
+    : 4 - (validLen % 4)
+
+  return [validLen, placeHoldersLen]
+}
+
+// base64 is 4/3 + up to two characters of the original data
+function byteLength (b64) {
+  var lens = getLens(b64)
+  var validLen = lens[0]
+  var placeHoldersLen = lens[1]
+  return ((validLen + placeHoldersLen) * 3 / 4) - placeHoldersLen
+}
+
+function _byteLength (b64, validLen, placeHoldersLen) {
+  return ((validLen + placeHoldersLen) * 3 / 4) - placeHoldersLen
+}
+
+function toByteArray (b64) {
+  var tmp
+  var lens = getLens(b64)
+  var validLen = lens[0]
+  var placeHoldersLen = lens[1]
+
+  var arr = new Arr(_byteLength(b64, validLen, placeHoldersLen))
+
+  var curByte = 0
+
+  // if there are placeholders, only get up to the last complete 4 chars
+  var len = placeHoldersLen > 0
+    ? validLen - 4
+    : validLen
+
+  var i
+  for (i = 0; i < len; i += 4) {
+    tmp =
+      (revLookup[b64.charCodeAt(i)] << 18) |
+      (revLookup[b64.charCodeAt(i + 1)] << 12) |
+      (revLookup[b64.charCodeAt(i + 2)] << 6) |
+      revLookup[b64.charCodeAt(i + 3)]
+    arr[curByte++] = (tmp >> 16) & 0xFF
+    arr[curByte++] = (tmp >> 8) & 0xFF
+    arr[curByte++] = tmp & 0xFF
+  }
+
+  if (placeHoldersLen === 2) {
+    tmp =
+      (revLookup[b64.charCodeAt(i)] << 2) |
+      (revLookup[b64.charCodeAt(i + 1)] >> 4)
+    arr[curByte++] = tmp & 0xFF
+  }
+
+  if (placeHoldersLen === 1) {
+    tmp =
+      (revLookup[b64.charCodeAt(i)] << 10) |
+      (revLookup[b64.charCodeAt(i + 1)] << 4) |
+      (revLookup[b64.charCodeAt(i + 2)] >> 2)
+    arr[curByte++] = (tmp >> 8) & 0xFF
+    arr[curByte++] = tmp & 0xFF
+  }
+
+  return arr
+}
+
+function tripletToBase64 (num) {
+  return lookup[num >> 18 & 0x3F] +
+    lookup[num >> 12 & 0x3F] +
+    lookup[num >> 6 & 0x3F] +
+    lookup[num & 0x3F]
+}
+
+function encodeChunk (uint8, start, end) {
+  var tmp
+  var output = []
+  for (var i = start; i < end; i += 3) {
+    tmp =
+      ((uint8[i] << 16) & 0xFF0000) +
+      ((uint8[i + 1] << 8) & 0xFF00) +
+      (uint8[i + 2] & 0xFF)
+    output.push(tripletToBase64(tmp))
+  }
+  return output.join('')
+}
+
+function fromByteArray (uint8) {
+  var tmp
+  var len = uint8.length
+  var extraBytes = len % 3 // if we have 1 byte left, pad 2 bytes
+  var parts = []
+  var maxChunkLength = 16383 // must be multiple of 3
+
+  // go through the array every three bytes, we'll deal with trailing stuff later
+  for (var i = 0, len2 = len - extraBytes; i < len2; i += maxChunkLength) {
+    parts.push(encodeChunk(uint8, i, (i + maxChunkLength) > len2 ? len2 : (i + maxChunkLength)))
+  }
+
+  // pad the end with zeros, but make sure to not forget the extra bytes
+  if (extraBytes === 1) {
+    tmp = uint8[len - 1]
+    parts.push(
+      lookup[tmp >> 2] +
+      lookup[(tmp << 4) & 0x3F] +
+      '=='
+    )
+  } else if (extraBytes === 2) {
+    tmp = (uint8[len - 2] << 8) + uint8[len - 1]
+    parts.push(
+      lookup[tmp >> 10] +
+      lookup[(tmp >> 4) & 0x3F] +
+      lookup[(tmp << 2) & 0x3F] +
+      '='
+    )
+  }
+
+  return parts.join('')
+}
+
+
+/***/ }),
+
+/***/ "./node_modules/buffer/index.js":
+/*!**************************************!*\
+  !*** ./node_modules/buffer/index.js ***!
+  \**************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(global) {/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <http://feross.org>
+ * @license  MIT
+ */
+/* eslint-disable no-proto */
+
+
+
+var base64 = __webpack_require__(/*! base64-js */ "./node_modules/base64-js/index.js")
+var ieee754 = __webpack_require__(/*! ieee754 */ "./node_modules/ieee754/index.js")
+var isArray = __webpack_require__(/*! isarray */ "./node_modules/isarray/index.js")
+
+exports.Buffer = Buffer
+exports.SlowBuffer = SlowBuffer
+exports.INSPECT_MAX_BYTES = 50
+
+/**
+ * If `Buffer.TYPED_ARRAY_SUPPORT`:
+ *   === true    Use Uint8Array implementation (fastest)
+ *   === false   Use Object implementation (most compatible, even IE6)
+ *
+ * Browsers that support typed arrays are IE 10+, Firefox 4+, Chrome 7+, Safari 5.1+,
+ * Opera 11.6+, iOS 4.2+.
+ *
+ * Due to various browser bugs, sometimes the Object implementation will be used even
+ * when the browser supports typed arrays.
+ *
+ * Note:
+ *
+ *   - Firefox 4-29 lacks support for adding new properties to `Uint8Array` instances,
+ *     See: https://bugzilla.mozilla.org/show_bug.cgi?id=695438.
+ *
+ *   - Chrome 9-10 is missing the `TypedArray.prototype.subarray` function.
+ *
+ *   - IE10 has a broken `TypedArray.prototype.subarray` function which returns arrays of
+ *     incorrect length in some situations.
+
+ * We detect these buggy browsers and set `Buffer.TYPED_ARRAY_SUPPORT` to `false` so they
+ * get the Object implementation, which is slower but behaves correctly.
+ */
+Buffer.TYPED_ARRAY_SUPPORT = global.TYPED_ARRAY_SUPPORT !== undefined
+  ? global.TYPED_ARRAY_SUPPORT
+  : typedArraySupport()
+
+/*
+ * Export kMaxLength after typed array support is determined.
+ */
+exports.kMaxLength = kMaxLength()
+
+function typedArraySupport () {
+  try {
+    var arr = new Uint8Array(1)
+    arr.__proto__ = {__proto__: Uint8Array.prototype, foo: function () { return 42 }}
+    return arr.foo() === 42 && // typed array instances can be augmented
+        typeof arr.subarray === 'function' && // chrome 9-10 lack `subarray`
+        arr.subarray(1, 1).byteLength === 0 // ie10 has broken `subarray`
+  } catch (e) {
+    return false
+  }
+}
+
+function kMaxLength () {
+  return Buffer.TYPED_ARRAY_SUPPORT
+    ? 0x7fffffff
+    : 0x3fffffff
+}
+
+function createBuffer (that, length) {
+  if (kMaxLength() < length) {
+    throw new RangeError('Invalid typed array length')
+  }
+  if (Buffer.TYPED_ARRAY_SUPPORT) {
+    // Return an augmented `Uint8Array` instance, for best performance
+    that = new Uint8Array(length)
+    that.__proto__ = Buffer.prototype
+  } else {
+    // Fallback: Return an object instance of the Buffer class
+    if (that === null) {
+      that = new Buffer(length)
+    }
+    that.length = length
+  }
+
+  return that
+}
+
+/**
+ * The Buffer constructor returns instances of `Uint8Array` that have their
+ * prototype changed to `Buffer.prototype`. Furthermore, `Buffer` is a subclass of
+ * `Uint8Array`, so the returned instances will have all the node `Buffer` methods
+ * and the `Uint8Array` methods. Square bracket notation works as expected -- it
+ * returns a single octet.
+ *
+ * The `Uint8Array` prototype remains unmodified.
+ */
+
+function Buffer (arg, encodingOrOffset, length) {
+  if (!Buffer.TYPED_ARRAY_SUPPORT && !(this instanceof Buffer)) {
+    return new Buffer(arg, encodingOrOffset, length)
+  }
+
+  // Common case.
+  if (typeof arg === 'number') {
+    if (typeof encodingOrOffset === 'string') {
+      throw new Error(
+        'If encoding is specified then the first argument must be a string'
+      )
+    }
+    return allocUnsafe(this, arg)
+  }
+  return from(this, arg, encodingOrOffset, length)
+}
+
+Buffer.poolSize = 8192 // not used by this implementation
+
+// TODO: Legacy, not needed anymore. Remove in next major version.
+Buffer._augment = function (arr) {
+  arr.__proto__ = Buffer.prototype
+  return arr
+}
+
+function from (that, value, encodingOrOffset, length) {
+  if (typeof value === 'number') {
+    throw new TypeError('"value" argument must not be a number')
+  }
+
+  if (typeof ArrayBuffer !== 'undefined' && value instanceof ArrayBuffer) {
+    return fromArrayBuffer(that, value, encodingOrOffset, length)
+  }
+
+  if (typeof value === 'string') {
+    return fromString(that, value, encodingOrOffset)
+  }
+
+  return fromObject(that, value)
+}
+
+/**
+ * Functionally equivalent to Buffer(arg, encoding) but throws a TypeError
+ * if value is a number.
+ * Buffer.from(str[, encoding])
+ * Buffer.from(array)
+ * Buffer.from(buffer)
+ * Buffer.from(arrayBuffer[, byteOffset[, length]])
+ **/
+Buffer.from = function (value, encodingOrOffset, length) {
+  return from(null, value, encodingOrOffset, length)
+}
+
+if (Buffer.TYPED_ARRAY_SUPPORT) {
+  Buffer.prototype.__proto__ = Uint8Array.prototype
+  Buffer.__proto__ = Uint8Array
+  if (typeof Symbol !== 'undefined' && Symbol.species &&
+      Buffer[Symbol.species] === Buffer) {
+    // Fix subarray() in ES2016. See: https://github.com/feross/buffer/pull/97
+    Object.defineProperty(Buffer, Symbol.species, {
+      value: null,
+      configurable: true
+    })
+  }
+}
+
+function assertSize (size) {
+  if (typeof size !== 'number') {
+    throw new TypeError('"size" argument must be a number')
+  } else if (size < 0) {
+    throw new RangeError('"size" argument must not be negative')
+  }
+}
+
+function alloc (that, size, fill, encoding) {
+  assertSize(size)
+  if (size <= 0) {
+    return createBuffer(that, size)
+  }
+  if (fill !== undefined) {
+    // Only pay attention to encoding if it's a string. This
+    // prevents accidentally sending in a number that would
+    // be interpretted as a start offset.
+    return typeof encoding === 'string'
+      ? createBuffer(that, size).fill(fill, encoding)
+      : createBuffer(that, size).fill(fill)
+  }
+  return createBuffer(that, size)
+}
+
+/**
+ * Creates a new filled Buffer instance.
+ * alloc(size[, fill[, encoding]])
+ **/
+Buffer.alloc = function (size, fill, encoding) {
+  return alloc(null, size, fill, encoding)
+}
+
+function allocUnsafe (that, size) {
+  assertSize(size)
+  that = createBuffer(that, size < 0 ? 0 : checked(size) | 0)
+  if (!Buffer.TYPED_ARRAY_SUPPORT) {
+    for (var i = 0; i < size; ++i) {
+      that[i] = 0
+    }
+  }
+  return that
+}
+
+/**
+ * Equivalent to Buffer(num), by default creates a non-zero-filled Buffer instance.
+ * */
+Buffer.allocUnsafe = function (size) {
+  return allocUnsafe(null, size)
+}
+/**
+ * Equivalent to SlowBuffer(num), by default creates a non-zero-filled Buffer instance.
+ */
+Buffer.allocUnsafeSlow = function (size) {
+  return allocUnsafe(null, size)
+}
+
+function fromString (that, string, encoding) {
+  if (typeof encoding !== 'string' || encoding === '') {
+    encoding = 'utf8'
+  }
+
+  if (!Buffer.isEncoding(encoding)) {
+    throw new TypeError('"encoding" must be a valid string encoding')
+  }
+
+  var length = byteLength(string, encoding) | 0
+  that = createBuffer(that, length)
+
+  var actual = that.write(string, encoding)
+
+  if (actual !== length) {
+    // Writing a hex string, for example, that contains invalid characters will
+    // cause everything after the first invalid character to be ignored. (e.g.
+    // 'abxxcd' will be treated as 'ab')
+    that = that.slice(0, actual)
+  }
+
+  return that
+}
+
+function fromArrayLike (that, array) {
+  var length = array.length < 0 ? 0 : checked(array.length) | 0
+  that = createBuffer(that, length)
+  for (var i = 0; i < length; i += 1) {
+    that[i] = array[i] & 255
+  }
+  return that
+}
+
+function fromArrayBuffer (that, array, byteOffset, length) {
+  array.byteLength // this throws if `array` is not a valid ArrayBuffer
+
+  if (byteOffset < 0 || array.byteLength < byteOffset) {
+    throw new RangeError('\'offset\' is out of bounds')
+  }
+
+  if (array.byteLength < byteOffset + (length || 0)) {
+    throw new RangeError('\'length\' is out of bounds')
+  }
+
+  if (byteOffset === undefined && length === undefined) {
+    array = new Uint8Array(array)
+  } else if (length === undefined) {
+    array = new Uint8Array(array, byteOffset)
+  } else {
+    array = new Uint8Array(array, byteOffset, length)
+  }
+
+  if (Buffer.TYPED_ARRAY_SUPPORT) {
+    // Return an augmented `Uint8Array` instance, for best performance
+    that = array
+    that.__proto__ = Buffer.prototype
+  } else {
+    // Fallback: Return an object instance of the Buffer class
+    that = fromArrayLike(that, array)
+  }
+  return that
+}
+
+function fromObject (that, obj) {
+  if (Buffer.isBuffer(obj)) {
+    var len = checked(obj.length) | 0
+    that = createBuffer(that, len)
+
+    if (that.length === 0) {
+      return that
+    }
+
+    obj.copy(that, 0, 0, len)
+    return that
+  }
+
+  if (obj) {
+    if ((typeof ArrayBuffer !== 'undefined' &&
+        obj.buffer instanceof ArrayBuffer) || 'length' in obj) {
+      if (typeof obj.length !== 'number' || isnan(obj.length)) {
+        return createBuffer(that, 0)
+      }
+      return fromArrayLike(that, obj)
+    }
+
+    if (obj.type === 'Buffer' && isArray(obj.data)) {
+      return fromArrayLike(that, obj.data)
+    }
+  }
+
+  throw new TypeError('First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.')
+}
+
+function checked (length) {
+  // Note: cannot use `length < kMaxLength()` here because that fails when
+  // length is NaN (which is otherwise coerced to zero.)
+  if (length >= kMaxLength()) {
+    throw new RangeError('Attempt to allocate Buffer larger than maximum ' +
+                         'size: 0x' + kMaxLength().toString(16) + ' bytes')
+  }
+  return length | 0
+}
+
+function SlowBuffer (length) {
+  if (+length != length) { // eslint-disable-line eqeqeq
+    length = 0
+  }
+  return Buffer.alloc(+length)
+}
+
+Buffer.isBuffer = function isBuffer (b) {
+  return !!(b != null && b._isBuffer)
+}
+
+Buffer.compare = function compare (a, b) {
+  if (!Buffer.isBuffer(a) || !Buffer.isBuffer(b)) {
+    throw new TypeError('Arguments must be Buffers')
+  }
+
+  if (a === b) return 0
+
+  var x = a.length
+  var y = b.length
+
+  for (var i = 0, len = Math.min(x, y); i < len; ++i) {
+    if (a[i] !== b[i]) {
+      x = a[i]
+      y = b[i]
+      break
+    }
+  }
+
+  if (x < y) return -1
+  if (y < x) return 1
+  return 0
+}
+
+Buffer.isEncoding = function isEncoding (encoding) {
+  switch (String(encoding).toLowerCase()) {
+    case 'hex':
+    case 'utf8':
+    case 'utf-8':
+    case 'ascii':
+    case 'latin1':
+    case 'binary':
+    case 'base64':
+    case 'ucs2':
+    case 'ucs-2':
+    case 'utf16le':
+    case 'utf-16le':
+      return true
+    default:
+      return false
+  }
+}
+
+Buffer.concat = function concat (list, length) {
+  if (!isArray(list)) {
+    throw new TypeError('"list" argument must be an Array of Buffers')
+  }
+
+  if (list.length === 0) {
+    return Buffer.alloc(0)
+  }
+
+  var i
+  if (length === undefined) {
+    length = 0
+    for (i = 0; i < list.length; ++i) {
+      length += list[i].length
+    }
+  }
+
+  var buffer = Buffer.allocUnsafe(length)
+  var pos = 0
+  for (i = 0; i < list.length; ++i) {
+    var buf = list[i]
+    if (!Buffer.isBuffer(buf)) {
+      throw new TypeError('"list" argument must be an Array of Buffers')
+    }
+    buf.copy(buffer, pos)
+    pos += buf.length
+  }
+  return buffer
+}
+
+function byteLength (string, encoding) {
+  if (Buffer.isBuffer(string)) {
+    return string.length
+  }
+  if (typeof ArrayBuffer !== 'undefined' && typeof ArrayBuffer.isView === 'function' &&
+      (ArrayBuffer.isView(string) || string instanceof ArrayBuffer)) {
+    return string.byteLength
+  }
+  if (typeof string !== 'string') {
+    string = '' + string
+  }
+
+  var len = string.length
+  if (len === 0) return 0
+
+  // Use a for loop to avoid recursion
+  var loweredCase = false
+  for (;;) {
+    switch (encoding) {
+      case 'ascii':
+      case 'latin1':
+      case 'binary':
+        return len
+      case 'utf8':
+      case 'utf-8':
+      case undefined:
+        return utf8ToBytes(string).length
+      case 'ucs2':
+      case 'ucs-2':
+      case 'utf16le':
+      case 'utf-16le':
+        return len * 2
+      case 'hex':
+        return len >>> 1
+      case 'base64':
+        return base64ToBytes(string).length
+      default:
+        if (loweredCase) return utf8ToBytes(string).length // assume utf8
+        encoding = ('' + encoding).toLowerCase()
+        loweredCase = true
+    }
+  }
+}
+Buffer.byteLength = byteLength
+
+function slowToString (encoding, start, end) {
+  var loweredCase = false
+
+  // No need to verify that "this.length <= MAX_UINT32" since it's a read-only
+  // property of a typed array.
+
+  // This behaves neither like String nor Uint8Array in that we set start/end
+  // to their upper/lower bounds if the value passed is out of range.
+  // undefined is handled specially as per ECMA-262 6th Edition,
+  // Section 13.3.3.7 Runtime Semantics: KeyedBindingInitialization.
+  if (start === undefined || start < 0) {
+    start = 0
+  }
+  // Return early if start > this.length. Done here to prevent potential uint32
+  // coercion fail below.
+  if (start > this.length) {
+    return ''
+  }
+
+  if (end === undefined || end > this.length) {
+    end = this.length
+  }
+
+  if (end <= 0) {
+    return ''
+  }
+
+  // Force coersion to uint32. This will also coerce falsey/NaN values to 0.
+  end >>>= 0
+  start >>>= 0
+
+  if (end <= start) {
+    return ''
+  }
+
+  if (!encoding) encoding = 'utf8'
+
+  while (true) {
+    switch (encoding) {
+      case 'hex':
+        return hexSlice(this, start, end)
+
+      case 'utf8':
+      case 'utf-8':
+        return utf8Slice(this, start, end)
+
+      case 'ascii':
+        return asciiSlice(this, start, end)
+
+      case 'latin1':
+      case 'binary':
+        return latin1Slice(this, start, end)
+
+      case 'base64':
+        return base64Slice(this, start, end)
+
+      case 'ucs2':
+      case 'ucs-2':
+      case 'utf16le':
+      case 'utf-16le':
+        return utf16leSlice(this, start, end)
+
+      default:
+        if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding)
+        encoding = (encoding + '').toLowerCase()
+        loweredCase = true
+    }
+  }
+}
+
+// The property is used by `Buffer.isBuffer` and `is-buffer` (in Safari 5-7) to detect
+// Buffer instances.
+Buffer.prototype._isBuffer = true
+
+function swap (b, n, m) {
+  var i = b[n]
+  b[n] = b[m]
+  b[m] = i
+}
+
+Buffer.prototype.swap16 = function swap16 () {
+  var len = this.length
+  if (len % 2 !== 0) {
+    throw new RangeError('Buffer size must be a multiple of 16-bits')
+  }
+  for (var i = 0; i < len; i += 2) {
+    swap(this, i, i + 1)
+  }
+  return this
+}
+
+Buffer.prototype.swap32 = function swap32 () {
+  var len = this.length
+  if (len % 4 !== 0) {
+    throw new RangeError('Buffer size must be a multiple of 32-bits')
+  }
+  for (var i = 0; i < len; i += 4) {
+    swap(this, i, i + 3)
+    swap(this, i + 1, i + 2)
+  }
+  return this
+}
+
+Buffer.prototype.swap64 = function swap64 () {
+  var len = this.length
+  if (len % 8 !== 0) {
+    throw new RangeError('Buffer size must be a multiple of 64-bits')
+  }
+  for (var i = 0; i < len; i += 8) {
+    swap(this, i, i + 7)
+    swap(this, i + 1, i + 6)
+    swap(this, i + 2, i + 5)
+    swap(this, i + 3, i + 4)
+  }
+  return this
+}
+
+Buffer.prototype.toString = function toString () {
+  var length = this.length | 0
+  if (length === 0) return ''
+  if (arguments.length === 0) return utf8Slice(this, 0, length)
+  return slowToString.apply(this, arguments)
+}
+
+Buffer.prototype.equals = function equals (b) {
+  if (!Buffer.isBuffer(b)) throw new TypeError('Argument must be a Buffer')
+  if (this === b) return true
+  return Buffer.compare(this, b) === 0
+}
+
+Buffer.prototype.inspect = function inspect () {
+  var str = ''
+  var max = exports.INSPECT_MAX_BYTES
+  if (this.length > 0) {
+    str = this.toString('hex', 0, max).match(/.{2}/g).join(' ')
+    if (this.length > max) str += ' ... '
+  }
+  return '<Buffer ' + str + '>'
+}
+
+Buffer.prototype.compare = function compare (target, start, end, thisStart, thisEnd) {
+  if (!Buffer.isBuffer(target)) {
+    throw new TypeError('Argument must be a Buffer')
+  }
+
+  if (start === undefined) {
+    start = 0
+  }
+  if (end === undefined) {
+    end = target ? target.length : 0
+  }
+  if (thisStart === undefined) {
+    thisStart = 0
+  }
+  if (thisEnd === undefined) {
+    thisEnd = this.length
+  }
+
+  if (start < 0 || end > target.length || thisStart < 0 || thisEnd > this.length) {
+    throw new RangeError('out of range index')
+  }
+
+  if (thisStart >= thisEnd && start >= end) {
+    return 0
+  }
+  if (thisStart >= thisEnd) {
+    return -1
+  }
+  if (start >= end) {
+    return 1
+  }
+
+  start >>>= 0
+  end >>>= 0
+  thisStart >>>= 0
+  thisEnd >>>= 0
+
+  if (this === target) return 0
+
+  var x = thisEnd - thisStart
+  var y = end - start
+  var len = Math.min(x, y)
+
+  var thisCopy = this.slice(thisStart, thisEnd)
+  var targetCopy = target.slice(start, end)
+
+  for (var i = 0; i < len; ++i) {
+    if (thisCopy[i] !== targetCopy[i]) {
+      x = thisCopy[i]
+      y = targetCopy[i]
+      break
+    }
+  }
+
+  if (x < y) return -1
+  if (y < x) return 1
+  return 0
+}
+
+// Finds either the first index of `val` in `buffer` at offset >= `byteOffset`,
+// OR the last index of `val` in `buffer` at offset <= `byteOffset`.
+//
+// Arguments:
+// - buffer - a Buffer to search
+// - val - a string, Buffer, or number
+// - byteOffset - an index into `buffer`; will be clamped to an int32
+// - encoding - an optional encoding, relevant is val is a string
+// - dir - true for indexOf, false for lastIndexOf
+function bidirectionalIndexOf (buffer, val, byteOffset, encoding, dir) {
+  // Empty buffer means no match
+  if (buffer.length === 0) return -1
+
+  // Normalize byteOffset
+  if (typeof byteOffset === 'string') {
+    encoding = byteOffset
+    byteOffset = 0
+  } else if (byteOffset > 0x7fffffff) {
+    byteOffset = 0x7fffffff
+  } else if (byteOffset < -0x80000000) {
+    byteOffset = -0x80000000
+  }
+  byteOffset = +byteOffset  // Coerce to Number.
+  if (isNaN(byteOffset)) {
+    // byteOffset: it it's undefined, null, NaN, "foo", etc, search whole buffer
+    byteOffset = dir ? 0 : (buffer.length - 1)
+  }
+
+  // Normalize byteOffset: negative offsets start from the end of the buffer
+  if (byteOffset < 0) byteOffset = buffer.length + byteOffset
+  if (byteOffset >= buffer.length) {
+    if (dir) return -1
+    else byteOffset = buffer.length - 1
+  } else if (byteOffset < 0) {
+    if (dir) byteOffset = 0
+    else return -1
+  }
+
+  // Normalize val
+  if (typeof val === 'string') {
+    val = Buffer.from(val, encoding)
+  }
+
+  // Finally, search either indexOf (if dir is true) or lastIndexOf
+  if (Buffer.isBuffer(val)) {
+    // Special case: looking for empty string/buffer always fails
+    if (val.length === 0) {
+      return -1
+    }
+    return arrayIndexOf(buffer, val, byteOffset, encoding, dir)
+  } else if (typeof val === 'number') {
+    val = val & 0xFF // Search for a byte value [0-255]
+    if (Buffer.TYPED_ARRAY_SUPPORT &&
+        typeof Uint8Array.prototype.indexOf === 'function') {
+      if (dir) {
+        return Uint8Array.prototype.indexOf.call(buffer, val, byteOffset)
+      } else {
+        return Uint8Array.prototype.lastIndexOf.call(buffer, val, byteOffset)
+      }
+    }
+    return arrayIndexOf(buffer, [ val ], byteOffset, encoding, dir)
+  }
+
+  throw new TypeError('val must be string, number or Buffer')
+}
+
+function arrayIndexOf (arr, val, byteOffset, encoding, dir) {
+  var indexSize = 1
+  var arrLength = arr.length
+  var valLength = val.length
+
+  if (encoding !== undefined) {
+    encoding = String(encoding).toLowerCase()
+    if (encoding === 'ucs2' || encoding === 'ucs-2' ||
+        encoding === 'utf16le' || encoding === 'utf-16le') {
+      if (arr.length < 2 || val.length < 2) {
+        return -1
+      }
+      indexSize = 2
+      arrLength /= 2
+      valLength /= 2
+      byteOffset /= 2
+    }
+  }
+
+  function read (buf, i) {
+    if (indexSize === 1) {
+      return buf[i]
+    } else {
+      return buf.readUInt16BE(i * indexSize)
+    }
+  }
+
+  var i
+  if (dir) {
+    var foundIndex = -1
+    for (i = byteOffset; i < arrLength; i++) {
+      if (read(arr, i) === read(val, foundIndex === -1 ? 0 : i - foundIndex)) {
+        if (foundIndex === -1) foundIndex = i
+        if (i - foundIndex + 1 === valLength) return foundIndex * indexSize
+      } else {
+        if (foundIndex !== -1) i -= i - foundIndex
+        foundIndex = -1
+      }
+    }
+  } else {
+    if (byteOffset + valLength > arrLength) byteOffset = arrLength - valLength
+    for (i = byteOffset; i >= 0; i--) {
+      var found = true
+      for (var j = 0; j < valLength; j++) {
+        if (read(arr, i + j) !== read(val, j)) {
+          found = false
+          break
+        }
+      }
+      if (found) return i
+    }
+  }
+
+  return -1
+}
+
+Buffer.prototype.includes = function includes (val, byteOffset, encoding) {
+  return this.indexOf(val, byteOffset, encoding) !== -1
+}
+
+Buffer.prototype.indexOf = function indexOf (val, byteOffset, encoding) {
+  return bidirectionalIndexOf(this, val, byteOffset, encoding, true)
+}
+
+Buffer.prototype.lastIndexOf = function lastIndexOf (val, byteOffset, encoding) {
+  return bidirectionalIndexOf(this, val, byteOffset, encoding, false)
+}
+
+function hexWrite (buf, string, offset, length) {
+  offset = Number(offset) || 0
+  var remaining = buf.length - offset
+  if (!length) {
+    length = remaining
+  } else {
+    length = Number(length)
+    if (length > remaining) {
+      length = remaining
+    }
+  }
+
+  // must be an even number of digits
+  var strLen = string.length
+  if (strLen % 2 !== 0) throw new TypeError('Invalid hex string')
+
+  if (length > strLen / 2) {
+    length = strLen / 2
+  }
+  for (var i = 0; i < length; ++i) {
+    var parsed = parseInt(string.substr(i * 2, 2), 16)
+    if (isNaN(parsed)) return i
+    buf[offset + i] = parsed
+  }
+  return i
+}
+
+function utf8Write (buf, string, offset, length) {
+  return blitBuffer(utf8ToBytes(string, buf.length - offset), buf, offset, length)
+}
+
+function asciiWrite (buf, string, offset, length) {
+  return blitBuffer(asciiToBytes(string), buf, offset, length)
+}
+
+function latin1Write (buf, string, offset, length) {
+  return asciiWrite(buf, string, offset, length)
+}
+
+function base64Write (buf, string, offset, length) {
+  return blitBuffer(base64ToBytes(string), buf, offset, length)
+}
+
+function ucs2Write (buf, string, offset, length) {
+  return blitBuffer(utf16leToBytes(string, buf.length - offset), buf, offset, length)
+}
+
+Buffer.prototype.write = function write (string, offset, length, encoding) {
+  // Buffer#write(string)
+  if (offset === undefined) {
+    encoding = 'utf8'
+    length = this.length
+    offset = 0
+  // Buffer#write(string, encoding)
+  } else if (length === undefined && typeof offset === 'string') {
+    encoding = offset
+    length = this.length
+    offset = 0
+  // Buffer#write(string, offset[, length][, encoding])
+  } else if (isFinite(offset)) {
+    offset = offset | 0
+    if (isFinite(length)) {
+      length = length | 0
+      if (encoding === undefined) encoding = 'utf8'
+    } else {
+      encoding = length
+      length = undefined
+    }
+  // legacy write(string, encoding, offset, length) - remove in v0.13
+  } else {
+    throw new Error(
+      'Buffer.write(string, encoding, offset[, length]) is no longer supported'
+    )
+  }
+
+  var remaining = this.length - offset
+  if (length === undefined || length > remaining) length = remaining
+
+  if ((string.length > 0 && (length < 0 || offset < 0)) || offset > this.length) {
+    throw new RangeError('Attempt to write outside buffer bounds')
+  }
+
+  if (!encoding) encoding = 'utf8'
+
+  var loweredCase = false
+  for (;;) {
+    switch (encoding) {
+      case 'hex':
+        return hexWrite(this, string, offset, length)
+
+      case 'utf8':
+      case 'utf-8':
+        return utf8Write(this, string, offset, length)
+
+      case 'ascii':
+        return asciiWrite(this, string, offset, length)
+
+      case 'latin1':
+      case 'binary':
+        return latin1Write(this, string, offset, length)
+
+      case 'base64':
+        // Warning: maxLength not taken into account in base64Write
+        return base64Write(this, string, offset, length)
+
+      case 'ucs2':
+      case 'ucs-2':
+      case 'utf16le':
+      case 'utf-16le':
+        return ucs2Write(this, string, offset, length)
+
+      default:
+        if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding)
+        encoding = ('' + encoding).toLowerCase()
+        loweredCase = true
+    }
+  }
+}
+
+Buffer.prototype.toJSON = function toJSON () {
+  return {
+    type: 'Buffer',
+    data: Array.prototype.slice.call(this._arr || this, 0)
+  }
+}
+
+function base64Slice (buf, start, end) {
+  if (start === 0 && end === buf.length) {
+    return base64.fromByteArray(buf)
+  } else {
+    return base64.fromByteArray(buf.slice(start, end))
+  }
+}
+
+function utf8Slice (buf, start, end) {
+  end = Math.min(buf.length, end)
+  var res = []
+
+  var i = start
+  while (i < end) {
+    var firstByte = buf[i]
+    var codePoint = null
+    var bytesPerSequence = (firstByte > 0xEF) ? 4
+      : (firstByte > 0xDF) ? 3
+      : (firstByte > 0xBF) ? 2
+      : 1
+
+    if (i + bytesPerSequence <= end) {
+      var secondByte, thirdByte, fourthByte, tempCodePoint
+
+      switch (bytesPerSequence) {
+        case 1:
+          if (firstByte < 0x80) {
+            codePoint = firstByte
+          }
+          break
+        case 2:
+          secondByte = buf[i + 1]
+          if ((secondByte & 0xC0) === 0x80) {
+            tempCodePoint = (firstByte & 0x1F) << 0x6 | (secondByte & 0x3F)
+            if (tempCodePoint > 0x7F) {
+              codePoint = tempCodePoint
+            }
+          }
+          break
+        case 3:
+          secondByte = buf[i + 1]
+          thirdByte = buf[i + 2]
+          if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80) {
+            tempCodePoint = (firstByte & 0xF) << 0xC | (secondByte & 0x3F) << 0x6 | (thirdByte & 0x3F)
+            if (tempCodePoint > 0x7FF && (tempCodePoint < 0xD800 || tempCodePoint > 0xDFFF)) {
+              codePoint = tempCodePoint
+            }
+          }
+          break
+        case 4:
+          secondByte = buf[i + 1]
+          thirdByte = buf[i + 2]
+          fourthByte = buf[i + 3]
+          if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80 && (fourthByte & 0xC0) === 0x80) {
+            tempCodePoint = (firstByte & 0xF) << 0x12 | (secondByte & 0x3F) << 0xC | (thirdByte & 0x3F) << 0x6 | (fourthByte & 0x3F)
+            if (tempCodePoint > 0xFFFF && tempCodePoint < 0x110000) {
+              codePoint = tempCodePoint
+            }
+          }
+      }
+    }
+
+    if (codePoint === null) {
+      // we did not generate a valid codePoint so insert a
+      // replacement char (U+FFFD) and advance only 1 byte
+      codePoint = 0xFFFD
+      bytesPerSequence = 1
+    } else if (codePoint > 0xFFFF) {
+      // encode to utf16 (surrogate pair dance)
+      codePoint -= 0x10000
+      res.push(codePoint >>> 10 & 0x3FF | 0xD800)
+      codePoint = 0xDC00 | codePoint & 0x3FF
+    }
+
+    res.push(codePoint)
+    i += bytesPerSequence
+  }
+
+  return decodeCodePointsArray(res)
+}
+
+// Based on http://stackoverflow.com/a/22747272/680742, the browser with
+// the lowest limit is Chrome, with 0x10000 args.
+// We go 1 magnitude less, for safety
+var MAX_ARGUMENTS_LENGTH = 0x1000
+
+function decodeCodePointsArray (codePoints) {
+  var len = codePoints.length
+  if (len <= MAX_ARGUMENTS_LENGTH) {
+    return String.fromCharCode.apply(String, codePoints) // avoid extra slice()
+  }
+
+  // Decode in chunks to avoid "call stack size exceeded".
+  var res = ''
+  var i = 0
+  while (i < len) {
+    res += String.fromCharCode.apply(
+      String,
+      codePoints.slice(i, i += MAX_ARGUMENTS_LENGTH)
+    )
+  }
+  return res
+}
+
+function asciiSlice (buf, start, end) {
+  var ret = ''
+  end = Math.min(buf.length, end)
+
+  for (var i = start; i < end; ++i) {
+    ret += String.fromCharCode(buf[i] & 0x7F)
+  }
+  return ret
+}
+
+function latin1Slice (buf, start, end) {
+  var ret = ''
+  end = Math.min(buf.length, end)
+
+  for (var i = start; i < end; ++i) {
+    ret += String.fromCharCode(buf[i])
+  }
+  return ret
+}
+
+function hexSlice (buf, start, end) {
+  var len = buf.length
+
+  if (!start || start < 0) start = 0
+  if (!end || end < 0 || end > len) end = len
+
+  var out = ''
+  for (var i = start; i < end; ++i) {
+    out += toHex(buf[i])
+  }
+  return out
+}
+
+function utf16leSlice (buf, start, end) {
+  var bytes = buf.slice(start, end)
+  var res = ''
+  for (var i = 0; i < bytes.length; i += 2) {
+    res += String.fromCharCode(bytes[i] + bytes[i + 1] * 256)
+  }
+  return res
+}
+
+Buffer.prototype.slice = function slice (start, end) {
+  var len = this.length
+  start = ~~start
+  end = end === undefined ? len : ~~end
+
+  if (start < 0) {
+    start += len
+    if (start < 0) start = 0
+  } else if (start > len) {
+    start = len
+  }
+
+  if (end < 0) {
+    end += len
+    if (end < 0) end = 0
+  } else if (end > len) {
+    end = len
+  }
+
+  if (end < start) end = start
+
+  var newBuf
+  if (Buffer.TYPED_ARRAY_SUPPORT) {
+    newBuf = this.subarray(start, end)
+    newBuf.__proto__ = Buffer.prototype
+  } else {
+    var sliceLen = end - start
+    newBuf = new Buffer(sliceLen, undefined)
+    for (var i = 0; i < sliceLen; ++i) {
+      newBuf[i] = this[i + start]
+    }
+  }
+
+  return newBuf
+}
+
+/*
+ * Need to make sure that buffer isn't trying to write out of bounds.
+ */
+function checkOffset (offset, ext, length) {
+  if ((offset % 1) !== 0 || offset < 0) throw new RangeError('offset is not uint')
+  if (offset + ext > length) throw new RangeError('Trying to access beyond buffer length')
+}
+
+Buffer.prototype.readUIntLE = function readUIntLE (offset, byteLength, noAssert) {
+  offset = offset | 0
+  byteLength = byteLength | 0
+  if (!noAssert) checkOffset(offset, byteLength, this.length)
+
+  var val = this[offset]
+  var mul = 1
+  var i = 0
+  while (++i < byteLength && (mul *= 0x100)) {
+    val += this[offset + i] * mul
+  }
+
+  return val
+}
+
+Buffer.prototype.readUIntBE = function readUIntBE (offset, byteLength, noAssert) {
+  offset = offset | 0
+  byteLength = byteLength | 0
+  if (!noAssert) {
+    checkOffset(offset, byteLength, this.length)
+  }
+
+  var val = this[offset + --byteLength]
+  var mul = 1
+  while (byteLength > 0 && (mul *= 0x100)) {
+    val += this[offset + --byteLength] * mul
+  }
+
+  return val
+}
+
+Buffer.prototype.readUInt8 = function readUInt8 (offset, noAssert) {
+  if (!noAssert) checkOffset(offset, 1, this.length)
+  return this[offset]
+}
+
+Buffer.prototype.readUInt16LE = function readUInt16LE (offset, noAssert) {
+  if (!noAssert) checkOffset(offset, 2, this.length)
+  return this[offset] | (this[offset + 1] << 8)
+}
+
+Buffer.prototype.readUInt16BE = function readUInt16BE (offset, noAssert) {
+  if (!noAssert) checkOffset(offset, 2, this.length)
+  return (this[offset] << 8) | this[offset + 1]
+}
+
+Buffer.prototype.readUInt32LE = function readUInt32LE (offset, noAssert) {
+  if (!noAssert) checkOffset(offset, 4, this.length)
+
+  return ((this[offset]) |
+      (this[offset + 1] << 8) |
+      (this[offset + 2] << 16)) +
+      (this[offset + 3] * 0x1000000)
+}
+
+Buffer.prototype.readUInt32BE = function readUInt32BE (offset, noAssert) {
+  if (!noAssert) checkOffset(offset, 4, this.length)
+
+  return (this[offset] * 0x1000000) +
+    ((this[offset + 1] << 16) |
+    (this[offset + 2] << 8) |
+    this[offset + 3])
+}
+
+Buffer.prototype.readIntLE = function readIntLE (offset, byteLength, noAssert) {
+  offset = offset | 0
+  byteLength = byteLength | 0
+  if (!noAssert) checkOffset(offset, byteLength, this.length)
+
+  var val = this[offset]
+  var mul = 1
+  var i = 0
+  while (++i < byteLength && (mul *= 0x100)) {
+    val += this[offset + i] * mul
+  }
+  mul *= 0x80
+
+  if (val >= mul) val -= Math.pow(2, 8 * byteLength)
+
+  return val
+}
+
+Buffer.prototype.readIntBE = function readIntBE (offset, byteLength, noAssert) {
+  offset = offset | 0
+  byteLength = byteLength | 0
+  if (!noAssert) checkOffset(offset, byteLength, this.length)
+
+  var i = byteLength
+  var mul = 1
+  var val = this[offset + --i]
+  while (i > 0 && (mul *= 0x100)) {
+    val += this[offset + --i] * mul
+  }
+  mul *= 0x80
+
+  if (val >= mul) val -= Math.pow(2, 8 * byteLength)
+
+  return val
+}
+
+Buffer.prototype.readInt8 = function readInt8 (offset, noAssert) {
+  if (!noAssert) checkOffset(offset, 1, this.length)
+  if (!(this[offset] & 0x80)) return (this[offset])
+  return ((0xff - this[offset] + 1) * -1)
+}
+
+Buffer.prototype.readInt16LE = function readInt16LE (offset, noAssert) {
+  if (!noAssert) checkOffset(offset, 2, this.length)
+  var val = this[offset] | (this[offset + 1] << 8)
+  return (val & 0x8000) ? val | 0xFFFF0000 : val
+}
+
+Buffer.prototype.readInt16BE = function readInt16BE (offset, noAssert) {
+  if (!noAssert) checkOffset(offset, 2, this.length)
+  var val = this[offset + 1] | (this[offset] << 8)
+  return (val & 0x8000) ? val | 0xFFFF0000 : val
+}
+
+Buffer.prototype.readInt32LE = function readInt32LE (offset, noAssert) {
+  if (!noAssert) checkOffset(offset, 4, this.length)
+
+  return (this[offset]) |
+    (this[offset + 1] << 8) |
+    (this[offset + 2] << 16) |
+    (this[offset + 3] << 24)
+}
+
+Buffer.prototype.readInt32BE = function readInt32BE (offset, noAssert) {
+  if (!noAssert) checkOffset(offset, 4, this.length)
+
+  return (this[offset] << 24) |
+    (this[offset + 1] << 16) |
+    (this[offset + 2] << 8) |
+    (this[offset + 3])
+}
+
+Buffer.prototype.readFloatLE = function readFloatLE (offset, noAssert) {
+  if (!noAssert) checkOffset(offset, 4, this.length)
+  return ieee754.read(this, offset, true, 23, 4)
+}
+
+Buffer.prototype.readFloatBE = function readFloatBE (offset, noAssert) {
+  if (!noAssert) checkOffset(offset, 4, this.length)
+  return ieee754.read(this, offset, false, 23, 4)
+}
+
+Buffer.prototype.readDoubleLE = function readDoubleLE (offset, noAssert) {
+  if (!noAssert) checkOffset(offset, 8, this.length)
+  return ieee754.read(this, offset, true, 52, 8)
+}
+
+Buffer.prototype.readDoubleBE = function readDoubleBE (offset, noAssert) {
+  if (!noAssert) checkOffset(offset, 8, this.length)
+  return ieee754.read(this, offset, false, 52, 8)
+}
+
+function checkInt (buf, value, offset, ext, max, min) {
+  if (!Buffer.isBuffer(buf)) throw new TypeError('"buffer" argument must be a Buffer instance')
+  if (value > max || value < min) throw new RangeError('"value" argument is out of bounds')
+  if (offset + ext > buf.length) throw new RangeError('Index out of range')
+}
+
+Buffer.prototype.writeUIntLE = function writeUIntLE (value, offset, byteLength, noAssert) {
+  value = +value
+  offset = offset | 0
+  byteLength = byteLength | 0
+  if (!noAssert) {
+    var maxBytes = Math.pow(2, 8 * byteLength) - 1
+    checkInt(this, value, offset, byteLength, maxBytes, 0)
+  }
+
+  var mul = 1
+  var i = 0
+  this[offset] = value & 0xFF
+  while (++i < byteLength && (mul *= 0x100)) {
+    this[offset + i] = (value / mul) & 0xFF
+  }
+
+  return offset + byteLength
+}
+
+Buffer.prototype.writeUIntBE = function writeUIntBE (value, offset, byteLength, noAssert) {
+  value = +value
+  offset = offset | 0
+  byteLength = byteLength | 0
+  if (!noAssert) {
+    var maxBytes = Math.pow(2, 8 * byteLength) - 1
+    checkInt(this, value, offset, byteLength, maxBytes, 0)
+  }
+
+  var i = byteLength - 1
+  var mul = 1
+  this[offset + i] = value & 0xFF
+  while (--i >= 0 && (mul *= 0x100)) {
+    this[offset + i] = (value / mul) & 0xFF
+  }
+
+  return offset + byteLength
+}
+
+Buffer.prototype.writeUInt8 = function writeUInt8 (value, offset, noAssert) {
+  value = +value
+  offset = offset | 0
+  if (!noAssert) checkInt(this, value, offset, 1, 0xff, 0)
+  if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value)
+  this[offset] = (value & 0xff)
+  return offset + 1
+}
+
+function objectWriteUInt16 (buf, value, offset, littleEndian) {
+  if (value < 0) value = 0xffff + value + 1
+  for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; ++i) {
+    buf[offset + i] = (value & (0xff << (8 * (littleEndian ? i : 1 - i)))) >>>
+      (littleEndian ? i : 1 - i) * 8
+  }
+}
+
+Buffer.prototype.writeUInt16LE = function writeUInt16LE (value, offset, noAssert) {
+  value = +value
+  offset = offset | 0
+  if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0)
+  if (Buffer.TYPED_ARRAY_SUPPORT) {
+    this[offset] = (value & 0xff)
+    this[offset + 1] = (value >>> 8)
+  } else {
+    objectWriteUInt16(this, value, offset, true)
+  }
+  return offset + 2
+}
+
+Buffer.prototype.writeUInt16BE = function writeUInt16BE (value, offset, noAssert) {
+  value = +value
+  offset = offset | 0
+  if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0)
+  if (Buffer.TYPED_ARRAY_SUPPORT) {
+    this[offset] = (value >>> 8)
+    this[offset + 1] = (value & 0xff)
+  } else {
+    objectWriteUInt16(this, value, offset, false)
+  }
+  return offset + 2
+}
+
+function objectWriteUInt32 (buf, value, offset, littleEndian) {
+  if (value < 0) value = 0xffffffff + value + 1
+  for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; ++i) {
+    buf[offset + i] = (value >>> (littleEndian ? i : 3 - i) * 8) & 0xff
+  }
+}
+
+Buffer.prototype.writeUInt32LE = function writeUInt32LE (value, offset, noAssert) {
+  value = +value
+  offset = offset | 0
+  if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0)
+  if (Buffer.TYPED_ARRAY_SUPPORT) {
+    this[offset + 3] = (value >>> 24)
+    this[offset + 2] = (value >>> 16)
+    this[offset + 1] = (value >>> 8)
+    this[offset] = (value & 0xff)
+  } else {
+    objectWriteUInt32(this, value, offset, true)
+  }
+  return offset + 4
+}
+
+Buffer.prototype.writeUInt32BE = function writeUInt32BE (value, offset, noAssert) {
+  value = +value
+  offset = offset | 0
+  if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0)
+  if (Buffer.TYPED_ARRAY_SUPPORT) {
+    this[offset] = (value >>> 24)
+    this[offset + 1] = (value >>> 16)
+    this[offset + 2] = (value >>> 8)
+    this[offset + 3] = (value & 0xff)
+  } else {
+    objectWriteUInt32(this, value, offset, false)
+  }
+  return offset + 4
+}
+
+Buffer.prototype.writeIntLE = function writeIntLE (value, offset, byteLength, noAssert) {
+  value = +value
+  offset = offset | 0
+  if (!noAssert) {
+    var limit = Math.pow(2, 8 * byteLength - 1)
+
+    checkInt(this, value, offset, byteLength, limit - 1, -limit)
+  }
+
+  var i = 0
+  var mul = 1
+  var sub = 0
+  this[offset] = value & 0xFF
+  while (++i < byteLength && (mul *= 0x100)) {
+    if (value < 0 && sub === 0 && this[offset + i - 1] !== 0) {
+      sub = 1
+    }
+    this[offset + i] = ((value / mul) >> 0) - sub & 0xFF
+  }
+
+  return offset + byteLength
+}
+
+Buffer.prototype.writeIntBE = function writeIntBE (value, offset, byteLength, noAssert) {
+  value = +value
+  offset = offset | 0
+  if (!noAssert) {
+    var limit = Math.pow(2, 8 * byteLength - 1)
+
+    checkInt(this, value, offset, byteLength, limit - 1, -limit)
+  }
+
+  var i = byteLength - 1
+  var mul = 1
+  var sub = 0
+  this[offset + i] = value & 0xFF
+  while (--i >= 0 && (mul *= 0x100)) {
+    if (value < 0 && sub === 0 && this[offset + i + 1] !== 0) {
+      sub = 1
+    }
+    this[offset + i] = ((value / mul) >> 0) - sub & 0xFF
+  }
+
+  return offset + byteLength
+}
+
+Buffer.prototype.writeInt8 = function writeInt8 (value, offset, noAssert) {
+  value = +value
+  offset = offset | 0
+  if (!noAssert) checkInt(this, value, offset, 1, 0x7f, -0x80)
+  if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value)
+  if (value < 0) value = 0xff + value + 1
+  this[offset] = (value & 0xff)
+  return offset + 1
+}
+
+Buffer.prototype.writeInt16LE = function writeInt16LE (value, offset, noAssert) {
+  value = +value
+  offset = offset | 0
+  if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000)
+  if (Buffer.TYPED_ARRAY_SUPPORT) {
+    this[offset] = (value & 0xff)
+    this[offset + 1] = (value >>> 8)
+  } else {
+    objectWriteUInt16(this, value, offset, true)
+  }
+  return offset + 2
+}
+
+Buffer.prototype.writeInt16BE = function writeInt16BE (value, offset, noAssert) {
+  value = +value
+  offset = offset | 0
+  if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000)
+  if (Buffer.TYPED_ARRAY_SUPPORT) {
+    this[offset] = (value >>> 8)
+    this[offset + 1] = (value & 0xff)
+  } else {
+    objectWriteUInt16(this, value, offset, false)
+  }
+  return offset + 2
+}
+
+Buffer.prototype.writeInt32LE = function writeInt32LE (value, offset, noAssert) {
+  value = +value
+  offset = offset | 0
+  if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000)
+  if (Buffer.TYPED_ARRAY_SUPPORT) {
+    this[offset] = (value & 0xff)
+    this[offset + 1] = (value >>> 8)
+    this[offset + 2] = (value >>> 16)
+    this[offset + 3] = (value >>> 24)
+  } else {
+    objectWriteUInt32(this, value, offset, true)
+  }
+  return offset + 4
+}
+
+Buffer.prototype.writeInt32BE = function writeInt32BE (value, offset, noAssert) {
+  value = +value
+  offset = offset | 0
+  if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000)
+  if (value < 0) value = 0xffffffff + value + 1
+  if (Buffer.TYPED_ARRAY_SUPPORT) {
+    this[offset] = (value >>> 24)
+    this[offset + 1] = (value >>> 16)
+    this[offset + 2] = (value >>> 8)
+    this[offset + 3] = (value & 0xff)
+  } else {
+    objectWriteUInt32(this, value, offset, false)
+  }
+  return offset + 4
+}
+
+function checkIEEE754 (buf, value, offset, ext, max, min) {
+  if (offset + ext > buf.length) throw new RangeError('Index out of range')
+  if (offset < 0) throw new RangeError('Index out of range')
+}
+
+function writeFloat (buf, value, offset, littleEndian, noAssert) {
+  if (!noAssert) {
+    checkIEEE754(buf, value, offset, 4, 3.4028234663852886e+38, -3.4028234663852886e+38)
+  }
+  ieee754.write(buf, value, offset, littleEndian, 23, 4)
+  return offset + 4
+}
+
+Buffer.prototype.writeFloatLE = function writeFloatLE (value, offset, noAssert) {
+  return writeFloat(this, value, offset, true, noAssert)
+}
+
+Buffer.prototype.writeFloatBE = function writeFloatBE (value, offset, noAssert) {
+  return writeFloat(this, value, offset, false, noAssert)
+}
+
+function writeDouble (buf, value, offset, littleEndian, noAssert) {
+  if (!noAssert) {
+    checkIEEE754(buf, value, offset, 8, 1.7976931348623157E+308, -1.7976931348623157E+308)
+  }
+  ieee754.write(buf, value, offset, littleEndian, 52, 8)
+  return offset + 8
+}
+
+Buffer.prototype.writeDoubleLE = function writeDoubleLE (value, offset, noAssert) {
+  return writeDouble(this, value, offset, true, noAssert)
+}
+
+Buffer.prototype.writeDoubleBE = function writeDoubleBE (value, offset, noAssert) {
+  return writeDouble(this, value, offset, false, noAssert)
+}
+
+// copy(targetBuffer, targetStart=0, sourceStart=0, sourceEnd=buffer.length)
+Buffer.prototype.copy = function copy (target, targetStart, start, end) {
+  if (!start) start = 0
+  if (!end && end !== 0) end = this.length
+  if (targetStart >= target.length) targetStart = target.length
+  if (!targetStart) targetStart = 0
+  if (end > 0 && end < start) end = start
+
+  // Copy 0 bytes; we're done
+  if (end === start) return 0
+  if (target.length === 0 || this.length === 0) return 0
+
+  // Fatal error conditions
+  if (targetStart < 0) {
+    throw new RangeError('targetStart out of bounds')
+  }
+  if (start < 0 || start >= this.length) throw new RangeError('sourceStart out of bounds')
+  if (end < 0) throw new RangeError('sourceEnd out of bounds')
+
+  // Are we oob?
+  if (end > this.length) end = this.length
+  if (target.length - targetStart < end - start) {
+    end = target.length - targetStart + start
+  }
+
+  var len = end - start
+  var i
+
+  if (this === target && start < targetStart && targetStart < end) {
+    // descending copy from end
+    for (i = len - 1; i >= 0; --i) {
+      target[i + targetStart] = this[i + start]
+    }
+  } else if (len < 1000 || !Buffer.TYPED_ARRAY_SUPPORT) {
+    // ascending copy from start
+    for (i = 0; i < len; ++i) {
+      target[i + targetStart] = this[i + start]
+    }
+  } else {
+    Uint8Array.prototype.set.call(
+      target,
+      this.subarray(start, start + len),
+      targetStart
+    )
+  }
+
+  return len
+}
+
+// Usage:
+//    buffer.fill(number[, offset[, end]])
+//    buffer.fill(buffer[, offset[, end]])
+//    buffer.fill(string[, offset[, end]][, encoding])
+Buffer.prototype.fill = function fill (val, start, end, encoding) {
+  // Handle string cases:
+  if (typeof val === 'string') {
+    if (typeof start === 'string') {
+      encoding = start
+      start = 0
+      end = this.length
+    } else if (typeof end === 'string') {
+      encoding = end
+      end = this.length
+    }
+    if (val.length === 1) {
+      var code = val.charCodeAt(0)
+      if (code < 256) {
+        val = code
+      }
+    }
+    if (encoding !== undefined && typeof encoding !== 'string') {
+      throw new TypeError('encoding must be a string')
+    }
+    if (typeof encoding === 'string' && !Buffer.isEncoding(encoding)) {
+      throw new TypeError('Unknown encoding: ' + encoding)
+    }
+  } else if (typeof val === 'number') {
+    val = val & 255
+  }
+
+  // Invalid ranges are not set to a default, so can range check early.
+  if (start < 0 || this.length < start || this.length < end) {
+    throw new RangeError('Out of range index')
+  }
+
+  if (end <= start) {
+    return this
+  }
+
+  start = start >>> 0
+  end = end === undefined ? this.length : end >>> 0
+
+  if (!val) val = 0
+
+  var i
+  if (typeof val === 'number') {
+    for (i = start; i < end; ++i) {
+      this[i] = val
+    }
+  } else {
+    var bytes = Buffer.isBuffer(val)
+      ? val
+      : utf8ToBytes(new Buffer(val, encoding).toString())
+    var len = bytes.length
+    for (i = 0; i < end - start; ++i) {
+      this[i + start] = bytes[i % len]
+    }
+  }
+
+  return this
+}
+
+// HELPER FUNCTIONS
+// ================
+
+var INVALID_BASE64_RE = /[^+\/0-9A-Za-z-_]/g
+
+function base64clean (str) {
+  // Node strips out invalid characters like \n and \t from the string, base64-js does not
+  str = stringtrim(str).replace(INVALID_BASE64_RE, '')
+  // Node converts strings with length < 2 to ''
+  if (str.length < 2) return ''
+  // Node allows for non-padded base64 strings (missing trailing ===), base64-js does not
+  while (str.length % 4 !== 0) {
+    str = str + '='
+  }
+  return str
+}
+
+function stringtrim (str) {
+  if (str.trim) return str.trim()
+  return str.replace(/^\s+|\s+$/g, '')
+}
+
+function toHex (n) {
+  if (n < 16) return '0' + n.toString(16)
+  return n.toString(16)
+}
+
+function utf8ToBytes (string, units) {
+  units = units || Infinity
+  var codePoint
+  var length = string.length
+  var leadSurrogate = null
+  var bytes = []
+
+  for (var i = 0; i < length; ++i) {
+    codePoint = string.charCodeAt(i)
+
+    // is surrogate component
+    if (codePoint > 0xD7FF && codePoint < 0xE000) {
+      // last char was a lead
+      if (!leadSurrogate) {
+        // no lead yet
+        if (codePoint > 0xDBFF) {
+          // unexpected trail
+          if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)
+          continue
+        } else if (i + 1 === length) {
+          // unpaired lead
+          if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)
+          continue
+        }
+
+        // valid lead
+        leadSurrogate = codePoint
+
+        continue
+      }
+
+      // 2 leads in a row
+      if (codePoint < 0xDC00) {
+        if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)
+        leadSurrogate = codePoint
+        continue
+      }
+
+      // valid surrogate pair
+      codePoint = (leadSurrogate - 0xD800 << 10 | codePoint - 0xDC00) + 0x10000
+    } else if (leadSurrogate) {
+      // valid bmp char, but last char was a lead
+      if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)
+    }
+
+    leadSurrogate = null
+
+    // encode utf8
+    if (codePoint < 0x80) {
+      if ((units -= 1) < 0) break
+      bytes.push(codePoint)
+    } else if (codePoint < 0x800) {
+      if ((units -= 2) < 0) break
+      bytes.push(
+        codePoint >> 0x6 | 0xC0,
+        codePoint & 0x3F | 0x80
+      )
+    } else if (codePoint < 0x10000) {
+      if ((units -= 3) < 0) break
+      bytes.push(
+        codePoint >> 0xC | 0xE0,
+        codePoint >> 0x6 & 0x3F | 0x80,
+        codePoint & 0x3F | 0x80
+      )
+    } else if (codePoint < 0x110000) {
+      if ((units -= 4) < 0) break
+      bytes.push(
+        codePoint >> 0x12 | 0xF0,
+        codePoint >> 0xC & 0x3F | 0x80,
+        codePoint >> 0x6 & 0x3F | 0x80,
+        codePoint & 0x3F | 0x80
+      )
+    } else {
+      throw new Error('Invalid code point')
+    }
+  }
+
+  return bytes
+}
+
+function asciiToBytes (str) {
+  var byteArray = []
+  for (var i = 0; i < str.length; ++i) {
+    // Node's code seems to be doing this and not & 0x7F..
+    byteArray.push(str.charCodeAt(i) & 0xFF)
+  }
+  return byteArray
+}
+
+function utf16leToBytes (str, units) {
+  var c, hi, lo
+  var byteArray = []
+  for (var i = 0; i < str.length; ++i) {
+    if ((units -= 2) < 0) break
+
+    c = str.charCodeAt(i)
+    hi = c >> 8
+    lo = c % 256
+    byteArray.push(lo)
+    byteArray.push(hi)
+  }
+
+  return byteArray
+}
+
+function base64ToBytes (str) {
+  return base64.toByteArray(base64clean(str))
+}
+
+function blitBuffer (src, dst, offset, length) {
+  for (var i = 0; i < length; ++i) {
+    if ((i + offset >= dst.length) || (i >= src.length)) break
+    dst[i + offset] = src[i]
+  }
+  return i
+}
+
+function isnan (val) {
+  return val !== val // eslint-disable-line no-self-compare
+}
+
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../webpack/buildin/global.js */ "./node_modules/webpack/buildin/global.js")))
+
+/***/ }),
+
+/***/ "./node_modules/fast-xml-parser/src/fxp.js":
+/*!*************************************************!*\
+  !*** ./node_modules/fast-xml-parser/src/fxp.js ***!
+  \*************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const validator = __webpack_require__(/*! ./validator */ "./node_modules/fast-xml-parser/src/validator.js");
+const XMLParser = __webpack_require__(/*! ./xmlparser/XMLParser */ "./node_modules/fast-xml-parser/src/xmlparser/XMLParser.js");
+const XMLBuilder = __webpack_require__(/*! ./xmlbuilder/json2xml */ "./node_modules/fast-xml-parser/src/xmlbuilder/json2xml.js");
+
+module.exports = {
+  XMLParser: XMLParser,
+  XMLValidator: validator,
+  XMLBuilder: XMLBuilder
+}
+
+/***/ }),
+
+/***/ "./node_modules/fast-xml-parser/src/ignoreAttributes.js":
+/*!**************************************************************!*\
+  !*** ./node_modules/fast-xml-parser/src/ignoreAttributes.js ***!
+  \**************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+function getIgnoreAttributesFn(ignoreAttributes) {
+    if (typeof ignoreAttributes === 'function') {
+        return ignoreAttributes
+    }
+    if (Array.isArray(ignoreAttributes)) {
+        return (attrName) => {
+            for (const pattern of ignoreAttributes) {
+                if (typeof pattern === 'string' && attrName === pattern) {
+                    return true
+                }
+                if (pattern instanceof RegExp && pattern.test(attrName)) {
+                    return true
+                }
+            }
+        }
+    }
+    return () => false
+}
+
+module.exports = getIgnoreAttributesFn
+
+/***/ }),
+
+/***/ "./node_modules/fast-xml-parser/src/util.js":
+/*!**************************************************!*\
+  !*** ./node_modules/fast-xml-parser/src/util.js ***!
+  \**************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const nameStartChar = ':A-Za-z_\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD';
+const nameChar = nameStartChar + '\\-.\\d\\u00B7\\u0300-\\u036F\\u203F-\\u2040';
+const nameRegexp = '[' + nameStartChar + '][' + nameChar + ']*'
+const regexName = new RegExp('^' + nameRegexp + '$');
+
+const getAllMatches = function(string, regex) {
+  const matches = [];
+  let match = regex.exec(string);
+  while (match) {
+    const allmatches = [];
+    allmatches.startIndex = regex.lastIndex - match[0].length;
+    const len = match.length;
+    for (let index = 0; index < len; index++) {
+      allmatches.push(match[index]);
+    }
+    matches.push(allmatches);
+    match = regex.exec(string);
+  }
+  return matches;
+};
+
+const isName = function(string) {
+  const match = regexName.exec(string);
+  return !(match === null || typeof match === 'undefined');
+};
+
+exports.isExist = function(v) {
+  return typeof v !== 'undefined';
+};
+
+exports.isEmptyObject = function(obj) {
+  return Object.keys(obj).length === 0;
+};
+
+/**
+ * Copy all the properties of a into b.
+ * @param {*} target
+ * @param {*} a
+ */
+exports.merge = function(target, a, arrayMode) {
+  if (a) {
+    const keys = Object.keys(a); // will return an array of own properties
+    const len = keys.length; //don't make it inline
+    for (let i = 0; i < len; i++) {
+      if (arrayMode === 'strict') {
+        target[keys[i]] = [ a[keys[i]] ];
+      } else {
+        target[keys[i]] = a[keys[i]];
+      }
+    }
+  }
+};
+/* exports.merge =function (b,a){
+  return Object.assign(b,a);
+} */
+
+exports.getValue = function(v) {
+  if (exports.isExist(v)) {
+    return v;
+  } else {
+    return '';
+  }
+};
+
+// const fakeCall = function(a) {return a;};
+// const fakeCallNoReturn = function() {};
+
+exports.isName = isName;
+exports.getAllMatches = getAllMatches;
+exports.nameRegexp = nameRegexp;
+
+
+/***/ }),
+
+/***/ "./node_modules/fast-xml-parser/src/validator.js":
+/*!*******************************************************!*\
+  !*** ./node_modules/fast-xml-parser/src/validator.js ***!
+  \*******************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const util = __webpack_require__(/*! ./util */ "./node_modules/fast-xml-parser/src/util.js");
+
+const defaultOptions = {
+  allowBooleanAttributes: false, //A tag can have attributes without any value
+  unpairedTags: []
+};
+
+//const tagsPattern = new RegExp("<\\/?([\\w:\\-_\.]+)\\s*\/?>","g");
+exports.validate = function (xmlData, options) {
+  options = Object.assign({}, defaultOptions, options);
+
+  //xmlData = xmlData.replace(/(\r\n|\n|\r)/gm,"");//make it single line
+  //xmlData = xmlData.replace(/(^\s*<\?xml.*?\?>)/g,"");//Remove XML starting tag
+  //xmlData = xmlData.replace(/(<!DOCTYPE[\s\w\"\.\/\-\:]+(\[.*\])*\s*>)/g,"");//Remove DOCTYPE
+  const tags = [];
+  let tagFound = false;
+
+  //indicates that the root tag has been closed (aka. depth 0 has been reached)
+  let reachedRoot = false;
+
+  if (xmlData[0] === '\ufeff') {
+    // check for byte order mark (BOM)
+    xmlData = xmlData.substr(1);
+  }
+  
+  for (let i = 0; i < xmlData.length; i++) {
+
+    if (xmlData[i] === '<' && xmlData[i+1] === '?') {
+      i+=2;
+      i = readPI(xmlData,i);
+      if (i.err) return i;
+    }else if (xmlData[i] === '<') {
+      //starting of tag
+      //read until you reach to '>' avoiding any '>' in attribute value
+      let tagStartPos = i;
+      i++;
+      
+      if (xmlData[i] === '!') {
+        i = readCommentAndCDATA(xmlData, i);
+        continue;
+      } else {
+        let closingTag = false;
+        if (xmlData[i] === '/') {
+          //closing tag
+          closingTag = true;
+          i++;
+        }
+        //read tagname
+        let tagName = '';
+        for (; i < xmlData.length &&
+          xmlData[i] !== '>' &&
+          xmlData[i] !== ' ' &&
+          xmlData[i] !== '\t' &&
+          xmlData[i] !== '\n' &&
+          xmlData[i] !== '\r'; i++
+        ) {
+          tagName += xmlData[i];
+        }
+        tagName = tagName.trim();
+        //console.log(tagName);
+
+        if (tagName[tagName.length - 1] === '/') {
+          //self closing tag without attributes
+          tagName = tagName.substring(0, tagName.length - 1);
+          //continue;
+          i--;
+        }
+        if (!validateTagName(tagName)) {
+          let msg;
+          if (tagName.trim().length === 0) {
+            msg = "Invalid space after '<'.";
+          } else {
+            msg = "Tag '"+tagName+"' is an invalid name.";
+          }
+          return getErrorObject('InvalidTag', msg, getLineNumberForPosition(xmlData, i));
+        }
+
+        const result = readAttributeStr(xmlData, i);
+        if (result === false) {
+          return getErrorObject('InvalidAttr', "Attributes for '"+tagName+"' have open quote.", getLineNumberForPosition(xmlData, i));
+        }
+        let attrStr = result.value;
+        i = result.index;
+
+        if (attrStr[attrStr.length - 1] === '/') {
+          //self closing tag
+          const attrStrStart = i - attrStr.length;
+          attrStr = attrStr.substring(0, attrStr.length - 1);
+          const isValid = validateAttributeString(attrStr, options);
+          if (isValid === true) {
+            tagFound = true;
+            //continue; //text may presents after self closing tag
+          } else {
+            //the result from the nested function returns the position of the error within the attribute
+            //in order to get the 'true' error line, we need to calculate the position where the attribute begins (i - attrStr.length) and then add the position within the attribute
+            //this gives us the absolute index in the entire xml, which we can use to find the line at last
+            return getErrorObject(isValid.err.code, isValid.err.msg, getLineNumberForPosition(xmlData, attrStrStart + isValid.err.line));
+          }
+        } else if (closingTag) {
+          if (!result.tagClosed) {
+            return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' doesn't have proper closing.", getLineNumberForPosition(xmlData, i));
+          } else if (attrStr.trim().length > 0) {
+            return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' can't have attributes or invalid starting.", getLineNumberForPosition(xmlData, tagStartPos));
+          } else if (tags.length === 0) {
+            return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' has not been opened.", getLineNumberForPosition(xmlData, tagStartPos));
+          } else {
+            const otg = tags.pop();
+            if (tagName !== otg.tagName) {
+              let openPos = getLineNumberForPosition(xmlData, otg.tagStartPos);
+              return getErrorObject('InvalidTag',
+                "Expected closing tag '"+otg.tagName+"' (opened in line "+openPos.line+", col "+openPos.col+") instead of closing tag '"+tagName+"'.",
+                getLineNumberForPosition(xmlData, tagStartPos));
+            }
+
+            //when there are no more tags, we reached the root level.
+            if (tags.length == 0) {
+              reachedRoot = true;
+            }
+          }
+        } else {
+          const isValid = validateAttributeString(attrStr, options);
+          if (isValid !== true) {
+            //the result from the nested function returns the position of the error within the attribute
+            //in order to get the 'true' error line, we need to calculate the position where the attribute begins (i - attrStr.length) and then add the position within the attribute
+            //this gives us the absolute index in the entire xml, which we can use to find the line at last
+            return getErrorObject(isValid.err.code, isValid.err.msg, getLineNumberForPosition(xmlData, i - attrStr.length + isValid.err.line));
+          }
+
+          //if the root level has been reached before ...
+          if (reachedRoot === true) {
+            return getErrorObject('InvalidXml', 'Multiple possible root nodes found.', getLineNumberForPosition(xmlData, i));
+          } else if(options.unpairedTags.indexOf(tagName) !== -1){
+            //don't push into stack
+          } else {
+            tags.push({tagName, tagStartPos});
+          }
+          tagFound = true;
+        }
+
+        //skip tag text value
+        //It may include comments and CDATA value
+        for (i++; i < xmlData.length; i++) {
+          if (xmlData[i] === '<') {
+            if (xmlData[i + 1] === '!') {
+              //comment or CADATA
+              i++;
+              i = readCommentAndCDATA(xmlData, i);
+              continue;
+            } else if (xmlData[i+1] === '?') {
+              i = readPI(xmlData, ++i);
+              if (i.err) return i;
+            } else{
+              break;
+            }
+          } else if (xmlData[i] === '&') {
+            const afterAmp = validateAmpersand(xmlData, i);
+            if (afterAmp == -1)
+              return getErrorObject('InvalidChar', "char '&' is not expected.", getLineNumberForPosition(xmlData, i));
+            i = afterAmp;
+          }else{
+            if (reachedRoot === true && !isWhiteSpace(xmlData[i])) {
+              return getErrorObject('InvalidXml', "Extra text at the end", getLineNumberForPosition(xmlData, i));
+            }
+          }
+        } //end of reading tag text value
+        if (xmlData[i] === '<') {
+          i--;
+        }
+      }
+    } else {
+      if ( isWhiteSpace(xmlData[i])) {
+        continue;
+      }
+      return getErrorObject('InvalidChar', "char '"+xmlData[i]+"' is not expected.", getLineNumberForPosition(xmlData, i));
+    }
+  }
+
+  if (!tagFound) {
+    return getErrorObject('InvalidXml', 'Start tag expected.', 1);
+  }else if (tags.length == 1) {
+      return getErrorObject('InvalidTag', "Unclosed tag '"+tags[0].tagName+"'.", getLineNumberForPosition(xmlData, tags[0].tagStartPos));
+  }else if (tags.length > 0) {
+      return getErrorObject('InvalidXml', "Invalid '"+
+          JSON.stringify(tags.map(t => t.tagName), null, 4).replace(/\r?\n/g, '')+
+          "' found.", {line: 1, col: 1});
+  }
+
+  return true;
+};
+
+function isWhiteSpace(char){
+  return char === ' ' || char === '\t' || char === '\n'  || char === '\r';
+}
+/**
+ * Read Processing insstructions and skip
+ * @param {*} xmlData
+ * @param {*} i
+ */
+function readPI(xmlData, i) {
+  const start = i;
+  for (; i < xmlData.length; i++) {
+    if (xmlData[i] == '?' || xmlData[i] == ' ') {
+      //tagname
+      const tagname = xmlData.substr(start, i - start);
+      if (i > 5 && tagname === 'xml') {
+        return getErrorObject('InvalidXml', 'XML declaration allowed only at the start of the document.', getLineNumberForPosition(xmlData, i));
+      } else if (xmlData[i] == '?' && xmlData[i + 1] == '>') {
+        //check if valid attribut string
+        i++;
+        break;
+      } else {
+        continue;
+      }
+    }
+  }
+  return i;
+}
+
+function readCommentAndCDATA(xmlData, i) {
+  if (xmlData.length > i + 5 && xmlData[i + 1] === '-' && xmlData[i + 2] === '-') {
+    //comment
+    for (i += 3; i < xmlData.length; i++) {
+      if (xmlData[i] === '-' && xmlData[i + 1] === '-' && xmlData[i + 2] === '>') {
+        i += 2;
+        break;
+      }
+    }
+  } else if (
+    xmlData.length > i + 8 &&
+    xmlData[i + 1] === 'D' &&
+    xmlData[i + 2] === 'O' &&
+    xmlData[i + 3] === 'C' &&
+    xmlData[i + 4] === 'T' &&
+    xmlData[i + 5] === 'Y' &&
+    xmlData[i + 6] === 'P' &&
+    xmlData[i + 7] === 'E'
+  ) {
+    let angleBracketsCount = 1;
+    for (i += 8; i < xmlData.length; i++) {
+      if (xmlData[i] === '<') {
+        angleBracketsCount++;
+      } else if (xmlData[i] === '>') {
+        angleBracketsCount--;
+        if (angleBracketsCount === 0) {
+          break;
+        }
+      }
+    }
+  } else if (
+    xmlData.length > i + 9 &&
+    xmlData[i + 1] === '[' &&
+    xmlData[i + 2] === 'C' &&
+    xmlData[i + 3] === 'D' &&
+    xmlData[i + 4] === 'A' &&
+    xmlData[i + 5] === 'T' &&
+    xmlData[i + 6] === 'A' &&
+    xmlData[i + 7] === '['
+  ) {
+    for (i += 8; i < xmlData.length; i++) {
+      if (xmlData[i] === ']' && xmlData[i + 1] === ']' && xmlData[i + 2] === '>') {
+        i += 2;
+        break;
+      }
+    }
+  }
+
+  return i;
+}
+
+const doubleQuote = '"';
+const singleQuote = "'";
+
+/**
+ * Keep reading xmlData until '<' is found outside the attribute value.
+ * @param {string} xmlData
+ * @param {number} i
+ */
+function readAttributeStr(xmlData, i) {
+  let attrStr = '';
+  let startChar = '';
+  let tagClosed = false;
+  for (; i < xmlData.length; i++) {
+    if (xmlData[i] === doubleQuote || xmlData[i] === singleQuote) {
+      if (startChar === '') {
+        startChar = xmlData[i];
+      } else if (startChar !== xmlData[i]) {
+        //if vaue is enclosed with double quote then single quotes are allowed inside the value and vice versa
+      } else {
+        startChar = '';
+      }
+    } else if (xmlData[i] === '>') {
+      if (startChar === '') {
+        tagClosed = true;
+        break;
+      }
+    }
+    attrStr += xmlData[i];
+  }
+  if (startChar !== '') {
+    return false;
+  }
+
+  return {
+    value: attrStr,
+    index: i,
+    tagClosed: tagClosed
+  };
+}
+
+/**
+ * Select all the attributes whether valid or invalid.
+ */
+const validAttrStrRegxp = new RegExp('(\\s*)([^\\s=]+)(\\s*=)?(\\s*([\'"])(([\\s\\S])*?)\\5)?', 'g');
+
+//attr, ="sd", a="amit's", a="sd"b="saf", ab  cd=""
+
+function validateAttributeString(attrStr, options) {
+  //console.log("start:"+attrStr+":end");
+
+  //if(attrStr.trim().length === 0) return true; //empty string
+
+  const matches = util.getAllMatches(attrStr, validAttrStrRegxp);
+  const attrNames = {};
+
+  for (let i = 0; i < matches.length; i++) {
+    if (matches[i][1].length === 0) {
+      //nospace before attribute name: a="sd"b="saf"
+      return getErrorObject('InvalidAttr', "Attribute '"+matches[i][2]+"' has no space in starting.", getPositionFromMatch(matches[i]))
+    } else if (matches[i][3] !== undefined && matches[i][4] === undefined) {
+      return getErrorObject('InvalidAttr', "Attribute '"+matches[i][2]+"' is without value.", getPositionFromMatch(matches[i]));
+    } else if (matches[i][3] === undefined && !options.allowBooleanAttributes) {
+      //independent attribute: ab
+      return getErrorObject('InvalidAttr', "boolean attribute '"+matches[i][2]+"' is not allowed.", getPositionFromMatch(matches[i]));
+    }
+    /* else if(matches[i][6] === undefined){//attribute without value: ab=
+                    return { err: { code:"InvalidAttr",msg:"attribute " + matches[i][2] + " has no value assigned."}};
+                } */
+    const attrName = matches[i][2];
+    if (!validateAttrName(attrName)) {
+      return getErrorObject('InvalidAttr', "Attribute '"+attrName+"' is an invalid name.", getPositionFromMatch(matches[i]));
+    }
+    if (!attrNames.hasOwnProperty(attrName)) {
+      //check for duplicate attribute.
+      attrNames[attrName] = 1;
+    } else {
+      return getErrorObject('InvalidAttr', "Attribute '"+attrName+"' is repeated.", getPositionFromMatch(matches[i]));
+    }
+  }
+
+  return true;
+}
+
+function validateNumberAmpersand(xmlData, i) {
+  let re = /\d/;
+  if (xmlData[i] === 'x') {
+    i++;
+    re = /[\da-fA-F]/;
+  }
+  for (; i < xmlData.length; i++) {
+    if (xmlData[i] === ';')
+      return i;
+    if (!xmlData[i].match(re))
+      break;
+  }
+  return -1;
+}
+
+function validateAmpersand(xmlData, i) {
+  // https://www.w3.org/TR/xml/#dt-charref
+  i++;
+  if (xmlData[i] === ';')
+    return -1;
+  if (xmlData[i] === '#') {
+    i++;
+    return validateNumberAmpersand(xmlData, i);
+  }
+  let count = 0;
+  for (; i < xmlData.length; i++, count++) {
+    if (xmlData[i].match(/\w/) && count < 20)
+      continue;
+    if (xmlData[i] === ';')
+      break;
+    return -1;
+  }
+  return i;
+}
+
+function getErrorObject(code, message, lineNumber) {
+  return {
+    err: {
+      code: code,
+      msg: message,
+      line: lineNumber.line || lineNumber,
+      col: lineNumber.col,
+    },
+  };
+}
+
+function validateAttrName(attrName) {
+  return util.isName(attrName);
+}
+
+// const startsWithXML = /^xml/i;
+
+function validateTagName(tagname) {
+  return util.isName(tagname) /* && !tagname.match(startsWithXML) */;
+}
+
+//this function returns the line number for the character at the given index
+function getLineNumberForPosition(xmlData, index) {
+  const lines = xmlData.substring(0, index).split(/\r?\n/);
+  return {
+    line: lines.length,
+
+    // column number is last line's length + 1, because column numbering starts at 1:
+    col: lines[lines.length - 1].length + 1
+  };
+}
+
+//this function returns the position of the first character of match within attrStr
+function getPositionFromMatch(match) {
+  return match.startIndex + match[1].length;
+}
+
+
+/***/ }),
+
+/***/ "./node_modules/fast-xml-parser/src/xmlbuilder/json2xml.js":
+/*!*****************************************************************!*\
+  !*** ./node_modules/fast-xml-parser/src/xmlbuilder/json2xml.js ***!
+  \*****************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+//parse Empty Node as self closing node
+const buildFromOrderedJs = __webpack_require__(/*! ./orderedJs2Xml */ "./node_modules/fast-xml-parser/src/xmlbuilder/orderedJs2Xml.js");
+const getIgnoreAttributesFn = __webpack_require__(/*! ../ignoreAttributes */ "./node_modules/fast-xml-parser/src/ignoreAttributes.js")
+
+const defaultOptions = {
+  attributeNamePrefix: '@_',
+  attributesGroupName: false,
+  textNodeName: '#text',
+  ignoreAttributes: true,
+  cdataPropName: false,
+  format: false,
+  indentBy: '  ',
+  suppressEmptyNode: false,
+  suppressUnpairedNode: true,
+  suppressBooleanAttributes: true,
+  tagValueProcessor: function(key, a) {
+    return a;
+  },
+  attributeValueProcessor: function(attrName, a) {
+    return a;
+  },
+  preserveOrder: false,
+  commentPropName: false,
+  unpairedTags: [],
+  entities: [
+    { regex: new RegExp("&", "g"), val: "&" },//it must be on top
+    { regex: new RegExp(">", "g"), val: ">" },
+    { regex: new RegExp("<", "g"), val: "<" },
+    { regex: new RegExp("\'", "g"), val: "'" },
+    { regex: new RegExp("\"", "g"), val: """ }
+  ],
+  processEntities: true,
+  stopNodes: [],
+  // transformTagName: false,
+  // transformAttributeName: false,
+  oneListGroup: false
+};
+
+function Builder(options) {
+  this.options = Object.assign({}, defaultOptions, options);
+  if (this.options.ignoreAttributes === true || this.options.attributesGroupName) {
+    this.isAttribute = function(/*a*/) {
+      return false;
+    };
+  } else {
+    this.ignoreAttributesFn = getIgnoreAttributesFn(this.options.ignoreAttributes)
+    this.attrPrefixLen = this.options.attributeNamePrefix.length;
+    this.isAttribute = isAttribute;
+  }
+
+  this.processTextOrObjNode = processTextOrObjNode
+
+  if (this.options.format) {
+    this.indentate = indentate;
+    this.tagEndChar = '>\n';
+    this.newLine = '\n';
+  } else {
+    this.indentate = function() {
+      return '';
+    };
+    this.tagEndChar = '>';
+    this.newLine = '';
+  }
+}
+
+Builder.prototype.build = function(jObj) {
+  if(this.options.preserveOrder){
+    return buildFromOrderedJs(jObj, this.options);
+  }else {
+    if(Array.isArray(jObj) && this.options.arrayNodeName && this.options.arrayNodeName.length > 1){
+      jObj = {
+        [this.options.arrayNodeName] : jObj
+      }
+    }
+    return this.j2x(jObj, 0, []).val;
+  }
+};
+
+Builder.prototype.j2x = function(jObj, level, ajPath) {
+  let attrStr = '';
+  let val = '';
+  const jPath = ajPath.join('.')
+  for (let key in jObj) {
+    if(!Object.prototype.hasOwnProperty.call(jObj, key)) continue;
+    if (typeof jObj[key] === 'undefined') {
+      // supress undefined node only if it is not an attribute
+      if (this.isAttribute(key)) {
+        val += '';
+      }
+    } else if (jObj[key] === null) {
+      // null attribute should be ignored by the attribute list, but should not cause the tag closing
+      if (this.isAttribute(key)) {
+        val += '';
+      } else if (key[0] === '?') {
+        val += this.indentate(level) + '<' + key + '?' + this.tagEndChar;
+      } else {
+        val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
+      }
+      // val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
+    } else if (jObj[key] instanceof Date) {
+      val += this.buildTextValNode(jObj[key], key, '', level);
+    } else if (typeof jObj[key] !== 'object') {
+      //premitive type
+      const attr = this.isAttribute(key);
+      if (attr && !this.ignoreAttributesFn(attr, jPath)) {
+        attrStr += this.buildAttrPairStr(attr, '' + jObj[key]);
+      } else if (!attr) {
+        //tag value
+        if (key === this.options.textNodeName) {
+          let newval = this.options.tagValueProcessor(key, '' + jObj[key]);
+          val += this.replaceEntitiesValue(newval);
+        } else {
+          val += this.buildTextValNode(jObj[key], key, '', level);
+        }
+      }
+    } else if (Array.isArray(jObj[key])) {
+      //repeated nodes
+      const arrLen = jObj[key].length;
+      let listTagVal = "";
+      let listTagAttr = "";
+      for (let j = 0; j < arrLen; j++) {
+        const item = jObj[key][j];
+        if (typeof item === 'undefined') {
+          // supress undefined node
+        } else if (item === null) {
+          if(key[0] === "?") val += this.indentate(level) + '<' + key + '?' + this.tagEndChar;
+          else val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
+          // val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
+        } else if (typeof item === 'object') {
+          if(this.options.oneListGroup){
+            const result = this.j2x(item, level + 1, ajPath.concat(key));
+            listTagVal += result.val;
+            if (this.options.attributesGroupName && item.hasOwnProperty(this.options.attributesGroupName)) {
+              listTagAttr += result.attrStr
+            }
+          }else{
+            listTagVal += this.processTextOrObjNode(item, key, level, ajPath)
+          }
+        } else {
+          if (this.options.oneListGroup) {
+            let textValue = this.options.tagValueProcessor(key, item);
+            textValue = this.replaceEntitiesValue(textValue);
+            listTagVal += textValue;
+          } else {
+            listTagVal += this.buildTextValNode(item, key, '', level);
+          }
+        }
+      }
+      if(this.options.oneListGroup){
+        listTagVal = this.buildObjectNode(listTagVal, key, listTagAttr, level);
+      }
+      val += listTagVal;
+    } else {
+      //nested node
+      if (this.options.attributesGroupName && key === this.options.attributesGroupName) {
+        const Ks = Object.keys(jObj[key]);
+        const L = Ks.length;
+        for (let j = 0; j < L; j++) {
+          attrStr += this.buildAttrPairStr(Ks[j], '' + jObj[key][Ks[j]]);
+        }
+      } else {
+        val += this.processTextOrObjNode(jObj[key], key, level, ajPath)
+      }
+    }
+  }
+  return {attrStr: attrStr, val: val};
+};
+
+Builder.prototype.buildAttrPairStr = function(attrName, val){
+  val = this.options.attributeValueProcessor(attrName, '' + val);
+  val = this.replaceEntitiesValue(val);
+  if (this.options.suppressBooleanAttributes && val === "true") {
+    return ' ' + attrName;
+  } else return ' ' + attrName + '="' + val + '"';
+}
+
+function processTextOrObjNode (object, key, level, ajPath) {
+  const result = this.j2x(object, level + 1, ajPath.concat(key));
+  if (object[this.options.textNodeName] !== undefined && Object.keys(object).length === 1) {
+    return this.buildTextValNode(object[this.options.textNodeName], key, result.attrStr, level);
+  } else {
+    return this.buildObjectNode(result.val, key, result.attrStr, level);
+  }
+}
+
+Builder.prototype.buildObjectNode = function(val, key, attrStr, level) {
+  if(val === ""){
+    if(key[0] === "?") return  this.indentate(level) + '<' + key + attrStr+ '?' + this.tagEndChar;
+    else {
+      return this.indentate(level) + '<' + key + attrStr + this.closeTag(key) + this.tagEndChar;
+    }
+  }else{
+
+    let tagEndExp = '</' + key + this.tagEndChar;
+    let piClosingChar = "";
+    
+    if(key[0] === "?") {
+      piClosingChar = "?";
+      tagEndExp = "";
+    }
+  
+    // attrStr is an empty string in case the attribute came as undefined or null
+    if ((attrStr || attrStr === '') && val.indexOf('<') === -1) {
+      return ( this.indentate(level) + '<' +  key + attrStr + piClosingChar + '>' + val + tagEndExp );
+    } else if (this.options.commentPropName !== false && key === this.options.commentPropName && piClosingChar.length === 0) {
+      return this.indentate(level) + `` + this.newLine;
+    }else {
+      return (
+        this.indentate(level) + '<' + key + attrStr + piClosingChar + this.tagEndChar +
+        val +
+        this.indentate(level) + tagEndExp    );
+    }
+  }
+}
+
+Builder.prototype.closeTag = function(key){
+  let closeTag = "";
+  if(this.options.unpairedTags.indexOf(key) !== -1){ //unpaired
+    if(!this.options.suppressUnpairedNode) closeTag = "/"
+  }else if(this.options.suppressEmptyNode){ //empty
+    closeTag = "/";
+  }else{
+    closeTag = `></${key}`
+  }
+  return closeTag;
+}
+
+function buildEmptyObjNode(val, key, attrStr, level) {
+  if (val !== '') {
+    return this.buildObjectNode(val, key, attrStr, level);
+  } else {
+    if(key[0] === "?") return  this.indentate(level) + '<' + key + attrStr+ '?' + this.tagEndChar;
+    else {
+      return  this.indentate(level) + '<' + key + attrStr + '/' + this.tagEndChar;
+      // return this.buildTagStr(level,key, attrStr);
+    }
+  }
+}
+
+Builder.prototype.buildTextValNode = function(val, key, attrStr, level) {
+  if (this.options.cdataPropName !== false && key === this.options.cdataPropName) {
+    return this.indentate(level) + `<![CDATA[${val}]]>` +  this.newLine;
+  }else if (this.options.commentPropName !== false && key === this.options.commentPropName) {
+    return this.indentate(level) + `` +  this.newLine;
+  }else if(key[0] === "?") {//PI tag
+    return  this.indentate(level) + '<' + key + attrStr+ '?' + this.tagEndChar; 
+  }else{
+    let textValue = this.options.tagValueProcessor(key, val);
+    textValue = this.replaceEntitiesValue(textValue);
+  
+    if( textValue === ''){
+      return this.indentate(level) + '<' + key + attrStr + this.closeTag(key) + this.tagEndChar;
+    }else{
+      return this.indentate(level) + '<' + key + attrStr + '>' +
+         textValue +
+        '</' + key + this.tagEndChar;
+    }
+  }
+}
+
+Builder.prototype.replaceEntitiesValue = function(textValue){
+  if(textValue && textValue.length > 0 && this.options.processEntities){
+    for (let i=0; i<this.options.entities.length; i++) {
+      const entity = this.options.entities[i];
+      textValue = textValue.replace(entity.regex, entity.val);
+    }
+  }
+  return textValue;
+}
+
+function indentate(level) {
+  return this.options.indentBy.repeat(level);
+}
+
+function isAttribute(name /*, options*/) {
+  if (name.startsWith(this.options.attributeNamePrefix) && name !== this.options.textNodeName) {
+    return name.substr(this.attrPrefixLen);
+  } else {
+    return false;
+  }
+}
+
+module.exports = Builder;
+
+
+/***/ }),
+
+/***/ "./node_modules/fast-xml-parser/src/xmlbuilder/orderedJs2Xml.js":
+/*!**********************************************************************!*\
+  !*** ./node_modules/fast-xml-parser/src/xmlbuilder/orderedJs2Xml.js ***!
+  \**********************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+const EOL = "\n";
+
+/**
+ * 
+ * @param {array} jArray 
+ * @param {any} options 
+ * @returns 
+ */
+function toXml(jArray, options) {
+    let indentation = "";
+    if (options.format && options.indentBy.length > 0) {
+        indentation = EOL;
+    }
+    return arrToStr(jArray, options, "", indentation);
+}
+
+function arrToStr(arr, options, jPath, indentation) {
+    let xmlStr = "";
+    let isPreviousElementTag = false;
+
+    for (let i = 0; i < arr.length; i++) {
+        const tagObj = arr[i];
+        const tagName = propName(tagObj);
+        if(tagName === undefined) continue;
+
+        let newJPath = "";
+        if (jPath.length === 0) newJPath = tagName
+        else newJPath = `${jPath}.${tagName}`;
+
+        if (tagName === options.textNodeName) {
+            let tagText = tagObj[tagName];
+            if (!isStopNode(newJPath, options)) {
+                tagText = options.tagValueProcessor(tagName, tagText);
+                tagText = replaceEntitiesValue(tagText, options);
+            }
+            if (isPreviousElementTag) {
+                xmlStr += indentation;
+            }
+            xmlStr += tagText;
+            isPreviousElementTag = false;
+            continue;
+        } else if (tagName === options.cdataPropName) {
+            if (isPreviousElementTag) {
+                xmlStr += indentation;
+            }
+            xmlStr += `<![CDATA[${tagObj[tagName][0][options.textNodeName]}]]>`;
+            isPreviousElementTag = false;
+            continue;
+        } else if (tagName === options.commentPropName) {
+            xmlStr += indentation + ``;
+            isPreviousElementTag = true;
+            continue;
+        } else if (tagName[0] === "?") {
+            const attStr = attr_to_str(tagObj[":@"], options);
+            const tempInd = tagName === "?xml" ? "" : indentation;
+            let piTextNodeName = tagObj[tagName][0][options.textNodeName];
+            piTextNodeName = piTextNodeName.length !== 0 ? " " + piTextNodeName : ""; //remove extra spacing
+            xmlStr += tempInd + `<${tagName}${piTextNodeName}${attStr}?>`;
+            isPreviousElementTag = true;
+            continue;
+        }
+        let newIdentation = indentation;
+        if (newIdentation !== "") {
+            newIdentation += options.indentBy;
+        }
+        const attStr = attr_to_str(tagObj[":@"], options);
+        const tagStart = indentation + `<${tagName}${attStr}`;
+        const tagValue = arrToStr(tagObj[tagName], options, newJPath, newIdentation);
+        if (options.unpairedTags.indexOf(tagName) !== -1) {
+            if (options.suppressUnpairedNode) xmlStr += tagStart + ">";
+            else xmlStr += tagStart + "/>";
+        } else if ((!tagValue || tagValue.length === 0) && options.suppressEmptyNode) {
+            xmlStr += tagStart + "/>";
+        } else if (tagValue && tagValue.endsWith(">")) {
+            xmlStr += tagStart + `>${tagValue}${indentation}</${tagName}>`;
+        } else {
+            xmlStr += tagStart + ">";
+            if (tagValue && indentation !== "" && (tagValue.includes("/>") || tagValue.includes("</"))) {
+                xmlStr += indentation + options.indentBy + tagValue + indentation;
+            } else {
+                xmlStr += tagValue;
+            }
+            xmlStr += `</${tagName}>`;
+        }
+        isPreviousElementTag = true;
+    }
+
+    return xmlStr;
+}
+
+function propName(obj) {
+    const keys = Object.keys(obj);
+    for (let i = 0; i < keys.length; i++) {
+        const key = keys[i];
+        if(!obj.hasOwnProperty(key)) continue;
+        if (key !== ":@") return key;
+    }
+}
+
+function attr_to_str(attrMap, options) {
+    let attrStr = "";
+    if (attrMap && !options.ignoreAttributes) {
+        for (let attr in attrMap) {
+            if(!attrMap.hasOwnProperty(attr)) continue;
+            let attrVal = options.attributeValueProcessor(attr, attrMap[attr]);
+            attrVal = replaceEntitiesValue(attrVal, options);
+            if (attrVal === true && options.suppressBooleanAttributes) {
+                attrStr += ` ${attr.substr(options.attributeNamePrefix.length)}`;
+            } else {
+                attrStr += ` ${attr.substr(options.attributeNamePrefix.length)}="${attrVal}"`;
+            }
+        }
+    }
+    return attrStr;
+}
+
+function isStopNode(jPath, options) {
+    jPath = jPath.substr(0, jPath.length - options.textNodeName.length - 1);
+    let tagName = jPath.substr(jPath.lastIndexOf(".") + 1);
+    for (let index in options.stopNodes) {
+        if (options.stopNodes[index] === jPath || options.stopNodes[index] === "*." + tagName) return true;
+    }
+    return false;
+}
+
+function replaceEntitiesValue(textValue, options) {
+    if (textValue && textValue.length > 0 && options.processEntities) {
+        for (let i = 0; i < options.entities.length; i++) {
+            const entity = options.entities[i];
+            textValue = textValue.replace(entity.regex, entity.val);
+        }
+    }
+    return textValue;
+}
+module.exports = toXml;
+
+
+/***/ }),
+
+/***/ "./node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js":
+/*!*********************************************************************!*\
+  !*** ./node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js ***!
+  \*********************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+const util = __webpack_require__(/*! ../util */ "./node_modules/fast-xml-parser/src/util.js");
+
+//TODO: handle comments
+function readDocType(xmlData, i){
+    
+    const entities = {};
+    if( xmlData[i + 3] === 'O' &&
+         xmlData[i + 4] === 'C' &&
+         xmlData[i + 5] === 'T' &&
+         xmlData[i + 6] === 'Y' &&
+         xmlData[i + 7] === 'P' &&
+         xmlData[i + 8] === 'E')
+    {    
+        i = i+9;
+        let angleBracketsCount = 1;
+        let hasBody = false, comment = false;
+        let exp = "";
+        for(;i<xmlData.length;i++){
+            if (xmlData[i] === '<' && !comment) { //Determine the tag type
+                if( hasBody && isEntity(xmlData, i)){
+                    i += 7; 
+                    [entityName, val,i] = readEntityExp(xmlData,i+1);
+                    if(val.indexOf("&") === -1) //Parameter entities are not supported
+                        entities[ validateEntityName(entityName) ] = {
+                            regx : RegExp( `&${entityName};`,"g"),
+                            val: val
+                        };
+                }
+                else if( hasBody && isElement(xmlData, i))  i += 8;//Not supported
+                else if( hasBody && isAttlist(xmlData, i))  i += 8;//Not supported
+                else if( hasBody && isNotation(xmlData, i)) i += 9;//Not supported
+                else if( isComment)                         comment = true;
+                else                                        throw new Error("Invalid DOCTYPE");
+
+                angleBracketsCount++;
+                exp = "";
+            } else if (xmlData[i] === '>') { //Read tag content
+                if(comment){
+                    if( xmlData[i - 1] === "-" && xmlData[i - 2] === "-"){
+                        comment = false;
+                        angleBracketsCount--;
+                    }
+                }else{
+                    angleBracketsCount--;
+                }
+                if (angleBracketsCount === 0) {
+                  break;
+                }
+            }else if( xmlData[i] === '['){
+                hasBody = true;
+            }else{
+                exp += xmlData[i];
+            }
+        }
+        if(angleBracketsCount !== 0){
+            throw new Error(`Unclosed DOCTYPE`);
+        }
+    }else{
+        throw new Error(`Invalid Tag instead of DOCTYPE`);
+    }
+    return {entities, i};
+}
+
+function readEntityExp(xmlData,i){
+    //External entities are not supported
+    //    <!ENTITY ext SYSTEM "http://normal-website.com" >
+
+    //Parameter entities are not supported
+    //    <!ENTITY entityname "&anotherElement;">
+
+    //Internal entities are supported
+    //    <!ENTITY entityname "replacement text">
+    
+    //read EntityName
+    let entityName = "";
+    for (; i < xmlData.length && (xmlData[i] !== "'" && xmlData[i] !== '"' ); i++) {
+        // if(xmlData[i] === " ") continue;
+        // else 
+        entityName += xmlData[i];
+    }
+    entityName = entityName.trim();
+    if(entityName.indexOf(" ") !== -1) throw new Error("External entites are not supported");
+
+    //read Entity Value
+    const startChar = xmlData[i++];
+    let val = ""
+    for (; i < xmlData.length && xmlData[i] !== startChar ; i++) {
+        val += xmlData[i];
+    }
+    return [entityName, val, i];
+}
+
+function isComment(xmlData, i){
+    if(xmlData[i+1] === '!' &&
+    xmlData[i+2] === '-' &&
+    xmlData[i+3] === '-') return true
+    return false
+}
+function isEntity(xmlData, i){
+    if(xmlData[i+1] === '!' &&
+    xmlData[i+2] === 'E' &&
+    xmlData[i+3] === 'N' &&
+    xmlData[i+4] === 'T' &&
+    xmlData[i+5] === 'I' &&
+    xmlData[i+6] === 'T' &&
+    xmlData[i+7] === 'Y') return true
+    return false
+}
+function isElement(xmlData, i){
+    if(xmlData[i+1] === '!' &&
+    xmlData[i+2] === 'E' &&
+    xmlData[i+3] === 'L' &&
+    xmlData[i+4] === 'E' &&
+    xmlData[i+5] === 'M' &&
+    xmlData[i+6] === 'E' &&
+    xmlData[i+7] === 'N' &&
+    xmlData[i+8] === 'T') return true
+    return false
+}
+
+function isAttlist(xmlData, i){
+    if(xmlData[i+1] === '!' &&
+    xmlData[i+2] === 'A' &&
+    xmlData[i+3] === 'T' &&
+    xmlData[i+4] === 'T' &&
+    xmlData[i+5] === 'L' &&
+    xmlData[i+6] === 'I' &&
+    xmlData[i+7] === 'S' &&
+    xmlData[i+8] === 'T') return true
+    return false
+}
+function isNotation(xmlData, i){
+    if(xmlData[i+1] === '!' &&
+    xmlData[i+2] === 'N' &&
+    xmlData[i+3] === 'O' &&
+    xmlData[i+4] === 'T' &&
+    xmlData[i+5] === 'A' &&
+    xmlData[i+6] === 'T' &&
+    xmlData[i+7] === 'I' &&
+    xmlData[i+8] === 'O' &&
+    xmlData[i+9] === 'N') return true
+    return false
+}
+
+function validateEntityName(name){
+    if (util.isName(name))
+	return name;
+    else
+        throw new Error(`Invalid entity name ${name}`);
+}
+
+module.exports = readDocType;
+
+
+/***/ }),
+
+/***/ "./node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js":
+/*!**********************************************************************!*\
+  !*** ./node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js ***!
+  \**********************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+
+const defaultOptions = {
+    preserveOrder: false,
+    attributeNamePrefix: '@_',
+    attributesGroupName: false,
+    textNodeName: '#text',
+    ignoreAttributes: true,
+    removeNSPrefix: false, // remove NS from tag name or attribute name if true
+    allowBooleanAttributes: false, //a tag can have attributes without any value
+    //ignoreRootElement : false,
+    parseTagValue: true,
+    parseAttributeValue: false,
+    trimValues: true, //Trim string values of tag and attributes
+    cdataPropName: false,
+    numberParseOptions: {
+      hex: true,
+      leadingZeros: true,
+      eNotation: true
+    },
+    tagValueProcessor: function(tagName, val) {
+      return val;
+    },
+    attributeValueProcessor: function(attrName, val) {
+      return val;
+    },
+    stopNodes: [], //nested tags will not be parsed even for errors
+    alwaysCreateTextNode: false,
+    isArray: () => false,
+    commentPropName: false,
+    unpairedTags: [],
+    processEntities: true,
+    htmlEntities: false,
+    ignoreDeclaration: false,
+    ignorePiTags: false,
+    transformTagName: false,
+    transformAttributeName: false,
+    updateTag: function(tagName, jPath, attrs){
+      return tagName
+    },
+    // skipEmptyListItem: false
+};
+   
+const buildOptions = function(options) {
+    return Object.assign({}, defaultOptions, options);
+};
+
+exports.buildOptions = buildOptions;
+exports.defaultOptions = defaultOptions;
+
+/***/ }),
+
+/***/ "./node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js":
+/*!************************************************************************!*\
+  !*** ./node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js ***!
+  \************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+///@ts-check
+
+const util = __webpack_require__(/*! ../util */ "./node_modules/fast-xml-parser/src/util.js");
+const xmlNode = __webpack_require__(/*! ./xmlNode */ "./node_modules/fast-xml-parser/src/xmlparser/xmlNode.js");
+const readDocType = __webpack_require__(/*! ./DocTypeReader */ "./node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js");
+const toNumber = __webpack_require__(/*! strnum */ "./node_modules/strnum/strnum.js");
+const getIgnoreAttributesFn = __webpack_require__(/*! ../ignoreAttributes */ "./node_modules/fast-xml-parser/src/ignoreAttributes.js")
+
+// const regx =
+//   '<((!\\[CDATA\\[([\\s\\S]*?)(]]>))|((NAME:)?(NAME))([^>]*)>|((\\/)(NAME)\\s*>))([^<]*)'
+//   .replace(/NAME/g, util.nameRegexp);
+
+//const tagsRegx = new RegExp("<(\\/?[\\w:\\-\._]+)([^>]*)>(\\s*"+cdataRegx+")*([^<]+)?","g");
+//const tagsRegx = new RegExp("<(\\/?)((\\w*:)?([\\w:\\-\._]+))([^>]*)>([^<]*)("+cdataRegx+"([^<]*))*([^<]+)?","g");
+
+class OrderedObjParser{
+  constructor(options){
+    this.options = options;
+    this.currentNode = null;
+    this.tagsNodeStack = [];
+    this.docTypeEntities = {};
+    this.lastEntities = {
+      "apos" : { regex: /&(apos|#39|#x27);/g, val : "'"},
+      "gt" : { regex: /&(gt|#62|#x3E);/g, val : ">"},
+      "lt" : { regex: /&(lt|#60|#x3C);/g, val : "<"},
+      "quot" : { regex: /&(quot|#34|#x22);/g, val : "\""},
+    };
+    this.ampEntity = { regex: /&(amp|#38|#x26);/g, val : "&"};
+    this.htmlEntities = {
+      "space": { regex: /&(nbsp|#160);/g, val: " " },
+      // "lt" : { regex: /&(lt|#60);/g, val: "<" },
+      // "gt" : { regex: /&(gt|#62);/g, val: ">" },
+      // "amp" : { regex: /&(amp|#38);/g, val: "&" },
+      // "quot" : { regex: /&(quot|#34);/g, val: "\"" },
+      // "apos" : { regex: /&(apos|#39);/g, val: "'" },
+      "cent" : { regex: /&(cent|#162);/g, val: "¢" },
+      "pound" : { regex: /&(pound|#163);/g, val: "£" },
+      "yen" : { regex: /&(yen|#165);/g, val: "¥" },
+      "euro" : { regex: /&(euro|#8364);/g, val: "€" },
+      "copyright" : { regex: /&(copy|#169);/g, val: "©" },
+      "reg" : { regex: /&(reg|#174);/g, val: "®" },
+      "inr" : { regex: /&(inr|#8377);/g, val: "₹" },
+      "num_dec": { regex: /&#([0-9]{1,7});/g, val : (_, str) => String.fromCharCode(Number.parseInt(str, 10)) },
+      "num_hex": { regex: /&#x([0-9a-fA-F]{1,6});/g, val : (_, str) => String.fromCharCode(Number.parseInt(str, 16)) },
+    };
+    this.addExternalEntities = addExternalEntities;
+    this.parseXml = parseXml;
+    this.parseTextData = parseTextData;
+    this.resolveNameSpace = resolveNameSpace;
+    this.buildAttributesMap = buildAttributesMap;
+    this.isItStopNode = isItStopNode;
+    this.replaceEntitiesValue = replaceEntitiesValue;
+    this.readStopNodeData = readStopNodeData;
+    this.saveTextToParentTag = saveTextToParentTag;
+    this.addChild = addChild;
+    this.ignoreAttributesFn = getIgnoreAttributesFn(this.options.ignoreAttributes)
+  }
+
+}
+
+function addExternalEntities(externalEntities){
+  const entKeys = Object.keys(externalEntities);
+  for (let i = 0; i < entKeys.length; i++) {
+    const ent = entKeys[i];
+    this.lastEntities[ent] = {
+       regex: new RegExp("&"+ent+";","g"),
+       val : externalEntities[ent]
+    }
+  }
+}
+
+/**
+ * @param {string} val
+ * @param {string} tagName
+ * @param {string} jPath
+ * @param {boolean} dontTrim
+ * @param {boolean} hasAttributes
+ * @param {boolean} isLeafNode
+ * @param {boolean} escapeEntities
+ */
+function parseTextData(val, tagName, jPath, dontTrim, hasAttributes, isLeafNode, escapeEntities) {
+  if (val !== undefined) {
+    if (this.options.trimValues && !dontTrim) {
+      val = val.trim();
+    }
+    if(val.length > 0){
+      if(!escapeEntities) val = this.replaceEntitiesValue(val);
+      
+      const newval = this.options.tagValueProcessor(tagName, val, jPath, hasAttributes, isLeafNode);
+      if(newval === null || newval === undefined){
+        //don't parse
+        return val;
+      }else if(typeof newval !== typeof val || newval !== val){
+        //overwrite
+        return newval;
+      }else if(this.options.trimValues){
+        return parseValue(val, this.options.parseTagValue, this.options.numberParseOptions);
+      }else{
+        const trimmedVal = val.trim();
+        if(trimmedVal === val){
+          return parseValue(val, this.options.parseTagValue, this.options.numberParseOptions);
+        }else{
+          return val;
+        }
+      }
+    }
+  }
+}
+
+function resolveNameSpace(tagname) {
+  if (this.options.removeNSPrefix) {
+    const tags = tagname.split(':');
+    const prefix = tagname.charAt(0) === '/' ? '/' : '';
+    if (tags[0] === 'xmlns') {
+      return '';
+    }
+    if (tags.length === 2) {
+      tagname = prefix + tags[1];
+    }
+  }
+  return tagname;
+}
+
+//TODO: change regex to capture NS
+//const attrsRegx = new RegExp("([\\w\\-\\.\\:]+)\\s*=\\s*(['\"])((.|\n)*?)\\2","gm");
+const attrsRegx = new RegExp('([^\\s=]+)\\s*(=\\s*([\'"])([\\s\\S]*?)\\3)?', 'gm');
+
+function buildAttributesMap(attrStr, jPath, tagName) {
+  if (this.options.ignoreAttributes !== true && typeof attrStr === 'string') {
+    // attrStr = attrStr.replace(/\r?\n/g, ' ');
+    //attrStr = attrStr || attrStr.trim();
+
+    const matches = util.getAllMatches(attrStr, attrsRegx);
+    const len = matches.length; //don't make it inline
+    const attrs = {};
+    for (let i = 0; i < len; i++) {
+      const attrName = this.resolveNameSpace(matches[i][1]);
+      if (this.ignoreAttributesFn(attrName, jPath)) {
+        continue
+      }
+      let oldVal = matches[i][4];
+      let aName = this.options.attributeNamePrefix + attrName;
+      if (attrName.length) {
+        if (this.options.transformAttributeName) {
+          aName = this.options.transformAttributeName(aName);
+        }
+        if(aName === "__proto__") aName  = "#__proto__";
+        if (oldVal !== undefined) {
+          if (this.options.trimValues) {
+            oldVal = oldVal.trim();
+          }
+          oldVal = this.replaceEntitiesValue(oldVal);
+          const newVal = this.options.attributeValueProcessor(attrName, oldVal, jPath);
+          if(newVal === null || newVal === undefined){
+            //don't parse
+            attrs[aName] = oldVal;
+          }else if(typeof newVal !== typeof oldVal || newVal !== oldVal){
+            //overwrite
+            attrs[aName] = newVal;
+          }else{
+            //parse
+            attrs[aName] = parseValue(
+              oldVal,
+              this.options.parseAttributeValue,
+              this.options.numberParseOptions
+            );
+          }
+        } else if (this.options.allowBooleanAttributes) {
+          attrs[aName] = true;
+        }
+      }
+    }
+    if (!Object.keys(attrs).length) {
+      return;
+    }
+    if (this.options.attributesGroupName) {
+      const attrCollection = {};
+      attrCollection[this.options.attributesGroupName] = attrs;
+      return attrCollection;
+    }
+    return attrs
+  }
+}
+
+const parseXml = function(xmlData) {
+  // xmlData = xmlData.replace(/\r\n?/g, "\n"); //TODO: remove this line
+  const xmlObj = new xmlNode('!xml');
+  let currentNode = xmlObj;
+  let textData = "";
+  let jPath = "";
+  for(let i=0; i< xmlData.length; i++){//for each char in XML data
+    const ch = xmlData[i];
+    if(ch === '<'){
+      // const nextIndex = i+1;
+      // const _2ndChar = xmlData[nextIndex];
+      if( xmlData[i+1] === '/') {//Closing Tag
+        const closeIndex = findClosingIndex(xmlData, ">", i, "Closing Tag is not closed.")
+        let tagName = xmlData.substring(i+2,closeIndex).trim();
+
+        if(this.options.removeNSPrefix){
+          const colonIndex = tagName.indexOf(":");
+          if(colonIndex !== -1){
+            tagName = tagName.substr(colonIndex+1);
+          }
+        }
+
+        if(this.options.transformTagName) {
+          tagName = this.options.transformTagName(tagName);
+        }
+
+        if(currentNode){
+          textData = this.saveTextToParentTag(textData, currentNode, jPath);
+        }
+
+        //check if last tag of nested tag was unpaired tag
+        const lastTagName = jPath.substring(jPath.lastIndexOf(".")+1);
+        if(tagName && this.options.unpairedTags.indexOf(tagName) !== -1 ){
+          throw new Error(`Unpaired tag can not be used as closing tag: </${tagName}>`);
+        }
+        let propIndex = 0
+        if(lastTagName && this.options.unpairedTags.indexOf(lastTagName) !== -1 ){
+          propIndex = jPath.lastIndexOf('.', jPath.lastIndexOf('.')-1)
+          this.tagsNodeStack.pop();
+        }else{
+          propIndex = jPath.lastIndexOf(".");
+        }
+        jPath = jPath.substring(0, propIndex);
+
+        currentNode = this.tagsNodeStack.pop();//avoid recursion, set the parent tag scope
+        textData = "";
+        i = closeIndex;
+      } else if( xmlData[i+1] === '?') {
+
+        let tagData = readTagExp(xmlData,i, false, "?>");
+        if(!tagData) throw new Error("Pi Tag is not closed.");
+
+        textData = this.saveTextToParentTag(textData, currentNode, jPath);
+        if( (this.options.ignoreDeclaration && tagData.tagName === "?xml") || this.options.ignorePiTags){
+
+        }else{
+  
+          const childNode = new xmlNode(tagData.tagName);
+          childNode.add(this.options.textNodeName, "");
+          
+          if(tagData.tagName !== tagData.tagExp && tagData.attrExpPresent){
+            childNode[":@"] = this.buildAttributesMap(tagData.tagExp, jPath, tagData.tagName);
+          }
+          this.addChild(currentNode, childNode, jPath)
+
+        }
+
+
+        i = tagData.closeIndex + 1;
+      } else if(xmlData.substr(i + 1, 3) === '!--') {
+        const endIndex = findClosingIndex(xmlData, "-->", i+4, "Comment is not closed.")
+        if(this.options.commentPropName){
+          const comment = xmlData.substring(i + 4, endIndex - 2);
+
+          textData = this.saveTextToParentTag(textData, currentNode, jPath);
+
+          currentNode.add(this.options.commentPropName, [ { [this.options.textNodeName] : comment } ]);
+        }
+        i = endIndex;
+      } else if( xmlData.substr(i + 1, 2) === '!D') {
+        const result = readDocType(xmlData, i);
+        this.docTypeEntities = result.entities;
+        i = result.i;
+      }else if(xmlData.substr(i + 1, 2) === '![') {
+        const closeIndex = findClosingIndex(xmlData, "]]>", i, "CDATA is not closed.") - 2;
+        const tagExp = xmlData.substring(i + 9,closeIndex);
+
+        textData = this.saveTextToParentTag(textData, currentNode, jPath);
+
+        let val = this.parseTextData(tagExp, currentNode.tagname, jPath, true, false, true, true);
+        if(val == undefined) val = "";
+
+        //cdata should be set even if it is 0 length string
+        if(this.options.cdataPropName){
+          currentNode.add(this.options.cdataPropName, [ { [this.options.textNodeName] : tagExp } ]);
+        }else{
+          currentNode.add(this.options.textNodeName, val);
+        }
+        
+        i = closeIndex + 2;
+      }else {//Opening tag
+        let result = readTagExp(xmlData,i, this.options.removeNSPrefix);
+        let tagName= result.tagName;
+        const rawTagName = result.rawTagName;
+        let tagExp = result.tagExp;
+        let attrExpPresent = result.attrExpPresent;
+        let closeIndex = result.closeIndex;
+
+        if (this.options.transformTagName) {
+          tagName = this.options.transformTagName(tagName);
+        }
+        
+        //save text as child node
+        if (currentNode && textData) {
+          if(currentNode.tagname !== '!xml'){
+            //when nested tag is found
+            textData = this.saveTextToParentTag(textData, currentNode, jPath, false);
+          }
+        }
+
+        //check if last tag was unpaired tag
+        const lastTag = currentNode;
+        if(lastTag && this.options.unpairedTags.indexOf(lastTag.tagname) !== -1 ){
+          currentNode = this.tagsNodeStack.pop();
+          jPath = jPath.substring(0, jPath.lastIndexOf("."));
+        }
+        if(tagName !== xmlObj.tagname){
+          jPath += jPath ? "." + tagName : tagName;
+        }
+        if (this.isItStopNode(this.options.stopNodes, jPath, tagName)) {
+          let tagContent = "";
+          //self-closing tag
+          if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){
+            if(tagName[tagName.length - 1] === "/"){ //remove trailing '/'
+              tagName = tagName.substr(0, tagName.length - 1);
+              jPath = jPath.substr(0, jPath.length - 1);
+              tagExp = tagName;
+            }else{
+              tagExp = tagExp.substr(0, tagExp.length - 1);
+            }
+            i = result.closeIndex;
+          }
+          //unpaired tag
+          else if(this.options.unpairedTags.indexOf(tagName) !== -1){
+            
+            i = result.closeIndex;
+          }
+          //normal tag
+          else{
+            //read until closing tag is found
+            const result = this.readStopNodeData(xmlData, rawTagName, closeIndex + 1);
+            if(!result) throw new Error(`Unexpected end of ${rawTagName}`);
+            i = result.i;
+            tagContent = result.tagContent;
+          }
+
+          const childNode = new xmlNode(tagName);
+          if(tagName !== tagExp && attrExpPresent){
+            childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
+          }
+          if(tagContent) {
+            tagContent = this.parseTextData(tagContent, tagName, jPath, true, attrExpPresent, true, true);
+          }
+          
+          jPath = jPath.substr(0, jPath.lastIndexOf("."));
+          childNode.add(this.options.textNodeName, tagContent);
+          
+          this.addChild(currentNode, childNode, jPath)
+        }else{
+  //selfClosing tag
+          if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){
+            if(tagName[tagName.length - 1] === "/"){ //remove trailing '/'
+              tagName = tagName.substr(0, tagName.length - 1);
+              jPath = jPath.substr(0, jPath.length - 1);
+              tagExp = tagName;
+            }else{
+              tagExp = tagExp.substr(0, tagExp.length - 1);
+            }
+            
+            if(this.options.transformTagName) {
+              tagName = this.options.transformTagName(tagName);
+            }
+
+            const childNode = new xmlNode(tagName);
+            if(tagName !== tagExp && attrExpPresent){
+              childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
+            }
+            this.addChild(currentNode, childNode, jPath)
+            jPath = jPath.substr(0, jPath.lastIndexOf("."));
+          }
+    //opening tag
+          else{
+            const childNode = new xmlNode( tagName);
+            this.tagsNodeStack.push(currentNode);
+            
+            if(tagName !== tagExp && attrExpPresent){
+              childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
+            }
+            this.addChild(currentNode, childNode, jPath)
+            currentNode = childNode;
+          }
+          textData = "";
+          i = closeIndex;
+        }
+      }
+    }else{
+      textData += xmlData[i];
+    }
+  }
+  return xmlObj.child;
+}
+
+function addChild(currentNode, childNode, jPath){
+  const result = this.options.updateTag(childNode.tagname, jPath, childNode[":@"])
+  if(result === false){
+  }else if(typeof result === "string"){
+    childNode.tagname = result
+    currentNode.addChild(childNode);
+  }else{
+    currentNode.addChild(childNode);
+  }
+}
+
+const replaceEntitiesValue = function(val){
+
+  if(this.options.processEntities){
+    for(let entityName in this.docTypeEntities){
+      const entity = this.docTypeEntities[entityName];
+      val = val.replace( entity.regx, entity.val);
+    }
+    for(let entityName in this.lastEntities){
+      const entity = this.lastEntities[entityName];
+      val = val.replace( entity.regex, entity.val);
+    }
+    if(this.options.htmlEntities){
+      for(let entityName in this.htmlEntities){
+        const entity = this.htmlEntities[entityName];
+        val = val.replace( entity.regex, entity.val);
+      }
+    }
+    val = val.replace( this.ampEntity.regex, this.ampEntity.val);
+  }
+  return val;
+}
+function saveTextToParentTag(textData, currentNode, jPath, isLeafNode) {
+  if (textData) { //store previously collected data as textNode
+    if(isLeafNode === undefined) isLeafNode = Object.keys(currentNode.child).length === 0
+    
+    textData = this.parseTextData(textData,
+      currentNode.tagname,
+      jPath,
+      false,
+      currentNode[":@"] ? Object.keys(currentNode[":@"]).length !== 0 : false,
+      isLeafNode);
+
+    if (textData !== undefined && textData !== "")
+      currentNode.add(this.options.textNodeName, textData);
+    textData = "";
+  }
+  return textData;
+}
+
+//TODO: use jPath to simplify the logic
+/**
+ * 
+ * @param {string[]} stopNodes 
+ * @param {string} jPath
+ * @param {string} currentTagName 
+ */
+function isItStopNode(stopNodes, jPath, currentTagName){
+  const allNodesExp = "*." + currentTagName;
+  for (const stopNodePath in stopNodes) {
+    const stopNodeExp = stopNodes[stopNodePath];
+    if( allNodesExp === stopNodeExp || jPath === stopNodeExp  ) return true;
+  }
+  return false;
+}
+
+/**
+ * Returns the tag Expression and where it is ending handling single-double quotes situation
+ * @param {string} xmlData 
+ * @param {number} i starting index
+ * @returns 
+ */
+function tagExpWithClosingIndex(xmlData, i, closingChar = ">"){
+  let attrBoundary;
+  let tagExp = "";
+  for (let index = i; index < xmlData.length; index++) {
+    let ch = xmlData[index];
+    if (attrBoundary) {
+        if (ch === attrBoundary) attrBoundary = "";//reset
+    } else if (ch === '"' || ch === "'") {
+        attrBoundary = ch;
+    } else if (ch === closingChar[0]) {
+      if(closingChar[1]){
+        if(xmlData[index + 1] === closingChar[1]){
+          return {
+            data: tagExp,
+            index: index
+          }
+        }
+      }else{
+        return {
+          data: tagExp,
+          index: index
+        }
+      }
+    } else if (ch === '\t') {
+      ch = " "
+    }
+    tagExp += ch;
+  }
+}
+
+function findClosingIndex(xmlData, str, i, errMsg){
+  const closingIndex = xmlData.indexOf(str, i);
+  if(closingIndex === -1){
+    throw new Error(errMsg)
+  }else{
+    return closingIndex + str.length - 1;
+  }
+}
+
+function readTagExp(xmlData,i, removeNSPrefix, closingChar = ">"){
+  const result = tagExpWithClosingIndex(xmlData, i+1, closingChar);
+  if(!result) return;
+  let tagExp = result.data;
+  const closeIndex = result.index;
+  const separatorIndex = tagExp.search(/\s/);
+  let tagName = tagExp;
+  let attrExpPresent = true;
+  if(separatorIndex !== -1){//separate tag name and attributes expression
+    tagName = tagExp.substring(0, separatorIndex);
+    tagExp = tagExp.substring(separatorIndex + 1).trimStart();
+  }
+
+  const rawTagName = tagName;
+  if(removeNSPrefix){
+    const colonIndex = tagName.indexOf(":");
+    if(colonIndex !== -1){
+      tagName = tagName.substr(colonIndex+1);
+      attrExpPresent = tagName !== result.data.substr(colonIndex + 1);
+    }
+  }
+
+  return {
+    tagName: tagName,
+    tagExp: tagExp,
+    closeIndex: closeIndex,
+    attrExpPresent: attrExpPresent,
+    rawTagName: rawTagName,
+  }
+}
+/**
+ * find paired tag for a stop node
+ * @param {string} xmlData 
+ * @param {string} tagName 
+ * @param {number} i 
+ */
+function readStopNodeData(xmlData, tagName, i){
+  const startIndex = i;
+  // Starting at 1 since we already have an open tag
+  let openTagCount = 1;
+
+  for (; i < xmlData.length; i++) {
+    if( xmlData[i] === "<"){ 
+      if (xmlData[i+1] === "/") {//close tag
+          const closeIndex = findClosingIndex(xmlData, ">", i, `${tagName} is not closed`);
+          let closeTagName = xmlData.substring(i+2,closeIndex).trim();
+          if(closeTagName === tagName){
+            openTagCount--;
+            if (openTagCount === 0) {
+              return {
+                tagContent: xmlData.substring(startIndex, i),
+                i : closeIndex
+              }
+            }
+          }
+          i=closeIndex;
+        } else if(xmlData[i+1] === '?') { 
+          const closeIndex = findClosingIndex(xmlData, "?>", i+1, "StopNode is not closed.")
+          i=closeIndex;
+        } else if(xmlData.substr(i + 1, 3) === '!--') { 
+          const closeIndex = findClosingIndex(xmlData, "-->", i+3, "StopNode is not closed.")
+          i=closeIndex;
+        } else if(xmlData.substr(i + 1, 2) === '![') { 
+          const closeIndex = findClosingIndex(xmlData, "]]>", i, "StopNode is not closed.") - 2;
+          i=closeIndex;
+        } else {
+          const tagData = readTagExp(xmlData, i, '>')
+
+          if (tagData) {
+            const openTagName = tagData && tagData.tagName;
+            if (openTagName === tagName && tagData.tagExp[tagData.tagExp.length-1] !== "/") {
+              openTagCount++;
+            }
+            i=tagData.closeIndex;
+          }
+        }
+      }
+  }//end for loop
+}
+
+function parseValue(val, shouldParse, options) {
+  if (shouldParse && typeof val === 'string') {
+    //console.log(options)
+    const newval = val.trim();
+    if(newval === 'true' ) return true;
+    else if(newval === 'false' ) return false;
+    else return toNumber(val, options);
+  } else {
+    if (util.isExist(val)) {
+      return val;
+    } else {
+      return '';
+    }
+  }
+}
+
+
+module.exports = OrderedObjParser;
+
+
+/***/ }),
+
+/***/ "./node_modules/fast-xml-parser/src/xmlparser/XMLParser.js":
+/*!*****************************************************************!*\
+  !*** ./node_modules/fast-xml-parser/src/xmlparser/XMLParser.js ***!
+  \*****************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+const { buildOptions} = __webpack_require__(/*! ./OptionsBuilder */ "./node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js");
+const OrderedObjParser = __webpack_require__(/*! ./OrderedObjParser */ "./node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js");
+const { prettify} = __webpack_require__(/*! ./node2json */ "./node_modules/fast-xml-parser/src/xmlparser/node2json.js");
+const validator = __webpack_require__(/*! ../validator */ "./node_modules/fast-xml-parser/src/validator.js");
+
+class XMLParser{
+    
+    constructor(options){
+        this.externalEntities = {};
+        this.options = buildOptions(options);
+        
+    }
+    /**
+     * Parse XML dats to JS object 
+     * @param {string|Buffer} xmlData 
+     * @param {boolean|Object} validationOption 
+     */
+    parse(xmlData,validationOption){
+        if(typeof xmlData === "string"){
+        }else if( xmlData.toString){
+            xmlData = xmlData.toString();
+        }else{
+            throw new Error("XML data is accepted in String or Bytes[] form.")
+        }
+        if( validationOption){
+            if(validationOption === true) validationOption = {}; //validate with default options
+            
+            const result = validator.validate(xmlData, validationOption);
+            if (result !== true) {
+              throw Error( `${result.err.msg}:${result.err.line}:${result.err.col}` )
+            }
+          }
+        const orderedObjParser = new OrderedObjParser(this.options);
+        orderedObjParser.addExternalEntities(this.externalEntities);
+        const orderedResult = orderedObjParser.parseXml(xmlData);
+        if(this.options.preserveOrder || orderedResult === undefined) return orderedResult;
+        else return prettify(orderedResult, this.options);
+    }
+
+    /**
+     * Add Entity which is not by default supported by this library
+     * @param {string} key 
+     * @param {string} value 
+     */
+    addEntity(key, value){
+        if(value.indexOf("&") !== -1){
+            throw new Error("Entity value can't have '&'")
+        }else if(key.indexOf("&") !== -1 || key.indexOf(";") !== -1){
+            throw new Error("An entity must be set without '&' and ';'. Eg. use '#xD' for ''")
+        }else if(value === "&"){
+            throw new Error("An entity with value '&' is not permitted");
+        }else{
+            this.externalEntities[key] = value;
+        }
+    }
+}
+
+module.exports = XMLParser;
+
+/***/ }),
+
+/***/ "./node_modules/fast-xml-parser/src/xmlparser/node2json.js":
+/*!*****************************************************************!*\
+  !*** ./node_modules/fast-xml-parser/src/xmlparser/node2json.js ***!
+  \*****************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/**
+ * 
+ * @param {array} node 
+ * @param {any} options 
+ * @returns 
+ */
+function prettify(node, options){
+  return compress( node, options);
+}
+
+/**
+ * 
+ * @param {array} arr 
+ * @param {object} options 
+ * @param {string} jPath 
+ * @returns object
+ */
+function compress(arr, options, jPath){
+  let text;
+  const compressedObj = {};
+  for (let i = 0; i < arr.length; i++) {
+    const tagObj = arr[i];
+    const property = propName(tagObj);
+    let newJpath = "";
+    if(jPath === undefined) newJpath = property;
+    else newJpath = jPath + "." + property;
+
+    if(property === options.textNodeName){
+      if(text === undefined) text = tagObj[property];
+      else text += "" + tagObj[property];
+    }else if(property === undefined){
+      continue;
+    }else if(tagObj[property]){
+      
+      let val = compress(tagObj[property], options, newJpath);
+      const isLeaf = isLeafTag(val, options);
+
+      if(tagObj[":@"]){
+        assignAttributes( val, tagObj[":@"], newJpath, options);
+      }else if(Object.keys(val).length === 1 && val[options.textNodeName] !== undefined && !options.alwaysCreateTextNode){
+        val = val[options.textNodeName];
+      }else if(Object.keys(val).length === 0){
+        if(options.alwaysCreateTextNode) val[options.textNodeName] = "";
+        else val = "";
+      }
+
+      if(compressedObj[property] !== undefined && compressedObj.hasOwnProperty(property)) {
+        if(!Array.isArray(compressedObj[property])) {
+            compressedObj[property] = [ compressedObj[property] ];
+        }
+        compressedObj[property].push(val);
+      }else{
+        //TODO: if a node is not an array, then check if it should be an array
+        //also determine if it is a leaf node
+        if (options.isArray(property, newJpath, isLeaf )) {
+          compressedObj[property] = [val];
+        }else{
+          compressedObj[property] = val;
+        }
+      }
+    }
+    
+  }
+  // if(text && text.length > 0) compressedObj[options.textNodeName] = text;
+  if(typeof text === "string"){
+    if(text.length > 0) compressedObj[options.textNodeName] = text;
+  }else if(text !== undefined) compressedObj[options.textNodeName] = text;
+  return compressedObj;
+}
+
+function propName(obj){
+  const keys = Object.keys(obj);
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    if(key !== ":@") return key;
+  }
+}
+
+function assignAttributes(obj, attrMap, jpath, options){
+  if (attrMap) {
+    const keys = Object.keys(attrMap);
+    const len = keys.length; //don't make it inline
+    for (let i = 0; i < len; i++) {
+      const atrrName = keys[i];
+      if (options.isArray(atrrName, jpath + "." + atrrName, true, true)) {
+        obj[atrrName] = [ attrMap[atrrName] ];
+      } else {
+        obj[atrrName] = attrMap[atrrName];
+      }
+    }
+  }
+}
+
+function isLeafTag(obj, options){
+  const { textNodeName } = options;
+  const propCount = Object.keys(obj).length;
+  
+  if (propCount === 0) {
+    return true;
+  }
+
+  if (
+    propCount === 1 &&
+    (obj[textNodeName] || typeof obj[textNodeName] === "boolean" || obj[textNodeName] === 0)
+  ) {
+    return true;
+  }
+
+  return false;
+}
+exports.prettify = prettify;
+
+
+/***/ }),
+
+/***/ "./node_modules/fast-xml-parser/src/xmlparser/xmlNode.js":
+/*!***************************************************************!*\
+  !*** ./node_modules/fast-xml-parser/src/xmlparser/xmlNode.js ***!
+  \***************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+class XmlNode{
+  constructor(tagname) {
+    this.tagname = tagname;
+    this.child = []; //nested tags, text, cdata, comments in order
+    this[":@"] = {}; //attributes map
+  }
+  add(key,val){
+    // this.child.push( {name : key, val: val, isCdata: isCdata });
+    if(key === "__proto__") key = "#__proto__";
+    this.child.push( {[key]: val });
+  }
+  addChild(node) {
+    if(node.tagname === "__proto__") node.tagname = "#__proto__";
+    if(node[":@"] && Object.keys(node[":@"]).length > 0){
+      this.child.push( { [node.tagname]: node.child, [":@"]: node[":@"] });
+    }else{
+      this.child.push( { [node.tagname]: node.child });
+    }
+  };
+};
+
+
+module.exports = XmlNode;
+
+/***/ }),
+
+/***/ "./node_modules/ieee754/index.js":
+/*!***************************************!*\
+  !*** ./node_modules/ieee754/index.js ***!
+  \***************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
+exports.read = function (buffer, offset, isLE, mLen, nBytes) {
+  var e, m
+  var eLen = (nBytes * 8) - mLen - 1
+  var eMax = (1 << eLen) - 1
+  var eBias = eMax >> 1
+  var nBits = -7
+  var i = isLE ? (nBytes - 1) : 0
+  var d = isLE ? -1 : 1
+  var s = buffer[offset + i]
+
+  i += d
+
+  e = s & ((1 << (-nBits)) - 1)
+  s >>= (-nBits)
+  nBits += eLen
+  for (; nBits > 0; e = (e * 256) + buffer[offset + i], i += d, nBits -= 8) {}
+
+  m = e & ((1 << (-nBits)) - 1)
+  e >>= (-nBits)
+  nBits += mLen
+  for (; nBits > 0; m = (m * 256) + buffer[offset + i], i += d, nBits -= 8) {}
+
+  if (e === 0) {
+    e = 1 - eBias
+  } else if (e === eMax) {
+    return m ? NaN : ((s ? -1 : 1) * Infinity)
+  } else {
+    m = m + Math.pow(2, mLen)
+    e = e - eBias
+  }
+  return (s ? -1 : 1) * m * Math.pow(2, e - mLen)
+}
+
+exports.write = function (buffer, value, offset, isLE, mLen, nBytes) {
+  var e, m, c
+  var eLen = (nBytes * 8) - mLen - 1
+  var eMax = (1 << eLen) - 1
+  var eBias = eMax >> 1
+  var rt = (mLen === 23 ? Math.pow(2, -24) - Math.pow(2, -77) : 0)
+  var i = isLE ? 0 : (nBytes - 1)
+  var d = isLE ? 1 : -1
+  var s = value < 0 || (value === 0 && 1 / value < 0) ? 1 : 0
+
+  value = Math.abs(value)
+
+  if (isNaN(value) || value === Infinity) {
+    m = isNaN(value) ? 1 : 0
+    e = eMax
+  } else {
+    e = Math.floor(Math.log(value) / Math.LN2)
+    if (value * (c = Math.pow(2, -e)) < 1) {
+      e--
+      c *= 2
+    }
+    if (e + eBias >= 1) {
+      value += rt / c
+    } else {
+      value += rt * Math.pow(2, 1 - eBias)
+    }
+    if (value * c >= 2) {
+      e++
+      c /= 2
+    }
+
+    if (e + eBias >= eMax) {
+      m = 0
+      e = eMax
+    } else if (e + eBias >= 1) {
+      m = ((value * c) - 1) * Math.pow(2, mLen)
+      e = e + eBias
+    } else {
+      m = value * Math.pow(2, eBias - 1) * Math.pow(2, mLen)
+      e = 0
+    }
+  }
+
+  for (; mLen >= 8; buffer[offset + i] = m & 0xff, i += d, m /= 256, mLen -= 8) {}
+
+  e = (e << mLen) | m
+  eLen += mLen
+  for (; eLen > 0; buffer[offset + i] = e & 0xff, i += d, e /= 256, eLen -= 8) {}
+
+  buffer[offset + i - d] |= s * 128
+}
+
+
+/***/ }),
+
+/***/ "./node_modules/isarray/index.js":
+/*!***************************************!*\
+  !*** ./node_modules/isarray/index.js ***!
+  \***************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+var toString = {}.toString;
+
+module.exports = Array.isArray || function (arr) {
+  return toString.call(arr) == '[object Array]';
+};
+
+
+/***/ }),
+
+/***/ "./node_modules/mime/Mime.js":
+/*!***********************************!*\
+  !*** ./node_modules/mime/Mime.js ***!
+  \***********************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/**
+ * @param typeMap [Object] Map of MIME type -> Array[extensions]
+ * @param ...
+ */
+function Mime() {
+  this._types = Object.create(null);
+  this._extensions = Object.create(null);
+
+  for (let i = 0; i < arguments.length; i++) {
+    this.define(arguments[i]);
+  }
+
+  this.define = this.define.bind(this);
+  this.getType = this.getType.bind(this);
+  this.getExtension = this.getExtension.bind(this);
+}
+
+/**
+ * Define mimetype -> extension mappings.  Each key is a mime-type that maps
+ * to an array of extensions associated with the type.  The first extension is
+ * used as the default extension for the type.
+ *
+ * e.g. mime.define({'audio/ogg', ['oga', 'ogg', 'spx']});
+ *
+ * If a type declares an extension that has already been defined, an error will
+ * be thrown.  To suppress this error and force the extension to be associated
+ * with the new type, pass `force`=true.  Alternatively, you may prefix the
+ * extension with "*" to map the type to extension, without mapping the
+ * extension to the type.
+ *
+ * e.g. mime.define({'audio/wav', ['wav']}, {'audio/x-wav', ['*wav']});
+ *
+ *
+ * @param map (Object) type definitions
+ * @param force (Boolean) if true, force overriding of existing definitions
+ */
+Mime.prototype.define = function(typeMap, force) {
+  for (let type in typeMap) {
+    let extensions = typeMap[type].map(function(t) {
+      return t.toLowerCase();
+    });
+    type = type.toLowerCase();
+
+    for (let i = 0; i < extensions.length; i++) {
+      const ext = extensions[i];
+
+      // '*' prefix = not the preferred type for this extension.  So fixup the
+      // extension, and skip it.
+      if (ext[0] === '*') {
+        continue;
+      }
+
+      if (!force && (ext in this._types)) {
+        throw new Error(
+          'Attempt to change mapping for "' + ext +
+          '" extension from "' + this._types[ext] + '" to "' + type +
+          '". Pass `force=true` to allow this, otherwise remove "' + ext +
+          '" from the list of extensions for "' + type + '".'
+        );
+      }
+
+      this._types[ext] = type;
+    }
+
+    // Use first extension as default
+    if (force || !this._extensions[type]) {
+      const ext = extensions[0];
+      this._extensions[type] = (ext[0] !== '*') ? ext : ext.substr(1);
+    }
+  }
+};
+
+/**
+ * Lookup a mime type based on extension
+ */
+Mime.prototype.getType = function(path) {
+  path = String(path);
+  let last = path.replace(/^.*[/\\]/, '').toLowerCase();
+  let ext = last.replace(/^.*\./, '').toLowerCase();
+
+  let hasPath = last.length < path.length;
+  let hasDot = ext.length < last.length - 1;
+
+  return (hasDot || !hasPath) && this._types[ext] || null;
+};
+
+/**
+ * Return file extension associated with a mime type
+ */
+Mime.prototype.getExtension = function(type) {
+  type = /^\s*([^;\s]*)/.test(type) && RegExp.$1;
+  return type && this._extensions[type.toLowerCase()] || null;
+};
+
+module.exports = Mime;
+
+
+/***/ }),
+
+/***/ "./node_modules/mime/index.js":
+/*!************************************!*\
+  !*** ./node_modules/mime/index.js ***!
+  \************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+let Mime = __webpack_require__(/*! ./Mime */ "./node_modules/mime/Mime.js");
+module.exports = new Mime(__webpack_require__(/*! ./types/standard */ "./node_modules/mime/types/standard.js"), __webpack_require__(/*! ./types/other */ "./node_modules/mime/types/other.js"));
+
+
+/***/ }),
+
+/***/ "./node_modules/mime/types/other.js":
+/*!******************************************!*\
+  !*** ./node_modules/mime/types/other.js ***!
+  \******************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = {"application/prs.cww":["cww"],"application/vnd.1000minds.decision-model+xml":["1km"],"application/vnd.3gpp.pic-bw-large":["plb"],"application/vnd.3gpp.pic-bw-small":["psb"],"application/vnd.3gpp.pic-bw-var":["pvb"],"application/vnd.3gpp2.tcap":["tcap"],"application/vnd.3m.post-it-notes":["pwn"],"application/vnd.accpac.simply.aso":["aso"],"application/vnd.accpac.simply.imp":["imp"],"application/vnd.acucobol":["acu"],"application/vnd.acucorp":["atc","acutc"],"application/vnd.adobe.air-application-installer-package+zip":["air"],"application/vnd.adobe.formscentral.fcdt":["fcdt"],"application/vnd.adobe.fxp":["fxp","fxpl"],"application/vnd.adobe.xdp+xml":["xdp"],"application/vnd.adobe.xfdf":["xfdf"],"application/vnd.ahead.space":["ahead"],"application/vnd.airzip.filesecure.azf":["azf"],"application/vnd.airzip.filesecure.azs":["azs"],"application/vnd.amazon.ebook":["azw"],"application/vnd.americandynamics.acc":["acc"],"application/vnd.amiga.ami":["ami"],"application/vnd.android.package-archive":["apk"],"application/vnd.anser-web-certificate-issue-initiation":["cii"],"application/vnd.anser-web-funds-transfer-initiation":["fti"],"application/vnd.antix.game-component":["atx"],"application/vnd.apple.installer+xml":["mpkg"],"application/vnd.apple.keynote":["key"],"application/vnd.apple.mpegurl":["m3u8"],"application/vnd.apple.numbers":["numbers"],"application/vnd.apple.pages":["pages"],"application/vnd.apple.pkpass":["pkpass"],"application/vnd.aristanetworks.swi":["swi"],"application/vnd.astraea-software.iota":["iota"],"application/vnd.audiograph":["aep"],"application/vnd.balsamiq.bmml+xml":["bmml"],"application/vnd.blueice.multipass":["mpm"],"application/vnd.bmi":["bmi"],"application/vnd.businessobjects":["rep"],"application/vnd.chemdraw+xml":["cdxml"],"application/vnd.chipnuts.karaoke-mmd":["mmd"],"application/vnd.cinderella":["cdy"],"application/vnd.citationstyles.style+xml":["csl"],"application/vnd.claymore":["cla"],"application/vnd.cloanto.rp9":["rp9"],"application/vnd.clonk.c4group":["c4g","c4d","c4f","c4p","c4u"],"application/vnd.cluetrust.cartomobile-config":["c11amc"],"application/vnd.cluetrust.cartomobile-config-pkg":["c11amz"],"application/vnd.commonspace":["csp"],"application/vnd.contact.cmsg":["cdbcmsg"],"application/vnd.cosmocaller":["cmc"],"application/vnd.crick.clicker":["clkx"],"application/vnd.crick.clicker.keyboard":["clkk"],"application/vnd.crick.clicker.palette":["clkp"],"application/vnd.crick.clicker.template":["clkt"],"application/vnd.crick.clicker.wordbank":["clkw"],"application/vnd.criticaltools.wbs+xml":["wbs"],"application/vnd.ctc-posml":["pml"],"application/vnd.cups-ppd":["ppd"],"application/vnd.curl.car":["car"],"application/vnd.curl.pcurl":["pcurl"],"application/vnd.dart":["dart"],"application/vnd.data-vision.rdz":["rdz"],"application/vnd.dbf":["dbf"],"application/vnd.dece.data":["uvf","uvvf","uvd","uvvd"],"application/vnd.dece.ttml+xml":["uvt","uvvt"],"application/vnd.dece.unspecified":["uvx","uvvx"],"application/vnd.dece.zip":["uvz","uvvz"],"application/vnd.denovo.fcselayout-link":["fe_launch"],"application/vnd.dna":["dna"],"application/vnd.dolby.mlp":["mlp"],"application/vnd.dpgraph":["dpg"],"application/vnd.dreamfactory":["dfac"],"application/vnd.ds-keypoint":["kpxx"],"application/vnd.dvb.ait":["ait"],"application/vnd.dvb.service":["svc"],"application/vnd.dynageo":["geo"],"application/vnd.ecowin.chart":["mag"],"application/vnd.enliven":["nml"],"application/vnd.epson.esf":["esf"],"application/vnd.epson.msf":["msf"],"application/vnd.epson.quickanime":["qam"],"application/vnd.epson.salt":["slt"],"application/vnd.epson.ssf":["ssf"],"application/vnd.eszigno3+xml":["es3","et3"],"application/vnd.ezpix-album":["ez2"],"application/vnd.ezpix-package":["ez3"],"application/vnd.fdf":["fdf"],"application/vnd.fdsn.mseed":["mseed"],"application/vnd.fdsn.seed":["seed","dataless"],"application/vnd.flographit":["gph"],"application/vnd.fluxtime.clip":["ftc"],"application/vnd.framemaker":["fm","frame","maker","book"],"application/vnd.frogans.fnc":["fnc"],"application/vnd.frogans.ltf":["ltf"],"application/vnd.fsc.weblaunch":["fsc"],"application/vnd.fujitsu.oasys":["oas"],"application/vnd.fujitsu.oasys2":["oa2"],"application/vnd.fujitsu.oasys3":["oa3"],"application/vnd.fujitsu.oasysgp":["fg5"],"application/vnd.fujitsu.oasysprs":["bh2"],"application/vnd.fujixerox.ddd":["ddd"],"application/vnd.fujixerox.docuworks":["xdw"],"application/vnd.fujixerox.docuworks.binder":["xbd"],"application/vnd.fuzzysheet":["fzs"],"application/vnd.genomatix.tuxedo":["txd"],"application/vnd.geogebra.file":["ggb"],"application/vnd.geogebra.tool":["ggt"],"application/vnd.geometry-explorer":["gex","gre"],"application/vnd.geonext":["gxt"],"application/vnd.geoplan":["g2w"],"application/vnd.geospace":["g3w"],"application/vnd.gmx":["gmx"],"application/vnd.google-apps.document":["gdoc"],"application/vnd.google-apps.presentation":["gslides"],"application/vnd.google-apps.spreadsheet":["gsheet"],"application/vnd.google-earth.kml+xml":["kml"],"application/vnd.google-earth.kmz":["kmz"],"application/vnd.grafeq":["gqf","gqs"],"application/vnd.groove-account":["gac"],"application/vnd.groove-help":["ghf"],"application/vnd.groove-identity-message":["gim"],"application/vnd.groove-injector":["grv"],"application/vnd.groove-tool-message":["gtm"],"application/vnd.groove-tool-template":["tpl"],"application/vnd.groove-vcard":["vcg"],"application/vnd.hal+xml":["hal"],"application/vnd.handheld-entertainment+xml":["zmm"],"application/vnd.hbci":["hbci"],"application/vnd.hhe.lesson-player":["les"],"application/vnd.hp-hpgl":["hpgl"],"application/vnd.hp-hpid":["hpid"],"application/vnd.hp-hps":["hps"],"application/vnd.hp-jlyt":["jlt"],"application/vnd.hp-pcl":["pcl"],"application/vnd.hp-pclxl":["pclxl"],"application/vnd.hydrostatix.sof-data":["sfd-hdstx"],"application/vnd.ibm.minipay":["mpy"],"application/vnd.ibm.modcap":["afp","listafp","list3820"],"application/vnd.ibm.rights-management":["irm"],"application/vnd.ibm.secure-container":["sc"],"application/vnd.iccprofile":["icc","icm"],"application/vnd.igloader":["igl"],"application/vnd.immervision-ivp":["ivp"],"application/vnd.immervision-ivu":["ivu"],"application/vnd.insors.igm":["igm"],"application/vnd.intercon.formnet":["xpw","xpx"],"application/vnd.intergeo":["i2g"],"application/vnd.intu.qbo":["qbo"],"application/vnd.intu.qfx":["qfx"],"application/vnd.ipunplugged.rcprofile":["rcprofile"],"application/vnd.irepository.package+xml":["irp"],"application/vnd.is-xpr":["xpr"],"application/vnd.isac.fcs":["fcs"],"application/vnd.jam":["jam"],"application/vnd.jcp.javame.midlet-rms":["rms"],"application/vnd.jisp":["jisp"],"application/vnd.joost.joda-archive":["joda"],"application/vnd.kahootz":["ktz","ktr"],"application/vnd.kde.karbon":["karbon"],"application/vnd.kde.kchart":["chrt"],"application/vnd.kde.kformula":["kfo"],"application/vnd.kde.kivio":["flw"],"application/vnd.kde.kontour":["kon"],"application/vnd.kde.kpresenter":["kpr","kpt"],"application/vnd.kde.kspread":["ksp"],"application/vnd.kde.kword":["kwd","kwt"],"application/vnd.kenameaapp":["htke"],"application/vnd.kidspiration":["kia"],"application/vnd.kinar":["kne","knp"],"application/vnd.koan":["skp","skd","skt","skm"],"application/vnd.kodak-descriptor":["sse"],"application/vnd.las.las+xml":["lasxml"],"application/vnd.llamagraphics.life-balance.desktop":["lbd"],"application/vnd.llamagraphics.life-balance.exchange+xml":["lbe"],"application/vnd.lotus-1-2-3":["123"],"application/vnd.lotus-approach":["apr"],"application/vnd.lotus-freelance":["pre"],"application/vnd.lotus-notes":["nsf"],"application/vnd.lotus-organizer":["org"],"application/vnd.lotus-screencam":["scm"],"application/vnd.lotus-wordpro":["lwp"],"application/vnd.macports.portpkg":["portpkg"],"application/vnd.mapbox-vector-tile":["mvt"],"application/vnd.mcd":["mcd"],"application/vnd.medcalcdata":["mc1"],"application/vnd.mediastation.cdkey":["cdkey"],"application/vnd.mfer":["mwf"],"application/vnd.mfmp":["mfm"],"application/vnd.micrografx.flo":["flo"],"application/vnd.micrografx.igx":["igx"],"application/vnd.mif":["mif"],"application/vnd.mobius.daf":["daf"],"application/vnd.mobius.dis":["dis"],"application/vnd.mobius.mbk":["mbk"],"application/vnd.mobius.mqy":["mqy"],"application/vnd.mobius.msl":["msl"],"application/vnd.mobius.plc":["plc"],"application/vnd.mobius.txf":["txf"],"application/vnd.mophun.application":["mpn"],"application/vnd.mophun.certificate":["mpc"],"application/vnd.mozilla.xul+xml":["xul"],"application/vnd.ms-artgalry":["cil"],"application/vnd.ms-cab-compressed":["cab"],"application/vnd.ms-excel":["xls","xlm","xla","xlc","xlt","xlw"],"application/vnd.ms-excel.addin.macroenabled.12":["xlam"],"application/vnd.ms-excel.sheet.binary.macroenabled.12":["xlsb"],"application/vnd.ms-excel.sheet.macroenabled.12":["xlsm"],"application/vnd.ms-excel.template.macroenabled.12":["xltm"],"application/vnd.ms-fontobject":["eot"],"application/vnd.ms-htmlhelp":["chm"],"application/vnd.ms-ims":["ims"],"application/vnd.ms-lrm":["lrm"],"application/vnd.ms-officetheme":["thmx"],"application/vnd.ms-outlook":["msg"],"application/vnd.ms-pki.seccat":["cat"],"application/vnd.ms-pki.stl":["*stl"],"application/vnd.ms-powerpoint":["ppt","pps","pot"],"application/vnd.ms-powerpoint.addin.macroenabled.12":["ppam"],"application/vnd.ms-powerpoint.presentation.macroenabled.12":["pptm"],"application/vnd.ms-powerpoint.slide.macroenabled.12":["sldm"],"application/vnd.ms-powerpoint.slideshow.macroenabled.12":["ppsm"],"application/vnd.ms-powerpoint.template.macroenabled.12":["potm"],"application/vnd.ms-project":["mpp","mpt"],"application/vnd.ms-word.document.macroenabled.12":["docm"],"application/vnd.ms-word.template.macroenabled.12":["dotm"],"application/vnd.ms-works":["wps","wks","wcm","wdb"],"application/vnd.ms-wpl":["wpl"],"application/vnd.ms-xpsdocument":["xps"],"application/vnd.mseq":["mseq"],"application/vnd.musician":["mus"],"application/vnd.muvee.style":["msty"],"application/vnd.mynfc":["taglet"],"application/vnd.neurolanguage.nlu":["nlu"],"application/vnd.nitf":["ntf","nitf"],"application/vnd.noblenet-directory":["nnd"],"application/vnd.noblenet-sealer":["nns"],"application/vnd.noblenet-web":["nnw"],"application/vnd.nokia.n-gage.ac+xml":["*ac"],"application/vnd.nokia.n-gage.data":["ngdat"],"application/vnd.nokia.n-gage.symbian.install":["n-gage"],"application/vnd.nokia.radio-preset":["rpst"],"application/vnd.nokia.radio-presets":["rpss"],"application/vnd.novadigm.edm":["edm"],"application/vnd.novadigm.edx":["edx"],"application/vnd.novadigm.ext":["ext"],"application/vnd.oasis.opendocument.chart":["odc"],"application/vnd.oasis.opendocument.chart-template":["otc"],"application/vnd.oasis.opendocument.database":["odb"],"application/vnd.oasis.opendocument.formula":["odf"],"application/vnd.oasis.opendocument.formula-template":["odft"],"application/vnd.oasis.opendocument.graphics":["odg"],"application/vnd.oasis.opendocument.graphics-template":["otg"],"application/vnd.oasis.opendocument.image":["odi"],"application/vnd.oasis.opendocument.image-template":["oti"],"application/vnd.oasis.opendocument.presentation":["odp"],"application/vnd.oasis.opendocument.presentation-template":["otp"],"application/vnd.oasis.opendocument.spreadsheet":["ods"],"application/vnd.oasis.opendocument.spreadsheet-template":["ots"],"application/vnd.oasis.opendocument.text":["odt"],"application/vnd.oasis.opendocument.text-master":["odm"],"application/vnd.oasis.opendocument.text-template":["ott"],"application/vnd.oasis.opendocument.text-web":["oth"],"application/vnd.olpc-sugar":["xo"],"application/vnd.oma.dd2+xml":["dd2"],"application/vnd.openblox.game+xml":["obgx"],"application/vnd.openofficeorg.extension":["oxt"],"application/vnd.openstreetmap.data+xml":["osm"],"application/vnd.openxmlformats-officedocument.presentationml.presentation":["pptx"],"application/vnd.openxmlformats-officedocument.presentationml.slide":["sldx"],"application/vnd.openxmlformats-officedocument.presentationml.slideshow":["ppsx"],"application/vnd.openxmlformats-officedocument.presentationml.template":["potx"],"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet":["xlsx"],"application/vnd.openxmlformats-officedocument.spreadsheetml.template":["xltx"],"application/vnd.openxmlformats-officedocument.wordprocessingml.document":["docx"],"application/vnd.openxmlformats-officedocument.wordprocessingml.template":["dotx"],"application/vnd.osgeo.mapguide.package":["mgp"],"application/vnd.osgi.dp":["dp"],"application/vnd.osgi.subsystem":["esa"],"application/vnd.palm":["pdb","pqa","oprc"],"application/vnd.pawaafile":["paw"],"application/vnd.pg.format":["str"],"application/vnd.pg.osasli":["ei6"],"application/vnd.picsel":["efif"],"application/vnd.pmi.widget":["wg"],"application/vnd.pocketlearn":["plf"],"application/vnd.powerbuilder6":["pbd"],"application/vnd.previewsystems.box":["box"],"application/vnd.proteus.magazine":["mgz"],"application/vnd.publishare-delta-tree":["qps"],"application/vnd.pvi.ptid1":["ptid"],"application/vnd.quark.quarkxpress":["qxd","qxt","qwd","qwt","qxl","qxb"],"application/vnd.rar":["rar"],"application/vnd.realvnc.bed":["bed"],"application/vnd.recordare.musicxml":["mxl"],"application/vnd.recordare.musicxml+xml":["musicxml"],"application/vnd.rig.cryptonote":["cryptonote"],"application/vnd.rim.cod":["cod"],"application/vnd.rn-realmedia":["rm"],"application/vnd.rn-realmedia-vbr":["rmvb"],"application/vnd.route66.link66+xml":["link66"],"application/vnd.sailingtracker.track":["st"],"application/vnd.seemail":["see"],"application/vnd.sema":["sema"],"application/vnd.semd":["semd"],"application/vnd.semf":["semf"],"application/vnd.shana.informed.formdata":["ifm"],"application/vnd.shana.informed.formtemplate":["itp"],"application/vnd.shana.informed.interchange":["iif"],"application/vnd.shana.informed.package":["ipk"],"application/vnd.simtech-mindmapper":["twd","twds"],"application/vnd.smaf":["mmf"],"application/vnd.smart.teacher":["teacher"],"application/vnd.software602.filler.form+xml":["fo"],"application/vnd.solent.sdkm+xml":["sdkm","sdkd"],"application/vnd.spotfire.dxp":["dxp"],"application/vnd.spotfire.sfs":["sfs"],"application/vnd.stardivision.calc":["sdc"],"application/vnd.stardivision.draw":["sda"],"application/vnd.stardivision.impress":["sdd"],"application/vnd.stardivision.math":["smf"],"application/vnd.stardivision.writer":["sdw","vor"],"application/vnd.stardivision.writer-global":["sgl"],"application/vnd.stepmania.package":["smzip"],"application/vnd.stepmania.stepchart":["sm"],"application/vnd.sun.wadl+xml":["wadl"],"application/vnd.sun.xml.calc":["sxc"],"application/vnd.sun.xml.calc.template":["stc"],"application/vnd.sun.xml.draw":["sxd"],"application/vnd.sun.xml.draw.template":["std"],"application/vnd.sun.xml.impress":["sxi"],"application/vnd.sun.xml.impress.template":["sti"],"application/vnd.sun.xml.math":["sxm"],"application/vnd.sun.xml.writer":["sxw"],"application/vnd.sun.xml.writer.global":["sxg"],"application/vnd.sun.xml.writer.template":["stw"],"application/vnd.sus-calendar":["sus","susp"],"application/vnd.svd":["svd"],"application/vnd.symbian.install":["sis","sisx"],"application/vnd.syncml+xml":["xsm"],"application/vnd.syncml.dm+wbxml":["bdm"],"application/vnd.syncml.dm+xml":["xdm"],"application/vnd.syncml.dmddf+xml":["ddf"],"application/vnd.tao.intent-module-archive":["tao"],"application/vnd.tcpdump.pcap":["pcap","cap","dmp"],"application/vnd.tmobile-livetv":["tmo"],"application/vnd.trid.tpt":["tpt"],"application/vnd.triscape.mxs":["mxs"],"application/vnd.trueapp":["tra"],"application/vnd.ufdl":["ufd","ufdl"],"application/vnd.uiq.theme":["utz"],"application/vnd.umajin":["umj"],"application/vnd.unity":["unityweb"],"application/vnd.uoml+xml":["uoml"],"application/vnd.vcx":["vcx"],"application/vnd.visio":["vsd","vst","vss","vsw"],"application/vnd.visionary":["vis"],"application/vnd.vsf":["vsf"],"application/vnd.wap.wbxml":["wbxml"],"application/vnd.wap.wmlc":["wmlc"],"application/vnd.wap.wmlscriptc":["wmlsc"],"application/vnd.webturbo":["wtb"],"application/vnd.wolfram.player":["nbp"],"application/vnd.wordperfect":["wpd"],"application/vnd.wqd":["wqd"],"application/vnd.wt.stf":["stf"],"application/vnd.xara":["xar"],"application/vnd.xfdl":["xfdl"],"application/vnd.yamaha.hv-dic":["hvd"],"application/vnd.yamaha.hv-script":["hvs"],"application/vnd.yamaha.hv-voice":["hvp"],"application/vnd.yamaha.openscoreformat":["osf"],"application/vnd.yamaha.openscoreformat.osfpvg+xml":["osfpvg"],"application/vnd.yamaha.smaf-audio":["saf"],"application/vnd.yamaha.smaf-phrase":["spf"],"application/vnd.yellowriver-custom-menu":["cmp"],"application/vnd.zul":["zir","zirz"],"application/vnd.zzazz.deck+xml":["zaz"],"application/x-7z-compressed":["7z"],"application/x-abiword":["abw"],"application/x-ace-compressed":["ace"],"application/x-apple-diskimage":["*dmg"],"application/x-arj":["arj"],"application/x-authorware-bin":["aab","x32","u32","vox"],"application/x-authorware-map":["aam"],"application/x-authorware-seg":["aas"],"application/x-bcpio":["bcpio"],"application/x-bdoc":["*bdoc"],"application/x-bittorrent":["torrent"],"application/x-blorb":["blb","blorb"],"application/x-bzip":["bz"],"application/x-bzip2":["bz2","boz"],"application/x-cbr":["cbr","cba","cbt","cbz","cb7"],"application/x-cdlink":["vcd"],"application/x-cfs-compressed":["cfs"],"application/x-chat":["chat"],"application/x-chess-pgn":["pgn"],"application/x-chrome-extension":["crx"],"application/x-cocoa":["cco"],"application/x-conference":["nsc"],"application/x-cpio":["cpio"],"application/x-csh":["csh"],"application/x-debian-package":["*deb","udeb"],"application/x-dgc-compressed":["dgc"],"application/x-director":["dir","dcr","dxr","cst","cct","cxt","w3d","fgd","swa"],"application/x-doom":["wad"],"application/x-dtbncx+xml":["ncx"],"application/x-dtbook+xml":["dtb"],"application/x-dtbresource+xml":["res"],"application/x-dvi":["dvi"],"application/x-envoy":["evy"],"application/x-eva":["eva"],"application/x-font-bdf":["bdf"],"application/x-font-ghostscript":["gsf"],"application/x-font-linux-psf":["psf"],"application/x-font-pcf":["pcf"],"application/x-font-snf":["snf"],"application/x-font-type1":["pfa","pfb","pfm","afm"],"application/x-freearc":["arc"],"application/x-futuresplash":["spl"],"application/x-gca-compressed":["gca"],"application/x-glulx":["ulx"],"application/x-gnumeric":["gnumeric"],"application/x-gramps-xml":["gramps"],"application/x-gtar":["gtar"],"application/x-hdf":["hdf"],"application/x-httpd-php":["php"],"application/x-install-instructions":["install"],"application/x-iso9660-image":["*iso"],"application/x-iwork-keynote-sffkey":["*key"],"application/x-iwork-numbers-sffnumbers":["*numbers"],"application/x-iwork-pages-sffpages":["*pages"],"application/x-java-archive-diff":["jardiff"],"application/x-java-jnlp-file":["jnlp"],"application/x-keepass2":["kdbx"],"application/x-latex":["latex"],"application/x-lua-bytecode":["luac"],"application/x-lzh-compressed":["lzh","lha"],"application/x-makeself":["run"],"application/x-mie":["mie"],"application/x-mobipocket-ebook":["prc","mobi"],"application/x-ms-application":["application"],"application/x-ms-shortcut":["lnk"],"application/x-ms-wmd":["wmd"],"application/x-ms-wmz":["wmz"],"application/x-ms-xbap":["xbap"],"application/x-msaccess":["mdb"],"application/x-msbinder":["obd"],"application/x-mscardfile":["crd"],"application/x-msclip":["clp"],"application/x-msdos-program":["*exe"],"application/x-msdownload":["*exe","*dll","com","bat","*msi"],"application/x-msmediaview":["mvb","m13","m14"],"application/x-msmetafile":["*wmf","*wmz","*emf","emz"],"application/x-msmoney":["mny"],"application/x-mspublisher":["pub"],"application/x-msschedule":["scd"],"application/x-msterminal":["trm"],"application/x-mswrite":["wri"],"application/x-netcdf":["nc","cdf"],"application/x-ns-proxy-autoconfig":["pac"],"application/x-nzb":["nzb"],"application/x-perl":["pl","pm"],"application/x-pilot":["*prc","*pdb"],"application/x-pkcs12":["p12","pfx"],"application/x-pkcs7-certificates":["p7b","spc"],"application/x-pkcs7-certreqresp":["p7r"],"application/x-rar-compressed":["*rar"],"application/x-redhat-package-manager":["rpm"],"application/x-research-info-systems":["ris"],"application/x-sea":["sea"],"application/x-sh":["sh"],"application/x-shar":["shar"],"application/x-shockwave-flash":["swf"],"application/x-silverlight-app":["xap"],"application/x-sql":["sql"],"application/x-stuffit":["sit"],"application/x-stuffitx":["sitx"],"application/x-subrip":["srt"],"application/x-sv4cpio":["sv4cpio"],"application/x-sv4crc":["sv4crc"],"application/x-t3vm-image":["t3"],"application/x-tads":["gam"],"application/x-tar":["tar"],"application/x-tcl":["tcl","tk"],"application/x-tex":["tex"],"application/x-tex-tfm":["tfm"],"application/x-texinfo":["texinfo","texi"],"application/x-tgif":["*obj"],"application/x-ustar":["ustar"],"application/x-virtualbox-hdd":["hdd"],"application/x-virtualbox-ova":["ova"],"application/x-virtualbox-ovf":["ovf"],"application/x-virtualbox-vbox":["vbox"],"application/x-virtualbox-vbox-extpack":["vbox-extpack"],"application/x-virtualbox-vdi":["vdi"],"application/x-virtualbox-vhd":["vhd"],"application/x-virtualbox-vmdk":["vmdk"],"application/x-wais-source":["src"],"application/x-web-app-manifest+json":["webapp"],"application/x-x509-ca-cert":["der","crt","pem"],"application/x-xfig":["fig"],"application/x-xliff+xml":["*xlf"],"application/x-xpinstall":["xpi"],"application/x-xz":["xz"],"application/x-zmachine":["z1","z2","z3","z4","z5","z6","z7","z8"],"audio/vnd.dece.audio":["uva","uvva"],"audio/vnd.digital-winds":["eol"],"audio/vnd.dra":["dra"],"audio/vnd.dts":["dts"],"audio/vnd.dts.hd":["dtshd"],"audio/vnd.lucent.voice":["lvp"],"audio/vnd.ms-playready.media.pya":["pya"],"audio/vnd.nuera.ecelp4800":["ecelp4800"],"audio/vnd.nuera.ecelp7470":["ecelp7470"],"audio/vnd.nuera.ecelp9600":["ecelp9600"],"audio/vnd.rip":["rip"],"audio/x-aac":["aac"],"audio/x-aiff":["aif","aiff","aifc"],"audio/x-caf":["caf"],"audio/x-flac":["flac"],"audio/x-m4a":["*m4a"],"audio/x-matroska":["mka"],"audio/x-mpegurl":["m3u"],"audio/x-ms-wax":["wax"],"audio/x-ms-wma":["wma"],"audio/x-pn-realaudio":["ram","ra"],"audio/x-pn-realaudio-plugin":["rmp"],"audio/x-realaudio":["*ra"],"audio/x-wav":["*wav"],"chemical/x-cdx":["cdx"],"chemical/x-cif":["cif"],"chemical/x-cmdf":["cmdf"],"chemical/x-cml":["cml"],"chemical/x-csml":["csml"],"chemical/x-xyz":["xyz"],"image/prs.btif":["btif"],"image/prs.pti":["pti"],"image/vnd.adobe.photoshop":["psd"],"image/vnd.airzip.accelerator.azv":["azv"],"image/vnd.dece.graphic":["uvi","uvvi","uvg","uvvg"],"image/vnd.djvu":["djvu","djv"],"image/vnd.dvb.subtitle":["*sub"],"image/vnd.dwg":["dwg"],"image/vnd.dxf":["dxf"],"image/vnd.fastbidsheet":["fbs"],"image/vnd.fpx":["fpx"],"image/vnd.fst":["fst"],"image/vnd.fujixerox.edmics-mmr":["mmr"],"image/vnd.fujixerox.edmics-rlc":["rlc"],"image/vnd.microsoft.icon":["ico"],"image/vnd.ms-dds":["dds"],"image/vnd.ms-modi":["mdi"],"image/vnd.ms-photo":["wdp"],"image/vnd.net-fpx":["npx"],"image/vnd.pco.b16":["b16"],"image/vnd.tencent.tap":["tap"],"image/vnd.valve.source.texture":["vtf"],"image/vnd.wap.wbmp":["wbmp"],"image/vnd.xiff":["xif"],"image/vnd.zbrush.pcx":["pcx"],"image/x-3ds":["3ds"],"image/x-cmu-raster":["ras"],"image/x-cmx":["cmx"],"image/x-freehand":["fh","fhc","fh4","fh5","fh7"],"image/x-icon":["*ico"],"image/x-jng":["jng"],"image/x-mrsid-image":["sid"],"image/x-ms-bmp":["*bmp"],"image/x-pcx":["*pcx"],"image/x-pict":["pic","pct"],"image/x-portable-anymap":["pnm"],"image/x-portable-bitmap":["pbm"],"image/x-portable-graymap":["pgm"],"image/x-portable-pixmap":["ppm"],"image/x-rgb":["rgb"],"image/x-tga":["tga"],"image/x-xbitmap":["xbm"],"image/x-xpixmap":["xpm"],"image/x-xwindowdump":["xwd"],"message/vnd.wfa.wsc":["wsc"],"model/vnd.collada+xml":["dae"],"model/vnd.dwf":["dwf"],"model/vnd.gdl":["gdl"],"model/vnd.gtw":["gtw"],"model/vnd.mts":["mts"],"model/vnd.opengex":["ogex"],"model/vnd.parasolid.transmit.binary":["x_b"],"model/vnd.parasolid.transmit.text":["x_t"],"model/vnd.sap.vds":["vds"],"model/vnd.usdz+zip":["usdz"],"model/vnd.valve.source.compiled-map":["bsp"],"model/vnd.vtu":["vtu"],"text/prs.lines.tag":["dsc"],"text/vnd.curl":["curl"],"text/vnd.curl.dcurl":["dcurl"],"text/vnd.curl.mcurl":["mcurl"],"text/vnd.curl.scurl":["scurl"],"text/vnd.dvb.subtitle":["sub"],"text/vnd.fly":["fly"],"text/vnd.fmi.flexstor":["flx"],"text/vnd.graphviz":["gv"],"text/vnd.in3d.3dml":["3dml"],"text/vnd.in3d.spot":["spot"],"text/vnd.sun.j2me.app-descriptor":["jad"],"text/vnd.wap.wml":["wml"],"text/vnd.wap.wmlscript":["wmls"],"text/x-asm":["s","asm"],"text/x-c":["c","cc","cxx","cpp","h","hh","dic"],"text/x-component":["htc"],"text/x-fortran":["f","for","f77","f90"],"text/x-handlebars-template":["hbs"],"text/x-java-source":["java"],"text/x-lua":["lua"],"text/x-markdown":["mkd"],"text/x-nfo":["nfo"],"text/x-opml":["opml"],"text/x-org":["*org"],"text/x-pascal":["p","pas"],"text/x-processing":["pde"],"text/x-sass":["sass"],"text/x-scss":["scss"],"text/x-setext":["etx"],"text/x-sfv":["sfv"],"text/x-suse-ymp":["ymp"],"text/x-uuencode":["uu"],"text/x-vcalendar":["vcs"],"text/x-vcard":["vcf"],"video/vnd.dece.hd":["uvh","uvvh"],"video/vnd.dece.mobile":["uvm","uvvm"],"video/vnd.dece.pd":["uvp","uvvp"],"video/vnd.dece.sd":["uvs","uvvs"],"video/vnd.dece.video":["uvv","uvvv"],"video/vnd.dvb.file":["dvb"],"video/vnd.fvt":["fvt"],"video/vnd.mpegurl":["mxu","m4u"],"video/vnd.ms-playready.media.pyv":["pyv"],"video/vnd.uvvu.mp4":["uvu","uvvu"],"video/vnd.vivo":["viv"],"video/x-f4v":["f4v"],"video/x-fli":["fli"],"video/x-flv":["flv"],"video/x-m4v":["m4v"],"video/x-matroska":["mkv","mk3d","mks"],"video/x-mng":["mng"],"video/x-ms-asf":["asf","asx"],"video/x-ms-vob":["vob"],"video/x-ms-wm":["wm"],"video/x-ms-wmv":["wmv"],"video/x-ms-wmx":["wmx"],"video/x-ms-wvx":["wvx"],"video/x-msvideo":["avi"],"video/x-sgi-movie":["movie"],"video/x-smv":["smv"],"x-conference/x-cooltalk":["ice"]};
+
+/***/ }),
+
+/***/ "./node_modules/mime/types/standard.js":
+/*!*********************************************!*\
+  !*** ./node_modules/mime/types/standard.js ***!
+  \*********************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = {"application/andrew-inset":["ez"],"application/applixware":["aw"],"application/atom+xml":["atom"],"application/atomcat+xml":["atomcat"],"application/atomdeleted+xml":["atomdeleted"],"application/atomsvc+xml":["atomsvc"],"application/atsc-dwd+xml":["dwd"],"application/atsc-held+xml":["held"],"application/atsc-rsat+xml":["rsat"],"application/bdoc":["bdoc"],"application/calendar+xml":["xcs"],"application/ccxml+xml":["ccxml"],"application/cdfx+xml":["cdfx"],"application/cdmi-capability":["cdmia"],"application/cdmi-container":["cdmic"],"application/cdmi-domain":["cdmid"],"application/cdmi-object":["cdmio"],"application/cdmi-queue":["cdmiq"],"application/cu-seeme":["cu"],"application/dash+xml":["mpd"],"application/davmount+xml":["davmount"],"application/docbook+xml":["dbk"],"application/dssc+der":["dssc"],"application/dssc+xml":["xdssc"],"application/ecmascript":["es","ecma"],"application/emma+xml":["emma"],"application/emotionml+xml":["emotionml"],"application/epub+zip":["epub"],"application/exi":["exi"],"application/express":["exp"],"application/fdt+xml":["fdt"],"application/font-tdpfr":["pfr"],"application/geo+json":["geojson"],"application/gml+xml":["gml"],"application/gpx+xml":["gpx"],"application/gxf":["gxf"],"application/gzip":["gz"],"application/hjson":["hjson"],"application/hyperstudio":["stk"],"application/inkml+xml":["ink","inkml"],"application/ipfix":["ipfix"],"application/its+xml":["its"],"application/java-archive":["jar","war","ear"],"application/java-serialized-object":["ser"],"application/java-vm":["class"],"application/javascript":["js","mjs"],"application/json":["json","map"],"application/json5":["json5"],"application/jsonml+json":["jsonml"],"application/ld+json":["jsonld"],"application/lgr+xml":["lgr"],"application/lost+xml":["lostxml"],"application/mac-binhex40":["hqx"],"application/mac-compactpro":["cpt"],"application/mads+xml":["mads"],"application/manifest+json":["webmanifest"],"application/marc":["mrc"],"application/marcxml+xml":["mrcx"],"application/mathematica":["ma","nb","mb"],"application/mathml+xml":["mathml"],"application/mbox":["mbox"],"application/mediaservercontrol+xml":["mscml"],"application/metalink+xml":["metalink"],"application/metalink4+xml":["meta4"],"application/mets+xml":["mets"],"application/mmt-aei+xml":["maei"],"application/mmt-usd+xml":["musd"],"application/mods+xml":["mods"],"application/mp21":["m21","mp21"],"application/mp4":["mp4s","m4p"],"application/msword":["doc","dot"],"application/mxf":["mxf"],"application/n-quads":["nq"],"application/n-triples":["nt"],"application/node":["cjs"],"application/octet-stream":["bin","dms","lrf","mar","so","dist","distz","pkg","bpk","dump","elc","deploy","exe","dll","deb","dmg","iso","img","msi","msp","msm","buffer"],"application/oda":["oda"],"application/oebps-package+xml":["opf"],"application/ogg":["ogx"],"application/omdoc+xml":["omdoc"],"application/onenote":["onetoc","onetoc2","onetmp","onepkg"],"application/oxps":["oxps"],"application/p2p-overlay+xml":["relo"],"application/patch-ops-error+xml":["xer"],"application/pdf":["pdf"],"application/pgp-encrypted":["pgp"],"application/pgp-signature":["asc","sig"],"application/pics-rules":["prf"],"application/pkcs10":["p10"],"application/pkcs7-mime":["p7m","p7c"],"application/pkcs7-signature":["p7s"],"application/pkcs8":["p8"],"application/pkix-attr-cert":["ac"],"application/pkix-cert":["cer"],"application/pkix-crl":["crl"],"application/pkix-pkipath":["pkipath"],"application/pkixcmp":["pki"],"application/pls+xml":["pls"],"application/postscript":["ai","eps","ps"],"application/provenance+xml":["provx"],"application/pskc+xml":["pskcxml"],"application/raml+yaml":["raml"],"application/rdf+xml":["rdf","owl"],"application/reginfo+xml":["rif"],"application/relax-ng-compact-syntax":["rnc"],"application/resource-lists+xml":["rl"],"application/resource-lists-diff+xml":["rld"],"application/rls-services+xml":["rs"],"application/route-apd+xml":["rapd"],"application/route-s-tsid+xml":["sls"],"application/route-usd+xml":["rusd"],"application/rpki-ghostbusters":["gbr"],"application/rpki-manifest":["mft"],"application/rpki-roa":["roa"],"application/rsd+xml":["rsd"],"application/rss+xml":["rss"],"application/rtf":["rtf"],"application/sbml+xml":["sbml"],"application/scvp-cv-request":["scq"],"application/scvp-cv-response":["scs"],"application/scvp-vp-request":["spq"],"application/scvp-vp-response":["spp"],"application/sdp":["sdp"],"application/senml+xml":["senmlx"],"application/sensml+xml":["sensmlx"],"application/set-payment-initiation":["setpay"],"application/set-registration-initiation":["setreg"],"application/shf+xml":["shf"],"application/sieve":["siv","sieve"],"application/smil+xml":["smi","smil"],"application/sparql-query":["rq"],"application/sparql-results+xml":["srx"],"application/srgs":["gram"],"application/srgs+xml":["grxml"],"application/sru+xml":["sru"],"application/ssdl+xml":["ssdl"],"application/ssml+xml":["ssml"],"application/swid+xml":["swidtag"],"application/tei+xml":["tei","teicorpus"],"application/thraud+xml":["tfi"],"application/timestamped-data":["tsd"],"application/toml":["toml"],"application/trig":["trig"],"application/ttml+xml":["ttml"],"application/ubjson":["ubj"],"application/urc-ressheet+xml":["rsheet"],"application/urc-targetdesc+xml":["td"],"application/voicexml+xml":["vxml"],"application/wasm":["wasm"],"application/widget":["wgt"],"application/winhlp":["hlp"],"application/wsdl+xml":["wsdl"],"application/wspolicy+xml":["wspolicy"],"application/xaml+xml":["xaml"],"application/xcap-att+xml":["xav"],"application/xcap-caps+xml":["xca"],"application/xcap-diff+xml":["xdf"],"application/xcap-el+xml":["xel"],"application/xcap-ns+xml":["xns"],"application/xenc+xml":["xenc"],"application/xhtml+xml":["xhtml","xht"],"application/xliff+xml":["xlf"],"application/xml":["xml","xsl","xsd","rng"],"application/xml-dtd":["dtd"],"application/xop+xml":["xop"],"application/xproc+xml":["xpl"],"application/xslt+xml":["*xsl","xslt"],"application/xspf+xml":["xspf"],"application/xv+xml":["mxml","xhvml","xvml","xvm"],"application/yang":["yang"],"application/yin+xml":["yin"],"application/zip":["zip"],"audio/3gpp":["*3gpp"],"audio/adpcm":["adp"],"audio/amr":["amr"],"audio/basic":["au","snd"],"audio/midi":["mid","midi","kar","rmi"],"audio/mobile-xmf":["mxmf"],"audio/mp3":["*mp3"],"audio/mp4":["m4a","mp4a"],"audio/mpeg":["mpga","mp2","mp2a","mp3","m2a","m3a"],"audio/ogg":["oga","ogg","spx","opus"],"audio/s3m":["s3m"],"audio/silk":["sil"],"audio/wav":["wav"],"audio/wave":["*wav"],"audio/webm":["weba"],"audio/xm":["xm"],"font/collection":["ttc"],"font/otf":["otf"],"font/ttf":["ttf"],"font/woff":["woff"],"font/woff2":["woff2"],"image/aces":["exr"],"image/apng":["apng"],"image/avif":["avif"],"image/bmp":["bmp"],"image/cgm":["cgm"],"image/dicom-rle":["drle"],"image/emf":["emf"],"image/fits":["fits"],"image/g3fax":["g3"],"image/gif":["gif"],"image/heic":["heic"],"image/heic-sequence":["heics"],"image/heif":["heif"],"image/heif-sequence":["heifs"],"image/hej2k":["hej2"],"image/hsj2":["hsj2"],"image/ief":["ief"],"image/jls":["jls"],"image/jp2":["jp2","jpg2"],"image/jpeg":["jpeg","jpg","jpe"],"image/jph":["jph"],"image/jphc":["jhc"],"image/jpm":["jpm"],"image/jpx":["jpx","jpf"],"image/jxr":["jxr"],"image/jxra":["jxra"],"image/jxrs":["jxrs"],"image/jxs":["jxs"],"image/jxsc":["jxsc"],"image/jxsi":["jxsi"],"image/jxss":["jxss"],"image/ktx":["ktx"],"image/ktx2":["ktx2"],"image/png":["png"],"image/sgi":["sgi"],"image/svg+xml":["svg","svgz"],"image/t38":["t38"],"image/tiff":["tif","tiff"],"image/tiff-fx":["tfx"],"image/webp":["webp"],"image/wmf":["wmf"],"message/disposition-notification":["disposition-notification"],"message/global":["u8msg"],"message/global-delivery-status":["u8dsn"],"message/global-disposition-notification":["u8mdn"],"message/global-headers":["u8hdr"],"message/rfc822":["eml","mime"],"model/3mf":["3mf"],"model/gltf+json":["gltf"],"model/gltf-binary":["glb"],"model/iges":["igs","iges"],"model/mesh":["msh","mesh","silo"],"model/mtl":["mtl"],"model/obj":["obj"],"model/step+xml":["stpx"],"model/step+zip":["stpz"],"model/step-xml+zip":["stpxz"],"model/stl":["stl"],"model/vrml":["wrl","vrml"],"model/x3d+binary":["*x3db","x3dbz"],"model/x3d+fastinfoset":["x3db"],"model/x3d+vrml":["*x3dv","x3dvz"],"model/x3d+xml":["x3d","x3dz"],"model/x3d-vrml":["x3dv"],"text/cache-manifest":["appcache","manifest"],"text/calendar":["ics","ifb"],"text/coffeescript":["coffee","litcoffee"],"text/css":["css"],"text/csv":["csv"],"text/html":["html","htm","shtml"],"text/jade":["jade"],"text/jsx":["jsx"],"text/less":["less"],"text/markdown":["markdown","md"],"text/mathml":["mml"],"text/mdx":["mdx"],"text/n3":["n3"],"text/plain":["txt","text","conf","def","list","log","in","ini"],"text/richtext":["rtx"],"text/rtf":["*rtf"],"text/sgml":["sgml","sgm"],"text/shex":["shex"],"text/slim":["slim","slm"],"text/spdx":["spdx"],"text/stylus":["stylus","styl"],"text/tab-separated-values":["tsv"],"text/troff":["t","tr","roff","man","me","ms"],"text/turtle":["ttl"],"text/uri-list":["uri","uris","urls"],"text/vcard":["vcard"],"text/vtt":["vtt"],"text/xml":["*xml"],"text/yaml":["yaml","yml"],"video/3gpp":["3gp","3gpp"],"video/3gpp2":["3g2"],"video/h261":["h261"],"video/h263":["h263"],"video/h264":["h264"],"video/iso.segment":["m4s"],"video/jpeg":["jpgv"],"video/jpm":["*jpm","jpgm"],"video/mj2":["mj2","mjp2"],"video/mp2t":["ts"],"video/mp4":["mp4","mp4v","mpg4"],"video/mpeg":["mpeg","mpg","mpe","m1v","m2v"],"video/ogg":["ogv"],"video/quicktime":["qt","mov"],"video/webm":["webm"]};
+
+/***/ }),
+
+/***/ "./node_modules/strnum/strnum.js":
+/*!***************************************!*\
+  !*** ./node_modules/strnum/strnum.js ***!
+  \***************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+const hexRegex = /^[-+]?0x[a-fA-F0-9]+$/;
+const numRegex = /^([\-\+])?(0*)(\.[0-9]+([eE]\-?[0-9]+)?|[0-9]+(\.[0-9]+([eE]\-?[0-9]+)?)?)$/;
+// const octRegex = /0x[a-z0-9]+/;
+// const binRegex = /0x[a-z0-9]+/;
+
+
+//polyfill
+if (!Number.parseInt && window.parseInt) {
+    Number.parseInt = window.parseInt;
+}
+if (!Number.parseFloat && window.parseFloat) {
+    Number.parseFloat = window.parseFloat;
+}
+
+  
+const consider = {
+    hex :  true,
+    leadingZeros: true,
+    decimalPoint: "\.",
+    eNotation: true
+    //skipLike: /regex/
+};
+
+function toNumber(str, options = {}){
+    // const options = Object.assign({}, consider);
+    // if(opt.leadingZeros === false){
+    //     options.leadingZeros = false;
+    // }else if(opt.hex === false){
+    //     options.hex = false;
+    // }
+
+    options = Object.assign({}, consider, options );
+    if(!str || typeof str !== "string" ) return str;
+    
+    let trimmedStr  = str.trim();
+    // if(trimmedStr === "0.0") return 0;
+    // else if(trimmedStr === "+0.0") return 0;
+    // else if(trimmedStr === "-0.0") return -0;
+
+    if(options.skipLike !== undefined && options.skipLike.test(trimmedStr)) return str;
+    else if (options.hex && hexRegex.test(trimmedStr)) {
+        return Number.parseInt(trimmedStr, 16);
+    // } else if (options.parseOct && octRegex.test(str)) {
+    //     return Number.parseInt(val, 8);
+    // }else if (options.parseBin && binRegex.test(str)) {
+    //     return Number.parseInt(val, 2);
+    }else{
+        //separate negative sign, leading zeros, and rest number
+        const match = numRegex.exec(trimmedStr);
+        if(match){
+            const sign = match[1];
+            const leadingZeros = match[2];
+            let numTrimmedByZeros = trimZeros(match[3]); //complete num without leading zeros
+            //trim ending zeros for floating number
+            
+            const eNotation = match[4] || match[6];
+            if(!options.leadingZeros && leadingZeros.length > 0 && sign && trimmedStr[2] !== ".") return str; //-0123
+            else if(!options.leadingZeros && leadingZeros.length > 0 && !sign && trimmedStr[1] !== ".") return str; //0123
+            else{//no leading zeros or leading zeros are allowed
+                const num = Number(trimmedStr);
+                const numStr = "" + num;
+                if(numStr.search(/[eE]/) !== -1){ //given number is long and parsed to eNotation
+                    if(options.eNotation) return num;
+                    else return str;
+                }else if(eNotation){ //given number has enotation
+                    if(options.eNotation) return num;
+                    else return str;
+                }else if(trimmedStr.indexOf(".") !== -1){ //floating number
+                    // const decimalPart = match[5].substr(1);
+                    // const intPart = trimmedStr.substr(0,trimmedStr.indexOf("."));
+
+                    
+                    // const p = numStr.indexOf(".");
+                    // const givenIntPart = numStr.substr(0,p);
+                    // const givenDecPart = numStr.substr(p+1);
+                    if(numStr === "0" && (numTrimmedByZeros === "") ) return num; //0.0
+                    else if(numStr === numTrimmedByZeros) return num; //0.456. 0.79000
+                    else if( sign && numStr === "-"+numTrimmedByZeros) return num;
+                    else return str;
+                }
+                
+                if(leadingZeros){
+                    // if(numTrimmedByZeros === numStr){
+                    //     if(options.leadingZeros) return num;
+                    //     else return str;
+                    // }else return str;
+                    if(numTrimmedByZeros === numStr) return num;
+                    else if(sign+numTrimmedByZeros === numStr) return num;
+                    else return str;
+                }
+
+                if(trimmedStr === numStr) return num;
+                else if(trimmedStr === sign+numStr) return num;
+                // else{
+                //     //number with +/- sign
+                //     trimmedStr.test(/[-+][0-9]);
+
+                // }
+                return str;
+            }
+            // else if(!eNotation && trimmedStr && trimmedStr !== Number(trimmedStr) ) return str;
+            
+        }else{ //non-numeric string
+            return str;
+        }
+    }
+}
+
+/**
+ * 
+ * @param {string} numStr without leading zeros
+ * @returns 
+ */
+function trimZeros(numStr){
+    if(numStr && numStr.indexOf(".") !== -1){//float
+        numStr = numStr.replace(/0+$/, ""); //remove ending zeros
+        if(numStr === ".")  numStr = "0";
+        else if(numStr[0] === ".")  numStr = "0"+numStr;
+        else if(numStr[numStr.length-1] === ".")  numStr = numStr.substr(0,numStr.length-1);
+        return numStr;
+    }
+    return numStr;
+}
+module.exports = toNumber
+
+
+/***/ }),
+
+/***/ "./node_modules/webpack/buildin/amd-options.js":
+/*!****************************************!*\
+  !*** (webpack)/buildin/amd-options.js ***!
+  \****************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+/* WEBPACK VAR INJECTION */(function(__webpack_amd_options__) {/* globals __webpack_amd_options__ */
+module.exports = __webpack_amd_options__;
+
+/* WEBPACK VAR INJECTION */}.call(this, {}))
+
+/***/ }),
+
+/***/ "./node_modules/webpack/buildin/global.js":
+/*!***********************************!*\
+  !*** (webpack)/buildin/global.js ***!
+  \***********************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+var g;
+
+// This works in non-strict mode
+g = (function() {
+	return this;
+})();
+
+try {
+	// This works if eval is allowed (see CSP)
+	g = g || new Function("return this")();
+} catch (e) {
+	// This works if the window reference is available
+	if (typeof window === "object") g = window;
+}
+
+// g can still be undefined, but nothing to do about it...
+// We return undefined, instead of nothing here, so it's
+// easier to handle this case. if(!global) { ...}
+
+module.exports = g;
+
+
+/***/ }),
+
+/***/ "./node_modules/webpack/buildin/module.js":
+/*!***********************************!*\
+  !*** (webpack)/buildin/module.js ***!
+  \***********************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = function(module) {
+	if (!module.webpackPolyfill) {
+		module.deprecate = function() {};
+		module.paths = [];
+		// module.parent = undefined by default
+		if (!module.children) module.children = [];
+		Object.defineProperty(module, "loaded", {
+			enumerable: true,
+			get: function() {
+				return module.l;
+			}
+		});
+		Object.defineProperty(module, "id", {
+			enumerable: true,
+			get: function() {
+				return module.i;
+			}
+		});
+		module.webpackPolyfill = 1;
+	}
+	return module;
+};
+
+
+/***/ }),
+
+/***/ "./package.json":
+/*!**********************!*\
+  !*** ./package.json ***!
+  \**********************/
+/*! exports provided: name, version, description, main, scripts, repository, author, license, dependencies, devDependencies, default */
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.9.0-beta.1\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"dist/cos-wx-sdk-v5.min.js\",\"scripts\":{\"prettier\":\"prettier --write src demo/demo-sdk.js demo/test.js demo/ciDemo\",\"dev\":\"cross-env NODE_ENV=development node build.js --mode=development\",\"build\":\"cross-env NODE_ENV=production node build.js --mode=production\",\"sts.js\":\"node server/sts.js\",\"postinstall\":\"node scripts/patch-check.js\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"fast-xml-parser\":\"4.5.0\",\"mime\":\"^2.4.6\"},\"devDependencies\":{\"@babel/core\":\"7.17.9\",\"@babel/preset-env\":\"7.16.11\",\"babel-loader\":\"8.2.5\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"patch-package\":\"^8.0.0\",\"prettier\":\"^3.0.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
+
+/***/ }),
+
+/***/ "./src/advance.js":
+/*!************************!*\
+  !*** ./src/advance.js ***!
+  \************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+var session = __webpack_require__(/*! ./session */ "./src/session.js");
+var Async = __webpack_require__(/*! ./async */ "./src/async.js");
+var EventProxy = __webpack_require__(/*! ./event */ "./src/event.js").EventProxy;
+var util = __webpack_require__(/*! ./util */ "./src/util.js");
+var Tracker = __webpack_require__(/*! ./tracker */ "./src/tracker.js");
+
+// 文件分块上传全过程，暴露的分块上传接口
+function sliceUploadFile(params, callback) {
+  var self = this;
+
+  // 如果小程序版本不支持获取文件分片内容，统一转到 简单上传 接口上传
+  if (!util.canFileSlice()) {
+    params.SkipTask = true;
+    if (self.options.SimpleUploadMethod === 'postObject') {
+      self.postObject(params, callback);
+    } else {
+      self.putObject(params, callback);
+    }
+    return;
+  }
+  var ep = new EventProxy();
+  var TaskId = params.TaskId;
+  var Bucket = params.Bucket;
+  var Region = params.Region;
+  var Key = params.Key;
+  var FilePath = params.FilePath;
+  var ChunkSize = params.ChunkSize || params.SliceSize || self.options.ChunkSize;
+  var AsyncLimit = params.AsyncLimit;
+  var StorageClass = params.StorageClass;
+  var ServerSideEncryption = params.ServerSideEncryption;
+  var FileSize;
+  var onProgress;
+  var onHashProgress = params.onHashProgress;
+  var tracker = params.tracker;
+  tracker && tracker.setParams({
+    chunkSize: ChunkSize
+  });
+
+  // 上传过程中出现错误，返回错误
+  ep.on('error', function (err) {
+    if (!self._isRunningTask(TaskId)) return;
+    var _err = {
+      UploadId: params.UploadData.UploadId || '',
+      err: err,
+      error: err
+    };
+    return callback(_err);
+  });
+
+  // 上传分块完成，开始 uploadSliceComplete 操作
+  ep.on('upload_complete', function (UploadCompleteData) {
+    var _UploadCompleteData = util.extend({
+      UploadId: params.UploadData.UploadId || ''
+    }, UploadCompleteData);
+    callback(null, _UploadCompleteData);
+  });
+
+  // 上传分块完成，开始 uploadSliceComplete 操作
+  ep.on('upload_slice_complete', function (UploadData) {
+    var metaHeaders = {};
+    util.each(params.Headers, function (val, k) {
+      var shortKey = k.toLowerCase();
+      if (shortKey.indexOf('x-cos-meta-') === 0 || shortKey === 'pic-operations') {
+        metaHeaders[k] = val;
+      }
+    });
+    uploadSliceComplete.call(self, {
+      Bucket: Bucket,
+      Region: Region,
+      Key: Key,
+      UploadId: UploadData.UploadId,
+      SliceList: UploadData.SliceList,
+      Headers: metaHeaders,
+      tracker: tracker
+    }, function (err, data) {
+      if (!self._isRunningTask(TaskId)) return;
+      session.removeUsing(UploadData.UploadId);
+      if (err) {
+        onProgress(null, true);
+        return ep.emit('error', err);
+      }
+      session.removeUploadId(UploadData.UploadId);
+      onProgress({
+        loaded: FileSize,
+        total: FileSize
+      }, true);
+      ep.emit('upload_complete', data);
+    });
+  });
+
+  // 获取 UploadId 完成，开始上传每个分片
+  ep.on('get_upload_data_finish', function (UploadData) {
+    // 处理 UploadId 缓存
+    var uuid = session.getFileId(params.FileStat, params.ChunkSize, Bucket, Key);
+    uuid && session.saveUploadId(uuid, UploadData.UploadId, self.options.UploadIdCacheLimit); // 缓存 UploadId
+    session.setUsing(UploadData.UploadId); // 标记 UploadId 为正在使用
+
+    // 获取 UploadId
+    onProgress(null, true); // 任务状态开始 uploading
+    uploadSliceList.call(self, {
+      TaskId: TaskId,
+      Bucket: Bucket,
+      Region: Region,
+      Key: Key,
+      FilePath: FilePath,
+      FileSize: FileSize,
+      SliceSize: ChunkSize,
+      AsyncLimit: AsyncLimit,
+      ServerSideEncryption: ServerSideEncryption,
+      UploadData: UploadData,
+      onProgress: onProgress,
+      tracker: tracker
+    }, function (err, data) {
+      if (!self._isRunningTask(TaskId)) return;
+      if (err) {
+        onProgress(null, true);
+        return ep.emit('error', err);
+      }
+      ep.emit('upload_slice_complete', data);
+    });
+  });
+
+  // 开始获取文件 UploadId，里面会视情况计算 ETag，并比对，保证文件一致性，也优化上传
+  ep.on('get_file_size_finish', function () {
+    onProgress = util.throttleOnProgress.call(self, FileSize, params.onProgress);
+    if (params.UploadData.UploadId) {
+      ep.emit('get_upload_data_finish', params.UploadData);
+    } else {
+      var _params = util.extend({
+        TaskId: TaskId,
+        Bucket: Bucket,
+        Region: Region,
+        Key: Key,
+        Headers: params.Headers,
+        StorageClass: StorageClass,
+        FilePath: FilePath,
+        FileSize: FileSize,
+        SliceSize: ChunkSize,
+        onHashProgress: onHashProgress,
+        tracker: tracker
+      }, params);
+      // 这里用户传入的params.FileSize可能单位不统一,必须使用sdk内获取的大小
+      _params.FileSize = FileSize;
+      getUploadIdAndPartList.call(self, _params, function (err, UploadData) {
+        if (!self._isRunningTask(TaskId)) return;
+        if (err) return ep.emit('error', err);
+        params.UploadData.UploadId = UploadData.UploadId;
+        params.UploadData.PartList = UploadData.PartList;
+        ep.emit('get_upload_data_finish', params.UploadData);
+      });
+    }
+  });
+
+  // 获取上传文件大小
+  FileSize = params.ContentLength;
+  delete params.ContentLength;
+  !params.Headers && (params.Headers = {});
+  util.each(params.Headers, function (item, key) {
+    if (key.toLowerCase() === 'content-length') {
+      delete params.Headers[key];
+    }
+  });
+
+  // 控制分片大小
+  (function () {
+    var SIZE = [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 1024 * 2, 1024 * 4, 1024 * 5];
+    var AutoChunkSize = 1024 * 1024;
+    for (var i = 0; i < SIZE.length; i++) {
+      AutoChunkSize = SIZE[i] * 1024 * 1024;
+      if (FileSize / AutoChunkSize <= self.options.MaxPartNumber) break;
+    }
+    params.ChunkSize = params.SliceSize = ChunkSize = Math.max(ChunkSize, AutoChunkSize);
+  })();
+
+  // 开始上传
+  if (FileSize === 0) {
+    params.Body = '';
+    params.ContentLength = 0;
+    params.SkipTask = true;
+    self.putObject(params, function (err, data) {
+      if (err) {
+        return callback(err);
+      }
+      callback(null, data);
+    });
+  } else {
+    ep.emit('get_file_size_finish');
+  }
+}
+
+// 获取上传任务的 UploadId
+function getUploadIdAndPartList(params, callback) {
+  var TaskId = params.TaskId;
+  var Bucket = params.Bucket;
+  var Region = params.Region;
+  var Key = params.Key;
+  var StorageClass = params.StorageClass;
+  var self = this;
+
+  // 计算 ETag
+  var ETagMap = {};
+  var FileSize = params.FileSize;
+  var SliceSize = params.SliceSize;
+  var SliceCount = Math.ceil(FileSize / SliceSize);
+  var FinishSliceCount = 0;
+  var FinishSize = 0;
+  var onHashProgress = util.throttleOnProgress.call(self, FileSize, params.onHashProgress);
+  var getChunkETag = function getChunkETag(PartNumber, callback) {
+    var start = SliceSize * (PartNumber - 1);
+    var end = Math.min(start + SliceSize, FileSize);
+    var ChunkSize = end - start;
+    if (ETagMap[PartNumber]) {
+      callback(null, {
+        PartNumber: PartNumber,
+        ETag: ETagMap[PartNumber],
+        Size: ChunkSize
+      });
+    } else {
+      util.fileSlice(params.FilePath, start, end, function (chunkItem) {
+        try {
+          var md5 = util.getFileMd5(chunkItem);
+        } catch (err) {
+          return callback(err);
+        }
+        var ETag = '"' + md5 + '"';
+        ETagMap[PartNumber] = ETag;
+        FinishSliceCount += 1;
+        FinishSize += ChunkSize;
+        callback(null, {
+          PartNumber: PartNumber,
+          ETag: ETag,
+          Size: ChunkSize
+        });
+        onHashProgress({
+          loaded: FinishSize,
+          total: FileSize
+        });
+      });
+    }
+  };
+
+  // 通过和文件的 md5 对比，判断 UploadId 是否可用
+  var isAvailableUploadList = function isAvailableUploadList(PartList, callback) {
+    var PartCount = PartList.length;
+    // 如果没有分片，通过
+    if (PartCount === 0) {
+      return callback(null, true);
+    }
+    // 检查分片数量
+    if (PartCount > SliceCount) {
+      return callback(null, false);
+    }
+    // 检查分片大小
+    if (PartCount > 1) {
+      var PartSliceSize = Math.max(PartList[0].Size, PartList[1].Size);
+      if (PartSliceSize !== SliceSize) {
+        return callback(null, false);
+      }
+    }
+    // 逐个分片计算并检查 ETag 是否一致
+    var next = function next(index) {
+      if (index < PartCount) {
+        var Part = PartList[index];
+        getChunkETag(Part.PartNumber, function (err, chunk) {
+          if (chunk && chunk.ETag === Part.ETag && chunk.Size === Part.Size) {
+            next(index + 1);
+          } else {
+            callback(null, false);
+          }
+        });
+      } else {
+        callback(null, true);
+      }
+    };
+    next(0);
+  };
+  var ep = new EventProxy();
+  ep.on('error', function (errData) {
+    if (!self._isRunningTask(TaskId)) return;
+    return callback(errData);
+  });
+
+  // 存在 UploadId
+  ep.on('upload_id_available', function (UploadData) {
+    // 转换成 map
+    var map = {};
+    var list = [];
+    util.each(UploadData.PartList, function (item) {
+      map[item.PartNumber] = item;
+    });
+    for (var PartNumber = 1; PartNumber <= SliceCount; PartNumber++) {
+      var item = map[PartNumber];
+      if (item) {
+        item.PartNumber = PartNumber;
+        item.Uploaded = true;
+      } else {
+        item = {
+          PartNumber: PartNumber,
+          ETag: null,
+          Uploaded: false
+        };
+      }
+      list.push(item);
+    }
+    UploadData.PartList = list;
+    callback(null, UploadData);
+  });
+
+  // 不存在 UploadId, 初始化生成 UploadId
+  ep.on('no_available_upload_id', function () {
+    if (!self._isRunningTask(TaskId)) return;
+    var _params = util.extend({
+      Bucket: Bucket,
+      Region: Region,
+      Key: Key,
+      Headers: util.clone(params.Headers),
+      Query: util.clone(params.Query),
+      StorageClass: StorageClass,
+      calledBySdk: 'sliceUploadFile',
+      tracker: params.tracker
+    }, params);
+    self.multipartInit(_params, function (err, data) {
+      if (!self._isRunningTask(TaskId)) return;
+      if (err) return ep.emit('error', err);
+      var UploadId = data.UploadId;
+      if (!UploadId) {
+        return callback({
+          Message: 'no upload id'
+        });
+      }
+      ep.emit('upload_id_available', {
+        UploadId: UploadId,
+        PartList: []
+      });
+    });
+  });
+
+  // 如果已存在 UploadId，找一个可以用的 UploadId
+  ep.on('has_and_check_upload_id', function (UploadIdList) {
+    // 串行地，找一个内容一致的 UploadId
+    UploadIdList = UploadIdList.reverse();
+    Async.eachLimit(UploadIdList, 1, function (UploadId, asyncCallback) {
+      if (!self._isRunningTask(TaskId)) return;
+      // 如果正在上传，跳过
+      if (session.using[UploadId]) {
+        asyncCallback(); // 检查下一个 UploadId
+        return;
+      }
+      // 判断 UploadId 是否可用
+      wholeMultipartListPart.call(self, {
+        Bucket: Bucket,
+        Region: Region,
+        Key: Key,
+        UploadId: UploadId,
+        tracker: params.tracker
+      }, function (err, PartListData) {
+        if (!self._isRunningTask(TaskId)) return;
+        if (err) {
+          session.removeUsing(UploadId);
+          return ep.emit('error', err);
+        }
+        var PartList = PartListData.PartList;
+        PartList.forEach(function (item) {
+          item.PartNumber *= 1;
+          item.Size *= 1;
+          item.ETag = item.ETag || '';
+        });
+        isAvailableUploadList(PartList, function (err, isAvailable) {
+          if (!self._isRunningTask(TaskId)) return;
+          if (err) return ep.emit('error', err);
+          if (isAvailable) {
+            asyncCallback({
+              UploadId: UploadId,
+              PartList: PartList
+            }); // 马上结束
+          } else {
+            asyncCallback(); // 检查下一个 UploadId
+          }
+        });
+      });
+    }, function (AvailableUploadData) {
+      if (!self._isRunningTask(TaskId)) return;
+      onHashProgress(null, true);
+      if (AvailableUploadData && AvailableUploadData.UploadId) {
+        ep.emit('upload_id_available', AvailableUploadData);
+      } else {
+        ep.emit('no_available_upload_id');
+      }
+    });
+  });
+
+  // 在本地缓存找可用的 UploadId
+  ep.on('seek_local_avail_upload_id', function (RemoteUploadIdList) {
+    // 在本地找可用的 UploadId
+    var uuid = session.getFileId(params.FileStat, params.ChunkSize, Bucket, Key);
+    var LocalUploadIdList = session.getUploadIdList(uuid);
+    if (!uuid || !LocalUploadIdList) {
+      ep.emit('has_and_check_upload_id', RemoteUploadIdList);
+      return;
+    }
+    var next = function next(index) {
+      // 如果本地找不到可用 UploadId，再一个个遍历校验远端
+      if (index >= LocalUploadIdList.length) {
+        ep.emit('has_and_check_upload_id', RemoteUploadIdList);
+        return;
+      }
+      var UploadId = LocalUploadIdList[index];
+      // 如果不在远端 UploadId 列表里，跳过并删除
+      if (!util.isInArray(RemoteUploadIdList, UploadId)) {
+        session.removeUploadId(UploadId);
+        next(index + 1);
+        return;
+      }
+      // 如果正在上传，跳过
+      if (session.using[UploadId]) {
+        next(index + 1);
+        return;
+      }
+      // 判断 UploadId 是否存在线上
+      wholeMultipartListPart.call(self, {
+        Bucket: Bucket,
+        Region: Region,
+        Key: Key,
+        UploadId: UploadId,
+        tracker: params.tracker
+      }, function (err, PartListData) {
+        if (!self._isRunningTask(TaskId)) return;
+        if (err) {
+          // 如果 UploadId 获取会出错，跳过并删除
+          session.removeUploadId(UploadId);
+          next(index + 1);
+        } else {
+          // 找到可用 UploadId
+          ep.emit('upload_id_available', {
+            UploadId: UploadId,
+            PartList: PartListData.PartList
+          });
+        }
+      });
+    };
+    next(0);
+  });
+
+  // 获取线上 UploadId 列表
+  ep.on('get_remote_upload_id_list', function () {
+    // 获取符合条件的 UploadId 列表，因为同一个文件可以有多个上传任务。
+    wholeMultipartList.call(self, {
+      Bucket: Bucket,
+      Region: Region,
+      Key: Key,
+      tracker: params.tracker
+    }, function (err, data) {
+      if (!self._isRunningTask(TaskId)) return;
+      if (err) {
+        return ep.emit('error', err);
+      }
+      // 整理远端 UploadId 列表
+      var RemoteUploadIdList = util.filter(data.UploadList, function (item) {
+        return item.Key === Key && (!StorageClass || item.StorageClass.toUpperCase() === StorageClass.toUpperCase());
+      }).reverse().map(function (item) {
+        return item.UploadId || item.UploadID;
+      });
+      if (RemoteUploadIdList.length) {
+        ep.emit('seek_local_avail_upload_id', RemoteUploadIdList);
+      } else {
+        // 远端没有 UploadId，清理缓存的 UploadId
+        var uuid = session.getFileId(params.FileStat, params.ChunkSize, Bucket, Key),
+          LocalUploadIdList;
+        if (uuid && (LocalUploadIdList = session.getUploadIdList(uuid))) {
+          util.each(LocalUploadIdList, function (UploadId) {
+            session.removeUploadId(UploadId);
+          });
+        }
+        ep.emit('no_available_upload_id');
+      }
+    });
+  });
+
+  // 开始找可用 UploadId
+  ep.emit('get_remote_upload_id_list');
+}
+
+// 获取符合条件的全部上传任务 (条件包括 Bucket, Region, Prefix)
+function wholeMultipartList(params, callback) {
+  var self = this;
+  var UploadList = [];
+  var sendParams = {
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Prefix: params.Key,
+    calledBySdk: params.calledBySdk || 'sliceUploadFile',
+    tracker: params.tracker
+  };
+  var next = function next() {
+    self.multipartList(sendParams, function (err, data) {
+      if (err) return callback(err);
+      UploadList.push.apply(UploadList, data.Upload || []);
+      if (data.IsTruncated === 'true') {
+        // 列表不完整
+        sendParams.KeyMarker = data.NextKeyMarker;
+        sendParams.UploadIdMarker = data.NextUploadIdMarker;
+        next();
+      } else {
+        callback(null, {
+          UploadList: UploadList
+        });
+      }
+    });
+  };
+  next();
+}
+
+// 获取指定上传任务的分块列表
+function wholeMultipartListPart(params, callback) {
+  var self = this;
+  var PartList = [];
+  var sendParams = {
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    UploadId: params.UploadId,
+    calledBySdk: 'sliceUploadFile',
+    tracker: params.tracker
+  };
+  var next = function next() {
+    self.multipartListPart(sendParams, function (err, data) {
+      if (err) return callback(err);
+      PartList.push.apply(PartList, data.Part || []);
+      if (data.IsTruncated === 'true') {
+        // 列表不完整
+        sendParams.PartNumberMarker = data.NextPartNumberMarker;
+        next();
+      } else {
+        callback(null, {
+          PartList: PartList
+        });
+      }
+    });
+  };
+  next();
+}
+
+// 上传文件分块，包括
+/*
+ UploadId (上传任务编号)
+ AsyncLimit (并发量)，
+ SliceList (上传的分块数组)，
+ FilePath (本地文件的位置)，
+ SliceSize (文件分块大小)
+ FileSize (文件大小)
+ onProgress (上传成功之后的回调函数)
+ */
+function uploadSliceList(params, cb) {
+  var self = this;
+  var TaskId = params.TaskId;
+  var Bucket = params.Bucket;
+  var Region = params.Region;
+  var Key = params.Key;
+  var UploadData = params.UploadData;
+  var FileSize = params.FileSize;
+  var SliceSize = params.SliceSize;
+  var ChunkParallel = Math.min(params.AsyncLimit || self.options.ChunkParallelLimit || 1, 256);
+  var FilePath = params.FilePath;
+  var SliceCount = Math.ceil(FileSize / SliceSize);
+  var FinishSize = 0;
+  var ServerSideEncryption = params.ServerSideEncryption;
+  var needUploadSlices = util.filter(UploadData.PartList, function (SliceItem) {
+    if (SliceItem['Uploaded']) {
+      FinishSize += SliceItem['PartNumber'] >= SliceCount ? FileSize % SliceSize || SliceSize : SliceSize;
+    }
+    return !SliceItem['Uploaded'];
+  });
+  var _onProgress2 = params.onProgress;
+  Async.eachLimit(needUploadSlices, ChunkParallel, function (SliceItem, asyncCallback) {
+    if (!self._isRunningTask(TaskId)) return;
+    var PartNumber = SliceItem['PartNumber'];
+    var currentSize = Math.min(FileSize, SliceItem['PartNumber'] * SliceSize) - (SliceItem['PartNumber'] - 1) * SliceSize;
+    var preAddSize = 0;
+    uploadSliceItem.call(self, {
+      TaskId: TaskId,
+      Bucket: Bucket,
+      Region: Region,
+      Key: Key,
+      SliceSize: SliceSize,
+      FileSize: FileSize,
+      PartNumber: PartNumber,
+      ServerSideEncryption: ServerSideEncryption,
+      FilePath: FilePath,
+      UploadData: UploadData,
+      onProgress: function onProgress(data) {
+        FinishSize += data.loaded - preAddSize;
+        preAddSize = data.loaded;
+        _onProgress2({
+          loaded: FinishSize,
+          total: FileSize
+        });
+      },
+      tracker: params.tracker
+    }, function (err, data) {
+      if (!self._isRunningTask(TaskId)) return;
+      if (err) {
+        FinishSize -= preAddSize;
+      } else {
+        FinishSize += currentSize - preAddSize;
+        SliceItem.ETag = data.ETag;
+      }
+      _onProgress2({
+        loaded: FinishSize,
+        total: FileSize
+      });
+      asyncCallback(err || null, data);
+    });
+  }, function (err) {
+    if (!self._isRunningTask(TaskId)) return;
+    if (err) return cb(err);
+    cb(null, {
+      UploadId: UploadData.UploadId,
+      SliceList: UploadData.PartList
+    });
+  });
+}
+
+// 上传指定分片
+function uploadSliceItem(params, callback) {
+  var self = this;
+  var TaskId = params.TaskId;
+  var Bucket = params.Bucket;
+  var Region = params.Region;
+  var Key = params.Key;
+  var FileSize = params.FileSize;
+  var FilePath = params.FilePath;
+  var PartNumber = params.PartNumber * 1;
+  var SliceSize = params.SliceSize;
+  var ServerSideEncryption = params.ServerSideEncryption;
+  var UploadData = params.UploadData;
+  var ChunkRetryTimes = self.options.ChunkRetryTimes + 1;
+  var Headers = params.Headers || {};
+  var start = SliceSize * (PartNumber - 1);
+  var ContentLength = SliceSize;
+  var end = start + SliceSize;
+  if (end > FileSize) {
+    end = FileSize;
+    ContentLength = end - start;
+  }
+  var headersWhiteList = ['x-cos-traffic-limit', 'x-cos-mime-limit'];
+  var headers = {};
+  util.each(Headers, function (v, k) {
+    if (headersWhiteList.indexOf(k) > -1) {
+      headers[k] = v;
+    }
+  });
+  util.fileSlice(FilePath, start, end, function (Body) {
+    var md5 = util.getFileMd5(Body);
+    var contentMd5 = md5 ? util.binaryBase64(md5) : null;
+    var PartItem = UploadData.PartList[PartNumber - 1];
+    Async.retry(ChunkRetryTimes, function (tryCallback) {
+      if (!self._isRunningTask(TaskId)) return;
+      self.multipartUpload({
+        TaskId: TaskId,
+        Bucket: Bucket,
+        Region: Region,
+        Key: Key,
+        ContentLength: ContentLength,
+        PartNumber: PartNumber,
+        UploadId: UploadData.UploadId,
+        ServerSideEncryption: ServerSideEncryption,
+        Body: Body,
+        Headers: headers,
+        onProgress: params.onProgress,
+        ContentMD5: contentMd5,
+        calledBySdk: 'sliceUploadFile',
+        tracker: params.tracker
+      }, function (err, data) {
+        if (!self._isRunningTask(TaskId)) return;
+        if (err) {
+          return tryCallback(err);
+        } else {
+          PartItem.Uploaded = true;
+          return tryCallback(null, data);
+        }
+      });
+    }, function (err, data) {
+      if (!self._isRunningTask(TaskId)) return;
+      return callback(err, data);
+    });
+  });
+}
+
+// 完成分块上传
+function uploadSliceComplete(params, callback) {
+  var Bucket = params.Bucket;
+  var Region = params.Region;
+  var Key = params.Key;
+  var UploadId = params.UploadId;
+  var SliceList = params.SliceList;
+  var self = this;
+  var ChunkRetryTimes = this.options.ChunkRetryTimes + 1;
+  var Parts = SliceList.map(function (item) {
+    return {
+      PartNumber: item.PartNumber,
+      ETag: item.ETag
+    };
+  });
+  // 完成上传的请求也做重试
+  Async.retry(ChunkRetryTimes, function (tryCallback) {
+    self.multipartComplete({
+      Bucket: Bucket,
+      Region: Region,
+      Key: Key,
+      UploadId: UploadId,
+      Parts: Parts,
+      calledBySdk: 'sliceUploadFile',
+      Headers: params.Headers || {},
+      tracker: params.tracker
+    }, tryCallback);
+  }, function (err, data) {
+    callback(err, data);
+  });
+}
+
+// 抛弃分块上传任务
+/*
+ AsyncLimit (抛弃上传任务的并发量)，
+ UploadId (上传任务的编号，当 Level 为 task 时候需要)
+ Level (抛弃分块上传任务的级别，task : 抛弃指定的上传任务，file ： 抛弃指定的文件对应的上传任务，其他值 ：抛弃指定Bucket 的全部上传任务)
+ */
+function abortUploadTask(params, callback) {
+  var Bucket = params.Bucket;
+  var Region = params.Region;
+  var Key = params.Key;
+  var UploadId = params.UploadId;
+  var Level = params.Level || 'task';
+  var AsyncLimit = params.AsyncLimit;
+  var self = this;
+  var ep = new EventProxy();
+  ep.on('error', function (errData) {
+    return callback(errData);
+  });
+
+  // 已经获取到需要抛弃的任务列表
+  ep.on('get_abort_array', function (AbortArray) {
+    abortUploadTaskArray.call(self, {
+      Bucket: Bucket,
+      Region: Region,
+      Key: Key,
+      Headers: params.Headers,
+      AsyncLimit: AsyncLimit,
+      AbortArray: AbortArray
+    }, function (err, data) {
+      if (err) {
+        return callback(err);
+      }
+      callback(null, data);
+    });
+  });
+  if (Level === 'bucket') {
+    // Bucket 级别的任务抛弃，抛弃该 Bucket 下的全部上传任务
+    wholeMultipartList.call(self, {
+      Bucket: Bucket,
+      Region: Region,
+      calledBySdk: 'abortUploadTask'
+    }, function (err, data) {
+      if (err) {
+        return callback(err);
+      }
+      ep.emit('get_abort_array', data.UploadList || []);
+    });
+  } else if (Level === 'file') {
+    // 文件级别的任务抛弃，抛弃该文件的全部上传任务
+    if (!Key) return callback({
+      error: 'abort_upload_task_no_key'
+    });
+    wholeMultipartList.call(self, {
+      Bucket: Bucket,
+      Region: Region,
+      Key: Key,
+      calledBySdk: 'abortUploadTask'
+    }, function (err, data) {
+      if (err) {
+        return callback(err);
+      }
+      ep.emit('get_abort_array', data.UploadList || []);
+    });
+  } else if (Level === 'task') {
+    // 单个任务级别的任务抛弃，抛弃指定 UploadId 的上传任务
+    if (!UploadId) return callback({
+      error: 'abort_upload_task_no_id'
+    });
+    if (!Key) return callback({
+      error: 'abort_upload_task_no_key'
+    });
+    ep.emit('get_abort_array', [{
+      Key: Key,
+      UploadId: UploadId
+    }]);
+  } else {
+    return callback({
+      error: 'abort_unknown_level'
+    });
+  }
+}
+
+// 批量抛弃分块上传任务
+function abortUploadTaskArray(params, callback) {
+  var Bucket = params.Bucket;
+  var Region = params.Region;
+  var Key = params.Key;
+  var AbortArray = params.AbortArray;
+  var AsyncLimit = params.AsyncLimit || 1;
+  var self = this;
+  var index = 0;
+  var resultList = new Array(AbortArray.length);
+  Async.eachLimit(AbortArray, AsyncLimit, function (AbortItem, callback) {
+    var eachIndex = index;
+    if (Key && Key !== AbortItem.Key) {
+      resultList[eachIndex] = {
+        error: {
+          KeyNotMatch: true
+        }
+      };
+      callback(null);
+      return;
+    }
+    var UploadId = AbortItem.UploadId || AbortItem.UploadID;
+    self.multipartAbort({
+      Bucket: Bucket,
+      Region: Region,
+      Key: AbortItem.Key,
+      Headers: params.Headers,
+      UploadId: UploadId
+    }, function (err) {
+      var task = {
+        Bucket: Bucket,
+        Region: Region,
+        Key: AbortItem.Key,
+        UploadId: UploadId
+      };
+      resultList[eachIndex] = {
+        error: err,
+        task: task
+      };
+      callback(null);
+    });
+    index++;
+  }, function (err) {
+    if (err) {
+      return callback(err);
+    }
+    var successList = [];
+    var errorList = [];
+    for (var i = 0, len = resultList.length; i < len; i++) {
+      var item = resultList[i];
+      if (item['task']) {
+        if (item['error']) {
+          errorList.push(item['task']);
+        } else {
+          successList.push(item['task']);
+        }
+      }
+    }
+    return callback(null, {
+      successList: successList,
+      errorList: errorList
+    });
+  });
+}
+
+// 高级上传
+function uploadFile(_x, _x2) {
+  return _uploadFile.apply(this, arguments);
+} // 批量上传文件
+function _uploadFile() {
+  _uploadFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, callback) {
+    var self, SliceSize, taskList, FileSize, fileInfo, accelerate, realApi, _onTaskReady, _onFileFinish, onFileFinish, simpleUploadMethod, api;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          self = this; // 判断多大的文件使用分片上传
+          SliceSize = params.SliceSize === undefined ? self.options.SliceSize : params.SliceSize;
+          taskList = []; // var FileSize = params.FileSize;
+          _context.prev = 3;
+          _context.next = 6;
+          return util.getFileSizeByPath(params.FilePath);
+        case 6:
+          FileSize = _context.sent;
+          _context.next = 13;
+          break;
+        case 9:
+          _context.prev = 9;
+          _context.t0 = _context["catch"](3);
+          callback({
+            error: _context.t0
+          });
+          return _context.abrupt("return");
+        case 13:
+          fileInfo = {
+            TaskId: ''
+          }; // 上传链路
+          if (self.options.EnableReporter) {
+            accelerate = self.options.UseAccelerate || typeof self.options.Domain === 'string' && self.options.Domain.includes('accelerate.');
+            realApi = FileSize > SliceSize ? 'sliceUploadFile' : 'putObject';
+            params.tracker = new Tracker({
+              Beacon: self.options.BeaconReporter,
+              clsReporter: self.options.ClsReporter,
+              bucket: params.Bucket,
+              region: params.Region,
+              apiName: 'uploadFile',
+              realApi: realApi,
+              fileKey: params.Key,
+              fileSize: FileSize,
+              accelerate: accelerate,
+              deepTracker: self.options.DeepTracker,
+              customId: self.options.CustomId,
+              delay: self.options.TrackerDelay
+            });
+          }
+
+          // 整理 option，用于返回给回调
+          util.each(params, function (v, k) {
+            if (_typeof(v) !== 'object' && typeof v !== 'function') {
+              fileInfo[k] = v;
+            }
+          });
+
+          // 处理文件 TaskReady
+          _onTaskReady = params.onTaskReady;
+          params.onTaskReady = function (tid) {
+            fileInfo.TaskId = tid;
+            _onTaskReady && _onTaskReady(tid);
+          };
+
+          // 处理文件完成
+          _onFileFinish = params.onFileFinish;
+          onFileFinish = function onFileFinish(err, data) {
+            // 格式化上报参数并上报
+            params.tracker && params.tracker.report(err, data);
+            _onFileFinish && _onFileFinish(err, data, fileInfo);
+            callback && callback(err, data);
+          }; // 添加上传任务
+          simpleUploadMethod = self.options.SimpleUploadMethod === 'postObject' ? 'postObject' : 'putObject';
+          api = FileSize > SliceSize ? 'sliceUploadFile' : simpleUploadMethod;
+          taskList.push({
+            api: api,
+            params: params,
+            callback: onFileFinish
+          });
+          self._addTasks(taskList);
+        case 24:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, this, [[3, 9]]);
+  }));
+  return _uploadFile.apply(this, arguments);
+}
+function uploadFiles(_x3, _x4) {
+  return _uploadFiles.apply(this, arguments);
+} // 分片复制文件
+function _uploadFiles() {
+  _uploadFiles = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params, callback) {
+    var self, SliceSize, TotalSize, TotalFinish, onTotalProgress, unFinishCount, _onTotalFileFinish, resultList, onTotalFileFinish, taskList, getTaskList;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          self = this; // 判断多大的文件使用分片上传
+          SliceSize = params.SliceSize === undefined ? self.options.SliceSize : params.SliceSize; // 汇总返回进度
+          TotalSize = 0;
+          TotalFinish = 0;
+          onTotalProgress = util.throttleOnProgress.call(self, TotalFinish, params.onProgress); // 汇总返回回调
+          unFinishCount = params.files.length;
+          _onTotalFileFinish = params.onFileFinish;
+          resultList = Array(unFinishCount);
+          onTotalFileFinish = function onTotalFileFinish(err, data, options) {
+            onTotalProgress(null, true);
+            _onTotalFileFinish && _onTotalFileFinish(err, data, options);
+            resultList[options.Index] = {
+              options: options,
+              error: err,
+              data: data
+            };
+            if (--unFinishCount <= 0 && callback) {
+              callback(null, {
+                files: resultList
+              });
+            }
+          }; // 开始处理每个文件
+          taskList = [];
+          getTaskList = function getTaskList() {
+            return params.files.map(function (fileParams, index) {
+              return new Promise( /*#__PURE__*/function () {
+                var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve) {
+                  var FileSize, fileInfo, accelerate, realApi, _onTaskReady, PreAddSize, _onProgress, _onFileFinish, onFileFinish, simpleUploadMethod, api;
+                  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                    while (1) switch (_context2.prev = _context2.next) {
+                      case 0:
+                        FileSize = 0;
+                        _context2.prev = 1;
+                        _context2.next = 4;
+                        return util.getFileSizeByPath(fileParams.FilePath);
+                      case 4:
+                        FileSize = _context2.sent;
+                        _context2.next = 9;
+                        break;
+                      case 7:
+                        _context2.prev = 7;
+                        _context2.t0 = _context2["catch"](1);
+                      case 9:
+                        fileInfo = {
+                          Index: index,
+                          TaskId: ''
+                        }; // 更新文件总大小
+                        TotalSize += FileSize;
+
+                        // 单个文件上传链路
+                        if (self.options.EnableReporter) {
+                          accelerate = self.options.UseAccelerate || typeof self.options.Domain === 'string' && self.options.Domain.includes('accelerate.');
+                          realApi = FileSize > SliceSize ? 'sliceUploadFile' : 'putObject';
+                          fileParams.tracker = new Tracker({
+                            Beacon: self.options.BeaconReporter,
+                            clsReporter: self.options.ClsReporter,
+                            bucket: fileParams.Bucket,
+                            region: fileParams.Region,
+                            apiName: 'uploadFiles',
+                            realApi: realApi,
+                            fileKey: fileParams.Key,
+                            fileSize: FileSize,
+                            accelerate: accelerate,
+                            deepTracker: self.options.DeepTracker,
+                            customId: self.options.CustomId,
+                            delay: self.options.TrackerDelay
+                          });
+                        }
+
+                        // 整理 option，用于返回给回调
+                        util.each(fileParams, function (v, k) {
+                          if (_typeof(v) !== 'object' && typeof v !== 'function') {
+                            fileInfo[k] = v;
+                          }
+                        });
+
+                        // 处理单个文件 TaskReady
+                        _onTaskReady = fileParams.onTaskReady;
+                        fileParams.onTaskReady = function (tid) {
+                          fileInfo.TaskId = tid;
+                          _onTaskReady && _onTaskReady(tid);
+                        };
+
+                        // 处理单个文件进度
+                        PreAddSize = 0;
+                        _onProgress = fileParams.onProgress;
+                        fileParams.onProgress = function (info) {
+                          TotalFinish = TotalFinish - PreAddSize + info.loaded;
+                          PreAddSize = info.loaded;
+                          _onProgress && _onProgress(info);
+                          onTotalProgress({
+                            loaded: TotalFinish,
+                            total: TotalSize
+                          });
+                        };
+
+                        // 处理单个文件完成
+                        _onFileFinish = fileParams.onFileFinish;
+                        onFileFinish = function onFileFinish(err, data) {
+                          // 格式化上报参数并上报
+                          fileParams.tracker && fileParams.tracker.report(err, data);
+                          _onFileFinish && _onFileFinish(err, data);
+                          onTotalFileFinish && onTotalFileFinish(err, data, fileInfo);
+                        }; // 添加上传任务
+                        simpleUploadMethod = self.options.SimpleUploadMethod === 'postObject' ? 'postObject' : 'putObject';
+                        api = FileSize > SliceSize ? 'sliceUploadFile' : simpleUploadMethod;
+                        taskList.push({
+                          api: api,
+                          params: fileParams,
+                          callback: onFileFinish
+                        });
+                        resolve(true);
+                      case 24:
+                      case "end":
+                        return _context2.stop();
+                    }
+                  }, _callee2, null, [[1, 7]]);
+                }));
+                return function (_x5) {
+                  return _ref.apply(this, arguments);
+                };
+              }());
+            });
+          };
+          _context3.next = 13;
+          return Promise.all(getTaskList());
+        case 13:
+          self._addTasks(taskList);
+        case 14:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3, this);
+  }));
+  return _uploadFiles.apply(this, arguments);
+}
+function sliceCopyFile(params, callback) {
+  var ep = new EventProxy();
+  var self = this;
+  var Bucket = params.Bucket;
+  var Region = params.Region;
+  var Key = params.Key;
+  var CopySource = params.CopySource;
+  var m = util.getSourceParams.call(this, CopySource);
+  if (!m) {
+    callback({
+      error: 'CopySource format error'
+    });
+    return;
+  }
+  var SourceBucket = m.Bucket;
+  var SourceRegion = m.Region;
+  var SourceKey = decodeURIComponent(m.Key);
+  var CopySliceSize = params.CopySliceSize === undefined ? self.options.CopySliceSize : params.CopySliceSize;
+  CopySliceSize = Math.max(0, CopySliceSize);
+  var ChunkSize = params.CopyChunkSize || this.options.CopyChunkSize;
+  var ChunkParallel = this.options.CopyChunkParallelLimit;
+  var ChunkRetryTimes = this.options.ChunkRetryTimes + 1;
+  var ChunkCount = 0;
+  var FinishSize = 0;
+  var FileSize;
+  var _onProgress3;
+  var SourceResHeaders = {};
+  var SourceHeaders = {};
+  var TargetHeader = {};
+
+  // 分片复制完成，开始 multipartComplete 操作
+  ep.on('copy_slice_complete', function (UploadData) {
+    var metaHeaders = {};
+    util.each(params.Headers, function (val, k) {
+      if (k.toLowerCase().indexOf('x-cos-meta-') === 0) metaHeaders[k] = val;
+    });
+    var Parts = util.map(UploadData.PartList, function (item) {
+      return {
+        PartNumber: item.PartNumber,
+        ETag: item.ETag
+      };
+    });
+    // 完成上传的请求也做重试
+    Async.retry(ChunkRetryTimes, function (tryCallback) {
+      self.multipartComplete({
+        Bucket: Bucket,
+        Region: Region,
+        Key: Key,
+        UploadId: UploadData.UploadId,
+        Parts: Parts,
+        tracker: params.tracker,
+        calledBySdk: 'sliceCopyFile'
+      }, tryCallback);
+    }, function (err, data) {
+      session.removeUsing(UploadData.UploadId); // 标记 UploadId 没被使用了，因为复制没提供重试，所以只要出错，就是 UploadId 停用了。
+      if (err) {
+        _onProgress3(null, true);
+        return callback(err);
+      }
+      session.removeUploadId(UploadData.UploadId);
+      _onProgress3({
+        loaded: FileSize,
+        total: FileSize
+      }, true);
+      callback(null, data);
+    });
+  });
+  ep.on('get_copy_data_finish', function (UploadData) {
+    // 处理 UploadId 缓存
+    var uuid = session.getCopyFileId(CopySource, SourceResHeaders, ChunkSize, Bucket, Key);
+    uuid && session.saveUploadId(uuid, UploadData.UploadId, self.options.UploadIdCacheLimit); // 缓存 UploadId
+    session.setUsing(UploadData.UploadId); // 标记 UploadId 为正在使用
+
+    var needCopySlices = util.filter(UploadData.PartList, function (SliceItem) {
+      if (SliceItem['Uploaded']) {
+        FinishSize += SliceItem['PartNumber'] >= ChunkCount ? FileSize % ChunkSize || ChunkSize : ChunkSize;
+      }
+      return !SliceItem['Uploaded'];
+    });
+    Async.eachLimit(needCopySlices, ChunkParallel, function (SliceItem, asyncCallback) {
+      var PartNumber = SliceItem.PartNumber;
+      var CopySourceRange = SliceItem.CopySourceRange;
+      var currentSize = SliceItem.end - SliceItem.start;
+      var preAddSize = 0;
+      Async.retry(ChunkRetryTimes, function (tryCallback) {
+        copySliceItem.call(self, {
+          Bucket: Bucket,
+          Region: Region,
+          Key: Key,
+          CopySource: CopySource,
+          UploadId: UploadData.UploadId,
+          PartNumber: PartNumber,
+          CopySourceRange: CopySourceRange,
+          tracker: params.tracker,
+          calledBySdk: 'sliceCopyFile',
+          onProgress: function onProgress(data) {
+            FinishSize += data.loaded - preAddSize;
+            preAddSize = data.loaded;
+            _onProgress3({
+              loaded: FinishSize,
+              total: FileSize
+            });
+          }
+        }, tryCallback);
+      }, function (err, data) {
+        if (err) {
+          return asyncCallback(err);
+        }
+        _onProgress3({
+          loaded: FinishSize,
+          total: FileSize
+        });
+        FinishSize += currentSize - preAddSize;
+        SliceItem.ETag = data.ETag;
+        asyncCallback(err || null, data);
+      });
+    }, function (err) {
+      if (err) {
+        session.removeUsing(UploadData.UploadId); // 标记 UploadId 没被使用了，因为复制没提供重试，所以只要出错，就是 UploadId 停用了。
+        _onProgress3(null, true);
+        return callback(err);
+      }
+      ep.emit('copy_slice_complete', UploadData);
+    });
+  });
+  ep.on('get_chunk_size_finish', function () {
+    var createNewUploadId = function createNewUploadId() {
+      self.multipartInit({
+        Bucket: Bucket,
+        Region: Region,
+        Key: Key,
+        Headers: TargetHeader,
+        tracker: params.tracker,
+        calledBySdk: 'sliceCopyFile'
+      }, function (err, data) {
+        if (err) return callback(err);
+        params.UploadId = data.UploadId;
+        ep.emit('get_copy_data_finish', {
+          UploadId: params.UploadId,
+          PartList: params.PartList
+        });
+      });
+    };
+
+    // 在本地找可用的 UploadId
+    var uuid = session.getCopyFileId(CopySource, SourceResHeaders, ChunkSize, Bucket, Key);
+    var LocalUploadIdList = session.getUploadIdList(uuid);
+    if (!uuid || !LocalUploadIdList) return createNewUploadId();
+    var next = function next(index) {
+      // 如果本地找不到可用 UploadId，再一个个遍历校验远端
+      if (index >= LocalUploadIdList.length) return createNewUploadId();
+      var UploadId = LocalUploadIdList[index];
+      // 如果正在被使用，跳过
+      if (session.using[UploadId]) return next(index + 1);
+      // 判断 UploadId 是否存在线上
+      wholeMultipartListPart.call(self, {
+        Bucket: Bucket,
+        Region: Region,
+        Key: Key,
+        UploadId: UploadId,
+        tracker: params.tracker,
+        calledBySdk: 'sliceCopyFile'
+      }, function (err, PartListData) {
+        if (err) {
+          // 如果 UploadId 获取会出错，跳过并删除
+          session.removeUploadId(UploadId);
+          next(index + 1);
+        } else {
+          // 如果异步回来 UploadId 已经被用了，也跳过
+          if (session.using[UploadId]) return next(index + 1);
+          // 找到可用 UploadId
+          var finishETagMap = {};
+          var offset = 0;
+          util.each(PartListData.PartList, function (PartItem) {
+            var size = parseInt(PartItem.Size);
+            var end = offset + size - 1;
+            finishETagMap[PartItem.PartNumber + '|' + offset + '|' + end] = PartItem.ETag;
+            offset += size;
+          });
+          util.each(params.PartList, function (PartItem) {
+            var ETag = finishETagMap[PartItem.PartNumber + '|' + PartItem.start + '|' + PartItem.end];
+            if (ETag) {
+              PartItem.ETag = ETag;
+              PartItem.Uploaded = true;
+            }
+          });
+          ep.emit('get_copy_data_finish', {
+            UploadId: UploadId,
+            PartList: params.PartList
+          });
+        }
+      });
+    };
+    next(0);
+  });
+  ep.on('get_file_size_finish', function () {
+    // 控制分片大小
+    (function () {
+      var SIZE = [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 1024 * 2, 1024 * 4, 1024 * 5];
+      var AutoChunkSize = 1024 * 1024;
+      for (var i = 0; i < SIZE.length; i++) {
+        AutoChunkSize = SIZE[i] * 1024 * 1024;
+        if (FileSize / AutoChunkSize <= self.options.MaxPartNumber) break;
+      }
+      params.ChunkSize = ChunkSize = Math.max(ChunkSize, AutoChunkSize);
+      ChunkCount = Math.ceil(FileSize / ChunkSize);
+      var list = [];
+      for (var partNumber = 1; partNumber <= ChunkCount; partNumber++) {
+        var start = (partNumber - 1) * ChunkSize;
+        var end = partNumber * ChunkSize < FileSize ? partNumber * ChunkSize - 1 : FileSize - 1;
+        var item = {
+          PartNumber: partNumber,
+          start: start,
+          end: end,
+          CopySourceRange: 'bytes=' + start + '-' + end
+        };
+        list.push(item);
+      }
+      params.PartList = list;
+    })();
+    var TargetHeader;
+    if (params.Headers['x-cos-metadata-directive'] === 'Replaced') {
+      TargetHeader = params.Headers;
+    } else {
+      TargetHeader = SourceHeaders;
+    }
+    TargetHeader['x-cos-storage-class'] = params.Headers['x-cos-storage-class'] || SourceHeaders['x-cos-storage-class'];
+    TargetHeader = util.clearKey(TargetHeader);
+    /**
+     * 对于归档存储的对象，如果未恢复副本，则不允许 Copy
+     */
+    if (SourceHeaders['x-cos-storage-class'] === 'ARCHIVE' || SourceHeaders['x-cos-storage-class'] === 'DEEP_ARCHIVE') {
+      var restoreHeader = SourceHeaders['x-cos-restore'];
+      if (!restoreHeader || restoreHeader === 'ongoing-request="true"') {
+        callback({
+          error: 'Unrestored archive object is not allowed to be copied'
+        });
+        return;
+      }
+    }
+    /**
+     * 去除一些无用的头部，规避 multipartInit 出错
+     * 这些头部通常是在 putObjectCopy 时才使用
+     */
+    delete TargetHeader['x-cos-copy-source'];
+    delete TargetHeader['x-cos-metadata-directive'];
+    delete TargetHeader['x-cos-copy-source-If-Modified-Since'];
+    delete TargetHeader['x-cos-copy-source-If-Unmodified-Since'];
+    delete TargetHeader['x-cos-copy-source-If-Match'];
+    delete TargetHeader['x-cos-copy-source-If-None-Match'];
+    ep.emit('get_chunk_size_finish');
+  });
+
+  // 获取远端复制源文件的大小
+  self.headObject({
+    Bucket: SourceBucket,
+    Region: SourceRegion,
+    Key: SourceKey,
+    tracker: params.tracker,
+    calledBySdk: 'sliceCopyFile'
+  }, function (err, data) {
+    if (err) {
+      if (err.statusCode && err.statusCode === 404) {
+        callback({
+          ErrorStatus: SourceKey + ' Not Exist'
+        });
+      } else {
+        callback(err);
+      }
+      return;
+    }
+    FileSize = params.FileSize = data.headers['content-length'];
+    if (FileSize === undefined || !FileSize) {
+      callback({
+        error: 'get Content-Length error, please add "Content-Length" to CORS ExposeHeader setting.'
+      });
+      return;
+    }
+    params.tracker && params.tracker.setParams({
+      httpSize: FileSize
+    });
+    _onProgress3 = util.throttleOnProgress.call(self, FileSize, params.onProgress);
+
+    // 开始上传
+    if (FileSize <= CopySliceSize) {
+      if (!params.Headers['x-cos-metadata-directive']) {
+        params.Headers['x-cos-metadata-directive'] = 'Copy';
+      }
+      self.putObjectCopy(Object.assign(params, {
+        calledBySdk: 'sliceCopyFile'
+      }), function (err, data) {
+        if (err) {
+          _onProgress3(null, true);
+          return callback(err);
+        }
+        _onProgress3({
+          loaded: FileSize,
+          total: FileSize
+        }, true);
+        callback(err, data);
+      });
+    } else {
+      var resHeaders = data.headers;
+      SourceResHeaders = resHeaders;
+      SourceHeaders = {
+        'Cache-Control': resHeaders['cache-control'],
+        'Content-Disposition': resHeaders['content-disposition'],
+        'Content-Encoding': resHeaders['content-encoding'],
+        'Content-Type': resHeaders['content-type'],
+        Expires: resHeaders['expires'],
+        'x-cos-storage-class': resHeaders['x-cos-storage-class']
+      };
+      util.each(resHeaders, function (v, k) {
+        var metaPrefix = 'x-cos-meta-';
+        if (k.indexOf(metaPrefix) === 0 && k.length > metaPrefix.length) {
+          SourceHeaders[k] = v;
+        }
+      });
+      ep.emit('get_file_size_finish');
+    }
+  });
+}
+
+// 复制指定分片
+function copySliceItem(params, callback) {
+  var TaskId = params.TaskId;
+  var Bucket = params.Bucket;
+  var Region = params.Region;
+  var Key = params.Key;
+  var CopySource = params.CopySource;
+  var UploadId = params.UploadId;
+  var PartNumber = params.PartNumber * 1;
+  var CopySourceRange = params.CopySourceRange;
+  var ChunkRetryTimes = this.options.ChunkRetryTimes + 1;
+  var self = this;
+  Async.retry(ChunkRetryTimes, function (tryCallback) {
+    self.uploadPartCopy({
+      TaskId: TaskId,
+      Bucket: Bucket,
+      Region: Region,
+      Key: Key,
+      CopySource: CopySource,
+      UploadId: UploadId,
+      PartNumber: PartNumber,
+      CopySourceRange: CopySourceRange,
+      onProgress: params.onProgress,
+      tracker: params.tracker,
+      calledBySdk: params.calledBySdk
+    }, function (err, data) {
+      tryCallback(err || null, data);
+    });
+  }, function (err, data) {
+    return callback(err, data);
+  });
+}
+var API_MAP = {
+  sliceUploadFile: sliceUploadFile,
+  abortUploadTask: abortUploadTask,
+  uploadFile: uploadFile,
+  uploadFiles: uploadFiles,
+  sliceCopyFile: sliceCopyFile
+};
+module.exports.init = function (COS, task) {
+  task.transferToTaskMethod(API_MAP, 'sliceUploadFile');
+  util.each(API_MAP, function (fn, apiName) {
+    COS.prototype[apiName] = util.apiWrapper(apiName, fn);
+  });
+};
+
+/***/ }),
+
+/***/ "./src/async.js":
+/*!**********************!*\
+  !*** ./src/async.js ***!
+  \**********************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+var eachLimit = function eachLimit(arr, limit, iterator, callback) {
+  callback = callback || function () {};
+  if (!arr.length || limit <= 0) {
+    return callback();
+  }
+  var completed = 0;
+  var started = 0;
+  var running = 0;
+  (function replenish() {
+    if (completed >= arr.length) {
+      return callback();
+    }
+    while (running < limit && started < arr.length) {
+      started += 1;
+      running += 1;
+      iterator(arr[started - 1], function (err) {
+        if (err) {
+          callback(err);
+          callback = function callback() {};
+        } else {
+          completed += 1;
+          running -= 1;
+          if (completed >= arr.length) {
+            callback();
+          } else {
+            replenish();
+          }
+        }
+      });
+    }
+  })();
+};
+var retry = function retry(times, iterator, callback) {
+  var next = function next(index) {
+    iterator(function (err, data) {
+      if (err && index < times) {
+        next(index + 1);
+      } else {
+        callback(err, data);
+      }
+    });
+  };
+  if (times < 1) {
+    callback();
+  } else {
+    next(1);
+  }
+};
+var async = {
+  eachLimit: eachLimit,
+  retry: retry
+};
+module.exports = async;
+
+/***/ }),
+
+/***/ "./src/base.js":
+/*!*********************!*\
+  !*** ./src/base.js ***!
+  \*********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(Buffer) {
+
+var REQUEST = __webpack_require__(/*! ../lib/request */ "./lib/request.js");
+var util = __webpack_require__(/*! ./util */ "./src/util.js");
+var mime = __webpack_require__(/*! mime */ "./node_modules/mime/index.js");
+
+// Bucket 相关
+
+/**
+ * 获取用户的 bucket 列表
+ * @param  {Object}  params         回调函数，必须，下面为参数列表
+ * 无特殊参数
+ * @param  {Function}  callback     回调函数，必须
+ */
+function getService(params, callback) {
+  if (typeof params === 'function') {
+    callback = params;
+    params = {};
+  }
+  var protocol = 'https:';
+  var domain = this.options.ServiceDomain;
+  var region = params.Region;
+  if (domain) {
+    domain = domain.replace(/\{\{Region\}\}/gi, region || '').replace(/\{\{.*?\}\}/gi, '');
+    if (!/^[a-zA-Z]+:\/\//.test(domain)) {
+      domain = protocol + '//' + domain;
+    }
+    if (domain.slice(-1) === '/') {
+      domain = domain.slice(0, -1);
+    }
+  } else if (region) {
+    domain = protocol + '//cos.' + region + '.myqcloud.com';
+  } else {
+    domain = protocol + '//service.cos.myqcloud.com';
+  }
+  var SignHost = '';
+  var standardHost = region ? 'cos.' + region + '.myqcloud.com' : 'service.cos.myqcloud.com';
+  var urlHost = domain.replace(/^https?:\/\/([^/]+)(\/.*)?$/, '$1');
+  if (standardHost === urlHost) SignHost = standardHost;
+  submitRequest.call(this, {
+    Action: 'name/cos:GetService',
+    url: domain,
+    method: 'GET',
+    headers: params.Headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    var buckets = data && data.ListAllMyBucketsResult && data.ListAllMyBucketsResult.Buckets && data.ListAllMyBucketsResult.Buckets.Bucket || [];
+    buckets = util.isArray(buckets) ? buckets : [buckets];
+    var owner = data && data.ListAllMyBucketsResult && data.ListAllMyBucketsResult.Owner || {};
+    callback(null, {
+      Buckets: buckets,
+      Owner: owner,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 创建 Bucket，并初始化访问权限
+ * @param  {Object}  params                         参数对象，必须
+ *     @param  {String}  params.Bucket              Bucket名称，必须
+ *     @param  {String}  params.Region              地域名称，必须
+ *     @param  {String}  params.ACL                 用户自定义文件权限，可以设置：private，public-read；默认值：private，非必须
+ *     @param  {String}  params.GrantRead           赋予被授权者读的权限，格式x-cos-grant-read: uin=" ",uin=" "，非必须
+ *     @param  {String}  params.GrantWrite          赋予被授权者写的权限，格式x-cos-grant-write: uin=" ",uin=" "，非必须
+ *     @param  {String}  params.GrantFullControl    赋予被授权者读写权限，格式x-cos-grant-full-control: uin=" ",uin=" "，非必须
+ * @param  {Function}  callback                     回调函数，必须
+ * @return  {Object}  err                           请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                          返回的数据
+ *     @return  {String}  data.Location             操作地址
+ */
+function putBucket(params, callback) {
+  var self = this;
+  var xml = '';
+  if (params['BucketAZConfig']) {
+    var CreateBucketConfiguration = {
+      BucketAZConfig: params.BucketAZConfig
+    };
+    xml = util.json2xml({
+      CreateBucketConfiguration: CreateBucketConfiguration
+    });
+  }
+  submitRequest.call(this, {
+    Action: 'name/cos:PutBucket',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    body: xml,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    var url = getUrl({
+      protocol: self.options.Protocol,
+      domain: self.options.Domain,
+      bucket: params.Bucket,
+      region: params.Region,
+      isLocation: true
+    });
+    callback(null, {
+      Location: url,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 查看是否存在该Bucket，是否有权限访问
+ * @param  {Object}  params                     参数对象，必须
+ *     @param  {String}  params.Bucket          Bucket名称，必须
+ *     @param  {String}  params.Region          地域名称，必须
+ * @param  {Function}  callback                 回调函数，必须
+ * @return  {Object}  err                       请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                      返回的数据
+ *     @return  {Boolean}  data.BucketExist     Bucket是否存在
+ *     @return  {Boolean}  data.BucketAuth      是否有 Bucket 的访问权限
+ */
+function headBucket(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:HeadBucket',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    method: 'HEAD',
+    tracker: params.tracker
+  }, function (err, data) {
+    callback(err, data);
+  });
+}
+
+/**
+ * 获取 Bucket 下的 object 列表
+ * @param  {Object}  params                         参数对象，必须
+ *     @param  {String}  params.Bucket              Bucket名称，必须
+ *     @param  {String}  params.Region              地域名称，必须
+ *     @param  {String}  params.Prefix              前缀匹配，用来规定返回的文件前缀地址，非必须
+ *     @param  {String}  params.Delimiter           定界符为一个符号，如果有Prefix，则将Prefix到delimiter之间的相同路径归为一类，非必须
+ *     @param  {String}  params.Marker              默认以UTF-8二进制顺序列出条目，所有列出条目从marker开始，非必须
+ *     @param  {String}  params.MaxKeys             单次返回最大的条目数量，默认1000，非必须
+ *     @param  {String}  params.EncodingType        规定返回值的编码方式，非必须
+ * @param  {Function}  callback                     回调函数，必须
+ * @return  {Object}  err                           请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                          返回的数据
+ *     @return  {Object}  data.ListBucketResult     返回的 object 列表信息
+ */
+function getBucket(params, callback) {
+  var reqParams = {};
+  reqParams['prefix'] = params['Prefix'] || '';
+  reqParams['delimiter'] = params['Delimiter'];
+  reqParams['marker'] = params['Marker'];
+  reqParams['max-keys'] = params['MaxKeys'];
+  reqParams['encoding-type'] = params['EncodingType'];
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucket',
+    ResourceKey: reqParams['prefix'],
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    qs: reqParams,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    var ListBucketResult = data.ListBucketResult || {};
+    var Contents = ListBucketResult.Contents || [];
+    var CommonPrefixes = ListBucketResult.CommonPrefixes || [];
+    Contents = util.isArray(Contents) ? Contents : [Contents];
+    CommonPrefixes = util.isArray(CommonPrefixes) ? CommonPrefixes : [CommonPrefixes];
+    var result = util.clone(ListBucketResult);
+    util.extend(result, {
+      Contents: Contents,
+      CommonPrefixes: CommonPrefixes,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+    callback(null, result);
+  });
+}
+
+/**
+ * 删除 Bucket
+ * @param  {Object}  params                 参数对象，必须
+ *     @param  {String}  params.Bucket      Bucket名称，必须
+ *     @param  {String}  params.Region      地域名称，必须
+ * @param  {Function}  callback             回调函数，必须
+ * @return  {Object}  err                   请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                  返回的数据
+ *     @return  {String}  data.Location     操作地址
+ */
+function deleteBucket(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:DeleteBucket',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    method: 'DELETE',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 设置 Bucket 的 权限列表
+ * @param  {Object}  params                         参数对象，必须
+ *     @param  {String}  params.Bucket              Bucket名称，必须
+ *     @param  {String}  params.Region              地域名称，必须
+ *     @param  {String}  params.ACL                 用户自定义文件权限，可以设置：private，public-read；默认值：private，非必须
+ *     @param  {String}  params.GrantRead           赋予被授权者读的权限，格式x-cos-grant-read: uin=" ",uin=" "，非必须
+ *     @param  {String}  params.GrantWrite          赋予被授权者写的权限，格式x-cos-grant-write: uin=" ",uin=" "，非必须
+ *     @param  {String}  params.GrantFullControl    赋予被授权者读写权限，格式x-cos-grant-full-control: uin=" ",uin=" "，非必须
+ * @param  {Function}  callback                     回调函数，必须
+ * @return  {Object}  err                           请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                          返回的数据
+ */
+function putBucketAcl(params, callback) {
+  var headers = params.Headers;
+  var xml = '';
+  if (params['AccessControlPolicy']) {
+    var AccessControlPolicy = util.clone(params['AccessControlPolicy'] || {});
+    var Grants = AccessControlPolicy.Grants || AccessControlPolicy.Grant;
+    Grants = util.isArray(Grants) ? Grants : [Grants];
+    delete AccessControlPolicy.Grant;
+    delete AccessControlPolicy.Grants;
+    AccessControlPolicy.AccessControlList = {
+      Grant: Grants
+    };
+    xml = util.json2xml({
+      AccessControlPolicy: AccessControlPolicy
+    });
+    headers['Content-Type'] = 'application/xml';
+    headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  }
+
+  // Grant Header 去重
+  util.each(headers, function (val, key) {
+    if (key.indexOf('x-cos-grant-') === 0) {
+      headers[key] = uniqGrant(headers[key]);
+    }
+  });
+  submitRequest.call(this, {
+    Action: 'name/cos:PutBucketACL',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: headers,
+    action: 'acl',
+    body: xml,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 获取 Bucket 的 权限列表
+ * @param  {Object}  params                         参数对象，必须
+ *     @param  {String}  params.Bucket              Bucket名称，必须
+ *     @param  {String}  params.Region              地域名称，必须
+ * @param  {Function}  callback                     回调函数，必须
+ * @return  {Object}  err                           请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                          返回的数据
+ *     @return  {Object}  data.AccessControlPolicy  访问权限信息
+ */
+function getBucketAcl(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketACL',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'acl',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    var AccessControlPolicy = data.AccessControlPolicy || {};
+    var Owner = AccessControlPolicy.Owner || {};
+    var Grant = AccessControlPolicy.AccessControlList.Grant || [];
+    Grant = util.isArray(Grant) ? Grant : [Grant];
+    var result = decodeAcl(AccessControlPolicy);
+    if (data.headers && data.headers['x-cos-acl']) {
+      result.ACL = data.headers['x-cos-acl'];
+    }
+    result = util.extend(result, {
+      Owner: Owner,
+      Grants: Grant,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+    callback(null, result);
+  });
+}
+
+/**
+ * 设置 Bucket 的 跨域设置
+ * @param  {Object}  params                             参数对象，必须
+ *     @param  {String}  params.Bucket                  Bucket名称，必须
+ *     @param  {String}  params.Region                  地域名称，必须
+ *     @param  {Object}  params.CORSConfiguration       相关的跨域设置，必须
+ * @param  {Array}  params.CORSConfiguration.CORSRules  对应的跨域规则
+ * @param  {Function}  callback                         回调函数，必须
+ * @return  {Object}  err                               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                              返回的数据
+ */
+function putBucketCors(params, callback) {
+  var CORSConfiguration = params['CORSConfiguration'] || {};
+  var CORSRules = CORSConfiguration['CORSRules'] || params['CORSRules'] || [];
+  CORSRules = util.clone(util.isArray(CORSRules) ? CORSRules : [CORSRules]);
+  util.each(CORSRules, function (rule) {
+    util.each(['AllowedOrigin', 'AllowedHeader', 'AllowedMethod', 'ExposeHeader'], function (key) {
+      var sKey = key + 's';
+      var val = rule[sKey] || rule[key] || [];
+      delete rule[sKey];
+      rule[key] = util.isArray(val) ? val : [val];
+    });
+  });
+  var Conf = {
+    CORSRule: CORSRules
+  };
+  if (params.ResponseVary) Conf.ResponseVary = params.ResponseVary;
+  var xml = util.json2xml({
+    CORSConfiguration: Conf
+  });
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Action: 'name/cos:PutBucketCORS',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    body: xml,
+    action: 'cors',
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 获取 Bucket 的 跨域设置
+ * @param  {Object}  params                         参数对象，必须
+ *     @param  {String}  params.Bucket              Bucket名称，必须
+ *     @param  {String}  params.Region              地域名称，必须
+ * @param  {Function}  callback                     回调函数，必须
+ * @return  {Object}  err                           请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                          返回的数据
+ *     @return  {Object}  data.CORSRules            Bucket的跨域设置
+ */
+function getBucketCors(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketCORS',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'cors',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) {
+      if (err.statusCode === 404 && err.error && err.error.Code === 'NoSuchCORSConfiguration') {
+        var result = {
+          CORSRules: [],
+          statusCode: err.statusCode
+        };
+        err.headers && (result.headers = err.headers);
+        callback(null, result);
+      } else {
+        callback(err);
+      }
+      return;
+    }
+    var CORSConfiguration = data.CORSConfiguration || {};
+    var CORSRules = CORSConfiguration.CORSRules || CORSConfiguration.CORSRule || [];
+    CORSRules = util.clone(util.isArray(CORSRules) ? CORSRules : [CORSRules]);
+    var ResponseVary = CORSConfiguration.ResponseVary;
+    util.each(CORSRules, function (rule) {
+      util.each(['AllowedOrigin', 'AllowedHeader', 'AllowedMethod', 'ExposeHeader'], function (key) {
+        var sKey = key + 's';
+        var val = rule[sKey] || rule[key] || [];
+        delete rule[key];
+        rule[sKey] = util.isArray(val) ? val : [val];
+      });
+    });
+    callback(null, {
+      CORSRules: CORSRules,
+      ResponseVary: ResponseVary,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 删除 Bucket 的 跨域设置
+ * @param  {Object}  params                 参数对象，必须
+ *     @param  {String}  params.Bucket      Bucket名称，必须
+ *     @param  {String}  params.Region      地域名称，必须
+ * @param  {Function}  callback             回调函数，必须
+ * @return  {Object}  err                   请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                  返回的数据
+ */
+function deleteBucketCors(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:DeleteBucketCORS',
+    method: 'DELETE',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'cors',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode || err.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 获取 Bucket 的 地域信息
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回数据，包含地域信息 LocationConstraint
+ */
+function getBucketLocation(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketLocation',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'location',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    callback(null, data);
+  });
+}
+function putBucketPolicy(params, callback) {
+  var Policy = params['Policy'];
+  var PolicyStr = Policy;
+  try {
+    if (typeof Policy === 'string') {
+      Policy = JSON.parse(PolicyStr);
+    } else {
+      PolicyStr = JSON.stringify(Policy);
+    }
+  } catch (e) {
+    callback({
+      error: 'Policy format error'
+    });
+  }
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/json';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(PolicyStr));
+  submitRequest.call(this, {
+    Action: 'name/cos:PutBucketPolicy',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    action: 'policy',
+    body: PolicyStr,
+    headers: headers,
+    json: true,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 获取 Bucket 的读取权限策略
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回数据
+ */
+function getBucketPolicy(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketPolicy',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'policy',
+    rawBody: true,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) {
+      if (err.statusCode && err.statusCode === 403) {
+        return callback({
+          ErrorStatus: 'Access Denied'
+        });
+      }
+      if (err.statusCode && err.statusCode === 405) {
+        return callback({
+          ErrorStatus: 'Method Not Allowed'
+        });
+      }
+      if (err.statusCode && err.statusCode === 404) {
+        return callback({
+          ErrorStatus: 'Policy Not Found'
+        });
+      }
+      return callback(err);
+    }
+    var Policy = {};
+    try {
+      Policy = JSON.parse(data.body);
+    } catch (e) {}
+    callback(null, {
+      Policy: Policy,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 删除 Bucket 的 跨域设置
+ * @param  {Object}  params                 参数对象，必须
+ *     @param  {String}  params.Bucket      Bucket名称，必须
+ *     @param  {String}  params.Region      地域名称，必须
+ * @param  {Function}  callback             回调函数，必须
+ * @return  {Object}  err                   请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                  返回的数据
+ */
+function deleteBucketPolicy(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:DeleteBucketPolicy',
+    method: 'DELETE',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'policy',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode || err.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 设置 Bucket 的标签
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ *     @param  {Array}   params.TagSet  标签设置，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回数据
+ */
+function putBucketTagging(params, callback) {
+  var Tagging = params['Tagging'] || {};
+  var Tags = Tagging.TagSet || Tagging.Tags || params['Tags'] || [];
+  Tags = util.clone(util.isArray(Tags) ? Tags : [Tags]);
+  var xml = util.json2xml({
+    Tagging: {
+      TagSet: {
+        Tag: Tags
+      }
+    }
+  });
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Action: 'name/cos:PutBucketTagging',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    body: xml,
+    action: 'tagging',
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 获取 Bucket 的标签设置
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回数据
+ */
+function getBucketTagging(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketTagging',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'tagging',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) {
+      if (err.statusCode === 404 && err.error && (err.error === 'Not Found' || err.error.Code === 'NoSuchTagSet')) {
+        var result = {
+          Tags: [],
+          statusCode: err.statusCode
+        };
+        err.headers && (result.headers = err.headers);
+        callback(null, result);
+      } else {
+        callback(err);
+      }
+      return;
+    }
+    var Tags = [];
+    try {
+      Tags = data.Tagging.TagSet.Tag || [];
+    } catch (e) {}
+    Tags = util.clone(util.isArray(Tags) ? Tags : [Tags]);
+    callback(null, {
+      Tags: Tags,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 删除 Bucket 的 标签设置
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回的数据
+ */
+function deleteBucketTagging(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:DeleteBucketTagging',
+    method: 'DELETE',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'tagging',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+function putBucketLifecycle(params, callback) {
+  var LifecycleConfiguration = params['LifecycleConfiguration'] || {};
+  var Rules = LifecycleConfiguration.Rules || params.Rules || [];
+  Rules = util.clone(Rules);
+  var xml = util.json2xml({
+    LifecycleConfiguration: {
+      Rule: Rules
+    }
+  });
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Action: 'name/cos:PutBucketLifecycle',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    body: xml,
+    action: 'lifecycle',
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+function getBucketLifecycle(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketLifecycle',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'lifecycle',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) {
+      if (err.statusCode === 404 && err.error && err.error.Code === 'NoSuchLifecycleConfiguration') {
+        var result = {
+          Rules: [],
+          statusCode: err.statusCode
+        };
+        err.headers && (result.headers = err.headers);
+        callback(null, result);
+      } else {
+        callback(err);
+      }
+      return;
+    }
+    var Rules = [];
+    try {
+      Rules = data.LifecycleConfiguration.Rule || [];
+    } catch (e) {}
+    Rules = util.clone(util.isArray(Rules) ? Rules : [Rules]);
+    callback(null, {
+      Rules: Rules,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+function deleteBucketLifecycle(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:DeleteBucketLifecycle',
+    method: 'DELETE',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'lifecycle',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+function putBucketVersioning(params, callback) {
+  if (!params['VersioningConfiguration']) {
+    callback({
+      error: 'missing param VersioningConfiguration'
+    });
+    return;
+  }
+  var VersioningConfiguration = params['VersioningConfiguration'] || {};
+  var xml = util.json2xml({
+    VersioningConfiguration: VersioningConfiguration
+  });
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Action: 'name/cos:PutBucketVersioning',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    body: xml,
+    action: 'versioning',
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+function getBucketVersioning(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketVersioning',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'versioning',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (!err) {
+      !data.VersioningConfiguration && (data.VersioningConfiguration = {});
+    }
+    callback(err, data);
+  });
+}
+function putBucketReplication(params, callback) {
+  var ReplicationConfiguration = util.clone(params.ReplicationConfiguration);
+  var xml = util.json2xml({
+    ReplicationConfiguration: ReplicationConfiguration
+  });
+  xml = xml.replace(/<(\/?)Rules>/gi, '<$1Rule>');
+  xml = xml.replace(/<(\/?)Tags>/gi, '<$1Tag>');
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Action: 'name/cos:PutBucketReplication',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    body: xml,
+    action: 'replication',
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+function getBucketReplication(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketReplication',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'replication',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) {
+      if (err.statusCode === 404 && err.error && (err.error === 'Not Found' || err.error.Code === 'ReplicationConfigurationnotFoundError')) {
+        var result = {
+          ReplicationConfiguration: {
+            Rules: []
+          },
+          statusCode: err.statusCode
+        };
+        err.headers && (result.headers = err.headers);
+        callback(null, result);
+      } else {
+        callback(err);
+      }
+      return;
+    }
+    if (!err) {
+      !data.ReplicationConfiguration && (data.ReplicationConfiguration = {});
+    }
+    if (data.ReplicationConfiguration.Rule) {
+      data.ReplicationConfiguration.Rules = data.ReplicationConfiguration.Rule;
+      delete data.ReplicationConfiguration.Rule;
+    }
+    callback(err, data);
+  });
+}
+function deleteBucketReplication(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:DeleteBucketReplication',
+    method: 'DELETE',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'replication',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 设置 Bucket 静态网站配置信息
+ * @param  {Object}  params                                                 参数对象，必须
+ *     @param  {String}  params.Bucket                                      Bucket名称，必须
+ *     @param  {String}  params.Region                                      地域名称，必须
+ *     @param  {Object}  params.WebsiteConfiguration                        地域名称，必须
+ *         @param  {Object}   WebsiteConfiguration.IndexDocument            索引文档，必须
+ *         @param  {Object}   WebsiteConfiguration.ErrorDocument            错误文档，非必须
+ *         @param  {Object}   WebsiteConfiguration.RedirectAllRequestsTo    重定向所有请求，非必须
+ *         @param  {Array}   params.RoutingRules                            重定向规则，非必须
+ * @param  {Function}  callback                                             回调函数，必须
+ * @return  {Object}  err                                                   请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                                                  返回数据
+ */
+function putBucketWebsite(params, callback) {
+  if (!params['WebsiteConfiguration']) {
+    callback({
+      error: 'missing param WebsiteConfiguration'
+    });
+    return;
+  }
+  var WebsiteConfiguration = util.clone(params['WebsiteConfiguration'] || {});
+  var RoutingRules = WebsiteConfiguration['RoutingRules'] || WebsiteConfiguration['RoutingRule'] || [];
+  RoutingRules = util.isArray(RoutingRules) ? RoutingRules : [RoutingRules];
+  delete WebsiteConfiguration.RoutingRule;
+  delete WebsiteConfiguration.RoutingRules;
+  if (RoutingRules.length) WebsiteConfiguration.RoutingRules = {
+    RoutingRule: RoutingRules
+  };
+  var xml = util.json2xml({
+    WebsiteConfiguration: WebsiteConfiguration
+  });
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Action: 'name/cos:PutBucketWebsite',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    body: xml,
+    action: 'website',
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 获取 Bucket 的静态网站配置信息
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回数据
+ */
+function getBucketWebsite(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketWebsite',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    headers: params.Headers,
+    action: 'website',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) {
+      if (err.statusCode === 404 && err.error.Code === 'NoSuchWebsiteConfiguration') {
+        var result = {
+          WebsiteConfiguration: {},
+          statusCode: err.statusCode
+        };
+        err.headers && (result.headers = err.headers);
+        callback(null, result);
+      } else {
+        callback(err);
+      }
+      return;
+    }
+    var WebsiteConfiguration = data.WebsiteConfiguration || {};
+    if (WebsiteConfiguration['RoutingRules']) {
+      var RoutingRules = util.clone(WebsiteConfiguration['RoutingRules'].RoutingRule || []);
+      RoutingRules = util.makeArray(RoutingRules);
+      WebsiteConfiguration.RoutingRules = RoutingRules;
+    }
+    callback(null, {
+      WebsiteConfiguration: WebsiteConfiguration,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 删除 Bucket 的静态网站配置
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回数据
+ */
+function deleteBucketWebsite(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:DeleteBucketWebsite',
+    method: 'DELETE',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'website',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 设置 Bucket 的防盗链白名单或者黑名单
+ * @param  {Object}  params                                                 参数对象，必须
+ *     @param  {String}  params.Bucket                                      Bucket名称，必须
+ *     @param  {String}  params.Region                                      地域名称，必须
+ *     @param  {Object}  params.RefererConfiguration                        地域名称，必须
+ *         @param  {String}   RefererConfiguration.Status                   是否开启防盗链，枚举值：Enabled、Disabled
+ *         @param  {String}   RefererConfiguration.RefererType              防盗链类型，枚举值：Black-List、White-List，必须
+ *         @param  {Array}   RefererConfiguration.DomianList.Domain         生效域名，必须
+ *         @param  {String}   RefererConfiguration.EmptyReferConfiguration  ，非必须
+ * @param  {Function}  callback                                             回调函数，必须
+ * @return  {Object}  err                                                   请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                                                  返回数据
+ */
+function putBucketReferer(params, callback) {
+  if (!params['RefererConfiguration']) {
+    callback({
+      error: 'missing param RefererConfiguration'
+    });
+    return;
+  }
+  var RefererConfiguration = util.clone(params['RefererConfiguration'] || {});
+  var DomainList = RefererConfiguration['DomainList'] || {};
+  var Domains = DomainList['Domains'] || DomainList['Domain'] || [];
+  Domains = util.isArray(Domains) ? Domains : [Domains];
+  if (Domains.length) RefererConfiguration.DomainList = {
+    Domain: Domains
+  };
+  var xml = util.json2xml({
+    RefererConfiguration: RefererConfiguration
+  });
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Action: 'name/cos:PutBucketReferer',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    body: xml,
+    action: 'referer',
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 获取 Bucket 的防盗链白名单或者黑名单
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回数据
+ */
+function getBucketReferer(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketReferer',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    headers: params.Headers,
+    action: 'referer',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) {
+      if (err.statusCode === 404 && err.error.Code === 'NoSuchRefererConfiguration') {
+        var result = {
+          WebsiteConfiguration: {},
+          statusCode: err.statusCode
+        };
+        err.headers && (result.headers = err.headers);
+        callback(null, result);
+      } else {
+        callback(err);
+      }
+      return;
+    }
+    var RefererConfiguration = data.RefererConfiguration || {};
+    if (RefererConfiguration['DomainList']) {
+      var Domains = util.makeArray(RefererConfiguration['DomainList'].Domain || []);
+      RefererConfiguration.DomainList = {
+        Domains: Domains
+      };
+    }
+    callback(null, {
+      RefererConfiguration: RefererConfiguration,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 设置 Bucket 自定义域名
+ * @param  {Object}  params                                                 参数对象，必须
+ *     @param  {String}  params.Bucket                                      Bucket名称，必须
+ *     @param  {String}  params.Region                                      地域名称，必须
+ * @param  {Function}  callback                                             回调函数，必须
+ * @return  {Object}  err                                                   请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                                                  返回数据
+ */
+function putBucketDomain(params, callback) {
+  var DomainConfiguration = params['DomainConfiguration'] || {};
+  var DomainRule = DomainConfiguration.DomainRule || params.DomainRule || [];
+  DomainRule = util.clone(DomainRule);
+  var xml = util.json2xml({
+    DomainConfiguration: {
+      DomainRule: DomainRule
+    }
+  });
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Action: 'name/cos:PutBucketDomain',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    body: xml,
+    action: 'domain',
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 获取 Bucket 的自定义域名
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回数据
+ */
+function getBucketDomain(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketDomain',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'domain',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    var DomainRule = [];
+    try {
+      DomainRule = data.DomainConfiguration.DomainRule || [];
+    } catch (e) {}
+    DomainRule = util.clone(util.isArray(DomainRule) ? DomainRule : [DomainRule]);
+    callback(null, {
+      DomainRule: DomainRule,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 删除 Bucket 自定义域名
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回数据
+ */
+function deleteBucketDomain(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:DeleteBucketDomain',
+    method: 'DELETE',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'domain',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 设置 Bucket 的回源
+ * @param  {Object}  params                                                 参数对象，必须
+ *     @param  {String}  params.Bucket                                      Bucket名称，必须
+ *     @param  {String}  params.Region                                      地域名称，必须
+ * @param  {Function}  callback                                             回调函数，必须
+ * @return  {Object}  err                                                   请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                                                  返回数据
+ */
+function putBucketOrigin(params, callback) {
+  var OriginConfiguration = params['OriginConfiguration'] || {};
+  var OriginRule = OriginConfiguration.OriginRule || params.OriginRule || [];
+  OriginRule = util.clone(OriginRule);
+  var xml = util.json2xml({
+    OriginConfiguration: {
+      OriginRule: OriginRule
+    }
+  });
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Action: 'name/cos:PutBucketOrigin',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    body: xml,
+    action: 'origin',
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 获取 Bucket 的回源
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回数据
+ */
+function getBucketOrigin(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketOrigin',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'origin',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    var OriginRule = [];
+    try {
+      OriginRule = data.OriginConfiguration.OriginRule || [];
+    } catch (e) {}
+    OriginRule = util.clone(util.isArray(OriginRule) ? OriginRule : [OriginRule]);
+    callback(null, {
+      OriginRule: OriginRule,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 删除 Bucket 的回源
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回数据
+ */
+function deleteBucketOrigin(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:DeleteBucketOrigin',
+    method: 'DELETE',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'origin',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 设置 Bucket 的日志记录
+ * @param  {Object}  params                                                 参数对象，必须
+ *     @param  {String}  params.Bucket                                      Bucket名称，必须
+ *     @param  {String}  params.Region                                      地域名称，必须
+ *     @param  {(Object|String)}  params.BucketLoggingStatus                         说明日志记录配置的状态，如果无子节点信息则意为关闭日志记录，必须
+ * @param  {Function}  callback                                             回调函数，必须
+ * @return  {Object}  err                                                   请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                                                  返回数据
+ */
+function putBucketLogging(params, callback) {
+  var xml = util.json2xml({
+    BucketLoggingStatus: params['BucketLoggingStatus'] || ''
+  });
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Action: 'name/cos:PutBucketLogging',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    body: xml,
+    action: 'logging',
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 获取 Bucket 的日志记录
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回数据
+ */
+function getBucketLogging(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketLogging',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'logging',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    delete data.BucketLoggingStatus._xmlns;
+    callback(null, {
+      BucketLoggingStatus: data.BucketLoggingStatus,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 创建/编辑 Bucket 的清单任务
+ * @param  {Object}  params                                                 参数对象，必须
+ *     @param  {String}  params.Bucket                                      Bucket名称，必须
+ *     @param  {String}  params.Region                                      地域名称，必须
+ *     @param  {String}  params.Id                                          清单任务的名称，必须
+ *     @param  {Object}  params.InventoryConfiguration                      包含清单的配置参数，必须
+ * @param  {Function}  callback                                             回调函数，必须
+ * @return  {Object}  err                                                   请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                                                  返回数据
+ */
+function putBucketInventory(params, callback) {
+  var InventoryConfiguration = util.clone(params['InventoryConfiguration']);
+  if (InventoryConfiguration.OptionalFields) {
+    var Field = InventoryConfiguration.OptionalFields || [];
+    InventoryConfiguration.OptionalFields = {
+      Field: Field
+    };
+  }
+  if (InventoryConfiguration.Destination && InventoryConfiguration.Destination.COSBucketDestination && InventoryConfiguration.Destination.COSBucketDestination.Encryption) {
+    var Encryption = InventoryConfiguration.Destination.COSBucketDestination.Encryption;
+    if (Object.keys(Encryption).indexOf('SSECOS') > -1) {
+      Encryption['SSE-COS'] = Encryption['SSECOS'];
+      delete Encryption['SSECOS'];
+    }
+  }
+  var xml = util.json2xml({
+    InventoryConfiguration: InventoryConfiguration
+  });
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Action: 'name/cos:PutBucketInventory',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    body: xml,
+    action: 'inventory',
+    qs: {
+      id: params['Id']
+    },
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 获取 Bucket 的清单任务信息
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ *     @param  {String}  params.Id      清单任务的名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回数据
+ */
+function getBucketInventory(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketInventory',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'inventory',
+    qs: {
+      id: params['Id']
+    },
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    var InventoryConfiguration = data['InventoryConfiguration'];
+    if (InventoryConfiguration && InventoryConfiguration.OptionalFields && InventoryConfiguration.OptionalFields.Field) {
+      var Field = InventoryConfiguration.OptionalFields.Field;
+      if (!util.isArray(Field)) {
+        Field = [Field];
+      }
+      InventoryConfiguration.OptionalFields = Field;
+    }
+    if (InventoryConfiguration.Destination && InventoryConfiguration.Destination.COSBucketDestination && InventoryConfiguration.Destination.COSBucketDestination.Encryption) {
+      var Encryption = InventoryConfiguration.Destination.COSBucketDestination.Encryption;
+      if (Object.keys(Encryption).indexOf('SSE-COS') > -1) {
+        Encryption['SSECOS'] = Encryption['SSE-COS'];
+        delete Encryption['SSE-COS'];
+      }
+    }
+    callback(null, {
+      InventoryConfiguration: InventoryConfiguration,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 获取 Bucket 的清单任务信息
+ * @param  {Object}  params                             参数对象，必须
+ *     @param  {String}  params.Bucket                  Bucket名称，必须
+ *     @param  {String}  params.Region                  地域名称，必须
+ *     @param  {String}  params.ContinuationToken       当 COS 响应体中 IsTruncated 为 true，且 NextContinuationToken 节点中存在参数值时，您可以将这个参数作为 continuation-token 参数值，以获取下一页的清单任务信息，非必须
+ * @param  {Function}  callback                         回调函数，必须
+ * @return  {Object}  err                               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                              返回数据
+ */
+function listBucketInventory(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:ListBucketInventory',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'inventory',
+    qs: {
+      'continuation-token': params['ContinuationToken']
+    },
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    var ListInventoryConfigurationResult = data['ListInventoryConfigurationResult'];
+    var InventoryConfigurations = ListInventoryConfigurationResult.InventoryConfiguration || [];
+    InventoryConfigurations = util.isArray(InventoryConfigurations) ? InventoryConfigurations : [InventoryConfigurations];
+    delete ListInventoryConfigurationResult['InventoryConfiguration'];
+    util.each(InventoryConfigurations, function (InventoryConfiguration) {
+      if (InventoryConfiguration && InventoryConfiguration.OptionalFields && InventoryConfiguration.OptionalFields.Field) {
+        var Field = InventoryConfiguration.OptionalFields.Field;
+        if (!util.isArray(Field)) {
+          Field = [Field];
+        }
+        InventoryConfiguration.OptionalFields = Field;
+      }
+      if (InventoryConfiguration.Destination && InventoryConfiguration.Destination.COSBucketDestination && InventoryConfiguration.Destination.COSBucketDestination.Encryption) {
+        var Encryption = InventoryConfiguration.Destination.COSBucketDestination.Encryption;
+        if (Object.keys(Encryption).indexOf('SSE-COS') > -1) {
+          Encryption['SSECOS'] = Encryption['SSE-COS'];
+          delete Encryption['SSE-COS'];
+        }
+      }
+    });
+    ListInventoryConfigurationResult.InventoryConfigurations = InventoryConfigurations;
+    util.extend(ListInventoryConfigurationResult, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+    callback(null, ListInventoryConfigurationResult);
+  });
+}
+
+/**
+ * 删除 Bucket 的清单任务
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ *     @param  {String}  params.Id      清单任务的名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回数据
+ */
+function deleteBucketInventory(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:DeleteBucketInventory',
+    method: 'DELETE',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'inventory',
+    qs: {
+      id: params['Id']
+    },
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/* 全球加速 */
+function putBucketAccelerate(params, callback) {
+  if (!params['AccelerateConfiguration']) {
+    callback({
+      error: 'missing param AccelerateConfiguration'
+    });
+    return;
+  }
+  var configuration = {
+    AccelerateConfiguration: params.AccelerateConfiguration || {}
+  };
+  var xml = util.json2xml(configuration);
+  var headers = {};
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Interface: 'putBucketAccelerate',
+    Action: 'name/cos:PutBucketAccelerate',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    body: xml,
+    action: 'accelerate',
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+function getBucketAccelerate(params, callback) {
+  submitRequest.call(this, {
+    Interface: 'getBucketAccelerate',
+    Action: 'name/cos:GetBucketAccelerate',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    action: 'accelerate',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (!err) {
+      !data.AccelerateConfiguration && (data.AccelerateConfiguration = {});
+    }
+    callback(err, data);
+  });
+}
+
+// Object 相关
+
+/**
+ * 取回对应Object的元数据，Head的权限与Get的权限一致
+ * @param  {Object}  params                         参数对象，必须
+ *     @param  {String}  params.Bucket              Bucket名称，必须
+ *     @param  {String}  params.Region              地域名称，必须
+ *     @param  {String}  params.Key                 文件名称，必须
+ *     @param  {String}  params.IfModifiedSince     当Object在指定时间后被修改，则返回对应Object元信息，否则返回304，非必须
+ * @param  {Function}  callback                     回调函数，必须
+ * @return  {Object}  err                           请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                          为指定 object 的元数据，如果设置了 IfModifiedSince ，且文件未修改，则返回一个对象，NotModified 属性为 true
+ *     @return  {Boolean}  data.NotModified         是否在 IfModifiedSince 时间点之后未修改该 object，则为 true
+ */
+function headObject(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:HeadObject',
+    method: 'HEAD',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    VersionId: params.VersionId,
+    headers: params.Headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) {
+      var statusCode = err.statusCode;
+      if (params.Headers['If-Modified-Since'] && statusCode && statusCode === 304) {
+        return callback(null, {
+          NotModified: true,
+          statusCode: statusCode
+        });
+      }
+      return callback(err);
+    }
+    data.ETag = util.attr(data.headers, 'etag', '');
+    callback(null, data);
+  });
+}
+function listObjectVersions(params, callback) {
+  var reqParams = {};
+  reqParams['prefix'] = params['Prefix'] || '';
+  reqParams['delimiter'] = params['Delimiter'];
+  reqParams['key-marker'] = params['KeyMarker'];
+  reqParams['version-id-marker'] = params['VersionIdMarker'];
+  reqParams['max-keys'] = params['MaxKeys'];
+  reqParams['encoding-type'] = params['EncodingType'];
+  submitRequest.call(this, {
+    Action: 'name/cos:GetBucketObjectVersions',
+    ResourceKey: reqParams['prefix'],
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    qs: reqParams,
+    action: 'versions',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    var ListVersionsResult = data.ListVersionsResult || {};
+    var DeleteMarkers = ListVersionsResult.DeleteMarker || [];
+    DeleteMarkers = util.isArray(DeleteMarkers) ? DeleteMarkers : [DeleteMarkers];
+    var Versions = ListVersionsResult.Version || [];
+    Versions = util.isArray(Versions) ? Versions : [Versions];
+    var result = util.clone(ListVersionsResult);
+    delete result.DeleteMarker;
+    delete result.Version;
+    util.extend(result, {
+      DeleteMarkers: DeleteMarkers,
+      Versions: Versions,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+    callback(null, result);
+  });
+}
+
+/**
+ * 下载 object
+ * @param  {Object}  params                                 参数对象，必须
+ *     @param  {String}  params.Bucket                      Bucket名称，必须
+ *     @param  {String}  params.Region                      地域名称，必须
+ *     @param  {String}  params.Key                         文件名称，必须
+ *     @param  {WriteStream}  params.Output                 文件写入流，非必须
+ *     @param  {String}  params.IfModifiedSince             当Object在指定时间后被修改，则返回对应Object元信息，否则返回304，非必须
+ *     @param  {String}  params.IfUnmodifiedSince           如果文件修改时间早于或等于指定时间，才返回文件内容。否则返回 412 (precondition failed)，非必须
+ *     @param  {String}  params.IfMatch                     当 ETag 与指定的内容一致，才返回文件。否则返回 412 (precondition failed)，非必须
+ *     @param  {String}  params.IfNoneMatch                 当 ETag 与指定的内容不一致，才返回文件。否则返回304 (not modified)，非必须
+ *     @param  {String}  params.ResponseContentType         设置返回头部中的 Content-Type 参数，非必须
+ *     @param  {String}  params.ResponseContentLanguage     设置返回头部中的 Content-Language 参数，非必须
+ *     @param  {String}  params.ResponseExpires             设置返回头部中的 Content-Expires 参数，非必须
+ *     @param  {String}  params.ResponseCacheControl        设置返回头部中的 Cache-Control 参数，非必须
+ *     @param  {String}  params.ResponseContentDisposition  设置返回头部中的 Content-Disposition 参数，非必须
+ *     @param  {String}  params.ResponseContentEncoding     设置返回头部中的 Content-Encoding 参数，非必须
+ * @param  {Function}  callback                             回调函数，必须
+ * @param  {Object}  err                                    请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @param  {Object}  data                                   为对应的 object 数据，包括 body 和 headers
+ */
+function getObject(params, callback) {
+  if (this.options.ObjectKeySimplifyCheck) {
+    // getObject 的 Key 需要校验，避免调用成 getBucket
+    var formatKey = util.simplifyPath(params.Key);
+    if (formatKey === '/') {
+      callback(util.error(new Error('The Getobject Key is illegal')));
+      return;
+    }
+  }
+  var reqParams = params.Query || {};
+  var reqParamsStr = params.QueryString || '';
+  var tracker = params.tracker;
+  tracker && tracker.setParams({
+    signStartTime: new Date().getTime()
+  });
+  reqParams['response-content-type'] = params['ResponseContentType'];
+  reqParams['response-content-language'] = params['ResponseContentLanguage'];
+  reqParams['response-expires'] = params['ResponseExpires'];
+  reqParams['response-cache-control'] = params['ResponseCacheControl'];
+  reqParams['response-content-disposition'] = params['ResponseContentDisposition'];
+  reqParams['response-content-encoding'] = params['ResponseContentEncoding'];
+
+  // 如果用户自己传入了 output
+  submitRequest.call(this, {
+    Action: 'name/cos:GetObject',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    VersionId: params.VersionId,
+    headers: params.Headers,
+    qs: reqParams,
+    qsStr: reqParamsStr,
+    rawBody: true,
+    dataType: params.DataType,
+    tracker: tracker
+  }, function (err, data) {
+    if (err) {
+      var statusCode = err.statusCode;
+      if (params.Headers['If-Modified-Since'] && statusCode && statusCode === 304) {
+        return callback(null, {
+          NotModified: true
+        });
+      }
+      return callback(err);
+    }
+    callback(null, {
+      Body: data.body,
+      ETag: util.attr(data.headers, 'etag', ''),
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 上传 object
+ * @param  {Object} params                                          参数对象，必须
+ *     @param  {String}  params.Bucket                              Bucket名称，必须
+ *     @param  {String}  params.Region                              地域名称，必须
+ *     @param  {String}  params.Key                                 文件名称，必须
+ *     @param  {String}  params.Body                                上传文件的内容，只支持字符串
+ *     @param  {String}  params.CacheControl                        RFC 2616 中定义的缓存策略，将作为 Object 元数据保存，非必须
+ *     @param  {String}  params.ContentDisposition                  RFC 2616 中定义的文件名称，将作为 Object 元数据保存，非必须
+ *     @param  {String}  params.ContentEncoding                     RFC 2616 中定义的编码格式，将作为 Object 元数据保存，非必须
+ *     @param  {String}  params.ContentLength                       RFC 2616 中定义的 HTTP 请求内容长度（字节），必须
+ *     @param  {String}  params.ContentType                         RFC 2616 中定义的内容类型（MIME），将作为 Object 元数据保存，非必须
+ *     @param  {String}  params.Expect                              当使用 Expect: 100-continue 时，在收到服务端确认后，才会发送请求内容，非必须
+ *     @param  {String}  params.Expires                             RFC 2616 中定义的过期时间，将作为 Object 元数据保存，非必须
+ *     @param  {String}  params.ContentSha1                         RFC 3174 中定义的 160-bit 内容 SHA-1 算法校验，非必须
+ *     @param  {String}  params.ACL                                 允许用户自定义文件权限，有效值：private | public-read，非必须
+ *     @param  {String}  params.GrantRead                           赋予被授权者读的权限，格式 x-cos-grant-read: uin=" ",uin=" "，非必须
+ *     @param  {String}  params.GrantWrite                          赋予被授权者写的权限，格式 x-cos-grant-write: uin=" ",uin=" "，非必须
+ *     @param  {String}  params.GrantFullControl                    赋予被授权者读写权限，格式 x-cos-grant-full-control: uin=" ",uin=" "，非必须
+ *     @param  {String}  params.ServerSideEncryption               支持按照指定的加密算法进行服务端数据加密，格式 x-cos-server-side-encryption: "AES256"，非必须
+ *     @param  {Function}  params.onProgress                        上传进度回调函数
+ * @param  {Function}  callback                                     回调函数，必须
+ * @return  {Object}  err                                           请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                                          为对应的 object 数据
+ *     @return  {String}  data.ETag                                 为对应上传文件的 ETag 值
+ */
+function putObject(params, callback) {
+  var self = this;
+  var FileSize = params.ContentLength;
+  var onProgress = util.throttleOnProgress.call(self, FileSize, params.onProgress);
+
+  // 特殊处理 Cache-Control、Content-Type，避免代理更改这两个字段导致写入到 Object 属性里
+  var headers = params.Headers;
+  if (!headers['Cache-Control'] && !headers['cache-control']) headers['Cache-Control'] = '';
+  if (!headers['Content-Type'] && !headers['content-type']) {
+    headers['Content-Type'] = mime.getType(params.Key) || 'application/octet-stream';
+  }
+  var needCalcMd5 = params.UploadAddMetaMd5 || self.options.UploadAddMetaMd5 || self.options.UploadCheckContentMd5;
+  var tracker = params.tracker;
+  needCalcMd5 && tracker && tracker.setParams({
+    md5StartTime: new Date().getTime()
+  });
+  util.getBodyMd5(needCalcMd5, params.Body, function (md5) {
+    if (md5) {
+      tracker && tracker.setParams({
+        md5EndTime: new Date().getTime()
+      });
+      if (self.options.UploadCheckContentMd5) headers['Content-MD5'] = util.binaryBase64(md5);
+      if (params.UploadAddMetaMd5 || self.options.UploadAddMetaMd5) headers['x-cos-meta-md5'] = md5;
+    }
+    if (params.ContentLength !== undefined) headers['Content-Length'] = params.ContentLength;
+    onProgress(null, true); // 任务状态开始 uploading
+    submitRequest.call(self, {
+      Action: 'name/cos:PutObject',
+      TaskId: params.TaskId,
+      method: 'PUT',
+      Bucket: params.Bucket,
+      Region: params.Region,
+      Key: params.Key,
+      headers: params.Headers,
+      qs: params.Query,
+      body: params.Body,
+      onProgress: onProgress,
+      tracker: tracker
+    }, function (err, data) {
+      if (err) {
+        onProgress(null, true);
+        return callback(err);
+      }
+      onProgress({
+        loaded: FileSize,
+        total: FileSize
+      }, true);
+      var url = getUrl({
+        ForcePathStyle: self.options.ForcePathStyle,
+        protocol: self.options.Protocol,
+        domain: self.options.Domain,
+        bucket: params.Bucket,
+        region: !self.options.UseAccelerate ? params.Region : 'accelerate',
+        object: params.Key
+      });
+      url = url.substr(url.indexOf('://') + 3);
+      data.Location = url;
+      data.ETag = util.attr(data.headers, 'etag', '');
+      callback(null, data);
+    });
+  });
+}
+
+/**
+ * 上传 object
+ * @param  {Object} params                                          参数对象，必须
+ *     @param  {String}  params.Bucket                              Bucket名称，必须
+ *     @param  {String}  params.Region                              地域名称，必须
+ *     @param  {String}  params.Key                                 文件名称，必须
+ *     @param  {FilePath}  params.FilePath                          要上传的文件路径
+ *     @param  {Function}  params.onProgress                        上传进度回调函数
+ * @param  {Function}  callback                                     回调函数，必须
+ * @return  {Object}  err                                           请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                                          为对应的 object 数据
+ *     @return  {String}  data.ETag                                 为对应上传文件的 ETag 值
+ */
+function postObject(params, callback) {
+  var self = this;
+  var headers = {};
+  var filePath = params.FilePath;
+  if (!filePath) {
+    callback({
+      error: 'missing param FilePath'
+    });
+    return;
+  }
+  headers['Cache-Control'] = params['CacheControl'];
+  headers['Content-Disposition'] = params['ContentDisposition'];
+  headers['Content-Encoding'] = params['ContentEncoding'];
+  headers['Content-MD5'] = params['ContentMD5'];
+  headers['Content-Length'] = params['ContentLength'];
+  headers['Content-Type'] = params['ContentType'];
+  headers['Expect'] = params['Expect'];
+  headers['Expires'] = params['Expires'];
+  headers['x-cos-acl'] = params['ACL'];
+  headers['x-cos-grant-read'] = params['GrantRead'];
+  headers['x-cos-grant-write'] = params['GrantWrite'];
+  headers['x-cos-grant-full-control'] = params['GrantFullControl'];
+  headers['x-cos-storage-class'] = params['StorageClass'];
+  headers['x-cos-mime-limit'] = params['MimeLimit'];
+  headers['x-cos-traffic-limit'] = params['TrafficLimit'];
+  headers['x-cos-forbid-overwrite'] = params['ForbidOverwrite'];
+  // SSE-C
+  headers['x-cos-server-side-encryption-customer-algorithm'] = params['SSECustomerAlgorithm'];
+  headers['x-cos-server-side-encryption-customer-key'] = params['SSECustomerKey'];
+  headers['x-cos-server-side-encryption-customer-key-MD5'] = params['SSECustomerKeyMD5'];
+  // SSE-COS、SSE-KMS
+  headers['x-cos-server-side-encryption'] = params['ServerSideEncryption'];
+  headers['x-cos-server-side-encryption-cos-kms-key-id'] = params['SSEKMSKeyId'];
+  headers['x-cos-server-side-encryption-context'] = params['SSEContext'];
+
+  // 删除 Content-Length 避免签名错误
+  delete headers['Content-Length'];
+  delete headers['content-length'];
+  for (var key in params) {
+    if (key.indexOf('x-cos-meta-') > -1) {
+      headers[key] = params[key];
+    }
+  }
+  var onProgress = util.throttleOnProgress.call(self, headers['Content-Length'], params.onProgress);
+  submitRequest.call(this, {
+    Action: 'name/cos:PostObject',
+    method: 'POST',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    headers: headers,
+    qs: params.Query,
+    filePath: filePath,
+    TaskId: params.TaskId,
+    onProgress: onProgress,
+    tracker: params.tracker
+  }, function (err, data) {
+    onProgress(null, true);
+    if (err) return callback(err);
+    if (data && data.headers) {
+      var headers = data.headers;
+      var ETag = headers.etag || headers.Etag || headers.ETag || '';
+      var filename = filePath.substr(filePath.lastIndexOf('/') + 1);
+      var url = getUrl({
+        ForcePathStyle: self.options.ForcePathStyle,
+        protocol: self.options.Protocol,
+        domain: self.options.Domain,
+        bucket: params.Bucket,
+        region: params.Region,
+        object: params.Key.replace(/\$\{filename\}/g, filename),
+        isLocation: true
+      });
+      return callback(null, {
+        Location: url,
+        statusCode: data.statusCode,
+        headers: headers,
+        ETag: ETag
+      });
+    }
+    callback(null, data);
+  });
+}
+
+/**
+ * 删除 object
+ * @param  {Object}  params                     参数对象，必须
+ *     @param  {String}  params.Bucket          Bucket名称，必须
+ *     @param  {String}  params.Region          地域名称，必须
+ *     @param  {String}  params.Key             object名称，必须
+ * @param  {Function}  callback                 回调函数，必须
+ * @param  {Object}  err                        请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @param  {Object}  data                       删除操作成功之后返回的数据
+ */
+function deleteObject(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:DeleteObject',
+    method: 'DELETE',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    headers: params.Headers,
+    VersionId: params.VersionId,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) {
+      var statusCode = err.statusCode;
+      if (statusCode && statusCode === 204) {
+        return callback(null, {
+          statusCode: statusCode
+        });
+      } else if (statusCode && statusCode === 404) {
+        return callback(null, {
+          BucketNotFound: true,
+          statusCode: statusCode
+        });
+      } else {
+        return callback(err);
+      }
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 获取 object 的 权限列表
+ * @param  {Object}  params                         参数对象，必须
+ *     @param  {String}  params.Bucket              Bucket名称，必须
+ *     @param  {String}  params.Region              地域名称，必须
+ *     @param  {String}  params.Key                 object名称，必须
+ * @param  {Function}  callback                     回调函数，必须
+ * @return  {Object}  err                           请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                          返回的数据
+ *     @return  {Object}  data.AccessControlPolicy  权限列表
+ */
+function getObjectAcl(params, callback) {
+  var reqParams = {};
+  if (params.VersionId) {
+    reqParams.versionId = params.VersionId;
+  }
+  submitRequest.call(this, {
+    Action: 'name/cos:GetObjectACL',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    headers: params.Headers,
+    qs: reqParams,
+    action: 'acl',
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    var AccessControlPolicy = data.AccessControlPolicy || {};
+    var Owner = AccessControlPolicy.Owner || {};
+    var Grant = AccessControlPolicy.AccessControlList && AccessControlPolicy.AccessControlList.Grant || [];
+    Grant = util.isArray(Grant) ? Grant : [Grant];
+    var result = decodeAcl(AccessControlPolicy);
+    if (data.headers && data.headers['x-cos-acl']) {
+      result.ACL = data.headers['x-cos-acl'];
+    }
+    result = util.extend(result, {
+      Owner: Owner,
+      Grants: Grant,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+    callback(null, result);
+  });
+}
+
+/**
+ * 设置 object 的 权限列表
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ *     @param  {String}  params.Key     object名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回的数据
+ */
+function putObjectAcl(params, callback) {
+  var headers = params.Headers;
+  var xml = '';
+  if (params['AccessControlPolicy']) {
+    var AccessControlPolicy = util.clone(params['AccessControlPolicy'] || {});
+    var Grants = AccessControlPolicy.Grants || AccessControlPolicy.Grant;
+    Grants = util.isArray(Grants) ? Grants : [Grants];
+    delete AccessControlPolicy.Grant;
+    delete AccessControlPolicy.Grants;
+    AccessControlPolicy.AccessControlList = {
+      Grant: Grants
+    };
+    xml = util.json2xml({
+      AccessControlPolicy: AccessControlPolicy
+    });
+    headers['Content-Type'] = 'application/xml';
+    headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  }
+
+  // Grant Header 去重
+  util.each(headers, function (val, key) {
+    if (key.indexOf('x-cos-grant-') === 0) {
+      headers[key] = uniqGrant(headers[key]);
+    }
+  });
+  submitRequest.call(this, {
+    Action: 'name/cos:PutObjectACL',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    action: 'acl',
+    headers: headers,
+    body: xml,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * Options Object请求实现跨域访问的预请求。即发出一个 OPTIONS 请求给服务器以确认是否可以进行跨域操作。
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ *     @param  {String}  params.Key     object名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data              返回的数据
+ */
+function optionsObject(params, callback) {
+  var headers = params.Headers;
+  headers['Origin'] = params['Origin'];
+  headers['Access-Control-Request-Method'] = params['AccessControlRequestMethod'];
+  headers['Access-Control-Request-Headers'] = params['AccessControlRequestHeaders'];
+  submitRequest.call(this, {
+    Action: 'name/cos:OptionsObject',
+    method: 'OPTIONS',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) {
+      if (err.statusCode && err.statusCode === 403) {
+        return callback(null, {
+          OptionsForbidden: true,
+          statusCode: err.statusCode
+        });
+      }
+      return callback(err);
+    }
+    var headers = data.headers || {};
+    callback(null, {
+      AccessControlAllowOrigin: headers['access-control-allow-origin'],
+      AccessControlAllowMethods: headers['access-control-allow-methods'],
+      AccessControlAllowHeaders: headers['access-control-allow-headers'],
+      AccessControlExposeHeaders: headers['access-control-expose-headers'],
+      AccessControlMaxAge: headers['access-control-max-age'],
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * @param  {Object}                                     参数列表
+ *     @param  {String}  Bucket                         Bucket 名称
+ *     @param  {String}  Region                         地域名称
+ *     @param  {String}  Key                            文件名称
+ *     @param  {String}  CopySource                     源文件URL绝对路径，可以通过versionid子资源指定历史版本
+ *     @param  {String}  ACL                            允许用户自定义文件权限。有效值：private，public-read默认值：private。
+ *     @param  {String}  GrantRead                      赋予被授权者读的权限，格式 x-cos-grant-read: uin=" ",uin=" "，当需要给子账户授权时，uin="RootAcountID/SubAccountID"，当需要给根账户授权时，uin="RootAcountID"。
+ *     @param  {String}  GrantWrite                     赋予被授权者写的权限，格式 x-cos-grant-write: uin=" ",uin=" "，当需要给子账户授权时，uin="RootAcountID/SubAccountID"，当需要给根账户授权时，uin="RootAcountID"。
+ *     @param  {String}  GrantFullControl               赋予被授权者读写权限，格式 x-cos-grant-full-control: uin=" ",uin=" "，当需要给子账户授权时，uin="RootAcountID/SubAccountID"，当需要给根账户授权时，uin="RootAcountID"。
+ *     @param  {String}  MetadataDirective              是否拷贝元数据，枚举值：Copy, Replaced，默认值Copy。假如标记为Copy，忽略Header中的用户元数据信息直接复制；假如标记为Replaced，按Header信息修改元数据。当目标路径和原路径一致，即用户试图修改元数据时，必须为Replaced
+ *     @param  {String}  CopySourceIfModifiedSince      当Object在指定时间后被修改，则执行操作，否则返回412。可与x-cos-copy-source-If-None-Match一起使用，与其他条件联合使用返回冲突。
+ *     @param  {String}  CopySourceIfUnmodifiedSince    当Object在指定时间后未被修改，则执行操作，否则返回412。可与x-cos-copy-source-If-Match一起使用，与其他条件联合使用返回冲突。
+ *     @param  {String}  CopySourceIfMatch              当Object的ETag和给定一致时，则执行操作，否则返回412。可与x-cos-copy-source-If-Unmodified-Since一起使用，与其他条件联合使用返回冲突。
+ *     @param  {String}  CopySourceIfNoneMatch          当Object的ETag和给定不一致时，则执行操作，否则返回412。可与x-cos-copy-source-If-Modified-Since一起使用，与其他条件联合使用返回冲突。
+ *     @param  {String}  StorageClass                   存储级别，枚举值：存储级别，枚举值：Standard, Standard_IA，Archive；默认值：Standard
+ *     @param  {String}  CacheControl                   指定所有缓存机制在整个请求/响应链中必须服从的指令。
+ *     @param  {String}  ContentDisposition             MIME 协议的扩展，MIME 协议指示 MIME 用户代理如何显示附加的文件
+ *     @param  {String}  ContentEncoding                HTTP 中用来对「采用何种编码格式传输正文」进行协定的一对头部字段
+ *     @param  {String}  ContentLength                  设置响应消息的实体内容的大小，单位为字节
+ *     @param  {String}  ContentType                    RFC 2616 中定义的 HTTP 请求内容类型（MIME），例如text/plain
+ *     @param  {String}  Expect                         请求的特定的服务器行为
+ *     @param  {String}  Expires                        响应过期的日期和时间
+ *     @param  {String}  params.ServerSideEncryption   支持按照指定的加密算法进行服务端数据加密，格式 x-cos-server-side-encryption: "AES256"，非必须
+ *     @param  {String}  ContentLanguage                指定内容语言
+ *     @param  {String}  x-cos-meta-*                   允许用户自定义的头部信息，将作为 Object 元数据返回。大小限制2K。
+ */
+function putObjectCopy(params, callback) {
+  // 特殊处理 Cache-Control
+  var headers = params.Headers;
+  if (!headers['Cache-Control'] && !!headers['cache-control']) headers['Cache-Control'] = '';
+  var CopySource = params.CopySource || '';
+  var m = util.getSourceParams.call(this, CopySource);
+  if (!m) {
+    callback({
+      error: 'CopySource format error'
+    });
+    return;
+  }
+  var SourceBucket = m.Bucket;
+  var SourceRegion = m.Region;
+  var SourceKey = decodeURIComponent(m.Key);
+  submitRequest.call(this, {
+    Scope: [{
+      action: 'name/cos:GetObject',
+      bucket: SourceBucket,
+      region: SourceRegion,
+      prefix: SourceKey
+    }, {
+      action: 'name/cos:PutObject',
+      bucket: params.Bucket,
+      region: params.Region,
+      prefix: params.Key
+    }],
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    VersionId: params.VersionId,
+    headers: params.Headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    var result = util.clone(data.CopyObjectResult || {});
+    util.extend(result, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+    callback(null, result);
+  });
+}
+function uploadPartCopy(params, callback) {
+  var CopySource = params.CopySource || '';
+  var m = util.getSourceParams.call(this, CopySource);
+  if (!m) {
+    callback({
+      error: 'CopySource format error'
+    });
+    return;
+  }
+  var SourceBucket = m.Bucket;
+  var SourceRegion = m.Region;
+  var SourceKey = decodeURIComponent(m.Key);
+  submitRequest.call(this, {
+    Scope: [{
+      action: 'name/cos:GetObject',
+      bucket: SourceBucket,
+      region: SourceRegion,
+      prefix: SourceKey
+    }, {
+      action: 'name/cos:PutObject',
+      bucket: params.Bucket,
+      region: params.Region,
+      prefix: params.Key
+    }],
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    VersionId: params.VersionId,
+    qs: {
+      partNumber: params['PartNumber'],
+      uploadId: params['UploadId']
+    },
+    headers: params.Headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    var result = util.clone(data.CopyPartResult || {});
+    util.extend(result, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+    callback(null, result);
+  });
+}
+function deleteMultipleObject(params, callback) {
+  var Objects = params.Objects || [];
+  var Quiet = params.Quiet;
+  Objects = util.isArray(Objects) ? Objects : [Objects];
+  var xml = util.json2xml({
+    Delete: {
+      Object: Objects,
+      Quiet: Quiet || false
+    }
+  });
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  var Scope = util.map(Objects, function (v) {
+    return {
+      action: 'name/cos:DeleteObject',
+      bucket: params.Bucket,
+      region: params.Region,
+      prefix: v.Key
+    };
+  });
+  submitRequest.call(this, {
+    Scope: Scope,
+    method: 'POST',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    body: xml,
+    action: 'delete',
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    var DeleteResult = data.DeleteResult || {};
+    var Deleted = DeleteResult.Deleted || [];
+    var Errors = DeleteResult.Error || [];
+    Deleted = util.isArray(Deleted) ? Deleted : [Deleted];
+    Errors = util.isArray(Errors) ? Errors : [Errors];
+    var result = util.clone(DeleteResult);
+    util.extend(result, {
+      Error: Errors,
+      Deleted: Deleted,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+    callback(null, result);
+  });
+}
+function restoreObject(params, callback) {
+  var headers = params.Headers;
+  if (!params['RestoreRequest']) {
+    callback({
+      error: 'missing param RestoreRequest'
+    });
+    return;
+  }
+  var RestoreRequest = params.RestoreRequest || {};
+  var xml = util.json2xml({
+    RestoreRequest: RestoreRequest
+  });
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Action: 'name/cos:RestoreObject',
+    method: 'POST',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    VersionId: params.VersionId,
+    body: xml,
+    action: 'restore',
+    headers: headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    callback(err, data);
+  });
+}
+
+/**
+ * 设置 Object 的标签
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Object名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ *     @param  {Array}   params.TagSet  标签设置，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/42998
+ * @return  {Object}  data              返回数据
+ */
+function putObjectTagging(params, callback) {
+  var Tagging = params['Tagging'] || {};
+  var Tags = Tagging.TagSet || Tagging.Tags || params['Tags'] || [];
+  Tags = util.clone(util.isArray(Tags) ? Tags : [Tags]);
+  var xml = util.json2xml({
+    Tagging: {
+      TagSet: {
+        Tag: Tags
+      }
+    }
+  });
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Interface: 'putObjectTagging',
+    Action: 'name/cos:PutObjectTagging',
+    method: 'PUT',
+    Bucket: params.Bucket,
+    Key: params.Key,
+    Region: params.Region,
+    body: xml,
+    action: 'tagging',
+    headers: headers,
+    VersionId: params.VersionId,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 获取 Object 的标签设置
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Bucket名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/42998
+ * @return  {Object}  data              返回数据
+ */
+function getObjectTagging(params, callback) {
+  submitRequest.call(this, {
+    Interface: 'getObjectTagging',
+    Action: 'name/cos:GetObjectTagging',
+    method: 'GET',
+    Key: params.Key,
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    action: 'tagging',
+    VersionId: params.VersionId,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) {
+      if (err.statusCode === 404 && err.error && (err.error === 'Not Found' || err.error.Code === 'NoSuchTagSet')) {
+        var result = {
+          Tags: [],
+          statusCode: err.statusCode
+        };
+        err.headers && (result.headers = err.headers);
+        callback(null, result);
+      } else {
+        callback(err);
+      }
+      return;
+    }
+    var Tags = [];
+    try {
+      Tags = data.Tagging.TagSet.Tag || [];
+    } catch (e) {}
+    Tags = util.clone(util.isArray(Tags) ? Tags : [Tags]);
+    callback(null, {
+      Tags: Tags,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 删除 Object 的 标签设置
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Bucket  Object名称，必须
+ *     @param  {String}  params.Region  地域名称，必须
+ * @param  {Function}  callback         回调函数，必须
+ * @return  {Object}  err               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/42998
+ * @return  {Object}  data              返回的数据
+ */
+function deleteObjectTagging(params, callback) {
+  submitRequest.call(this, {
+    Interface: 'deleteObjectTagging',
+    Action: 'name/cos:DeleteObjectTagging',
+    method: 'DELETE',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    headers: params.Headers,
+    action: 'tagging',
+    VersionId: params.VersionId,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err && err.statusCode === 204) {
+      return callback(null, {
+        statusCode: err.statusCode
+      });
+    } else if (err) {
+      return callback(err);
+    }
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+// 分块上传
+
+/**
+ * 初始化分块上传
+ * @param  {Object}  params                                     参数对象，必须
+ *     @param  {String}  params.Bucket                          Bucket名称，必须
+ *     @param  {String}  params.Region                          地域名称，必须
+ *     @param  {String}  params.Key                             object名称，必须
+ *     @param  {String}  params.UploadId                        object名称，必须
+ *     @param  {String}  params.CacheControl                    RFC 2616 中定义的缓存策略，将作为 Object 元数据保存，非必须
+ *     @param  {String}  params.ContentDisposition              RFC 2616 中定义的文件名称，将作为 Object 元数据保存    ，非必须
+ *     @param  {String}  params.ContentEncoding                 RFC 2616 中定义的编码格式，将作为 Object 元数据保存，非必须
+ *     @param  {String}  params.ContentType                     RFC 2616 中定义的内容类型（MIME），将作为 Object 元数据保存，非必须
+ *     @param  {String}  params.Expires                         RFC 2616 中定义的过期时间，将作为 Object 元数据保存，非必须
+ *     @param  {String}  params.ACL                             允许用户自定义文件权限，非必须
+ *     @param  {String}  params.GrantRead                       赋予被授权者读的权限 ，非必须
+ *     @param  {String}  params.GrantWrite                      赋予被授权者写的权限 ，非必须
+ *     @param  {String}  params.GrantFullControl                赋予被授权者读写权限 ，非必须
+ *     @param  {String}  params.StorageClass                    设置Object的存储级别，枚举值：Standard，Standard_IA，Archive，非必须
+ *     @param  {String}  params.ServerSideEncryption           支持按照指定的加密算法进行服务端数据加密，格式 x-cos-server-side-encryption: "AES256"，非必须
+ * @param  {Function}  callback                                 回调函数，必须
+ * @return  {Object}  err                                       请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                                      返回的数据
+ */
+function multipartInit(params, callback) {
+  var self = this;
+  var headers = params.Headers;
+  var tracker = params.tracker;
+
+  // 特殊处理 Cache-Control、Content-Type
+  if (!headers['Cache-Control'] && !headers['cache-control']) headers['Cache-Control'] = '';
+  if (!headers['Content-Type'] && !headers['content-type']) {
+    headers['Content-Type'] = mime.getType(params.Key) || 'application/octet-stream';
+  }
+  submitRequest.call(self, {
+    Action: 'name/cos:InitiateMultipartUpload',
+    method: 'POST',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    action: 'uploads',
+    headers: params.Headers,
+    qs: params.Query,
+    tracker: tracker
+  }, function (err, data) {
+    if (err) {
+      tracker && tracker.parent && tracker.parent.setParams({
+        errorNode: 'multipartInit'
+      });
+      return callback(err);
+    }
+    data = util.clone(data || {});
+    if (data && data.InitiateMultipartUploadResult) {
+      return callback(null, util.extend(data.InitiateMultipartUploadResult, {
+        statusCode: data.statusCode,
+        headers: data.headers
+      }));
+    }
+    callback(null, data);
+  });
+}
+
+/**
+ * 分块上传
+ * @param  {Object}  params                                 参数对象，必须
+ *     @param  {String}  params.Bucket                      Bucket名称，必须
+ *     @param  {String}  params.Region                      地域名称，必须
+ *     @param  {String}  params.Key                         object名称，必须
+ *     @param  {String}  params.Body                        上传文件对象或字符串
+ *     @param  {String} params.ContentLength                RFC 2616 中定义的 HTTP 请求内容长度（字节），非必须
+ *     @param  {String} params.Expect                       当使用 Expect: 100-continue 时，在收到服务端确认后，才会发送请求内容，非必须
+ *     @param  {String} params.ServerSideEncryption         支持按照指定的加密算法进行服务端数据加密，格式 x-cos-server-side-encryption: "AES256"，非必须
+ *     @param  {String} params.ContentSha1                  RFC 3174 中定义的 160-bit 内容 SHA-1 算法校验值，非必须
+ * @param  {Function}  callback                             回调函数，必须
+ *     @return  {Object}  err                               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ *     @return  {Object}  data                              返回的数据
+ *     @return  {Object}  data.ETag                         返回的文件分块 sha1 值
+ */
+function multipartUpload(params, callback) {
+  var self = this;
+  util.getFileSize('multipartUpload', params, function () {
+    var tracker = params.tracker;
+    var needCalcMd5 = self.options.UploadCheckContentMd5;
+    needCalcMd5 && tracker && tracker.setParams({
+      md5StartTime: new Date().getTime()
+    });
+    util.getBodyMd5(needCalcMd5, params.Body, function (md5) {
+      if (md5) {
+        params.Headers['Content-MD5'] = util.binaryBase64(md5);
+        needCalcMd5 && tracker && tracker.setParams({
+          md5EndTime: new Date().getTime()
+        });
+      }
+      tracker && tracker.setParams({
+        partNumber: params.PartNumber
+      });
+      submitRequest.call(self, {
+        Action: 'name/cos:UploadPart',
+        TaskId: params.TaskId,
+        method: 'PUT',
+        Bucket: params.Bucket,
+        Region: params.Region,
+        Key: params.Key,
+        qs: {
+          partNumber: params['PartNumber'],
+          uploadId: params['UploadId']
+        },
+        headers: params.Headers,
+        onProgress: params.onProgress,
+        body: params.Body || null,
+        tracker: tracker
+      }, function (err, data) {
+        if (err) {
+          tracker && tracker.parent && tracker.parent.setParams({
+            errorNode: 'multipartUpload'
+          });
+          return callback(err);
+        }
+        callback(null, {
+          ETag: util.attr(data.headers, 'etag', {}),
+          statusCode: data.statusCode,
+          headers: data.headers
+        });
+      });
+    });
+  });
+}
+
+/**
+ * 完成分块上传
+ * @param  {Object}  params                             参数对象，必须
+ *     @param  {String}  params.Bucket                  Bucket名称，必须
+ *     @param  {String}  params.Region                  地域名称，必须
+ *     @param  {String}  params.Key                     object名称，必须
+ *     @param  {Array}   params.Parts                   分块信息列表，必须
+ *     @param  {String}  params.Parts[i].PartNumber     块编号，必须
+ *     @param  {String}  params.Parts[i].ETag           分块的 sha1 校验值
+ * @param  {Function}  callback                         回调函数，必须
+ * @return  {Object}  err                               请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                              返回的数据
+ *     @return  {Object}  data.CompleteMultipartUpload  完成分块上传后的文件信息，包括Location, Bucket, Key 和 ETag
+ */
+function multipartComplete(params, callback) {
+  var self = this;
+  var UploadId = params.UploadId;
+  var Parts = params['Parts'];
+  var tracker = params.tracker;
+  for (var i = 0, len = Parts.length; i < len; i++) {
+    if (Parts[i]['ETag'].indexOf('"') === 0) {
+      continue;
+    }
+    Parts[i]['ETag'] = '"' + Parts[i]['ETag'] + '"';
+  }
+  var xml = util.json2xml({
+    CompleteMultipartUpload: {
+      Part: Parts
+    }
+  });
+  var headers = params.Headers;
+  headers['Content-Type'] = 'application/xml';
+  headers['Content-MD5'] = util.binaryBase64(util.md5(xml));
+  submitRequest.call(this, {
+    Action: 'name/cos:CompleteMultipartUpload',
+    method: 'POST',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    qs: {
+      uploadId: UploadId
+    },
+    body: xml,
+    headers: headers,
+    tracker: tracker
+  }, function (err, data) {
+    if (err) {
+      tracker && tracker.parent && tracker.parent.setParams({
+        errorNode: 'multipartComplete'
+      });
+      return callback(err);
+    }
+    var url = getUrl({
+      ForcePathStyle: self.options.ForcePathStyle,
+      protocol: self.options.Protocol,
+      domain: self.options.Domain,
+      bucket: params.Bucket,
+      region: !self.options.UseAccelerate ? params.Region : 'accelerate',
+      object: params.Key,
+      isLocation: true
+    });
+    var CompleteMultipartUploadResult = data.CompleteMultipartUploadResult || {};
+    var result = util.extend(CompleteMultipartUploadResult, {
+      Location: url,
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+    callback(null, result);
+  });
+}
+
+/**
+ * 分块上传任务列表查询
+ * @param  {Object}  params                                 参数对象，必须
+ *     @param  {String}  params.Bucket                      Bucket名称，必须
+ *     @param  {String}  params.Region                      地域名称，必须
+ *     @param  {String}  params.Delimiter                   定界符为一个符号，如果有Prefix，则将Prefix到delimiter之间的相同路径归为一类，定义为Common Prefix，然后列出所有Common Prefix。如果没有Prefix，则从路径起点开始，非必须
+ *     @param  {String}  params.EncodingType                规定返回值的编码方式，非必须
+ *     @param  {String}  params.Prefix                      前缀匹配，用来规定返回的文件前缀地址，非必须
+ *     @param  {String}  params.MaxUploads                  单次返回最大的条目数量，默认1000，非必须
+ *     @param  {String}  params.KeyMarker                   与upload-id-marker一起使用 </Br>当upload-id-marker未被指定时，ObjectName字母顺序大于key-marker的条目将被列出 </Br>当upload-id-marker被指定时，ObjectName字母顺序大于key-marker的条目被列出，ObjectName字母顺序等于key-marker同时UploadId大于upload-id-marker的条目将被列出，非必须
+ *     @param  {String}  params.UploadIdMarker              与key-marker一起使用 </Br>当key-marker未被指定时，upload-id-marker将被忽略 </Br>当key-marker被指定时，ObjectName字母顺序大于key-marker的条目被列出，ObjectName字母顺序等于key-marker同时UploadId大于upload-id-marker的条目将被列出，非必须
+ * @param  {Function}  callback                             回调函数，必须
+ * @return  {Object}  err                                   请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                                  返回的数据
+ *     @return  {Object}  data.ListMultipartUploadsResult   分块上传任务信息
+ */
+function multipartList(params, callback) {
+  var reqParams = {};
+  reqParams['delimiter'] = params['Delimiter'];
+  reqParams['encoding-type'] = params['EncodingType'];
+  reqParams['prefix'] = params['Prefix'] || '';
+  reqParams['max-uploads'] = params['MaxUploads'];
+  reqParams['key-marker'] = params['KeyMarker'];
+  reqParams['upload-id-marker'] = params['UploadIdMarker'];
+  reqParams = util.clearKey(reqParams);
+  var tracker = params.tracker;
+  tracker && tracker.setParams({
+    signStartTime: new Date().getTime()
+  });
+  submitRequest.call(this, {
+    Action: 'name/cos:ListMultipartUploads',
+    ResourceKey: reqParams['prefix'],
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    headers: params.Headers,
+    qs: reqParams,
+    action: 'uploads',
+    tracker: tracker
+  }, function (err, data) {
+    if (err) {
+      tracker && tracker.parent && tracker.parent.setParams({
+        errorNode: 'multipartList'
+      });
+      return callback(err);
+    }
+    if (data && data.ListMultipartUploadsResult) {
+      var Upload = data.ListMultipartUploadsResult.Upload || [];
+      var CommonPrefixes = data.ListMultipartUploadsResult.CommonPrefixes || [];
+      CommonPrefixes = util.isArray(CommonPrefixes) ? CommonPrefixes : [CommonPrefixes];
+      Upload = util.isArray(Upload) ? Upload : [Upload];
+      data.ListMultipartUploadsResult.Upload = Upload;
+      data.ListMultipartUploadsResult.CommonPrefixes = CommonPrefixes;
+    }
+    var result = util.clone(data.ListMultipartUploadsResult || {});
+    util.extend(result, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+    callback(null, result);
+  });
+}
+
+/**
+ * 上传的分块列表查询
+ * @param  {Object}  params                                 参数对象，必须
+ *     @param  {String}  params.Bucket                      Bucket名称，必须
+ *     @param  {String}  params.Region                      地域名称，必须
+ *     @param  {String}  params.Key                         object名称，必须
+ *     @param  {String}  params.UploadId                    标示本次分块上传的ID，必须
+ *     @param  {String}  params.EncodingType                规定返回值的编码方式，非必须
+ *     @param  {String}  params.MaxParts                    单次返回最大的条目数量，默认1000，非必须
+ *     @param  {String}  params.PartNumberMarker            默认以UTF-8二进制顺序列出条目，所有列出条目从marker开始，非必须
+ * @param  {Function}  callback                             回调函数，必须
+ * @return  {Object}  err                                   请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ * @return  {Object}  data                                  返回的数据
+ *     @return  {Object}  data.ListMultipartUploadsResult   分块信息
+ */
+function multipartListPart(params, callback) {
+  var reqParams = {};
+  var tracker = params.tracker;
+  reqParams['uploadId'] = params['UploadId'];
+  reqParams['encoding-type'] = params['EncodingType'];
+  reqParams['max-parts'] = params['MaxParts'];
+  reqParams['part-number-marker'] = params['PartNumberMarker'];
+  submitRequest.call(this, {
+    Action: 'name/cos:ListParts',
+    method: 'GET',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    headers: params.Headers,
+    qs: reqParams,
+    tracker: tracker
+  }, function (err, data) {
+    if (err) {
+      tracker && tracker.parent && tracker.parent.setParams({
+        errorNode: 'multipartListPart'
+      });
+      return callback(err);
+    }
+    var ListPartsResult = data.ListPartsResult || {};
+    var Part = ListPartsResult.Part || [];
+    Part = util.isArray(Part) ? Part : [Part];
+    ListPartsResult.Part = Part;
+    var result = util.clone(ListPartsResult);
+    util.extend(result, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+    callback(null, result);
+  });
+}
+
+/**
+ * 抛弃分块上传
+ * @param  {Object}  params                 参数对象，必须
+ *     @param  {String}  params.Bucket      Bucket名称，必须
+ *     @param  {String}  params.Region      地域名称，必须
+ *     @param  {String}  params.Key         object名称，必须
+ *     @param  {String}  params.UploadId    标示本次分块上传的ID，必须
+ * @param  {Function}  callback             回调函数，必须
+ *     @return  {Object}    err             请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ *     @return  {Object}    data            返回的数据
+ */
+function multipartAbort(params, callback) {
+  var reqParams = {};
+  reqParams['uploadId'] = params['UploadId'];
+  submitRequest.call(this, {
+    Action: 'name/cos:AbortMultipartUpload',
+    method: 'DELETE',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    headers: params.Headers,
+    qs: reqParams,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    callback(null, {
+      statusCode: data.statusCode,
+      headers: data.headers
+    });
+  });
+}
+
+/**
+ * 追加上传
+ * @param  {Object}  params                                         参数对象，必须
+ *     @param  {String}  params.Bucket                              Bucket名称，必须
+ *     @param  {String}  params.Region                              地域名称，必须
+ *     @param  {String}  params.Key                                 object名称，必须
+ *     @param  {String}  params.Body                上传文件的内容，只支持字符串
+ *     @param  {Number}  params.Position                            追加操作的起始点，单位为字节，必须
+ *     @param  {String}  params.CacheControl                        RFC 2616 中定义的缓存策略，将作为 Object 元数据保存，非必须
+ *     @param  {String}  params.ContentDisposition                  RFC 2616 中定义的文件名称，将作为 Object 元数据保存，非必须
+ *     @param  {String}  params.ContentEncoding                     RFC 2616 中定义的编码格式，将作为 Object 元数据保存，非必须
+ *     @param  {String}  params.ContentLength                       RFC 2616 中定义的 HTTP 请求内容长度（字节），必须
+ *     @param  {String}  params.ContentType                         RFC 2616 中定义的内容类型（MIME），将作为 Object 元数据保存，非必须
+ *     @param  {String}  params.Expect                              当使用 Expect: 100-continue 时，在收到服务端确认后，才会发送请求内容，非必须
+ *     @param  {String}  params.Expires                             RFC 2616 中定义的过期时间，将作为 Object 元数据保存，非必须
+ *     @param  {String}  params.ACL                                 允许用户自定义文件权限，有效值：private | public-read，非必须
+ *     @param  {String}  params.GrantRead                           赋予被授权者读取对象的权限，格式：id="[OwnerUin]"，可使用半角逗号（,）分隔多组被授权者，非必须
+ *     @param  {String}  params.GrantReadAcp                        赋予被授权者读取对象的访问控制列表（ACL）的权限，格式：id="[OwnerUin]"，可使用半角逗号（,）分隔多组被授权者，非必须
+ *     @param  {String}  params.GrantWriteAcp                       赋予被授权者写入对象的访问控制列表（ACL）的权限，格式：id="[OwnerUin]"，可使用半角逗号（,）分隔多组被授权者，非必须
+ *     @param  {String}  params.GrantFullControl                    赋予被授权者操作对象的所有权限，格式：id="[OwnerUin]"，可使用半角逗号（,）分隔多组被授权者，非必须
+ *     @param  {String}  params.StorageClass                        设置对象的存储级别，枚举值：STANDARD、STANDARD_IA、ARCHIVE，默认值：STANDARD，非必须
+ *     @param  {String}  params.x-cos-meta-*                        允许用户自定义的头部信息，将作为对象的元数据保存。大小限制2KB，非必须
+ *     @param  {String}  params.ContentSha1                         RFC 3174 中定义的 160-bit 内容 SHA-1 算法校验，非必须
+ *     @param  {String}  params.ServerSideEncryption                支持按照指定的加密算法进行服务端数据加密，格式 x-cos-server-side-encryption: "AES256"，非必须
+ * @param  {Function}  callback                                     回调函数，必须
+ *     @return  {Object}    err                                     请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ *     @return  {Object}    data                                    返回的数据
+ */
+function appendObject(params, callback) {
+  submitRequest.call(this, {
+    Action: 'name/cos:AppendObject',
+    method: 'POST',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    action: 'append',
+    Key: params.Key,
+    body: params.Body,
+    qs: {
+      position: params.Position
+    },
+    headers: params.Headers,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    callback(null, data);
+  });
+}
+
+/**
+ * cos 内置请求
+ * @param  {Object}  params                 参数对象，必须
+ *     @param  {String}  params.Bucket      Bucket名称，必须
+ *     @param  {String}  params.Region      地域名称，必须
+ *     @param  {String}  params.Key         object名称，必须
+ * @param  {Function}  callback             回调函数，必须
+ *     @return  {Object}    err             请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ *     @return  {Object}    data            返回的数据
+ */
+function request(params, callback) {
+  submitRequest.call(this, {
+    method: params.Method,
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Key: params.Key,
+    action: params.Action,
+    headers: params.Headers,
+    qs: params.Query,
+    body: params.Body,
+    Url: params.Url,
+    rawBody: params.RawBody,
+    dataType: params.DataType,
+    tracker: params.tracker
+  }, function (err, data) {
+    if (err) return callback(err);
+    if (data && data.body) {
+      data.Body = data.body;
+      delete data.body;
+    }
+    callback(err, data);
+  });
+}
+
+/**
+ * 获取签名
+ * @param  {Object}  params             参数对象，必须
+ *     @param  {String}  params.Method  请求方法，必须
+ *     @param  {String}  params.Key     object名称，必须
+ *     @param  {String}  params.Expires 名超时时间，单位秒，可选
+ * @return  {String}  data              返回签名字符串
+ */
+function getAuth(params) {
+  var self = this;
+  return util.getAuth({
+    SecretId: params.SecretId || this.options.SecretId || '',
+    SecretKey: params.SecretKey || this.options.SecretKey || '',
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Method: params.Method,
+    Key: params.Key,
+    Query: params.Query,
+    Headers: params.Headers,
+    Expires: params.Expires,
+    SystemClockOffset: self.options.SystemClockOffset
+  });
+}
+
+/**
+ * 获取文件下载链接
+ * @param  {Object}  params                 参数对象，必须
+ *     @param  {String}  params.Bucket      Bucket名称，必须
+ *     @param  {String}  params.Region      地域名称，必须
+ *     @param  {String}  params.Key         object名称，必须
+ *     @param  {String}  params.Method      请求的方法，可选
+ *     @param  {String}  params.Expires     签名超时时间，单位秒，可选
+ * @param  {Function}  callback             回调函数，必须
+ *     @return  {Object}    err             请求失败的错误，如果请求成功，则为空。https://cloud.tencent.com/document/product/436/7730
+ *     @return  {Object}    data            返回的数据
+ */
+function getObjectUrl(params, callback) {
+  var self = this;
+  var useAccelerate = params.UseAccelerate === undefined ? self.options.UseAccelerate : params.UseAccelerate;
+  var url = getUrl({
+    ForcePathStyle: self.options.ForcePathStyle,
+    protocol: params.Protocol || self.options.Protocol,
+    domain: params.Domain || self.options.Domain,
+    bucket: params.Bucket,
+    region: useAccelerate ? 'accelerate' : params.Region,
+    object: params.Key
+  });
+  var queryParamsStr = '';
+  if (params.Query) {
+    queryParamsStr += util.obj2str(params.Query);
+  }
+  if (params.QueryString) {
+    queryParamsStr += (queryParamsStr ? '&' : '') + params.QueryString;
+  }
+  var syncUrl = url;
+  if (params.Sign !== undefined && !params.Sign) {
+    queryParamsStr && (syncUrl += '?' + queryParamsStr);
+    callback(null, {
+      Url: syncUrl
+    });
+    return syncUrl;
+  }
+
+  // 签名加上 Host，避免跨桶访问
+  var SignHost = getSignHost.call(this, {
+    Bucket: params.Bucket,
+    Region: params.Region,
+    UseAccelerate: params.UseAccelerate,
+    Url: url
+  });
+  var AuthData = getAuthorizationAsync.call(this, {
+    Action: (params.Method || '').toUpperCase() === 'PUT' ? 'name/cos:PutObject' : 'name/cos:GetObject',
+    Bucket: params.Bucket || '',
+    Region: params.Region || '',
+    Method: params.Method || 'get',
+    Key: params.Key,
+    Expires: params.Expires,
+    Headers: params.Headers,
+    Query: params.Query,
+    SignHost: SignHost,
+    ForceSignHost: params.ForceSignHost === false ? false : self.options.ForceSignHost // getObjectUrl支持传参ForceSignHost
+  }, function (err, AuthData) {
+    if (!callback) return;
+    if (err) {
+      callback(err);
+      return;
+    }
+
+    // 兼容万象url qUrlParamList需要再encode一次
+    var replaceUrlParamList = function replaceUrlParamList(url) {
+      var urlParams = url.match(/q-url-param-list.*?(?=&)/g)[0];
+      var encodedParams = 'q-url-param-list=' + encodeURIComponent(urlParams.replace(/q-url-param-list=/, '')).toLowerCase();
+      var reg = new RegExp(urlParams, 'g');
+      var replacedUrl = url.replace(reg, encodedParams);
+      return replacedUrl;
+    };
+    var signUrl = url;
+    signUrl += '?' + (AuthData.Authorization.indexOf('q-signature') > -1 ? replaceUrlParamList(AuthData.Authorization) : 'sign=' + encodeURIComponent(AuthData.Authorization));
+    AuthData.SecurityToken && (signUrl += '&x-cos-security-token=' + AuthData.SecurityToken);
+    AuthData.ClientIP && (signUrl += '&clientIP=' + AuthData.ClientIP);
+    AuthData.ClientUA && (signUrl += '&clientUA=' + AuthData.ClientUA);
+    AuthData.Token && (signUrl += '&token=' + AuthData.Token);
+    queryParamsStr && (signUrl += '&' + queryParamsStr);
+    setTimeout(function () {
+      callback(null, {
+        Url: signUrl
+      });
+    });
+  });
+  if (AuthData) {
+    syncUrl += '?' + AuthData.Authorization + (AuthData.SecurityToken ? '&x-cos-security-token=' + AuthData.SecurityToken : '');
+    queryParamsStr && (syncUrl += '&' + queryParamsStr);
+  } else {
+    queryParamsStr && (syncUrl += '?' + queryParamsStr);
+  }
+  return syncUrl;
+}
+
+/**
+ * 私有方法
+ */
+function decodeAcl(AccessControlPolicy) {
+  var result = {
+    GrantFullControl: [],
+    GrantWrite: [],
+    GrantRead: [],
+    GrantReadAcp: [],
+    GrantWriteAcp: [],
+    ACL: ''
+  };
+  var GrantMap = {
+    FULL_CONTROL: 'GrantFullControl',
+    WRITE: 'GrantWrite',
+    READ: 'GrantRead',
+    READ_ACP: 'GrantReadAcp',
+    WRITE_ACP: 'GrantWriteAcp'
+  };
+  var AccessControlList = AccessControlPolicy && AccessControlPolicy.AccessControlList || {};
+  var Grant = AccessControlList.Grant;
+  if (Grant) {
+    Grant = util.isArray(Grant) ? Grant : [Grant];
+  }
+  var PublicAcl = {
+    READ: 0,
+    WRITE: 0,
+    FULL_CONTROL: 0
+  };
+  Grant && Grant.length && util.each(Grant, function (item) {
+    if (item.Grantee.ID === 'qcs::cam::anyone:anyone' || item.Grantee.URI === 'http://cam.qcloud.com/groups/global/AllUsers') {
+      PublicAcl[item.Permission] = 1;
+    } else if (item.Grantee.ID !== AccessControlPolicy.Owner.ID) {
+      result[GrantMap[item.Permission]].push('id="' + item.Grantee.ID + '"');
+    }
+  });
+  if (PublicAcl.FULL_CONTROL || PublicAcl.WRITE && PublicAcl.READ) {
+    result.ACL = 'public-read-write';
+  } else if (PublicAcl.READ) {
+    result.ACL = 'public-read';
+  } else {
+    result.ACL = 'private';
+  }
+  util.each(GrantMap, function (item) {
+    result[item] = uniqGrant(result[item].join(','));
+  });
+  return result;
+}
+
+// Grant 去重
+function uniqGrant(str) {
+  var arr = str.split(',');
+  var exist = {};
+  var i, item;
+  for (i = 0; i < arr.length;) {
+    item = arr[i].trim();
+    if (exist[item]) {
+      arr.splice(i, 1);
+    } else {
+      exist[item] = true;
+      arr[i] = item;
+      i++;
+    }
+  }
+  return arr.join(',');
+}
+
+// 生成操作 url
+function getUrl(params) {
+  var longBucket = params.bucket;
+  var shortBucket = longBucket.substr(0, longBucket.lastIndexOf('-'));
+  var appId = longBucket.substr(longBucket.lastIndexOf('-') + 1);
+  var domain = params.domain;
+  var region = params.region;
+  var object = params.object;
+  var protocol = 'https:';
+  if (!domain) {
+    if (['cn-south', 'cn-south-2', 'cn-north', 'cn-east', 'cn-southwest', 'sg'].indexOf(region) > -1) {
+      domain = '{Region}.myqcloud.com';
+    } else {
+      domain = 'cos.{Region}.myqcloud.com';
+    }
+    if (!params.ForcePathStyle) {
+      domain = '{Bucket}.' + domain;
+    }
+  }
+  domain = domain.replace(/\{\{AppId\}\}/gi, appId).replace(/\{\{Bucket\}\}/gi, shortBucket).replace(/\{\{Region\}\}/gi, region).replace(/\{\{.*?\}\}/gi, '');
+  domain = domain.replace(/\{AppId\}/gi, appId).replace(/\{BucketName\}/gi, shortBucket).replace(/\{Bucket\}/gi, longBucket).replace(/\{Region\}/gi, region).replace(/\{.*?\}/gi, '');
+  if (!/^[a-zA-Z]+:\/\//.test(domain)) {
+    domain = protocol + '//' + domain;
+  }
+
+  // 去掉域名最后的斜杆
+  if (domain.slice(-1) === '/') {
+    domain = domain.slice(0, -1);
+  }
+  var url = domain;
+  if (params.ForcePathStyle) {
+    url += '/' + longBucket;
+  }
+  url += '/';
+  if (object) {
+    url += util.camSafeUrlEncode(object).replace(/%2F/g, '/');
+  }
+  if (params.isLocation) {
+    url = url.replace(/^https?:\/\//, '');
+  }
+  return url;
+}
+var getSignHost = function getSignHost(opt) {
+  if (!opt.Bucket || !opt.Region) return '';
+  var useAccelerate = opt.UseAccelerate === undefined ? this.options.UseAccelerate : opt.UseAccelerate;
+  var url = opt.Url || getUrl({
+    ForcePathStyle: this.options.ForcePathStyle,
+    protocol: this.options.Protocol,
+    domain: this.options.Domain,
+    bucket: opt.Bucket,
+    region: useAccelerate ? 'accelerate' : opt.Region
+  });
+  var urlHost = url.replace(/^https?:\/\/([^/]+)(\/.*)?$/, '$1');
+  return urlHost;
+};
+
+// 异步获取签名
+function getAuthorizationAsync(params, callback) {
+  var headers = util.clone(params.Headers);
+  var headerHost = '';
+  util.each(headers, function (v, k) {
+    if (v === '') {
+      delete headers[k];
+    }
+    if (k.toLowerCase() === 'host') headerHost = v;
+  });
+
+  // ForceSignHost明确传入false才不加入host签名
+  var forceSignHost = params.ForceSignHost === false ? false : true;
+  // Host 加入签名计算
+  if (!headerHost && params.SignHost && forceSignHost) headers.Host = params.SignHost;
+
+  // 获取凭证的回调，避免用户 callback 多次
+  var cbDone = false;
+  var cb = function cb(err, AuthData) {
+    if (cbDone) return;
+    cbDone = true;
+    if (AuthData && AuthData.XCosSecurityToken && !AuthData.SecurityToken) {
+      AuthData = util.clone(AuthData);
+      AuthData.SecurityToken = AuthData.XCosSecurityToken;
+      delete AuthData.XCosSecurityToken;
+    }
+    callback && callback(err, AuthData);
+  };
+  var self = this;
+  var Bucket = params.Bucket || '';
+  var Region = params.Region || '';
+
+  // PathName
+  var KeyName = params.Action === 'name/cos:PostObject' || !params.Key ? '' : params.Key;
+  if (self.options.ForcePathStyle && Bucket) {
+    KeyName = Bucket + '/' + KeyName;
+  }
+  var Pathname = '/' + KeyName;
+
+  // Action、ResourceKey
+  var StsData = {};
+  var Scope = params.Scope;
+  if (!Scope) {
+    var Action = params.Action || '';
+    var ResourceKey = params.ResourceKey || params.Key || '';
+    Scope = params.Scope || [{
+      action: Action,
+      bucket: Bucket,
+      region: Region,
+      prefix: ResourceKey
+    }];
+  }
+  var ScopeKey = util.md5(JSON.stringify(Scope));
+
+  // STS
+  self._StsCache = self._StsCache || [];
+  (function () {
+    var i, AuthData;
+    for (i = self._StsCache.length - 1; i >= 0; i--) {
+      AuthData = self._StsCache[i];
+      var compareTime = Math.round(util.getSkewTime(self.options.SystemClockOffset) / 1000) + 30;
+      if (AuthData.StartTime && compareTime < AuthData.StartTime || compareTime >= AuthData.ExpiredTime) {
+        self._StsCache.splice(i, 1);
+        continue;
+      }
+      if (!AuthData.ScopeLimit || AuthData.ScopeLimit && AuthData.ScopeKey === ScopeKey) {
+        StsData = AuthData;
+        break;
+      }
+    }
+  })();
+  var calcAuthByTmpKey = function calcAuthByTmpKey() {
+    var KeyTime = '';
+    if (StsData.StartTime && params.Expires) {
+      KeyTime = StsData.StartTime + ';' + (StsData.StartTime + params.Expires * 1);
+    } else if (StsData.StartTime && StsData.ExpiredTime) {
+      KeyTime = StsData.StartTime + ';' + StsData.ExpiredTime;
+    }
+    var Authorization = util.getAuth({
+      SecretId: StsData.TmpSecretId,
+      SecretKey: StsData.TmpSecretKey,
+      Method: params.Method,
+      Pathname: Pathname,
+      Query: params.Query,
+      Headers: headers,
+      Expires: params.Expires,
+      SystemClockOffset: self.options.SystemClockOffset,
+      KeyTime: KeyTime,
+      ForceSignHost: forceSignHost
+    });
+    var AuthData = {
+      Authorization: Authorization,
+      SecurityToken: StsData.SecurityToken || StsData.XCosSecurityToken || '',
+      Token: StsData.Token || '',
+      ClientIP: StsData.ClientIP || '',
+      ClientUA: StsData.ClientUA || '',
+      SignFrom: 'client'
+    };
+    cb(null, AuthData);
+  };
+  var checkAuthError = function checkAuthError(AuthData) {
+    if (AuthData.Authorization) {
+      // 检查签名格式
+      var formatAllow = false;
+      var auth = AuthData.Authorization;
+      if (auth) {
+        if (auth.indexOf(' ') > -1) {
+          formatAllow = false;
+        } else if (auth.indexOf('q-sign-algorithm=') > -1 && auth.indexOf('q-ak=') > -1 && auth.indexOf('q-sign-time=') > -1 && auth.indexOf('q-key-time=') > -1 && auth.indexOf('q-url-param-list=') > -1) {
+          formatAllow = true;
+        } else {
+          try {
+            auth = atob(auth);
+            if (auth.indexOf('a=') > -1 && auth.indexOf('k=') > -1 && auth.indexOf('t=') > -1 && auth.indexOf('r=') > -1 && auth.indexOf('b=') > -1) {
+              formatAllow = true;
+            }
+          } catch (e) {}
+        }
+      }
+      if (!formatAllow) return util.error(new Error('getAuthorization callback params format error'));
+    } else {
+      if (!AuthData.TmpSecretId) return util.error(new Error('getAuthorization callback params missing "TmpSecretId"'));
+      if (!AuthData.TmpSecretKey) return util.error(new Error('getAuthorization callback params missing "TmpSecretKey"'));
+      if (!AuthData.SecurityToken && !AuthData.XCosSecurityToken) return util.error(new Error('getAuthorization callback params missing "SecurityToken"'));
+      if (!AuthData.ExpiredTime) return util.error(new Error('getAuthorization callback params missing "ExpiredTime"'));
+      if (AuthData.ExpiredTime && AuthData.ExpiredTime.toString().length !== 10) return util.error(new Error('getAuthorization callback params "ExpiredTime" should be 10 digits'));
+      if (AuthData.StartTime && AuthData.StartTime.toString().length !== 10) return util.error(new Error('getAuthorization callback params "StartTime" should be 10 StartTime'));
+    }
+    return false;
+  };
+
+  // 先判断是否有临时密钥
+  if (StsData.ExpiredTime && StsData.ExpiredTime - util.getSkewTime(self.options.SystemClockOffset) / 1000 > 60) {
+    // 如果缓存的临时密钥有效，并还有超过60秒有效期就直接使用
+    calcAuthByTmpKey();
+  } else if (self.options.getAuthorization) {
+    // 外部计算签名或获取临时密钥
+    self.options.getAuthorization.call(self, {
+      Bucket: Bucket,
+      Region: Region,
+      Method: params.Method,
+      Key: KeyName,
+      Pathname: Pathname,
+      Query: params.Query,
+      Headers: headers,
+      Scope: Scope,
+      SystemClockOffset: self.options.SystemClockOffset,
+      ForceSignHost: forceSignHost
+    }, function (AuthData) {
+      if (typeof AuthData === 'string') {
+        AuthData = {
+          Authorization: AuthData
+        };
+      }
+      var AuthError = checkAuthError(AuthData);
+      if (AuthError) return cb(AuthError);
+      if (AuthData.Authorization) {
+        cb(null, AuthData);
+      } else {
+        StsData = AuthData || {};
+        StsData.Scope = Scope;
+        StsData.ScopeKey = ScopeKey;
+        self._StsCache.push(StsData);
+        calcAuthByTmpKey();
+      }
+    });
+  } else if (self.options.getSTS) {
+    // 外部获取临时密钥
+    self.options.getSTS.call(self, {
+      Bucket: Bucket,
+      Region: Region
+    }, function (data) {
+      StsData = data || {};
+      StsData.Scope = Scope;
+      StsData.ScopeKey = ScopeKey;
+      if (!StsData.TmpSecretId) StsData.TmpSecretId = StsData.SecretId;
+      if (!StsData.TmpSecretKey) StsData.TmpSecretKey = StsData.SecretKey;
+      var AuthError = checkAuthError(StsData);
+      if (AuthError) return cb(AuthError);
+      self._StsCache.push(StsData);
+      calcAuthByTmpKey();
+    });
+  } else {
+    // 内部计算获取签名
+    return function () {
+      var KeyTime = '';
+      if (self.options.StartTime && params.Expires) {
+        if (self.options.StartTime.toString().length !== 10) {
+          return cb(util.error(new Error('params "StartTime" should be 10 digits')));
+        }
+        KeyTime = self.options.StartTime + ';' + (self.options.StartTime + params.Expires * 1);
+      } else if (self.options.StartTime && self.options.ExpiredTime) {
+        if (self.options.StartTime.toString().length !== 10) {
+          return cb(util.error(new Error('params "StartTime" should be 10 digits')));
+        }
+        if (self.options.ExpiredTime.toString().length !== 10) {
+          return cb(util.error(new Error('params "ExpiredTime" should be 10 digits')));
+        }
+        KeyTime = self.options.StartTime + ';' + self.options.ExpiredTime * 1;
+      }
+      var Authorization = util.getAuth({
+        SecretId: params.SecretId || self.options.SecretId,
+        SecretKey: params.SecretKey || self.options.SecretKey,
+        Method: params.Method,
+        Pathname: Pathname,
+        Query: params.Query,
+        Headers: headers,
+        Expires: params.Expires,
+        KeyTime: KeyTime,
+        SystemClockOffset: self.options.SystemClockOffset,
+        ForceSignHost: forceSignHost
+      });
+      var AuthData = {
+        Authorization: Authorization,
+        SecurityToken: self.options.SecurityToken || self.options.XCosSecurityToken,
+        SignFrom: 'client'
+      };
+      cb(null, AuthData);
+      return AuthData;
+    }();
+  }
+  return '';
+}
+
+// 判断当前请求出错时能否重试
+function allowRetry(err) {
+  var self = this;
+  var canRetry = false;
+  var networkError = false;
+  var isTimeError = false;
+  var serverDate = err.headers && (err.headers.date || err.headers.Date) || err.error && err.error.ServerTime;
+  try {
+    var errorCode = err.error.Code;
+    var errorMessage = err.error.Message;
+    if (errorCode === 'RequestTimeTooSkewed' || errorCode === 'AccessDenied' && errorMessage === 'Request has expired') {
+      isTimeError = true;
+    }
+  } catch (e) {}
+  if (err) {
+    if (isTimeError && serverDate) {
+      var serverTime = Date.parse(serverDate);
+      if (this.options.CorrectClockSkew && Math.abs(util.getSkewTime(this.options.SystemClockOffset) - serverTime) >= 30000) {
+        console.error('error: Local time is too skewed.');
+        this.options.SystemClockOffset = serverTime - Date.now();
+        canRetry = true;
+      }
+    } else if (Math.floor(err.statusCode / 100) === 5) {
+      return {
+        canRetry: true,
+        networkError: false
+      };
+    } else if (err.message === 'timeout') {
+      return {
+        canRetry: true,
+        networkError: self.options.AutoSwitchHost
+      };
+    }
+    /**
+     * 归为网络错误
+     * 1、no statusCode
+     * 2、statusCode === 3xx || 4xx || 5xx && no requestId
+     */
+    if (!err.statusCode) {
+      canRetry = true;
+      networkError = self.options.AutoSwitchHost;
+    } else {
+      var statusCode = Math.floor(err.statusCode / 100);
+      var requestId = (err === null || err === void 0 ? void 0 : err.headers) && (err === null || err === void 0 ? void 0 : err.headers['x-cos-request-id']);
+      if ([3, 4, 5].includes(statusCode) && !requestId) {
+        canRetry = self.options.AutoSwitchHost;
+        networkError = true;
+      }
+    }
+  }
+  return {
+    canRetry: canRetry,
+    networkError: networkError
+  };
+}
+
+/**
+ * requestUrl：请求的url，用于判断是否cos主域名，true才切
+ * clientCalcSign：是否客户端计算签名，服务端返回的签名不能切，true才切
+ * networkError：是否未知网络错误，true才切
+ * */
+function canSwitchHost(_ref) {
+  var requestUrl = _ref.requestUrl,
+    clientCalcSign = _ref.clientCalcSign,
+    networkError = _ref.networkError;
+  if (!this.options.AutoSwitchHost) return false;
+  if (!requestUrl) return false;
+  if (!clientCalcSign) return false;
+  if (!networkError) return false;
+  var commonReg = /^https?:\/\/[^\/]*\.cos\.[^\/]*\.myqcloud\.com(\/.*)?$/;
+  var accelerateReg = /^https?:\/\/[^\/]*\.cos\.accelerate\.myqcloud\.com(\/.*)?$/;
+  // 当前域名是cos主域名才切换
+  var isCommonCosHost = commonReg.test(requestUrl) && !accelerateReg.test(requestUrl);
+  return isCommonCosHost;
+}
+
+// 获取签名并发起请求
+function submitRequest(params, callback) {
+  var self = this;
+
+  // 处理 headers
+  !params.headers && (params.headers = {});
+
+  // 处理 query
+  !params.qs && (params.qs = {});
+  params.VersionId && (params.qs.versionId = params.VersionId);
+  params.qs = util.clearKey(params.qs);
+
+  // 清理 undefined 和 null 字段
+  params.headers && (params.headers = util.clearKey(params.headers));
+  params.qs && (params.qs = util.clearKey(params.qs));
+  var Query = util.clone(params.qs);
+  params.action && (Query[params.action] = '');
+  var contentType;
+  var contentLength = 0;
+  // 指定一个默认的 content-type，如不指定小程序默认会指定 application/json
+  var defaultContentType = 'application/json';
+  util.each(params.headers, function (value, key) {
+    if (key.toLowerCase() === 'content-type') {
+      contentType = value;
+    }
+    if (key.toLowerCase() === 'content-length') {
+      contentLength = value;
+    }
+  });
+  var method = params.method.toLowerCase();
+  var body = params.body;
+  if (body) {
+    if (!contentLength && typeof body === 'string') {
+      // 传了请求体需补充 content-length
+      var buffer = Buffer.from(body, 'utf-8');
+      var _contentLength = buffer.length;
+      params.headers['Content-Length'] = _contentLength;
+    }
+  } else {
+    // 非 get、head 请求的空请求体需补充 content-length = 0
+    var noContentLengthMethods = ['get', 'head'].includes(method);
+    if (!noContentLengthMethods) {
+      params.headers['Content-Length'] = 0;
+    }
+  }
+  // 补充默认 content-type，(putObject/multipartInit 不需要补充)
+  if (contentType === undefined) {
+    params.headers['Content-Type'] = defaultContentType;
+  }
+  var paramsUrl = params.url || params.Url;
+  var SignHost = params.SignHost || getSignHost.call(this, {
+    Bucket: params.Bucket,
+    Region: params.Region,
+    Url: paramsUrl
+  });
+  var tracker = params.tracker;
+  var next = function next(tryTimes) {
+    var oldClockOffset = self.options.SystemClockOffset;
+    if (params.SwitchHost) {
+      // 更换要签的host
+      SignHost = SignHost.replace(/myqcloud.com/, 'tencentcos.cn');
+    }
+    tracker && tracker.setParams({
+      signStartTime: new Date().getTime(),
+      httpRetryTimes: tryTimes - 1
+    });
+    getAuthorizationAsync.call(self, {
+      Bucket: params.Bucket || '',
+      Region: params.Region || '',
+      Method: params.method,
+      Key: params.Key,
+      Query: Query,
+      Headers: params.headers,
+      SignHost: SignHost,
+      Action: params.Action,
+      ResourceKey: params.ResourceKey,
+      Scope: params.Scope,
+      ForceSignHost: self.options.ForceSignHost
+    }, function (err, AuthData) {
+      if (err) {
+        callback(err);
+        return;
+      }
+      tracker && tracker.setParams({
+        signEndTime: new Date().getTime(),
+        httpStartTime: new Date().getTime()
+      });
+      params.AuthData = AuthData;
+      _submitRequest.call(self, params, function (err, data) {
+        var canRetry = false;
+        var networkError = false;
+        if (err) {
+          var info = allowRetry.call(self, err);
+          canRetry = info.canRetry || oldClockOffset !== self.options.SystemClockOffset;
+          networkError = info.networkError;
+        }
+        tracker && tracker.setParams({
+          httpEndTime: new Date().getTime()
+        });
+        if (err && tryTimes < 4 && canRetry) {
+          if (params.headers) {
+            delete params.headers.Authorization;
+            delete params.headers['token'];
+            delete params.headers['clientIP'];
+            delete params.headers['clientUA'];
+            params.headers['x-cos-security-token'] && delete params.headers['x-cos-security-token'];
+            params.headers['x-ci-security-token'] && delete params.headers['x-ci-security-token'];
+          }
+          // 进入重试逻辑时 需判断是否需要切换cos备用域名
+          var switchHost = canSwitchHost.call(self, {
+            requestUrl: (err === null || err === void 0 ? void 0 : err.url) || '',
+            clientCalcSign: (AuthData === null || AuthData === void 0 ? void 0 : AuthData.SignFrom) === 'client',
+            networkError: networkError
+          });
+          params.SwitchHost = switchHost;
+          // 重试时增加请求头，小程序里传字符串类型
+          params.headers['x-cos-sdk-retry'] = 'true';
+          next(tryTimes + 1);
+        } else {
+          callback(err, data);
+        }
+      });
+    });
+  };
+  next(1);
+}
+
+// 发起请求
+function _submitRequest(params, callback) {
+  var self = this;
+  var TaskId = params.TaskId;
+  if (TaskId && !self._isRunningTask(TaskId)) return;
+  var bucket = params.Bucket;
+  var region = params.Region;
+  var object = params.Key;
+  var method = params.method || 'GET';
+  var url = params.url || params.Url;
+  var body = params.body;
+  var json = params.json;
+  var rawBody = params.rawBody;
+  var dataType = params.dataType;
+  var httpDNSServiceId = self.options.HttpDNSServiceId;
+
+  // url
+  if (self.options.UseAccelerate) {
+    region = 'accelerate';
+  }
+  url = url || getUrl({
+    ForcePathStyle: self.options.ForcePathStyle,
+    protocol: self.options.Protocol,
+    domain: self.options.Domain,
+    bucket: bucket,
+    region: region,
+    object: object
+  });
+  if (params.SwitchHost) {
+    // 更换请求的url
+    url = url.replace(/myqcloud.com/, 'tencentcos.cn');
+  }
+  var repoterUrl = object ? url : '';
+  if (params.action) {
+    url = url + '?' + params.action;
+  }
+  if (params.qsStr) {
+    if (url.indexOf('?') > -1) {
+      url = url + '&' + params.qsStr;
+    } else {
+      url = url + '?' + params.qsStr;
+    }
+  }
+  var opt = {
+    method: method,
+    url: url,
+    headers: params.headers,
+    qs: params.qs,
+    filePath: params.filePath,
+    body: body,
+    json: json,
+    httpDNSServiceId: httpDNSServiceId,
+    dataType: dataType
+  };
+
+  // 兼容ci接口
+  var token = 'x-cos-security-token';
+  if (util.isCIHost(url)) {
+    token = 'x-ci-security-token';
+  }
+
+  // 获取签名
+  opt.headers.Authorization = params.AuthData.Authorization;
+  params.AuthData.Token && (opt.headers['token'] = params.AuthData.Token);
+  params.AuthData.ClientIP && (opt.headers['clientIP'] = params.AuthData.ClientIP);
+  params.AuthData.ClientUA && (opt.headers['clientUA'] = params.AuthData.ClientUA);
+  params.AuthData.SecurityToken && (opt.headers[token] = params.AuthData.SecurityToken);
+
+  // 清理 undefined 和 null 字段
+  opt.headers && (opt.headers = util.clearKey(opt.headers));
+  opt = util.clearKey(opt);
+
+  // progress
+  if (params.onProgress && typeof params.onProgress === 'function') {
+    opt.onProgress = function (e) {
+      if (TaskId && !self._isRunningTask(TaskId)) return;
+      var loaded = e ? e.loaded : 0;
+      params.onProgress({
+        loaded: loaded,
+        total: e.total
+      });
+    };
+  }
+  if (this.options.Timeout) {
+    opt.timeout = this.options.Timeout;
+  }
+  self.options.ForcePathStyle && (opt.pathStyle = self.options.ForcePathStyle);
+  self.emit('before-send', opt);
+  var useAccelerate = opt.url.includes('accelerate.');
+  var queryString = opt.qs ? Object.keys(opt.qs).map(function (key) {
+    return "".concat(key, "=").concat(opt.qs[key]);
+  }).join('&') : '';
+  var fullUrl = queryString ? opt.url + '?' + queryString : opt.url;
+  if (params.tracker) {
+    var _opt$body;
+    params.tracker.setParams({
+      url: fullUrl,
+      httpMethod: opt.method,
+      accelerate: useAccelerate,
+      httpSize: ((_opt$body = opt.body) === null || _opt$body === void 0 ? void 0 : _opt$body.size) || 0
+    });
+    // 分块上传时给父级tracker设置url信息
+    if (params.tracker.parent && !params.tracker.parent.params.url) {
+      params.tracker.parent.setParams({
+        url: repoterUrl,
+        accelerate: useAccelerate
+      });
+    }
+  }
+  var sender = REQUEST(opt, function (err, response, body) {
+    if (err === 'abort') return;
+
+    // 返回内容添加 状态码 和 headers
+    var hasReturned;
+    var cb = function cb(err, data) {
+      TaskId && self.off('inner-kill-task', killTask);
+      if (hasReturned) return;
+      hasReturned = true;
+      var attrs = {};
+      response && response.statusCode && (attrs.statusCode = response.statusCode);
+      response && response.headers && (attrs.headers = response.headers);
+      if (err) {
+        opt.url && (attrs.url = opt.url);
+        opt.method && (attrs.method = opt.method);
+        err = util.extend(err || {}, attrs);
+        callback(err, null);
+      } else {
+        data = util.extend(data || {}, attrs);
+        callback(null, data);
+      }
+      sender = null;
+    };
+    // 请求错误，发生网络错误
+    if (err) {
+      cb({
+        error: err
+      });
+      return;
+    }
+
+    // 请求返回码不为 200
+    var statusCode = response.statusCode;
+    var statusSuccess = Math.floor(statusCode / 100) === 2; // 200 202 204 206
+
+    // 不对 body 进行转换，body 直接挂载返回
+    if (rawBody) {
+      if (statusSuccess) {
+        return cb(null, {
+          body: body
+        });
+      } else {
+        // 报错但是返回了 ArrayBuffer，需要解析成 string
+        if (body instanceof ArrayBuffer) {
+          var errorStr = util.arrayBufferToString(body);
+          var json = util.parseResBody(errorStr);
+          var errorBody = json.Error || json;
+          return cb({
+            error: errorBody
+          });
+        }
+      }
+    }
+
+    // 解析body，兼容 xml、json，解析失败时完整返回
+    var jsonRes = util.parseResBody(body);
+    if (!statusSuccess) {
+      cb({
+        error: jsonRes.Error || jsonRes
+      });
+      return;
+    }
+    if (jsonRes.Error) {
+      cb({
+        error: jsonRes.Error
+      });
+      return;
+    }
+    cb(null, jsonRes);
+  });
+
+  // kill task
+  var killTask = function killTask(data) {
+    if (data.TaskId === TaskId) {
+      sender && sender.abort && sender.abort();
+      self.off('inner-kill-task', killTask);
+    }
+  };
+  TaskId && self.on('inner-kill-task', killTask);
+}
+var API_MAP = {
+  // Bucket 相关方法
+  getService: getService,
+  // Bucket
+  putBucket: putBucket,
+  headBucket: headBucket,
+  // Bucket
+  getBucket: getBucket,
+  deleteBucket: deleteBucket,
+  putBucketAcl: putBucketAcl,
+  // BucketACL
+  getBucketAcl: getBucketAcl,
+  putBucketCors: putBucketCors,
+  // BucketCors
+  getBucketCors: getBucketCors,
+  deleteBucketCors: deleteBucketCors,
+  getBucketLocation: getBucketLocation,
+  // BucketLocation
+  getBucketPolicy: getBucketPolicy,
+  // BucketPolicy
+  putBucketPolicy: putBucketPolicy,
+  deleteBucketPolicy: deleteBucketPolicy,
+  putBucketTagging: putBucketTagging,
+  // BucketTagging
+  getBucketTagging: getBucketTagging,
+  deleteBucketTagging: deleteBucketTagging,
+  putBucketLifecycle: putBucketLifecycle,
+  // BucketLifecycle
+  getBucketLifecycle: getBucketLifecycle,
+  deleteBucketLifecycle: deleteBucketLifecycle,
+  putBucketVersioning: putBucketVersioning,
+  // BucketVersioning
+  getBucketVersioning: getBucketVersioning,
+  putBucketReplication: putBucketReplication,
+  // BucketReplication
+  getBucketReplication: getBucketReplication,
+  deleteBucketReplication: deleteBucketReplication,
+  putBucketWebsite: putBucketWebsite,
+  // BucketWebsite
+  getBucketWebsite: getBucketWebsite,
+  deleteBucketWebsite: deleteBucketWebsite,
+  putBucketReferer: putBucketReferer,
+  // BucketReferer
+  getBucketReferer: getBucketReferer,
+  putBucketDomain: putBucketDomain,
+  // BucketDomain
+  getBucketDomain: getBucketDomain,
+  deleteBucketDomain: deleteBucketDomain,
+  putBucketOrigin: putBucketOrigin,
+  // BucketOrigin
+  getBucketOrigin: getBucketOrigin,
+  deleteBucketOrigin: deleteBucketOrigin,
+  putBucketLogging: putBucketLogging,
+  // BucketLogging
+  getBucketLogging: getBucketLogging,
+  putBucketInventory: putBucketInventory,
+  // BucketInventory
+  getBucketInventory: getBucketInventory,
+  listBucketInventory: listBucketInventory,
+  deleteBucketInventory: deleteBucketInventory,
+  putBucketAccelerate: putBucketAccelerate,
+  getBucketAccelerate: getBucketAccelerate,
+  // Object 相关方法
+  getObject: getObject,
+  headObject: headObject,
+  listObjectVersions: listObjectVersions,
+  putObject: putObject,
+  postObject: postObject,
+  deleteObject: deleteObject,
+  getObjectAcl: getObjectAcl,
+  putObjectAcl: putObjectAcl,
+  optionsObject: optionsObject,
+  putObjectCopy: putObjectCopy,
+  deleteMultipleObject: deleteMultipleObject,
+  restoreObject: restoreObject,
+  putObjectTagging: putObjectTagging,
+  getObjectTagging: getObjectTagging,
+  deleteObjectTagging: deleteObjectTagging,
+  appendObject: appendObject,
+  // 分块上传相关方法
+  uploadPartCopy: uploadPartCopy,
+  multipartInit: multipartInit,
+  multipartUpload: multipartUpload,
+  multipartComplete: multipartComplete,
+  multipartList: multipartList,
+  multipartListPart: multipartListPart,
+  multipartAbort: multipartAbort,
+  // 工具方法
+  request: request,
+  getObjectUrl: getObjectUrl,
+  getAuth: getAuth
+};
+module.exports.init = function (COS, task) {
+  task.transferToTaskMethod(API_MAP, 'postObject');
+  task.transferToTaskMethod(API_MAP, 'putObject');
+  util.each(API_MAP, function (fn, apiName) {
+    COS.prototype[apiName] = util.apiWrapper(apiName, fn);
+  });
+};
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../node_modules/buffer/index.js */ "./node_modules/buffer/index.js").Buffer))
+
+/***/ }),
+
+/***/ "./src/cos.js":
+/*!********************!*\
+  !*** ./src/cos.js ***!
+  \********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var util = __webpack_require__(/*! ./util */ "./src/util.js");
+var event = __webpack_require__(/*! ./event */ "./src/event.js");
+var task = __webpack_require__(/*! ./task */ "./src/task.js");
+var base = __webpack_require__(/*! ./base */ "./src/base.js");
+var advance = __webpack_require__(/*! ./advance */ "./src/advance.js");
+var pkg = __webpack_require__(/*! ../package.json */ "./package.json");
+var defaultOptions = {
+  SecretId: '',
+  SecretKey: '',
+  SecurityToken: '',
+  // 使用临时密钥需要注意自行刷新 Token
+  StartTime: 0,
+  // 临时密钥返回起始时间
+  ExpiredTime: 0,
+  // 临时密钥过期时间
+  ChunkRetryTimes: 2,
+  FileParallelLimit: 3,
+  ChunkParallelLimit: 3,
+  ChunkSize: 1024 * 1024,
+  SliceSize: 1024 * 1024,
+  CopyChunkParallelLimit: 20,
+  CopyChunkSize: 1024 * 1024 * 10,
+  CopySliceSize: 1024 * 1024 * 10,
+  MaxPartNumber: 10000,
+  ProgressInterval: 1000,
+  UploadQueueSize: 10000,
+  Domain: '',
+  ServiceDomain: '',
+  Protocol: '',
+  CompatibilityMode: false,
+  ForcePathStyle: false,
+  Timeout: 0,
+  // 单位毫秒，0 代表不设置超时时间
+  CorrectClockSkew: true,
+  SystemClockOffset: 0,
+  // 单位毫秒，ms
+  UploadCheckContentMd5: false,
+  UploadAddMetaMd5: false,
+  UploadIdCacheLimit: 50,
+  UseAccelerate: false,
+  ForceSignHost: true,
+  // 默认将host加入签名计算，关闭后可能导致越权风险，建议保持为true
+  HttpDNSServiceId: '',
+  // HttpDNS 服务商 Id,填写后代表开启 HttpDNS 服务。HttpDNS 用法详见https://developers.weixin.qq.com/miniprogram/dev/framework/ability/HTTPDNS.html
+  SimpleUploadMethod: 'postObject',
+  // 高级上传内部判断需要走简单上传时，指定的上传方法，可选postObject或putObject
+  AutoSwitchHost: false,
+  CopySourceParser: null,
+  // 自定义拷贝源解析器
+  ObjectKeySimplifyCheck: true,
+  // 开启合并校验 getObject Key
+  /** 上报相关配置 **/
+  DeepTracker: false,
+  // 上报时是否对每个分块上传做单独上报
+  TrackerDelay: 5000,
+  // 周期性上报，单位毫秒。0代表实时上报
+  CustomId: '',
+  // 自定义上报id
+  BeaconReporter: null,
+  // 灯塔上报组件，如有需要请自行传入，传入即代表开启上报
+  ClsReporter: null // cls 上报组件，如有需要请自行传入，传入即代表开启上报
+};
+
+// 对外暴露的类
+var COS = function COS(options) {
+  this.options = util.extend(util.clone(defaultOptions), options || {});
+  this.options.FileParallelLimit = Math.max(1, this.options.FileParallelLimit);
+  this.options.ChunkParallelLimit = Math.max(1, this.options.ChunkParallelLimit);
+  this.options.ChunkRetryTimes = Math.max(0, this.options.ChunkRetryTimes);
+  this.options.ChunkSize = Math.max(1024 * 1024, this.options.ChunkSize);
+  this.options.CopyChunkParallelLimit = Math.max(1, this.options.CopyChunkParallelLimit);
+  this.options.CopyChunkSize = Math.max(1024 * 1024, this.options.CopyChunkSize);
+  this.options.CopySliceSize = Math.max(0, this.options.CopySliceSize);
+  this.options.MaxPartNumber = Math.max(1024, Math.min(10000, this.options.MaxPartNumber));
+  this.options.Timeout = Math.max(0, this.options.Timeout);
+  this.options.EnableReporter = this.options.BeaconReporter || this.options.ClsReporter;
+  if (this.options.AppId) {
+    console.warn('warning: AppId has been deprecated, Please put it at the end of parameter Bucket(E.g: "test-1250000000").');
+  }
+  if (this.options.SecretId && this.options.SecretId.indexOf(' ') > -1) {
+    console.error('error: SecretId格式错误，请检查');
+    console.error('error: SecretId format is incorrect. Please check');
+  }
+  if (this.options.SecretKey && this.options.SecretKey.indexOf(' ') > -1) {
+    console.error('error: SecretKey格式错误，请检查');
+    console.error('error: SecretKey format is incorrect. Please check');
+  }
+  if (this.options.ForcePathStyle) {
+    console.warn('cos-wx-sdk-v5不再支持使用path-style，仅支持使用virtual-hosted-style，参考文档：https://cloud.tencent.com/document/product/436/96243');
+    throw new Error('ForcePathStyle is not supported');
+  }
+  event.init(this);
+  task.init(this);
+};
+base.init(COS, task);
+advance.init(COS, task);
+COS.util = {
+  md5: util.md5,
+  xml2json: util.xml2json,
+  json2xml: util.json2xml,
+  encodeBase64: util.encodeBase64
+};
+COS.getAuthorization = util.getAuth;
+COS.version = pkg.version;
+module.exports = COS;
+
+/***/ }),
+
+/***/ "./src/event.js":
+/*!**********************!*\
+  !*** ./src/event.js ***!
+  \**********************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+var initEvent = function initEvent(cos) {
+  var listeners = {};
+  var getList = function getList(action) {
+    !listeners[action] && (listeners[action] = []);
+    return listeners[action];
+  };
+  cos.on = function (action, callback) {
+    getList(action).push(callback);
+  };
+  cos.off = function (action, callback) {
+    var list = getList(action);
+    for (var i = list.length - 1; i >= 0; i--) {
+      callback === list[i] && list.splice(i, 1);
+    }
+  };
+  cos.emit = function (action, data) {
+    var list = getList(action).map(function (cb) {
+      return cb;
+    });
+    for (var i = 0; i < list.length; i++) {
+      list[i](data);
+    }
+  };
+};
+var EventProxy = function EventProxy() {
+  initEvent(this);
+};
+module.exports.init = initEvent;
+module.exports.EventProxy = EventProxy;
+
+/***/ }),
+
+/***/ "./src/session.js":
+/*!************************!*\
+  !*** ./src/session.js ***!
+  \************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var util = __webpack_require__(/*! ./util */ "./src/util.js");
+
+// 按照文件特征值，缓存 UploadId
+var cacheKey = 'cos_sdk_upload_cache';
+var expires = 30 * 24 * 3600;
+var cache;
+var timer;
+var getCache = function getCache() {
+  try {
+    var val = JSON.parse(wx.getStorageSync(cacheKey));
+  } catch (e) {}
+  if (!val) val = [];
+  return val;
+};
+var setCache = function setCache() {
+  try {
+    if (cache.length) wx.setStorageSync(cacheKey, JSON.stringify(cache));else wx.removeStorageSync(cacheKey);
+  } catch (e) {}
+};
+var init = function init() {
+  if (cache) return;
+  cache = getCache();
+  // 清理太老旧的数据
+  var changed = false;
+  var now = Math.round(Date.now() / 1000);
+  for (var i = cache.length - 1; i >= 0; i--) {
+    var mtime = cache[i][2];
+    if (!mtime || mtime + expires < now) {
+      cache.splice(i, 1);
+      changed = true;
+    }
+  }
+  changed && setCache();
+};
+
+// 把缓存存到本地
+var save = function save() {
+  if (timer) return;
+  timer = setTimeout(function () {
+    setCache();
+    timer = null;
+  }, 400);
+};
+var mod = {
+  using: {},
+  // 标记 UploadId 正在使用
+  setUsing: function setUsing(uuid) {
+    mod.using[uuid] = true;
+  },
+  // 标记 UploadId 已经没在使用
+  removeUsing: function removeUsing(uuid) {
+    delete mod.using[uuid];
+  },
+  // 用上传参数生成哈希值
+  getFileId: function getFileId(FileStat, ChunkSize, Bucket, Key) {
+    if (FileStat.FilePath && FileStat.size && FileStat.lastModifiedTime && ChunkSize) {
+      return util.md5([FileStat.FilePath].join('::')) + '-' + util.md5([FileStat.size, FileStat.mode, FileStat.lastAccessedTime, FileStat.lastModifiedTime, ChunkSize, Bucket, Key].join('::'));
+    } else {
+      return null;
+    }
+  },
+  // 用上传参数生成哈希值
+  getCopyFileId: function getCopyFileId(copySource, sourceHeaders, ChunkSize, Bucket, Key) {
+    var size = sourceHeaders['content-length'];
+    var etag = sourceHeaders.etag || '';
+    var lastModified = sourceHeaders['last-modified'];
+    if (copySource && ChunkSize) {
+      return util.md5([copySource, size, etag, lastModified, ChunkSize, Bucket, Key].join('::'));
+    } else {
+      return null;
+    }
+  },
+  // 获取文件对应的 UploadId 列表
+  getUploadIdList: function getUploadIdList(uuid) {
+    if (!uuid) return null;
+    init();
+    var list = [];
+    for (var i = 0; i < cache.length; i++) {
+      if (cache[i][0] === uuid) list.push(cache[i][1]);
+    }
+    return list.length ? list : null;
+  },
+  // 缓存 UploadId
+  saveUploadId: function saveUploadId(uuid, UploadId, limit) {
+    init();
+    if (!uuid) return;
+    // 清理没用的 UploadId
+    var part1 = uuid.substr(0, uuid.indexOf('-') + 1);
+    for (var i = cache.length - 1; i >= 0; i--) {
+      var item = cache[i];
+      if (item[0] === uuid && item[1] === UploadId) {
+        cache.splice(i, 1);
+      } else if (uuid !== item[0] && item[0].indexOf(part1) === 0) {
+        // 文件路径相同，但其他信息不同，说明文件改变了或上传参数（存储桶、路径、分片大小）变了，直接清理掉
+        cache.splice(i, 1);
+      }
+    }
+    cache.unshift([uuid, UploadId, Math.round(Date.now() / 1000)]);
+    if (cache.length > limit) cache.splice(limit);
+    save();
+  },
+  // UploadId 已用完，移除掉
+  removeUploadId: function removeUploadId(UploadId) {
+    init();
+    delete mod.using[UploadId];
+    for (var i = cache.length - 1; i >= 0; i--) {
+      if (cache[i][1] === UploadId) cache.splice(i, 1);
+    }
+    save();
+  }
+};
+module.exports = mod;
+
+/***/ }),
+
+/***/ "./src/task.js":
+/*!*********************!*\
+  !*** ./src/task.js ***!
+  \*********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var session = __webpack_require__(/*! ./session */ "./src/session.js");
+var util = __webpack_require__(/*! ./util */ "./src/util.js");
+var originApiMap = {};
+var transferToTaskMethod = function transferToTaskMethod(apiMap, apiName) {
+  originApiMap[apiName] = apiMap[apiName];
+  apiMap[apiName] = function (params, callback) {
+    if (params.SkipTask) {
+      originApiMap[apiName].call(this, params, callback);
+    } else {
+      this._addTask(apiName, params, callback);
+    }
+  };
+};
+var initTask = function initTask(cos) {
+  var queue = [];
+  var tasks = {};
+  var uploadingFileCount = 0;
+  var nextUploadIndex = 0;
+
+  // 接口返回简略的任务信息
+  var formatTask = function formatTask(task) {
+    var t = {
+      id: task.id,
+      Bucket: task.Bucket,
+      Region: task.Region,
+      Key: task.Key,
+      FilePath: task.FilePath,
+      state: task.state,
+      loaded: task.loaded,
+      size: task.size,
+      speed: task.speed,
+      percent: task.percent,
+      hashPercent: task.hashPercent,
+      error: task.error
+    };
+    if (task.FilePath) t.FilePath = task.FilePath;
+    return t;
+  };
+  var emitListUpdate = function () {
+    var timer;
+    var emit = function emit() {
+      timer = 0;
+      cos.emit('task-list-update', {
+        list: util.map(queue, formatTask)
+      });
+      cos.emit('list-update', {
+        list: util.map(queue, formatTask)
+      });
+    };
+    return function () {
+      if (!timer) timer = setTimeout(emit);
+    };
+  }();
+  var clearQueue = function clearQueue() {
+    if (queue.length <= cos.options.UploadQueueSize) return;
+    for
+
+      // 如果还太多，才继续清理
+    (var i = 0; i < nextUploadIndex &&
+    // 小于当前操作的 index 才清理
+    i < queue.length &&
+    // 大于队列才清理
+    queue.length > cos.options.UploadQueueSize;) {
+      var isActive = queue[i].state === 'waiting' || queue[i].state === 'checking' || queue[i].state === 'uploading';
+      if (!queue[i] || !isActive) {
+        tasks[queue[i].id] && delete tasks[queue[i].id];
+        queue.splice(i, 1);
+        nextUploadIndex--;
+      } else {
+        i++;
+      }
+    }
+    emitListUpdate();
+  };
+  var startNextTask = function startNextTask() {
+    // 检查是否允许增加执行进程
+    if (uploadingFileCount >= cos.options.FileParallelLimit) return;
+    // 跳过不可执行的任务
+    while (queue[nextUploadIndex] && queue[nextUploadIndex].state !== 'waiting') nextUploadIndex++;
+    // 检查是否已遍历结束
+    if (nextUploadIndex >= queue.length) return;
+    // 上传该遍历到的任务
+    var task = queue[nextUploadIndex];
+    nextUploadIndex++;
+    uploadingFileCount++;
+    task.state = 'checking';
+    task.params.onTaskStart && task.params.onTaskStart(formatTask(task));
+    !task.params.UploadData && (task.params.UploadData = {});
+    var apiParams = util.formatParams(task.api, task.params);
+    originApiMap[task.api].call(cos, apiParams, function (err, data) {
+      if (!cos._isRunningTask(task.id)) return;
+      if (task.state === 'checking' || task.state === 'uploading') {
+        task.state = err ? 'error' : 'success';
+        err && (task.error = err);
+        uploadingFileCount--;
+        emitListUpdate();
+        startNextTask();
+        task.callback && task.callback(err, data);
+        if (task.state === 'success') {
+          if (task.params) {
+            delete task.params.UploadData;
+            delete task.params.Body;
+            delete task.params;
+          }
+          delete task.callback;
+        }
+      }
+      clearQueue();
+    });
+    emitListUpdate();
+    // 异步执行下一个任务
+    setTimeout(startNextTask);
+  };
+  var killTask = function killTask(id, switchToState) {
+    var task = tasks[id];
+    if (!task) return;
+    var waiting = task && task.state === 'waiting';
+    var running = task && (task.state === 'checking' || task.state === 'uploading');
+    if (switchToState === 'canceled' && task.state !== 'canceled' || switchToState === 'paused' && waiting || switchToState === 'paused' && running) {
+      if (switchToState === 'paused' && task.params.Body && typeof task.params.Body.pipe === 'function') {
+        console.error('stream not support pause');
+        return;
+      }
+      task.state = switchToState;
+      cos.emit('inner-kill-task', {
+        TaskId: id,
+        toState: switchToState
+      });
+      try {
+        var UploadId = task && task.params && task.params.UploadData.UploadId;
+      } catch (e) {}
+      if (switchToState === 'canceled' && UploadId) session.removeUsing(UploadId);
+      emitListUpdate();
+      if (running) {
+        uploadingFileCount--;
+        startNextTask();
+      }
+      if (switchToState === 'canceled') {
+        if (task.params) {
+          delete task.params.UploadData;
+          delete task.params.Body;
+          delete task.params;
+        }
+        delete task.callback;
+      }
+    }
+    clearQueue();
+  };
+  cos._addTasks = function (taskList) {
+    util.each(taskList, function (task) {
+      cos._addTask(task.api, task.params, task.callback, true);
+    });
+    emitListUpdate();
+  };
+  cos._addTask = function (api, params, callback, ignoreAddEvent) {
+    // 如果小程序版本不支持获取文件分片内容，统一转到 简单上传 接口上传
+    var simpleUploadMethod = cos.options.SimpleUploadMethod === 'postObject' ? 'postObject' : 'putObject';
+    if (api === 'sliceUploadFile' && !util.canFileSlice()) api = simpleUploadMethod;
+
+    // 复制参数对象
+    params = util.formatParams(api, params);
+
+    // 生成 id
+    var id = util.uuid();
+    params.TaskId = id;
+    params.onTaskReady && params.onTaskReady(id);
+    var task = {
+      // env
+      params: params,
+      callback: callback,
+      api: api,
+      index: queue.length,
+      // task
+      id: id,
+      Bucket: params.Bucket,
+      Region: params.Region,
+      Key: params.Key,
+      FilePath: params.FilePath || '',
+      state: 'waiting',
+      loaded: 0,
+      size: 0,
+      speed: 0,
+      percent: 0,
+      hashPercent: 0,
+      error: null
+    };
+    var onHashProgress = params.onHashProgress;
+    params.onHashProgress = function (info) {
+      if (!cos._isRunningTask(task.id)) return;
+      task.hashPercent = info.percent;
+      onHashProgress && onHashProgress(info);
+      emitListUpdate();
+    };
+    var onProgress = params.onProgress;
+    params.onProgress = function (info) {
+      if (!cos._isRunningTask(task.id)) return;
+      task.state === 'checking' && (task.state = 'uploading');
+      task.loaded = info.loaded;
+      task.size = info.total;
+      task.speed = info.speed;
+      task.percent = info.percent;
+      onProgress && onProgress(info);
+      emitListUpdate();
+    };
+
+    // 异步获取 filesize
+    util.getFileSize(api, params, function (err, size) {
+      // 开始处理上传
+      if (err) {
+        // 如果获取大小出错，不加入队列
+        callback(err);
+        return;
+      }
+      // 获取完文件大小再把任务加入队列
+      tasks[id] = task;
+      queue.push(task);
+      task.size = size;
+      !ignoreAddEvent && emitListUpdate();
+      startNextTask();
+      clearQueue();
+    });
+    return id;
+  };
+  cos._isRunningTask = function (id) {
+    var task = tasks[id];
+    return !!(task && (task.state === 'checking' || task.state === 'uploading'));
+  };
+  cos.getTaskList = function () {
+    return util.map(queue, formatTask);
+  };
+  cos.cancelTask = function (id) {
+    killTask(id, 'canceled');
+  };
+  cos.pauseTask = function (id) {
+    killTask(id, 'paused');
+  };
+  cos.restartTask = function (id) {
+    var task = tasks[id];
+    if (task && (task.state === 'paused' || task.state === 'error')) {
+      task.state = 'waiting';
+      emitListUpdate();
+      nextUploadIndex = Math.min(nextUploadIndex, task.index);
+      startNextTask();
+    }
+  };
+  cos.isUploadRunning = function () {
+    return uploadingFileCount || nextUploadIndex < queue.length;
+  };
+};
+module.exports.transferToTaskMethod = transferToTaskMethod;
+module.exports.init = initTask;
+
+/***/ }),
+
+/***/ "./src/tracker.js":
+/*!************************!*\
+  !*** ./src/tracker.js ***!
+  \************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var pkg = __webpack_require__(/*! ../package.json */ "./package.json");
+var beacon = null;
+var getBeacon = function getBeacon(Beacon, delay) {
+  if (!beacon) {
+    // 生成 beacon
+    if (typeof Beacon !== 'function') {
+      throw new Error('Beacon not found');
+    }
+    beacon = new Beacon({
+      appkey: '0WEB05PY6MHRGK0U',
+      versionCode: pkg.version,
+      channelID: 'mp_sdk',
+      //渠道,选填
+      openid: 'openid',
+      // 用户id, 选填
+      unionid: 'unid',
+      //用户unionid , 类似idfv,选填
+      strictMode: false,
+      //严苛模式开关, 打开严苛模式会主动抛出异常, 上线请务必关闭!!!
+      delay: delay,
+      // 普通事件延迟上报时间(单位毫秒), 默认1000(1秒),选填
+      sessionDuration: 60 * 1000 // session变更的时间间隔, 一个用户持续30分钟(默认值)没有任何上报则算另一次 session,每变更一次session上报一次启动事件(rqd_applaunched),使用毫秒(ms),最小值30秒,选填
+    });
+  }
+  return beacon;
+};
+
+// 毫秒转秒
+var ms2s = function ms2s(ms) {
+  if (!ms || ms < 0) return 0;
+  return (ms / 1000).toFixed(3);
+};
+var utils = {
+  // 生成uid 每个链路对应唯一一条uid
+  getUid: function getUid() {
+    var S4 = function S4() {
+      return ((1 + Math.random()) * 0x10000 | 0).toString(16).substring(1);
+    };
+    return S4() + S4() + '-' + S4() + '-' + S4() + '-' + S4() + '-' + S4() + S4() + S4();
+  },
+  // 获取网络类型 4g ｜ wifi
+  getNetType: function getNetType() {
+    return new Promise(function (resolve) {
+      if (wx.canIUse('getNetworkType')) {
+        try {
+          wx.getNetworkType({
+            success: function success(res) {
+              resolve(res.networkType);
+            }
+          });
+        } catch (e) {
+          resolve('can_not_get_network_type');
+        }
+      } else {
+        resolve('can_not_get_network_type');
+      }
+    });
+  },
+  // 获取系统信息
+  getSystemInfo: function getSystemInfo() {
+    var baseInfo = {
+      // ↓上报项
+      devicePlatform: 'can_not_get_system_info',
+      // ios/anroid/windows/mac/devtools
+      wxVersion: 'can_not_get_system_info',
+      wxSystem: 'can_not_get_system_info',
+      wxSdkVersion: 'can_not_get_system_info'
+    };
+    var appBaseInfo = {};
+    var deviceInfo = {};
+    if (wx.canIUse('getAppBaseInfo')) {
+      appBaseInfo = wx.getAppBaseInfo() || {};
+    }
+    if (wx.canIUse('getDeviceInfo')) {
+      deviceInfo = wx.getDeviceInfo() || {};
+    }
+    var sdkVersion = appBaseInfo.SDKVersion || 'can_not_get_system_info';
+    var version = appBaseInfo.version || 'can_not_get_system_info';
+    var platform = deviceInfo.platform || 'can_not_get_system_info';
+    var system = deviceInfo.system || 'can_not_get_system_info';
+    Object.assign(baseInfo, {
+      devicePlatform: platform,
+      wxVersion: version,
+      wxSystem: system,
+      wxSdkVersion: sdkVersion
+    });
+    return baseInfo;
+  }
+};
+
+// 设备信息，只取一次值
+var deviceInfo = utils.getSystemInfo();
+var transApiName = function transApiName(api) {
+  if (['putObject', 'sliceUploadFile', 'uploadFile', 'uploadFiles'].includes(api)) {
+    return 'UploadTask';
+  } else if (api === 'getObject') {
+    return 'DownloadTask';
+  } else if (['putObjectCopy', 'sliceCopyFile'].includes(api)) {
+    return 'CopyTask';
+  }
+  return api;
+};
+
+// 上报参数驼峰改下划线
+function camel2underline(key) {
+  return key.replace(/([A-Z])/g, '_$1').toLowerCase();
+}
+function formatParams(params) {
+  var formattedParams = {};
+  var successKeys = ['sdkVersionName', 'sdkVersionCode', 'osName', 'networkType', 'requestName', 'requestResult', 'bucket', 'region', 'appid', 'accelerate', 'url', 'host', 'requestPath', 'userAgent', 'httpMethod', 'httpSize', 'httpSpeed', 'httpTookTime', 'httpMd5', 'httpSign', 'httpFullTime', 'httpDomain', 'partNumber', 'httpRetryTimes', 'customId', 'traceId', 'realApi'];
+  var failureKeys = [].concat(successKeys, ['errorNode', 'errorCode', 'errorName', 'errorMessage', 'errorRequestId', 'errorHttpCode', 'errorServiceName', 'errorType', 'fullError']);
+  // 需要上报的参数字段
+  var reporterKeys = params.requestResult === 'Success' ? successKeys : failureKeys;
+  for (var key in params) {
+    if (!reporterKeys.includes(key)) continue;
+    var formattedKey = camel2underline(key);
+    formattedParams[formattedKey] = params[key];
+  }
+  formattedParams['request_name'] = params.realApi ? transApiName(params.realApi) : params.requestName;
+  return formattedParams;
+}
+
+// 链路追踪器
+var Tracker = /*#__PURE__*/function () {
+  function Tracker(opt) {
+    var _this$params;
+    _classCallCheck(this, Tracker);
+    var parent = opt.parent,
+      traceId = opt.traceId,
+      bucket = opt.bucket,
+      region = opt.region,
+      apiName = opt.apiName,
+      realApi = opt.realApi,
+      httpMethod = opt.httpMethod,
+      fileKey = opt.fileKey,
+      fileSize = opt.fileSize,
+      accelerate = opt.accelerate,
+      customId = opt.customId,
+      delay = opt.delay,
+      deepTracker = opt.deepTracker,
+      Beacon = opt.Beacon,
+      clsReporter = opt.clsReporter;
+    var appid = bucket && bucket.substr(bucket.lastIndexOf('-') + 1) || '';
+    this.parent = parent;
+    this.deepTracker = deepTracker;
+    this.delay = delay;
+    if (clsReporter && !this.clsReporter) {
+      this.clsReporter = clsReporter;
+    }
+    // 上报用到的字段
+    this.params = (_this$params = {
+      // 通用字段
+      sdkVersionName: 'cos-wx-sdk-v5',
+      sdkVersionCode: pkg.version,
+      osName: deviceInfo.devicePlatform,
+      networkType: '',
+      requestName: apiName || '',
+      requestResult: '',
+      // sdk api调用结果Success、Failure
+      realApi: realApi,
+      bucket: bucket,
+      region: region,
+      accelerate: accelerate,
+      httpMethod: httpMethod,
+      url: '',
+      host: '',
+      httpDomain: '',
+      requestPath: fileKey || '',
+      errorType: '',
+      errorCode: '',
+      errorName: '',
+      errorMessage: '',
+      errorRequestId: '',
+      errorHttpCode: 0,
+      errorServiceName: '',
+      errorNode: '',
+      httpTookTime: 0,
+      // http整体耗时
+      httpSize: fileSize || 0,
+      // 主要是文件大小，大小 B
+      httpMd5: 0,
+      // MD5耗时
+      httpSign: 0,
+      // 计算签名耗时
+      httpFullTime: 0,
+      // 任务整体耗时(包括md5、签名等)
+      httpSpeed: 0,
+      // 主要关注上传速度，KB/s
+
+      size: fileSize || 0
+    }, _defineProperty(_this$params, "httpMd5", 0), _defineProperty(_this$params, "httpSign", 0), _defineProperty(_this$params, "httpFull", 0), _defineProperty(_this$params, "name", apiName || ''), _defineProperty(_this$params, "tookTime", 0), _defineProperty(_this$params, "md5StartTime", 0), _defineProperty(_this$params, "md5EndTime", 0), _defineProperty(_this$params, "signStartTime", 0), _defineProperty(_this$params, "signEndTime", 0), _defineProperty(_this$params, "httpStartTime", 0), _defineProperty(_this$params, "httpEndTime", 0), _defineProperty(_this$params, "startTime", new Date().getTime()), _defineProperty(_this$params, "endTime", 0), _defineProperty(_this$params, "traceId", traceId || utils.getUid()), _defineProperty(_this$params, "appid", appid), _defineProperty(_this$params, "partNumber", 0), _defineProperty(_this$params, "httpRetryTimes", 0), _defineProperty(_this$params, "customId", customId || ''), _defineProperty(_this$params, "partTime", 0), _this$params);
+    if (Beacon) {
+      this.beacon = getBeacon(Beacon, delay);
+    }
+  }
+
+  // 格式化sdk回调
+  _createClass(Tracker, [{
+    key: "formatResult",
+    value: function () {
+      var _formatResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(err, data) {
+        var _err$error, _err$error$error, _err$error2, _err$error2$error, _err$error3, _err$error4, _err$error5, _err$error5$error, _err$error6;
+        var now, networkType, errorCode, errorMessage, errorName, errorHttpCode, errorServiceName, requestId, errorType, isSliceUploadFile, isSliceCopyFile, speed, httpFullTime, httpTookTime, _speed, httpMd5, httpSign, exec;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              /**
+               * 解析到err的格式为:
+               * 1.服务端有返回时
+               * {
+               *  err: 同下方error,
+               *  error: {
+               *    error: {
+               *      Code: '', Message: '', Resource: '', RequestId: '', TraceId: '',
+               *    },
+               *    statusCode: xxx,
+               *    headers: {},
+               *    RequestId: '',
+               *  },
+               * }
+               * 2.本地抛出或小程序直接报错
+               * {error: 'message'}或{error: {error: 'message' }}
+               */
+              now = new Date().getTime();
+              _context.next = 3;
+              return utils.getNetType();
+            case 3:
+              networkType = _context.sent;
+              errorCode = err ? (err === null || err === void 0 ? void 0 : (_err$error = err.error) === null || _err$error === void 0 ? void 0 : (_err$error$error = _err$error.error) === null || _err$error$error === void 0 ? void 0 : _err$error$error.Code) || 'Error' : '';
+              errorMessage = err ? (err === null || err === void 0 ? void 0 : (_err$error2 = err.error) === null || _err$error2 === void 0 ? void 0 : (_err$error2$error = _err$error2.error) === null || _err$error2$error === void 0 ? void 0 : _err$error2$error.Message) || (err === null || err === void 0 ? void 0 : (_err$error3 = err.error) === null || _err$error3 === void 0 ? void 0 : _err$error3.error) || (err === null || err === void 0 ? void 0 : err.error) || '' : '';
+              errorName = errorMessage;
+              errorHttpCode = err ? err === null || err === void 0 ? void 0 : (_err$error4 = err.error) === null || _err$error4 === void 0 ? void 0 : _err$error4.statusCode : data.statusCode;
+              errorServiceName = err ? err === null || err === void 0 ? void 0 : (_err$error5 = err.error) === null || _err$error5 === void 0 ? void 0 : (_err$error5$error = _err$error5.error) === null || _err$error5$error === void 0 ? void 0 : _err$error5$error.Resource : '';
+              requestId = err ? (err === null || err === void 0 ? void 0 : (_err$error6 = err.error) === null || _err$error6 === void 0 ? void 0 : _err$error6.RequestId) || '' : (data === null || data === void 0 ? void 0 : data.RequestId) || '';
+              errorType = err ? requestId ? 'Server' : 'Client' : '';
+              if (this.params.requestName === 'getObject') {
+                this.params.httpSize = data ? data.headers && data.headers['content-length'] : 0;
+              }
+
+              // 上报 sliceUploadFile || uploadFile || uploadFiles 命中分块上传时
+              isSliceUploadFile = this.params.realApi === 'sliceUploadFile';
+              isSliceCopyFile = this.params.realApi === 'sliceCopyFile';
+              if (isSliceUploadFile || isSliceCopyFile) {
+                speed = this.params.httpSize / 1024 / this.params.partTime;
+                Object.assign(this.params, {
+                  httpSpeed: speed < 0 ? 0 : speed.toFixed(3)
+                });
+              } else {
+                httpFullTime = now - this.params.startTime;
+                httpTookTime = this.params.httpEndTime - this.params.httpStartTime;
+                _speed = this.params.httpSize / 1024 / (httpTookTime / 1000);
+                httpMd5 = this.params.md5EndTime - this.params.md5StartTime;
+                httpSign = this.params.signEndTime - this.params.signStartTime;
+                if (this.parent) {
+                  this.parent.addParamValue('httpTookTime', ms2s(httpTookTime));
+                  this.parent.addParamValue('httpFullTime', ms2s(httpFullTime));
+                  this.parent.addParamValue('httpMd5', ms2s(httpMd5));
+                  this.parent.addParamValue('httpSign', ms2s(httpSign));
+                  if (['multipartUpload', 'uploadPartCopy', 'putObjectCopy'].includes(this.params.requestName)) {
+                    // 只有小分块上传|复制才累计纯请求耗时，计算速度时用到
+                    this.parent.addParamValue('partTime', ms2s(httpTookTime));
+                  }
+                }
+                Object.assign(this.params, {
+                  httpFullTime: ms2s(httpFullTime),
+                  httpMd5: ms2s(httpMd5),
+                  httpSign: ms2s(httpSign),
+                  httpTookTime: ms2s(httpTookTime),
+                  httpSpeed: _speed < 0 ? 0 : _speed.toFixed(3)
+                });
+              }
+              Object.assign(this.params, {
+                networkType: networkType,
+                requestResult: err ? 'Failure' : 'Success',
+                errorType: errorType,
+                errorCode: errorCode,
+                errorHttpCode: errorHttpCode,
+                errorName: errorName,
+                errorMessage: errorMessage,
+                errorServiceName: errorServiceName,
+                errorRequestId: requestId
+              });
+              if (err && (!errorCode || !errorMessage)) {
+                // 暂存全量err一段时间 观察是否所有err格式都可被解析
+                this.params.fullError = err ? JSON.stringify(err) : '';
+              }
+              if (this.params.name === 'getObject') {
+                this.params.size = data ? data.headers && data.headers['content-length'] : -1;
+              }
+              if (this.params.url) {
+                try {
+                  exec = /^http(s)?:\/\/(.*?)\//.exec(this.params.url);
+                  this.params.host = exec[2];
+                } catch (e) {
+                  this.params.host = this.params.url;
+                }
+                this.params.httpDomain = this.params.host;
+              }
+            case 19:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function formatResult(_x, _x2) {
+        return _formatResult.apply(this, arguments);
+      }
+      return formatResult;
+    }() // 上报
+  }, {
+    key: "report",
+    value: function () {
+      var _report = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(err, data) {
+        var formattedParams;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              if (!(!this.beacon && !this.clsReporter)) {
+                _context2.next = 2;
+                break;
+              }
+              return _context2.abrupt("return");
+            case 2:
+              _context2.next = 4;
+              return this.formatResult(err, data);
+            case 4:
+              formattedParams = formatParams(this.params);
+              if (this.beacon) {
+                this.sendEventsToBeacon(formattedParams);
+              }
+              if (this.clsReporter) {
+                this.sendEventsToCLS(formattedParams);
+              }
+            case 7:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function report(_x3, _x4) {
+        return _report.apply(this, arguments);
+      }
+      return report;
+    }() // 设置当前链路的参数
+  }, {
+    key: "setParams",
+    value: function setParams(params) {
+      Object.assign(this.params, params);
+    }
+  }, {
+    key: "addParamValue",
+    value: function addParamValue(key, value) {
+      this.params[key] = (+this.params[key] + +value).toFixed(3);
+    }
+
+    // 上报灯塔
+  }, {
+    key: "sendEventsToBeacon",
+    value: function sendEventsToBeacon(formattedParams) {
+      // DeepTracker模式下才会上报分块上传内部细节
+      var isSliceUploadFile = this.params.requestName === 'sliceUploadFile' || this.params.realApi === 'sliceUploadFile';
+      if (isSliceUploadFile && !this.deepTracker) {
+        return;
+      }
+      var eventCode = 'qcloud_track_cos_sdk';
+      if (this.delay === 0) {
+        // 实时上报
+        this.beacon && this.beacon.onDirectUserAction(eventCode, formattedParams);
+      } else {
+        // 周期性上报
+        this.beacon && this.beacon.onUserAction(eventCode, formattedParams);
+      }
+    }
+
+    // 上报 cls
+  }, {
+    key: "sendEventsToCLS",
+    value: function sendEventsToCLS(formattedParams) {
+      // 是否实时上报
+      var immediate = !!(this.delay === 0);
+      this.clsReporter.log(formattedParams, immediate);
+    }
+
+    // 生成子实例，与父所属一个链路，可用于分块上传内部流程上报单个分块操作
+  }, {
+    key: "generateSubTracker",
+    value: function generateSubTracker(subParams) {
+      Object.assign(subParams, {
+        parent: this,
+        deepTracker: this.deepTracker,
+        traceId: this.params.traceId,
+        bucket: this.params.bucket,
+        region: this.params.region,
+        accelerate: this.params.accelerate,
+        fileKey: this.params.requestPath,
+        customId: this.params.customId,
+        delay: this.params.delay,
+        clsReporter: this.clsReporter
+      });
+      return new Tracker(subParams);
+    }
+  }]);
+  return Tracker;
+}();
+module.exports = Tracker;
+
+/***/ }),
+
+/***/ "./src/util.js":
+/*!*********************!*\
+  !*** ./src/util.js ***!
+  \*********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var md5 = __webpack_require__(/*! ../lib/md5 */ "./lib/md5.js");
+var CryptoJS = __webpack_require__(/*! ../lib/crypto */ "./lib/crypto.js");
+var base64 = __webpack_require__(/*! ../lib/base64 */ "./lib/base64.js");
+var btoa = base64.btoa;
+var wxfs = wx.getFileSystemManager();
+var Tracker = __webpack_require__(/*! ./tracker */ "./src/tracker.js");
+var _require = __webpack_require__(/*! fast-xml-parser */ "./node_modules/fast-xml-parser/src/fxp.js"),
+  XMLParser = _require.XMLParser,
+  XMLBuilder = _require.XMLBuilder;
+var xmlParser = new XMLParser({
+  ignoreDeclaration: true,
+  // 忽略 XML 声明
+  ignoreAttributes: true,
+  // 忽略属性
+  parseTagValue: false,
+  // 关闭自动解析
+  trimValues: false // 关闭默认 trim
+});
+var xmlBuilder = new XMLBuilder();
+
+// 删掉不需要的#text
+var textNodeName = '#text';
+var deleteTextNodes = function deleteTextNodes(obj) {
+  if (!isObject(obj)) return;
+  for (var i in obj) {
+    var item = obj[i];
+    if (typeof item === 'string') {
+      if (i === textNodeName) {
+        delete obj[i];
+      }
+    } else if (Array.isArray(item)) {
+      item.forEach(function (i) {
+        deleteTextNodes(i);
+      });
+    } else if (isObject(item)) {
+      deleteTextNodes(item);
+    }
+  }
+};
+
+// XML 对象转 JSON 对象
+var xml2json = function xml2json(bodyStr) {
+  var json = xmlParser.parse(bodyStr);
+  deleteTextNodes(json);
+  return json;
+};
+
+// JSON 对象转 XML 对象
+var json2xml = function json2xml(json) {
+  var xml = xmlBuilder.build(json);
+  return xml;
+};
+function camSafeUrlEncode(str) {
+  return encodeURIComponent(str).replace(/!/g, '%21').replace(/'/g, '%27').replace(/$/g, '%28').replace(/$/g, '%29').replace(/\*/g, '%2A');
+}
+function getObjectKeys(obj, forKey) {
+  var list = [];
+  for (var key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      list.push(forKey ? camSafeUrlEncode(key).toLowerCase() : key);
+    }
+  }
+  return list.sort(function (a, b) {
+    a = a.toLowerCase();
+    b = b.toLowerCase();
+    return a === b ? 0 : a > b ? 1 : -1;
+  });
+}
+
+/**
+ * obj转为string
+ * @param  {Object}  obj                需要转的对象，必须
+ * @param  {Boolean} lowerCaseKey       key是否转为小写，默认false，非必须
+ * @return {String}  data               返回字符串
+ */
+var obj2str = function obj2str(obj, lowerCaseKey) {
+  var i, key, val;
+  var list = [];
+  var keyList = getObjectKeys(obj);
+  for (i = 0; i < keyList.length; i++) {
+    key = keyList[i];
+    val = obj[key] === undefined || obj[key] === null ? '' : '' + obj[key];
+    key = lowerCaseKey ? camSafeUrlEncode(key).toLowerCase() : camSafeUrlEncode(key);
+    val = camSafeUrlEncode(val) || '';
+    list.push(key + '=' + val);
+  }
+  return list.join('&');
+};
+
+// 可以签入签名的headers
+var signHeaders = ['cache-control', 'content-disposition', 'content-encoding', 'content-length', 'content-md5', 'content-type', 'expect', 'expires', 'host', 'if-match', 'if-modified-since', 'if-none-match', 'if-unmodified-since', 'origin', 'range', 'transfer-encoding', 'pic-operations'];
+var getSignHeaderObj = function getSignHeaderObj(headers) {
+  var signHeaderObj = {};
+  for (var i in headers) {
+    var key = i.toLowerCase();
+    if (key.indexOf('x-cos-') > -1 || key.indexOf('x-ci-') > -1 || signHeaders.indexOf(key) > -1) {
+      signHeaderObj[i] = headers[i];
+    }
+  }
+  return signHeaderObj;
+};
+
+//测试用的key后面可以去掉
+var getAuth = function getAuth(opt) {
+  opt = opt || {};
+  var SecretId = opt.SecretId;
+  var SecretKey = opt.SecretKey;
+  var KeyTime = opt.KeyTime;
+  var method = (opt.method || opt.Method || 'get').toLowerCase();
+  var queryParams = clone(opt.Query || opt.params || {});
+  var headers = getSignHeaderObj(clone(opt.Headers || opt.headers || {}));
+  var Key = opt.Key || '';
+  var pathname;
+  if (opt.UseRawKey) {
+    pathname = opt.Pathname || opt.pathname || '/' + Key;
+  } else {
+    pathname = opt.Pathname || opt.pathname || Key;
+    pathname.indexOf('/') !== 0 && (pathname = '/' + pathname);
+  }
+
+  // ForceSignHost明确传入false才不加入host签名
+  var forceSignHost = opt.ForceSignHost === false ? false : true;
+
+  // 如果有传入存储桶，那么签名默认加 Host 参与计算，避免跨桶访问
+  if (!headers.Host && !headers.host && opt.Bucket && opt.Region && forceSignHost) headers.Host = opt.Bucket + '.cos.' + opt.Region + '.myqcloud.com';
+  if (!SecretId) return console.error('missing param SecretId');
+  if (!SecretKey) return console.error('missing param SecretKey');
+
+  // 签名有效起止时间
+  var now = Math.round(getSkewTime(opt.SystemClockOffset) / 1000) - 1;
+  var exp = now;
+  var Expires = opt.Expires || opt.expires;
+  if (Expires === undefined) {
+    exp += 900; // 签名过期时间为当前 + 900s
+  } else {
+    exp += Expires * 1 || 0;
+  }
+
+  // 要用到的 Authorization 参数列表
+  var qSignAlgorithm = 'sha1';
+  var qAk = SecretId;
+  var qSignTime = KeyTime || now + ';' + exp;
+  var qKeyTime = KeyTime || now + ';' + exp;
+  var qHeaderList = getObjectKeys(headers, true).join(';').toLowerCase();
+  var qUrlParamList = getObjectKeys(queryParams, true).join(';').toLowerCase();
+
+  // 签名算法说明文档：https://www.qcloud.com/document/product/436/7778
+  // 步骤一：计算 SignKey
+  var signKey = CryptoJS.HmacSHA1(qKeyTime, SecretKey).toString();
+
+  // 步骤二：构成 FormatString
+  var formatString = [method, pathname, util.obj2str(queryParams, true), util.obj2str(headers, true), ''].join('\n');
+
+  // 步骤三：计算 StringToSign
+  var stringToSign = ['sha1', qSignTime, CryptoJS.SHA1(formatString).toString(), ''].join('\n');
+
+  // 步骤四：计算 Signature
+  var qSignature = CryptoJS.HmacSHA1(stringToSign, signKey).toString();
+
+  // 步骤五：构造 Authorization
+  var authorization = ['q-sign-algorithm=' + qSignAlgorithm, 'q-ak=' + qAk, 'q-sign-time=' + qSignTime, 'q-key-time=' + qKeyTime, 'q-header-list=' + qHeaderList, 'q-url-param-list=' + qUrlParamList, 'q-signature=' + qSignature].join('&');
+  return authorization;
+};
+var getSourceParams = function getSourceParams(source) {
+  var parser = this.options.CopySourceParser;
+  if (parser) return parser(source);
+  var m = source.match(/^([^.]+-\d+)\.cos(v6|-cdc|-internal)?\.([^.]+)\.((myqcloud\.com)|(tencentcos\.cn))\/(.+)$/);
+  if (!m) return null;
+  return {
+    Bucket: m[1],
+    Region: m[3],
+    Key: m[7]
+  };
+};
+var noop = function noop() {};
+
+// 清除对象里值为的 undefined 或 null 的属性
+var clearKey = function clearKey(obj) {
+  var retObj = {};
+  for (var key in obj) {
+    if (obj.hasOwnProperty(key) && obj[key] !== undefined && obj[key] !== null) {
+      retObj[key] = obj[key];
+    }
+  }
+  return retObj;
+};
+
+// 获取文件分片
+var fileSlice = function fileSlice(FilePath, start, end, callback) {
+  if (FilePath) {
+    wxfs.readFile({
+      filePath: FilePath,
+      position: start,
+      length: end - start,
+      success: function success(res) {
+        callback(res.data);
+      },
+      fail: function fail() {
+        callback(null);
+      }
+    });
+  } else {
+    callback(null);
+  }
+};
+
+// 获取文件内容的 MD5
+var getBodyMd5 = function getBodyMd5(UploadCheckContentMd5, Body, callback) {
+  callback = callback || noop;
+  if (UploadCheckContentMd5) {
+    if (Body && Body instanceof ArrayBuffer) {
+      util.getFileMd5(Body, function (err, md5) {
+        callback(md5);
+      });
+    } else {
+      callback();
+    }
+  } else {
+    callback();
+  }
+};
+
+// 获取文件 md5 值
+var getFileMd5 = function getFileMd5(body, callback) {
+  var hash = md5(body);
+  callback && callback(hash);
+  return hash;
+};
+function clone(obj) {
+  return map(obj, function (v) {
+    return _typeof(v) === 'object' && v !== null ? clone(v) : v;
+  });
+}
+function attr(obj, name, defaultValue) {
+  return obj && name in obj ? obj[name] : defaultValue;
+}
+function extend(target, source) {
+  each(source, function (val, key) {
+    target[key] = source[key];
+  });
+  return target;
+}
+function isArray(arr) {
+  return arr instanceof Array;
+}
+function isObject(obj) {
+  return Object.prototype.toString.call(obj) === '[object Object]';
+}
+function isInArray(arr, item) {
+  var flag = false;
+  for (var i = 0; i < arr.length; i++) {
+    if (item === arr[i]) {
+      flag = true;
+      break;
+    }
+  }
+  return flag;
+}
+function makeArray(arr) {
+  return isArray(arr) ? arr : [arr];
+}
+function each(obj, fn) {
+  for (var i in obj) {
+    if (obj.hasOwnProperty(i)) {
+      fn(obj[i], i);
+    }
+  }
+}
+function map(obj, fn) {
+  var o = isArray(obj) ? [] : {};
+  for (var i in obj) {
+    if (obj.hasOwnProperty(i)) {
+      o[i] = fn(obj[i], i);
+    }
+  }
+  return o;
+}
+function filter(obj, fn) {
+  var iaArr = isArray(obj);
+  var o = iaArr ? [] : {};
+  for (var i in obj) {
+    if (obj.hasOwnProperty(i)) {
+      if (fn(obj[i], i)) {
+        if (iaArr) {
+          o.push(obj[i]);
+        } else {
+          o[i] = obj[i];
+        }
+      }
+    }
+  }
+  return o;
+}
+var binaryBase64 = function binaryBase64(str) {
+  var i,
+    len,
+    _char,
+    res = '';
+  for (i = 0, len = str.length / 2; i < len; i++) {
+    _char = parseInt(str[i * 2] + str[i * 2 + 1], 16);
+    res += String.fromCharCode(_char);
+  }
+  return btoa(res);
+};
+var uuid = function uuid() {
+  var S4 = function S4() {
+    return ((1 + Math.random()) * 0x10000 | 0).toString(16).substring(1);
+  };
+  return S4() + S4() + '-' + S4() + '-' + S4() + '-' + S4() + '-' + S4() + S4() + S4();
+};
+var hasMissingParams = function hasMissingParams(apiName, params) {
+  var Bucket = params.Bucket;
+  var Region = params.Region;
+  var Key = params.Key;
+  if (apiName.indexOf('Bucket') > -1 || apiName === 'deleteMultipleObject' || apiName === 'multipartList' || apiName === 'listObjectVersions') {
+    if (!Bucket) return 'Bucket';
+    if (!Region) return 'Region';
+  } else if (apiName.indexOf('Object') > -1 || apiName.indexOf('multipart') > -1 || apiName === 'sliceUploadFile' || apiName === 'abortUploadTask' || apiName === 'uploadFile') {
+    if (!Bucket) return 'Bucket';
+    if (!Region) return 'Region';
+    if (!Key) return 'Key';
+  }
+  return false;
+};
+var formatParams = function formatParams(apiName, params) {
+  // 复制参数对象
+  params = extend({}, params);
+
+  // 统一处理 Headers
+  if (apiName !== 'getAuth' && apiName !== 'getV4Auth' && apiName !== 'getObjectUrl') {
+    var Headers = params.Headers || {};
+    if (params && _typeof(params) === 'object') {
+      (function () {
+        for (var key in params) {
+          if (params.hasOwnProperty(key) && key.indexOf('x-cos-') > -1) {
+            Headers[key] = params[key];
+          }
+        }
+      })();
+      var headerMap = {
+        // params headers
+        'x-cos-mfa': 'MFA',
+        'Content-MD5': 'ContentMD5',
+        'Content-Length': 'ContentLength',
+        'Content-Type': 'ContentType',
+        Expect: 'Expect',
+        Expires: 'Expires',
+        'Cache-Control': 'CacheControl',
+        'Content-Disposition': 'ContentDisposition',
+        'Content-Encoding': 'ContentEncoding',
+        Range: 'Range',
+        'If-Modified-Since': 'IfModifiedSince',
+        'If-Unmodified-Since': 'IfUnmodifiedSince',
+        'If-Match': 'IfMatch',
+        'If-None-Match': 'IfNoneMatch',
+        'x-cos-copy-source': 'CopySource',
+        'x-cos-copy-source-Range': 'CopySourceRange',
+        'x-cos-metadata-directive': 'MetadataDirective',
+        'x-cos-copy-source-If-Modified-Since': 'CopySourceIfModifiedSince',
+        'x-cos-copy-source-If-Unmodified-Since': 'CopySourceIfUnmodifiedSince',
+        'x-cos-copy-source-If-Match': 'CopySourceIfMatch',
+        'x-cos-copy-source-If-None-Match': 'CopySourceIfNoneMatch',
+        'x-cos-acl': 'ACL',
+        'x-cos-grant-read': 'GrantRead',
+        'x-cos-grant-write': 'GrantWrite',
+        'x-cos-grant-full-control': 'GrantFullControl',
+        'x-cos-grant-read-acp': 'GrantReadAcp',
+        'x-cos-grant-write-acp': 'GrantWriteAcp',
+        'x-cos-storage-class': 'StorageClass',
+        'x-cos-traffic-limit': 'TrafficLimit',
+        'x-cos-mime-limit': 'MimeLimit',
+        'x-cos-forbid-overwrite': 'ForbidOverwrite',
+        // SSE-C
+        'x-cos-server-side-encryption-customer-algorithm': 'SSECustomerAlgorithm',
+        'x-cos-server-side-encryption-customer-key': 'SSECustomerKey',
+        'x-cos-server-side-encryption-customer-key-MD5': 'SSECustomerKeyMD5',
+        // SSE-COS、SSE-KMS
+        'x-cos-server-side-encryption': 'ServerSideEncryption',
+        'x-cos-server-side-encryption-cos-kms-key-id': 'SSEKMSKeyId',
+        'x-cos-server-side-encryption-context': 'SSEContext',
+        // 上传时图片处理
+        'Pic-Operations': 'PicOperations'
+      };
+      util.each(headerMap, function (paramKey, headerKey) {
+        if (params[paramKey] !== undefined) {
+          Headers[headerKey] = params[paramKey];
+        }
+      });
+      params.Headers = clearKey(Headers);
+    }
+  }
+  return params;
+};
+var apiWrapper = function apiWrapper(apiName, apiFn) {
+  return function (params, callback) {
+    var self = this;
+
+    // 处理参数
+    if (typeof params === 'function') {
+      callback = params;
+      params = {};
+    }
+
+    // 整理参数格式
+    params = formatParams(apiName, params);
+
+    // tracker传递
+    var tracker;
+    if (self.options.EnableReporter) {
+      if (params.calledBySdk === 'sliceUploadFile' || params.calledBySdk === 'sliceCopyFile') {
+        // 分块上传内部方法使用sliceUploadFile的子链路
+        tracker = params.tracker && params.tracker.generateSubTracker({
+          apiName: apiName
+        });
+      } else if (['uploadFile', 'uploadFiles'].includes(apiName)) {
+        // uploadFile、uploadFiles方法在内部处理，此处不处理
+        tracker = null;
+      } else {
+        var fileSize = 0;
+        if (params.Body) {
+          fileSize = typeof params.Body === 'string' ? params.Body.length : params.Body.size || params.Body.byteLength || 0;
+        }
+        var accelerate = self.options.UseAccelerate || typeof self.options.Domain === 'string' && self.options.Domain.includes('accelerate.');
+        tracker = new Tracker({
+          Beacon: self.options.BeaconReporter,
+          clsReporter: self.options.ClsReporter,
+          bucket: params.Bucket,
+          region: params.Region,
+          apiName: apiName,
+          realApi: apiName,
+          accelerate: accelerate,
+          fileKey: params.Key,
+          fileSize: fileSize,
+          deepTracker: self.options.DeepTracker,
+          customId: self.options.CustomId,
+          delay: self.options.TrackerDelay
+        });
+      }
+    }
+    params.tracker = tracker;
+
+    // 代理回调函数
+    var formatResult = function formatResult(result) {
+      if (result && result.headers) {
+        result.headers['x-ci-request-id'] && (result.RequestId = result.headers['x-ci-request-id']);
+        result.headers['x-cos-request-id'] && (result.RequestId = result.headers['x-cos-request-id']);
+        result.headers['x-cos-version-id'] && (result.VersionId = result.headers['x-cos-version-id']);
+        result.headers['x-cos-delete-marker'] && (result.DeleteMarker = result.headers['x-cos-delete-marker']);
+      }
+      return result;
+    };
+    var _callback = function _callback(err, data) {
+      // 格式化上报参数并上报
+      tracker && tracker.report(err, data);
+      callback && callback(formatResult(err), formatResult(data));
+    };
+    var checkParams = function checkParams() {
+      if (apiName !== 'getService' && apiName !== 'abortUploadTask') {
+        // 判断参数是否完整
+        var missingResult = hasMissingParams(apiName, params);
+        if (missingResult) {
+          return 'missing param ' + missingResult;
+        }
+        // 判断 region 格式
+        if (params.Region) {
+          if (params.Region.indexOf('cos.') > -1) {
+            return 'param Region should not be start with "cos."';
+          } else if (!/^([a-z\d-]+)$/.test(params.Region)) {
+            return 'Region format error.';
+          }
+          // 判断 region 格式
+          if (!self.options.CompatibilityMode && params.Region.indexOf('-') === -1 && params.Region !== 'yfb' && params.Region !== 'default' && params.Region !== 'accelerate') {
+            console.warn('warning: param Region format error, find help here: https://cloud.tencent.com/document/product/436/6224');
+          }
+        }
+        // 兼容不带 AppId 的 Bucket
+        if (params.Bucket) {
+          if (!/^([a-z\d-]+)-(\d+)$/.test(params.Bucket)) {
+            if (params.AppId) {
+              params.Bucket = params.Bucket + '-' + params.AppId;
+            } else if (self.options.AppId) {
+              params.Bucket = params.Bucket + '-' + self.options.AppId;
+            } else {
+              return 'Bucket should format as "test-1250000000".';
+            }
+          }
+          if (params.AppId) {
+            console.warn('warning: AppId has been deprecated, Please put it at the end of parameter Bucket(E.g Bucket:"test-1250000000" ).');
+            delete params.AppId;
+          }
+        }
+        // 如果 Key 是 / 开头，强制去掉第一个 /
+        if (params.Key && params.Key.substr(0, 1) === '/') {
+          params.Key = params.Key.substr(1);
+        }
+      }
+    };
+    var errMsg = checkParams();
+    var isSync = ['getAuth', 'getObjectUrl'].includes(apiName);
+    if (!isSync && !callback) {
+      return new Promise(function (resolve, reject) {
+        callback = function callback(err, data) {
+          err ? reject(err) : resolve(data);
+        };
+        if (errMsg) return _callback({
+          error: errMsg
+        });
+        apiFn.call(self, params, _callback);
+      });
+    } else {
+      if (errMsg) return _callback({
+        error: errMsg
+      });
+      var res = apiFn.call(self, params, _callback);
+      if (isSync) return res;
+    }
+  };
+};
+var throttleOnProgress = function throttleOnProgress(total, onProgress) {
+  var self = this;
+  var size0 = 0;
+  var size1 = 0;
+  var time0 = Date.now();
+  var time1;
+  var timer;
+  function update() {
+    timer = 0;
+    if (onProgress && typeof onProgress === 'function') {
+      time1 = Date.now();
+      var speed = Math.max(0, Math.round((size1 - size0) / ((time1 - time0) / 1000) * 100) / 100) || 0;
+      var percent;
+      if (size1 === 0 && total === 0) {
+        percent = 1;
+      } else {
+        percent = Math.floor(size1 / total * 100) / 100 || 0;
+      }
+      time0 = time1;
+      size0 = size1;
+      try {
+        onProgress({
+          loaded: size1,
+          total: total,
+          speed: speed,
+          percent: percent
+        });
+      } catch (e) {}
+    }
+  }
+  return function (info, immediately) {
+    if (info) {
+      size1 = info.loaded;
+      total = info.total;
+    }
+    if (immediately) {
+      clearTimeout(timer);
+      update();
+    } else {
+      if (timer) return;
+      timer = setTimeout(update, self.options.ProgressInterval);
+    }
+  };
+};
+
+// 通过FilePath获取上传文件的内容
+var getFileBody = function getFileBody(FilePath) {
+  return new Promise(function (resolve, reject) {
+    wxfs.readFile({
+      filePath: FilePath,
+      success: function success(res) {
+        resolve(res.data);
+      },
+      fail: function fail(res) {
+        reject((res === null || res === void 0 ? void 0 : res.errMsg) || '');
+      }
+    });
+  });
+};
+var getFileSize = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, params, callback) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!(api === 'postObject')) {
+            _context.next = 4;
+            break;
+          }
+          callback();
+          _context.next = 21;
+          break;
+        case 4:
+          if (!(api === 'putObject')) {
+            _context.next = 20;
+            break;
+          }
+          if (!(params.Body === undefined && params.FilePath)) {
+            _context.next = 17;
+            break;
+          }
+          _context.prev = 6;
+          _context.next = 9;
+          return getFileBody(params.FilePath);
+        case 9:
+          params.Body = _context.sent;
+          _context.next = 17;
+          break;
+        case 12:
+          _context.prev = 12;
+          _context.t0 = _context["catch"](6);
+          params.Body = undefined;
+          callback({
+            error: "readFile error, ".concat(_context.t0)
+          });
+          return _context.abrupt("return");
+        case 17:
+          if (params.Body !== undefined) {
+            params.ContentLength = params.Body.byteLength;
+            callback(null, params.ContentLength);
+          } else {
+            callback({
+              error: 'missing param Body'
+            });
+          }
+          _context.next = 21;
+          break;
+        case 20:
+          if (params.FilePath) {
+            wxfs.stat({
+              path: params.FilePath,
+              success: function success(res) {
+                var stats = res.stats;
+                params.FileStat = stats;
+                params.FileStat.FilePath = params.FilePath;
+                var size = stats.isDirectory() ? 0 : stats.size;
+                params.ContentLength = size = size || 0;
+                callback(null, size);
+              },
+              fail: function fail(err) {
+                callback(err);
+              }
+            });
+          } else {
+            callback({
+              error: 'missing param FilePath'
+            });
+          }
+        case 21:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[6, 12]]);
+  }));
+  return function getFileSize(_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+// 通过FilePath获取上传文件的大小
+var getFileSizeByPath = function getFileSizeByPath(filePath) {
+  return new Promise(function (resolve, reject) {
+    wxfs.stat({
+      path: filePath,
+      success: function success(res) {
+        var stats = res.stats;
+        var size = stats.isDirectory() ? 0 : stats.size;
+        resolve(size);
+      },
+      fail: function fail(res) {
+        reject((res === null || res === void 0 ? void 0 : res.errMsg) || '');
+      }
+    });
+  });
+};
+var getSkewTime = function getSkewTime(offset) {
+  return Date.now() + (offset || 0);
+};
+var compareVersion = function compareVersion(v1, v2) {
+  if (!v1 || !v2) return -1;
+  v1 = v1.split('.');
+  v2 = v2.split('.');
+  var len = Math.max(v1.length, v2.length);
+  while (v1.length < len) {
+    v1.push('0');
+  }
+  while (v2.length < len) {
+    v2.push('0');
+  }
+  for (var i = 0; i < len; i++) {
+    var num1 = parseInt(v1[i]);
+    var num2 = parseInt(v2[i]);
+    if (num1 > num2) {
+      return 1;
+    } else if (num1 < num2) {
+      return -1;
+    }
+  }
+  return 0;
+};
+var canFileSlice = function () {
+  var appBaseInfo = {};
+  var deviceInfo = {};
+  if (wx.canIUse('getAppBaseInfo')) {
+    appBaseInfo = wx.getAppBaseInfo() || {};
+  }
+  if (wx.canIUse('getDeviceInfo')) {
+    deviceInfo = wx.getDeviceInfo() || {};
+  }
+  var sdkVersion = appBaseInfo.SDKVersion;
+  var platform = deviceInfo.platform;
+  var support = compareVersion(sdkVersion, '2.10.0') >= 0;
+  var needWarning = !support && platform === 'devtools';
+  return function () {
+    if (needWarning) console.warn('当前小程序版本小于 2.10.0，不支持分片上传，请更新软件。');
+    needWarning = false;
+    return support;
+  };
+}();
+var isCIHost = function isCIHost(url) {
+  return /^https?:\/\/([^/]+\.)?ci\.[^/]+/.test(url);
+};
+var error = function error(err, opt) {
+  var sourceErr = err;
+  err.message = err.message || null;
+  if (typeof opt === 'string') {
+    err.error = opt;
+    err.message = opt;
+  } else if (_typeof(opt) === 'object' && opt !== null) {
+    extend(err, opt);
+    if (opt.code || opt.name) err.code = opt.code || opt.name;
+    if (opt.message) err.message = opt.message;
+    if (opt.stack) err.stack = opt.stack;
+  }
+  if (typeof Object.defineProperty === 'function') {
+    Object.defineProperty(err, 'name', {
+      writable: true,
+      enumerable: false
+    });
+    Object.defineProperty(err, 'message', {
+      enumerable: true
+    });
+  }
+  err.name = opt && opt.name || err.name || err.code || 'Error';
+  if (!err.code) err.code = err.name;
+  if (!err.error) err.error = clone(sourceErr); // 兼容老的错误格式
+
+  return err;
+};
+var encodeBase64 = function encodeBase64(str, safe) {
+  var base64Str = base64.encode(str);
+  // 万象使用的安全base64格式需要特殊处理
+  if (safe) {
+    base64Str = base64Str.replaceAll('+', '-').replaceAll('/', '_').replaceAll('=', '');
+  }
+  return base64Str;
+};
+var simplifyPath = function simplifyPath(path) {
+  var names = path.split('/');
+  var stack = [];
+  var _iterator = _createForOfIteratorHelper(names),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var name = _step.value;
+      if (name === '..') {
+        if (stack.length) {
+          stack.pop();
+        }
+      } else if (name.length && name !== '.') {
+        stack.push(name);
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return '/' + stack.join('/');
+};
+
+// 将ArrayBuffer转换为字符串
+var arrayBufferToString = function arrayBufferToString(arrayBuffer) {
+  var decoder = new TextDecoder('utf-8');
+  return decoder.decode(arrayBuffer);
+};
+
+// 解析响应体，兼容 xml、json
+var parseResBody = function parseResBody(responseBody) {
+  var json;
+  if (responseBody && typeof responseBody === 'string') {
+    var trimBody = responseBody.trim();
+    var isXml = trimBody.indexOf('<') === 0;
+    var isJson = trimBody.indexOf('{') === 0;
+    if (isXml) {
+      // xml 解析，解析失败返回{}
+      json = util.xml2json(responseBody) || {};
+    } else if (isJson) {
+      // json解析，解析失败返回原始 Body
+      try {
+        // 替换 json 中的换行符为空格，否则解析会出错
+        var formatBody = responseBody.replace(/\n/g, ' ');
+        var parsedBody = JSON.parse(formatBody);
+        // 确保解析出 json 对象
+        if (Object.prototype.toString.call(parsedBody) === '[object Object]') {
+          json = parsedBody;
+        } else {
+          json = responseBody;
+        }
+      } catch (e) {
+        json = responseBody;
+      }
+    } else {
+      json = responseBody;
+    }
+  } else {
+    json = responseBody || {};
+  }
+  return json;
+};
+var util = {
+  noop: noop,
+  formatParams: formatParams,
+  apiWrapper: apiWrapper,
+  xml2json: xml2json,
+  json2xml: json2xml,
+  md5: md5,
+  clearKey: clearKey,
+  fileSlice: fileSlice,
+  getBodyMd5: getBodyMd5,
+  getFileMd5: getFileMd5,
+  binaryBase64: binaryBase64,
+  extend: extend,
+  isArray: isArray,
+  isInArray: isInArray,
+  makeArray: makeArray,
+  each: each,
+  map: map,
+  filter: filter,
+  clone: clone,
+  attr: attr,
+  uuid: uuid,
+  camSafeUrlEncode: camSafeUrlEncode,
+  throttleOnProgress: throttleOnProgress,
+  getFileSize: getFileSize,
+  getFileSizeByPath: getFileSizeByPath,
+  getSkewTime: getSkewTime,
+  obj2str: obj2str,
+  getAuth: getAuth,
+  compareVersion: compareVersion,
+  canFileSlice: canFileSlice,
+  isCIHost: isCIHost,
+  error: error,
+  getSourceParams: getSourceParams,
+  encodeBase64: encodeBase64,
+  simplifyPath: simplifyPath,
+  arrayBufferToString: arrayBufferToString,
+  parseResBody: parseResBody
+};
+module.exports = util;
+
+/***/ })
+
+/******/ });
+});
\ No newline at end of file
diff --git a/utils/fadan_utils.py b/utils/fadan_utils.py
new file mode 100644
index 0000000..c513850
--- /dev/null
+++ b/utils/fadan_utils.py
@@ -0,0 +1,140 @@
+# utils/fadan_utils.py
+from dingdan.models import Fadan
+import logging
+
+logger = logging.getLogger('xiaochengxu')
+
+
+def check_fadan_qiangdan_eligible(yonghuid: str, action_type: int) -> tuple:
+    """
+    通用罚单资格检查。
+
+    参数:
+        yonghuid     : 被检查的用户 yonghuid
+        action_type  : 1 = 抢单, 2 = 提现
+
+    返回:
+        (is_eligible: bool, message: str)
+        True 允许操作，False 返回拦截原因。
+    """
+    try:
+        if action_type == 1:
+            # 抢单：仅当存在“影响抢单”且“未解决”的罚单时拦截（待缴纳或申诉中）
+            blocked = Fadan.objects.filter(
+                beichufa_id=yonghuid,
+                yingxiang_qiangdan=1,
+                zhuangtai__in=[1, 3]  # 1=待缴纳, 3=申诉中
+            ).exists()
+            if blocked:
+                logger.info(f"用户 {yonghuid} 抢单被拦截：存在未解决的影响抢单罚单")
+                return (False, "您有未缴纳或申诉中的罚单，请先处理后再抢单")
+            return (True, "无罚单限制")
+
+        elif action_type == 2:
+            # 提现：只要存在任意未解决的罚单（待缴纳/申诉中），不论是否影响抢单，一律禁止提现
+            blocked = Fadan.objects.filter(
+                beichufa_id=yonghuid,
+                zhuangtai__in=[1, 3]  # 1=待缴纳, 3=申诉中
+            ).exists()
+            if blocked:
+                logger.info(f"用户 {yonghuid} 提现被拦截：存在未解决的罚单")
+                return (False, "您有未处理完的罚单，需全部完成或驳回后方可提现")
+            return (True, "罚单状态正常，可提现")
+
+        else:
+            logger.warning(f"未知的检查类型: {action_type}")
+            return (False, "罚单查询系统异常（无效的检查类型）")
+
+    except Exception as e:
+        logger.error(f"检查用户 {yonghuid} 罚单状态异常: {e}", exc_info=True)
+        # 安全起见，异常时禁止操作
+        return (False, "罚单查询系统繁忙，请稍后重试")
+
+
+
+import logging
+from django.db import transaction
+from decimal import Decimal
+from dingdan.models import Fadan, FadanFenhong, FadanFenhongLilv
+
+logger = logging.getLogger('xiaochengxu')
+
+def fadan_fenhong(fadan_id):
+    """
+    罚款缴纳后，给申请处罚人累加分红。
+    自动映射身份，异常不抛出，不影响主流程。
+    """
+    try:
+        # 1. 查询罚单
+        try:
+            fadan = Fadan.objects.get(id=fadan_id)
+        except Fadan.DoesNotExist:
+            logger.warning(f"罚单 {fadan_id} 不存在，分红跳过")
+            return
+
+        if fadan.zhuangtai != 2:
+            logger.info(f"罚单 {fadan_id} 状态非已缴纳，不分红")
+            return
+
+        fenhongzhe_id = fadan.shenqing_chufa or ''
+        shenfen_in_fadan = fadan.shenqingren_shenfen   # 罚单中的申请人身份
+        jine = fadan.fakuanjine
+
+        if not fenhongzhe_id or jine <= 0:
+            logger.info(f"罚单 {fadan_id} 缺少申请处罚人或金额为0，不分红")
+            return
+
+        # 2. 直接用罚单身份的原始值查询费率（费率表 shenfen 与之含义一致）
+        rate_record = FadanFenhongLilv.objects.filter(shenfen=shenfen_in_fadan).first()
+        if not rate_record or rate_record.lilv <= 0:
+            logger.info(f"身份 {shenfen_in_fadan} 无有效分红费率，不分红")
+            return
+
+        rate = rate_record.lilv
+
+        # 3. 计算分红金额
+        amount = (jine * rate).quantize(Decimal('0.01'))
+        if amount <= 0:
+            logger.info(f"罚单 {fadan_id} 分红金额为0，不分红")
+            return
+
+        # 4. 硬编码映射：罚单身份 → 分红记录表身份
+        SHENFEN_MAP = {
+            1: 2,   # 客服 → 客服
+            2: 5,   # 售后 → 售后
+            3: 3,   # 管理员 → 平台管理者
+            4: 4,   # 店铺 → 店铺
+            5: 1,   # 商家 → 商家
+        }
+        shenfen_in_fenhong = SHENFEN_MAP.get(shenfen_in_fadan)
+        if shenfen_in_fenhong is None:
+            logger.info(f"罚单 {fadan_id} 身份 {shenfen_in_fadan} 无对应的分红记录映射，不分红")
+            return
+
+        # 5. 事务累加分红记录（同一用户+身份只保留一条记录）
+        with transaction.atomic():
+            record = FadanFenhong.objects.select_for_update().filter(
+                fenhongzhe_id=fenhongzhe_id,
+                shenfen=shenfen_in_fenhong    # 使用映射后的身份值
+            ).first()
+
+            if record:
+                record.zonge += amount
+                record.ketixian_fenhong += amount
+                record.fenhong_cishu += 1
+                record.yingde_lilv = rate
+                record.save()
+            else:
+                FadanFenhong.objects.create(
+                    fenhongzhe_id=fenhongzhe_id,
+                    shenfen=shenfen_in_fenhong,
+                    zonge=amount,
+                    ketixian_fenhong=amount,
+                    fenhong_cishu=1,
+                    yingde_lilv=rate,
+                )
+
+        logger.info(f"罚单 {fadan_id} 分红完成：用户 {fenhongzhe_id} 身份 {shenfen_in_fenhong} 金额 {amount}")
+
+    except Exception as e:
+        logger.error(f"罚单 {fadan_id} 分红异常：{e}", exc_info=True)
\ No newline at end of file
diff --git a/utils/goeasy_service.py b/utils/goeasy_service.py
new file mode 100644
index 0000000..932ddd4
--- /dev/null
+++ b/utils/goeasy_service.py
@@ -0,0 +1,103 @@
+# apps/dingdan/utils/goeasy_service.py
+import requests
+import json
+import logging
+from django.conf import settings
+
+logger = logging.getLogger(__name__)
+
+
+class GoEasyService:
+    """
+    GoEasy聊天服务工具类
+    用于建立用户间的私聊关系
+    """
+
+    def __init__(self):
+        self.appkey = settings.GOEASY_APPKEY  # 需要在settings.py中配置
+        self.secret = settings.GOEASY_SECRET  # GoEasy控制台获取的Secret
+        self.rest_host = "https://rest-hz.goeasy.io"  # 杭州区域
+
+    def create_private_chat(self, user1_id, user2_id, user1_info=None, user2_info=None):
+        """
+        建立两个用户间的私聊关系
+
+        Args:
+            user1_id: 用户1在GoEasy的标识
+            user2_id: 用户2在GoEasy的标识
+            user1_info: 用户1的附加信息 (avatar, nickname等)
+            user2_info: 用户2的附加信息
+        Returns:
+            bool: 是否成功
+        """
+        try:
+            # 构造消息数据
+            message_data = {
+                "appkey": self.appkey,
+                "senderId": "system_admin",
+                "senderData": {
+                    "avatar": "/static/system_avatar.png",
+                    "name": "系统通知"
+                },
+                "to": {
+                    "type": "private",
+                    "id": user1_id,
+                    "data": user2_info or {
+                        "avatar": "",
+                        "name": f"用户{user2_id}"
+                    }
+                },
+                "type": "system",
+                "payload": {
+                    "action": "create_chat",
+                    "partner_id": user2_id,
+                    "message": "已为您建立聊天连接"
+                },
+                "notification": {
+                    "title": "新聊天",
+                    "body": "您有新的聊天连接"
+                }
+            }
+
+            # 发送请求
+            headers = {
+                "Content-Type": "application/json",
+                "Authorization": f"Bearer {self.secret}"
+            }
+
+            response = requests.post(
+                f"{self.rest_host}/v2/im/message",
+                headers=headers,
+                json=message_data,
+                timeout=5  # 5秒超时
+            )
+
+            if response.status_code == 200:
+                logger.info(f"成功建立聊天关系: {user1_id} ↔ {user2_id}")
+                return True
+            else:
+                logger.error(f"建立聊天关系失败: {response.status_code}, {response.text}")
+                return False
+
+        except Exception as e:
+            logger.error(f"调用GoEasy API异常: {str(e)}")
+            return False
+
+    def establish_chat_for_order(self, order, dashou_yonghuid, dashou_info=None):
+        """
+        为订单建立聊天关系
+        """
+        # user1_id 是老板/商家标识 (从订单中获取)
+        # user2_id 是打手标识
+        user1_id = order.user1_id
+        user2_id = f"Ds{dashou_yonghuid}"
+
+        if not user1_id or not user2_id:
+            logger.warning(f"缺少用户标识，无法建立聊天: user1_id={user1_id}, user2_id={user2_id}")
+            return False
+
+        # 建立双向聊天关系
+        success1 = self.create_private_chat(user1_id, user2_id, user2_info=dashou_info)
+        success2 = self.create_private_chat(user2_id, user1_id)
+
+        return success1 or success2  # 只要有一个方向成功就认为成功
\ No newline at end of file
diff --git a/utils/imAuth/dashoujianquan.js b/utils/imAuth/dashoujianquan.js
new file mode 100644
index 0000000..bf33a06
--- /dev/null
+++ b/utils/imAuth/dashoujianquan.js
@@ -0,0 +1,51 @@
+// utils/imAuth/dashoujianquan.js
+const imRequest = require('./imRequest.js');
+
+/**
+ * 打手 IM 权限检测
+ * POST /yonghu/dshqltqx
+ * 后端返回 { code: 0, allow: 1 } 或 { code: 0, allow: 0 }
+ */
+async function dashoujianquan(app) {
+  const uid = wx.getStorageSync('uid');
+  if (!uid) return { allowed: false, reason: '未登录' };
+
+  try {
+    const res = await imRequest({
+      url: '/yonghu/dshqltqx',
+      method: 'POST',
+      data: { uid }
+    });
+
+    if (res && res.data && res.data.code === 0) {
+      const allow = res.data.allow;
+      if (allow === 1) {
+        return { allowed: true };
+      } else {
+        await app.disconnectGoEasy();
+        wx.showToast({
+          title: '当前身份已不支持消息聊天功能，请充值会员或联系管理员后尝试',
+          icon: 'none',
+          duration: 2000,
+          mask: true
+        });
+        await new Promise(r => setTimeout(r, 2100));
+        return { allowed: false, reason: '打手消息权限被限制' };
+      }
+    }
+    throw new Error(res.data?.msg || '鉴权接口异常');
+  } catch (err) {
+    console.error('打手鉴权失败:', err);
+    await app.disconnectGoEasy();
+    wx.showToast({
+      title: '消息服务暂不可用，请稍后重试',
+      icon: 'none',
+      duration: 2000,
+      mask: true
+    });
+    await new Promise(r => setTimeout(r, 2100));
+    return { allowed: false, reason: '鉴权请求失败' };
+  }
+}
+
+module.exports = { dashoujianquan };
\ No newline at end of file
diff --git a/utils/imAuth/imRequest.js b/utils/imAuth/imRequest.js
new file mode 100644
index 0000000..728eb84
--- /dev/null
+++ b/utils/imAuth/imRequest.js
@@ -0,0 +1,67 @@
+// utils/imAuth/imRequest.js
+// 专用于 IM 鉴权模块的请求封装
+// 与 utils/request.js 功能完全一致，但不依赖 getApp()，API 域名硬编码
+const API_BASE_URL = 'https://6ccy.top/hqhd';
+
+function imRequest(options) {
+  const token = wx.getStorageSync('token');
+  const header = {
+    'Content-Type': 'application/json',
+    ...options.header,
+  };
+  if (token) {
+    header['Authorization'] = 'Bearer ' + token;
+  }
+
+  return new Promise((resolve, reject) => {
+    wx.request({
+      url: API_BASE_URL + options.url,
+      method: options.method,
+      data: options.data || {},
+      header,
+      success: async (res) => {
+        if (res.statusCode === 401 || res.statusCode === 403) {
+          // 如果全局有登录 Promise 在等待，则等待完成后重试
+          const app = getApp();
+          if (app && app.globalData && app.globalData.loginPromise) {
+            try {
+              await app.globalData.loginPromise;
+              const retryRes = await imRequest(options);
+              resolve(retryRes);
+            } catch (err) {
+              wx.showModal({
+                content: '操作失败，请先登录',
+                success: (modalRes) => {
+                  if (modalRes.confirm) {
+                    wx.removeStorageSync('token');
+                    wx.switchTab({ url: '/pages/wode/wode' });
+                  }
+                },
+              });
+              resolve(res);
+            }
+            return;
+          }
+
+          // 常规未登录提示
+          wx.showModal({
+            content: '操作失败，请先登录',
+            success: (modalRes) => {
+              if (modalRes.confirm) {
+                wx.removeStorageSync('token');
+                wx.switchTab({ url: '/pages/wode/wode' });
+              }
+            },
+          });
+          resolve(res);
+          return;
+        }
+        // 正常响应
+        resolve(res);
+      },
+      fail: reject,
+    });
+  });
+}
+
+module.exports = imRequest;
\ No newline at end of file
diff --git a/utils/imAuth/jianquanxian.js b/utils/imAuth/jianquanxian.js
new file mode 100644
index 0000000..f373451
--- /dev/null
+++ b/utils/imAuth/jianquanxian.js
@@ -0,0 +1,58 @@
+// utils/imAuth/jianquanxian.js
+// 原：require('./laobanjianquan')
+// 改：
+const { laobanjianquan } = require('./laobanjianquan.js');
+const { dashoujianquan } = require('./dashoujianquan.js');
+
+/**
+ * IM 长连接权限统一入口
+ * 按顺序进行：
+ * 1. 检查本地 token/uid 是否存在
+ * 2. 若不存在，强制断开已有连接，弹窗提示未登录（强制阅读 2 秒）
+ * 3. 若存在，根据当前角色调用具体的鉴权模块
+ * 
+ * @param {Object} app 全局 App 实例
+ * @returns {Promise<{ allowed: boolean, reason?: string }>}
+ */
+async function jianquanxian(app) {
+  // 1. 检测登录态（用 uid 或 token）
+  const token = wx.getStorageSync('token') || wx.getStorageSync('uid');
+  if (!token) {
+    // 没登录：先强制断开（如果已连接）
+    await app.disconnectGoEasy();
+    // 弹窗提示，强制阅读 2 秒
+    wx.showToast({
+      title: '您当前处于未登录状态，消息功能暂不可用',
+      icon: 'none',
+      duration: 2000,
+      mask: true
+    });
+    // 等待提示结束，确保用户看到
+    await new Promise(resolve => setTimeout(resolve, 2100));
+    return { allowed: false, reason: '未登录' };
+  }
+
+  // 2. 获取当前选中的角色
+  const role = app.globalData.currentRole || 'normal';
+
+  // 3. 根据角色分发到具体鉴权模块
+  switch (role) {
+    case 'normal':   // 点单老板
+      return laobanjianquan(app);
+
+    case 'dashou':   // 打手
+      return dashoujianquan(app);
+
+    // 其他角色暂未细分，统一放行（后续可新增对应文件）
+    case 'shangjia':
+    case 'guanshi':
+    case 'zuzhang':
+    case 'kaoheguan':    
+      return { allowed: true };
+
+    default:
+      return { allowed: false, reason: '未知角色' };
+  }
+}
+
+module.exports = { jianquanxian };
\ No newline at end of file
diff --git a/utils/imAuth/laobanjianquan.js b/utils/imAuth/laobanjianquan.js
new file mode 100644
index 0000000..a29361a
--- /dev/null
+++ b/utils/imAuth/laobanjianquan.js
@@ -0,0 +1,51 @@
+// utils/imAuth/laobanjianquan.js
+const imRequest = require('./imRequest.js');
+
+/**
+ * 老板（点单用户）IM 权限检测
+ * POST /yonghu/lbhqltqx
+ * 后端返回 { code: 0, allow: 1 } 或 { code: 0, allow: 0 }
+ */
+async function laobanjianquan(app) {
+  const uid = wx.getStorageSync('uid');
+  if (!uid) return { allowed: false, reason: '未登录' };
+
+  try {
+    const res = await imRequest({
+      url: '/yonghu/lbhqltqx',
+      method: 'POST',
+      data: { uid }
+    });
+
+    if (res && res.data && res.data.code === 0) {
+      const allow = res.data.allow;
+      if (allow === 1) {
+        return { allowed: true };
+      } else {
+        await app.disconnectGoEasy();
+        wx.showToast({
+          title: '当前身份已不支持使用消息功能',
+          icon: 'none',
+          duration: 1000,
+          mask: true
+        });
+        await new Promise(r => setTimeout(r, 1100));
+        return { allowed: false, reason: '当前身份无消息权限' };
+      }
+    }
+    throw new Error(res.data?.msg || '鉴权接口异常');
+  } catch (err) {
+    console.error('老板鉴权失败:', err);
+    await app.disconnectGoEasy();
+    wx.showToast({
+      title: '消息服务暂不可用，请稍后重试',
+      icon: 'none',
+      duration: 2000,
+      mask: true
+    });
+    await new Promise(r => setTimeout(r, 2100));
+    return { allowed: false, reason: '鉴权请求失败' };
+  }
+}
+
+module.exports = { laobanjianquan };
\ No newline at end of file
diff --git a/utils/imageUrl.js b/utils/imageUrl.js
new file mode 100644
index 0000000..a8f15f3
--- /dev/null
+++ b/utils/imageUrl.js
@@ -0,0 +1,74 @@
+// /utils/imageUrl.js - 统一的COS图片路径管理
+const app = getApp();
+
+/**
+ * 获取完整的COS图片URL
+ * @param {string} path - 图片相对路径，如 'a_long/images/common/arrow-down.png'
+ * @returns {string} 完整的URL
+ */
+export function getImageUrl(path) {
+  if (!app || !app.globalData || !app.globalData.ossImageUrl) {
+    console.warn('⚠️ App.globalData.ossImageUrl 未初始化');
+    return path; // 返回原路径作为fallback
+  }
+  
+  // 如果已经是完整URL，直接返回
+  if (path.startsWith('http')) {
+    return path;
+  }
+  
+  // 拼接完整URL
+  return app.globalData.ossImageUrl + path;
+}
+
+/**
+ * 获取常用图片的URL
+ */
+export const imageUrls = {
+  // 身份相关
+  identityIcon: 'a_long/images/identity/identity-icon.png',
+  arrowDown: 'a_long/images/common/arrow-down.png',
+  bossIcon: 'a_long/images/identity/boss-icon.png',
+  dashouIcon: 'a_long/images/identity/dashou-icon.png',
+  shangjiaIcon: 'a_long/images/identity/shangjia-icon.png',
+  
+  // 公共图标
+  actionIcon: 'a_long/images/common/action.png',
+  emptyMessage: 'a_long/images/common/empty-message.png',
+  
+  // 通知相关
+  notificationOn: 'a_long/images/notifications/notification-on.png',
+  notificationOff: 'a_long/images/notifications/notification-off.png',
+  
+  // TabBar图标
+  tabbarHome: 'a_long/images/tabbar/home.png',
+  tabbarHomeActive: 'a_long/images/tabbar/home-active.png',
+  tabbarCategory: 'a_long/images/tabbar/category.png',
+  tabbarCategoryActive: 'a_long/images/tabbar/category-active.png',
+  tabbarMessage: 'a_long/images/tabbar/message.png',
+  tabbarMessageActive: 'a_long/images/tabbar/message-active.png',
+  tabbarProfile: 'a_long/images/tabbar/profile.png',
+  tabbarProfileActive: 'a_long/images/tabbar/profile-active.png',
+  
+  // 用户相关
+  defaultAvatar: 'a_long/images/common/default-avatar.png'
+};
+
+/**
+ * 预加载常用图片
+ */
+export function preloadCommonImages() {
+  const images = Object.values(imageUrls).map(path => getImageUrl(path));
+  
+  images.forEach(src => {
+    wx.getImageInfo({
+      src: src,
+      success: () => {
+        console.log('✅ 图片预加载成功:', src);
+      },
+      fail: (err) => {
+        console.warn('⚠️ 图片预加载失败:', src, err);
+      }
+    });
+  });
+}
\ No newline at end of file
diff --git a/utils/message-sender.js b/utils/message-sender.js
new file mode 100644
index 0000000..879ee25
--- /dev/null
+++ b/utils/message-sender.js
@@ -0,0 +1,152 @@
+// utils/message-sender.js
+const app = getApp();
+import { formatDate } from '../static/lib/utils';
+import request from './request.js';
+
+function sendGroupMessage(options) {
+  const { msgData, onSuccess, onSendStart } = options;
+  const { type, currentUser, groupId, orderId, isCross, groupName, groupAvatar } = msgData;
+
+  const localMsg = buildLocalMessage(msgData);
+  if (onSendStart) onSendStart(localMsg);
+
+  // 只有 isCross 明确为 0 才走前端 SDK，其余一律走后端
+  if (isCross === 0) {
+    sendViaSDK(localMsg, currentUser, groupId, onSuccess, orderId, isCross, groupName, groupAvatar);
+    return;
+  }
+  sendViaBackend(localMsg, currentUser, groupId, orderId, onSuccess);
+}
+
+function buildLocalMessage(data) {
+  const { type, text, filePath, orderPayload, currentUser, groupId } = data;
+  const now = Date.now();
+  const base = {
+    messageId: `${type}-${now}`,
+    timestamp: now,
+    senderId: currentUser.id,
+    groupId: groupId,
+    senderData: {
+      name: currentUser.name,
+      avatar: currentUser.avatar
+    },
+    status: 'sending',
+    formattedTime: formatDate(now)
+  };
+
+  if (type === 'text') return { ...base, type: 'text', payload: { text } };
+  if (type === 'image') return { ...base, type: 'image', payload: { url: filePath } };
+  if (type === 'order') return { ...base, type: 'order', payload: orderPayload };
+  return base;
+}
+
+function sendViaSDK(localMsg, currentUser, groupId, onSuccess, orderId, isCross, groupName, groupAvatar) {
+  const toData = {
+    name: groupName || '订单群聊',
+    avatar: groupAvatar || currentUser.avatar
+  };
+  if (orderId) toData.orderId = orderId;
+  toData.isCross = isCross || 0;
+
+  const to = {
+    type: wx.GoEasy.IM_SCENE.GROUP,
+    id: groupId,
+    data: toData
+  };
+
+  let message;
+  if (localMsg.type === 'text') {
+    message = wx.goEasy.im.createTextMessage({ text: localMsg.payload.text, to });
+  } else if (localMsg.type === 'image') {
+    message = wx.goEasy.im.createImageMessage({ file: localMsg.payload.url, to });
+  } else if (localMsg.type === 'order') {
+    message = wx.goEasy.im.createCustomMessage({ type: 'order', payload: localMsg.payload, to });
+  }
+
+  wx.goEasy.im.sendMessage({
+    message,
+    onSuccess: () => { if (onSuccess) onSuccess(localMsg.messageId, 'success'); },
+    onFailed: () => { if (onSuccess) onSuccess(localMsg.messageId, 'failed'); }
+  });
+}
+
+function sendViaBackend(localMsg, currentUser, groupId, orderId, onSuccess) {
+  const apiUrl = '/dingdan/kptxxfs';
+
+  // 🔥 实时获取当前身份，不再依赖外部传入的 currentUser.id
+  const uid = wx.getStorageSync('uid');
+  const role = app.globalData.currentRole || 'normal';
+  const prefixMap = { normal: 'Boss', dashou: 'Ds', shangjia: 'Sj', guanshi: 'Gs', zuzhang: 'Zz' };
+  const identityType = role === 'dashou' ? 'dashou' : (role === 'shangjia' ? 'shangjia' : 'boss');
+  const prefix = prefixMap[role] || 'Boss';
+  const senderId = prefix + uid;
+
+  const params = {
+    orderId: orderId,
+    groupId: groupId,
+    identityType: identityType,    // 告诉后端当前是什么身份
+    senderId: senderId,
+    senderName: currentUser.name || ('用户' + uid),
+    senderAvatar: currentUser.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang),
+    messageType: localMsg.type,
+    messageId: localMsg.messageId,
+    timestamp: localMsg.timestamp
+  };
+
+  if (localMsg.type === 'text' || localMsg.type === 'order') {
+    if (localMsg.type === 'text') {
+      params.text = localMsg.payload.text;
+    } else {
+      params.orderPayload = localMsg.payload;
+    }
+    request({
+      url: apiUrl,
+      method: 'POST',
+      data: params
+    }).then((res) => {
+      if (res && res.data && res.data.code === 200) {
+        if (onSuccess) onSuccess(localMsg.messageId, 'success');
+      } else {
+        if (onSuccess) onSuccess(localMsg.messageId, 'failed');
+      }
+    }).catch(() => {
+      if (onSuccess) onSuccess(localMsg.messageId, 'failed');
+    });
+    return;
+  }
+
+  // 图片消息
+  if (localMsg.type === 'image') {
+    const token = wx.getStorageSync('token');
+    const formData = {
+      ...params,
+      senderInfo: JSON.stringify({ id: senderId, name: params.senderName, avatar: params.senderAvatar })
+    };
+    wx.uploadFile({
+      url: app.globalData.apiBaseUrl + apiUrl,
+      filePath: localMsg.payload.url,
+      name: 'file',
+      formData: formData,
+      header: {
+        'Authorization': 'Bearer ' + (token || '')
+      },
+      success(res) {
+        try {
+          const data = JSON.parse(res.data);
+          if (data.code === 200) {
+            if (onSuccess) onSuccess(localMsg.messageId, 'success');
+          } else {
+            if (onSuccess) onSuccess(localMsg.messageId, 'failed');
+          }
+        } catch (e) {
+          if (onSuccess) onSuccess(localMsg.messageId, 'failed');
+        }
+      },
+      fail() {
+        if (onSuccess) onSuccess(localMsg.messageId, 'failed');
+      }
+    });
+  }
+}
+
+module.exports = { sendGroupMessage };
\ No newline at end of file
diff --git a/utils/migrations/__init__.py b/utils/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/utils/migrations/__pycache__/__init__.cpython-313.pyc b/utils/migrations/__pycache__/__init__.cpython-313.pyc
new file mode 100644
index 0000000..64abd28
Binary files /dev/null and b/utils/migrations/__pycache__/__init__.cpython-313.pyc differ
diff --git a/utils/models.py b/utils/models.py
new file mode 100644
index 0000000..71a8362
--- /dev/null
+++ b/utils/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/utils/oss_utils.py b/utils/oss_utils.py
new file mode 100644
index 0000000..1257f9e
--- /dev/null
+++ b/utils/oss_utils.py
@@ -0,0 +1,512 @@
+# utils/oss_utils.py
+import os
+import uuid
+from django.conf import settings
+from PIL import Image, UnidentifiedImageError
+import io
+
+'''try:
+    from qcloud_cos import CosConfig, CosS3Client
+
+    TENCENT_COS_AVAILABLE = True
+except ImportError:
+    TENCENT_COS_AVAILABLE = False
+
+try:
+    import oss2
+
+    ALIYUN_OSS_AVAILABLE = True
+except ImportError:
+    ALIYUN_OSS_AVAILABLE = False
+
+
+def validate_image(file):
+    """
+    验证图片文件
+    使用Pillow检查图片是否有效
+    """
+    try:
+        # 打开图片但不保存到磁盘
+        img = Image.open(file)
+        img.verify()  # 验证文件完整性
+
+        # 重置文件指针（因为PIL读取后会移动指针）
+        file.seek(0)
+
+        # 检查图片格式
+        allowed_formats = ['JPEG', 'PNG', 'GIF', 'WEBP', 'BMP']
+        if img.format not in allowed_formats:
+            return False, f"不支持{img.format}格式，请使用JPEG、PNG、GIF、WEBP或BMP格式"
+
+        # 检查图片大小（最大5MB）
+        file_size = len(file.read())
+        file.seek(0)
+        if file_size > 5 * 1024 * 1024:
+            return False, "图片大小不能超过5MB"
+
+        # 检查图片尺寸（最大2000x2000）
+        img = Image.open(file)
+        file.seek(0)
+        if img.width > 3000 or img.height > 3000:
+            return False, "图片尺寸不能超过2000x2000像素"
+
+        return True, "图片验证通过"
+
+    except UnidentifiedImageError:
+        return False, "文件不是有效的图片"
+    except Exception as e:
+        return False, f"图片验证失败: {str(e)}"
+
+
+def get_oss_client():
+    """
+    获取OSS客户端
+    根据配置自动选择云厂商
+    """
+    oss_type = getattr(settings, 'OSS_TYPE', 'tencent')  # 默认为腾讯云
+
+    if oss_type == 'tencent' and TENCENT_COS_AVAILABLE:
+        # 腾讯云COS
+        config = CosConfig(
+            Region=getattr(settings, 'COS_REGION', 'ap-shanghai'),
+            SecretId=getattr(settings, 'COS_SECRET_ID', ''),
+            SecretKey=getattr(settings, 'COS_SECRET_KEY', ''),
+            Scheme=getattr(settings, 'COS_SCHEME', 'https')
+        )
+        return CosS3Client(config)
+
+    elif oss_type == 'aliyun' and ALIYUN_OSS_AVAILABLE:
+        # 阿里云OSS
+        auth = oss2.Auth(
+            getattr(settings, 'ALIYUN_ACCESS_KEY_ID', ''),
+            getattr(settings, 'ALIYUN_ACCESS_KEY_SECRET', '')
+        )
+        endpoint = getattr(settings, 'ALIYUN_OSS_ENDPOINT', '')
+        bucket_name = getattr(settings, 'ALIYUN_OSS_BUCKET', '')
+        return oss2.Bucket(auth, endpoint, bucket_name)
+
+    else:
+        raise ImportError(f"不支持{oss_type}云存储或相关SDK未安装")
+
+
+def upload_to_oss(file_obj, file_path):
+    """
+    通用上传文件到OSS
+    file_obj: Django的UploadedFile对象或类文件对象
+    file_path: 在OSS中的相对路径，如 'avatar/123/abc.jpg'
+    返回: 文件访问URL
+    """
+    try:
+        oss_type = getattr(settings, 'OSS_TYPE', 'tencent')
+
+        if oss_type == 'tencent':
+            return _upload_to_tencent_cos(file_obj, file_path)
+        elif oss_type == 'aliyun':
+            return _upload_to_aliyun_oss(file_obj, file_path)
+        else:
+            raise ValueError(f"不支持的OSS类型: {oss_type}")
+
+    except Exception as e:
+        print(f"OSS上传失败: {e}")
+        return None
+
+
+def _upload_to_tencent_cos(file_obj, file_path):
+    """
+    上传到腾讯云COS
+    """
+    client = get_oss_client()
+
+    # 获取文件扩展名
+    ext = file_path.split('.')[-1].lower() if '.' in file_path else ''
+    content_type_map = {
+        'jpg': 'image/jpeg', 'jpeg': 'image/jpeg',
+        'png': 'image/png', 'gif': 'image/gif',
+        'webp': 'image/webp', 'bmp': 'image/bmp'
+    }
+    content_type = content_type_map.get(ext, 'image/jpeg')
+
+    # 如果是Django的UploadedFile，需要读取内容
+    if hasattr(file_obj, 'read'):
+        file_content = file_obj.read()
+    else:
+        file_content = file_obj
+
+    # 上传文件
+    response = client.put_object(
+        Bucket=getattr(settings, 'COS_BUCKET', ''),
+        Body=file_content,
+        Key=file_path,
+        ContentType=content_type,
+        ContentDisposition='inline'
+    )
+
+    # 返回完整URL
+    domain = getattr(settings, 'COS_DOMAIN', '')
+    return f"{domain}/{file_path}"
+
+
+def _upload_to_aliyun_oss(file_obj, file_path):
+    """
+    上传到阿里云OSS
+    """
+    bucket = get_oss_client()
+
+    # 如果是Django的UploadedFile，需要读取内容
+    if hasattr(file_obj, 'read'):
+        file_content = file_obj.read()
+    else:
+        file_content = file_obj
+
+    # 上传文件
+    result = bucket.put_object(file_path, file_content)
+
+    if result.status == 200:
+        # 阿里云OSS返回的URL
+        domain = getattr(settings, 'ALIYUN_OSS_DOMAIN', '')
+        return f"{domain}/{file_path}"
+    else:
+        return None
+
+
+def delete_from_oss(file_url):
+    """
+    从OSS删除文件
+    file_url: 可以是完整URL或相对路径
+    """
+    try:
+        if not file_url:
+            return False
+
+        oss_type = getattr(settings, 'OSS_TYPE', 'tencent')
+
+        # 从URL中提取文件路径
+        if oss_type == 'tencent':
+            domain = getattr(settings, 'COS_DOMAIN', '')
+
+            # 判断是完整URL还是相对路径
+            if file_url.startswith('http'):
+                # 完整URL
+                if domain not in file_url:
+                    return False  # URL不属于我们的域名
+                file_key = file_url.replace(f"{domain}/", "")
+            else:
+                # 相对路径，直接使用
+                file_key = file_url
+
+            return _delete_from_tencent_cos(file_key)
+
+        elif oss_type == 'aliyun':
+            domain = getattr(settings, 'ALIYUN_OSS_DOMAIN', '')
+
+            if file_url.startswith('http'):
+                if domain not in file_url:
+                    return False
+                file_key = file_url.replace(f"{domain}/", "")
+            else:
+                file_key = file_url
+
+            return _delete_from_aliyun_oss(file_key)
+
+        else:
+            return False
+
+    except Exception as e:
+        print(f"OSS删除失败: {e}")
+        return False
+
+
+def _delete_from_tencent_cos(file_key):
+    """
+    从腾讯云COS删除文件
+    """
+    client = get_oss_client()
+
+    try:
+        client.delete_object(
+            Bucket=getattr(settings, 'COS_BUCKET', ''),
+            Key=file_key
+        )
+        return True
+    except Exception as e:
+        print(f"腾讯云COS删除失败: {e}")
+        return False
+
+
+def _delete_from_aliyun_oss(file_key):
+    """
+    从阿里云OSS删除文件
+    """
+    bucket = get_oss_client()
+
+    try:
+        bucket.delete_object(file_key)
+        return True
+    except Exception as e:
+        print(f"阿里云OSS删除失败: {e}")
+        return False'''
+
+
+
+
+# utils/oss_utils.py
+import os
+import uuid
+from django.conf import settings
+from PIL import Image, UnidentifiedImageError
+import io
+
+try:
+    from qcloud_cos import CosConfig, CosS3Client
+
+    TENCENT_COS_AVAILABLE = True
+except ImportError:
+    TENCENT_COS_AVAILABLE = False
+
+try:
+    import oss2
+
+    ALIYUN_OSS_AVAILABLE = True
+except ImportError:
+    ALIYUN_OSS_AVAILABLE = False
+
+# ========== 通用 MIME 类型映射（扩展支持非图片文件） ==========
+MIME_TYPES = {
+    # 图片
+    'jpg': 'image/jpeg', 'jpeg': 'image/jpeg', 'png': 'image/png',
+    'gif': 'image/gif', 'webp': 'image/webp', 'bmp': 'image/bmp',
+    # JSON / 文本
+    'json': 'application/json', 'txt': 'text/plain',
+    # 音频（小程序录音常见格式）
+    'mp3': 'audio/mpeg', 'aac': 'audio/aac', 'wav': 'audio/wav',
+    'm4a': 'audio/mp4', 'ogg': 'audio/ogg',
+    # 视频
+    'mp4': 'video/mp4', 'webm': 'video/webm',
+    # 二进制
+    'bin': 'application/octet-stream',
+}
+
+# ====================================================================
+
+def validate_image(file):
+    """
+    验证图片文件
+    使用Pillow检查图片是否有效
+    """
+    try:
+        # 打开图片但不保存到磁盘
+        img = Image.open(file)
+        img.verify()  # 验证文件完整性
+
+        # 重置文件指针（因为PIL读取后会移动指针）
+        file.seek(0)
+
+        # 检查图片格式
+        allowed_formats = ['JPEG', 'PNG', 'GIF', 'WEBP', 'BMP']
+        if img.format not in allowed_formats:
+            return False, f"不支持{img.format}格式，请使用JPEG、PNG、GIF、WEBP或BMP格式"
+
+        # 检查图片大小（最大5MB）
+        file_size = len(file.read())
+        file.seek(0)
+        if file_size > 5 * 1024 * 1024:
+            return False, "图片大小不能超过5MB"
+
+        # 检查图片尺寸（最大2000x2000）
+        img = Image.open(file)
+        file.seek(0)
+        if img.width > 3000 or img.height > 3000:
+            return False, "图片尺寸不能超过2000x2000像素"
+
+        return True, "图片验证通过"
+
+    except UnidentifiedImageError:
+        return False, "文件不是有效的图片"
+    except Exception as e:
+        return False, f"图片验证失败: {str(e)}"
+
+
+def get_oss_client():
+    """
+    获取OSS客户端
+    根据配置自动选择云厂商
+    """
+    oss_type = getattr(settings, 'OSS_TYPE', 'tencent')  # 默认为腾讯云
+
+    if oss_type == 'tencent' and TENCENT_COS_AVAILABLE:
+        # 腾讯云COS
+        config = CosConfig(
+            Region=getattr(settings, 'COS_REGION', 'ap-shanghai'),
+            SecretId=getattr(settings, 'COS_SECRET_ID', ''),
+            SecretKey=getattr(settings, 'COS_SECRET_KEY', ''),
+            Scheme=getattr(settings, 'COS_SCHEME', 'https')
+        )
+        return CosS3Client(config)
+
+    elif oss_type == 'aliyun' and ALIYUN_OSS_AVAILABLE:
+        # 阿里云OSS
+        auth = oss2.Auth(
+            getattr(settings, 'ALIYUN_ACCESS_KEY_ID', ''),
+            getattr(settings, 'ALIYUN_ACCESS_KEY_SECRET', '')
+        )
+        endpoint = getattr(settings, 'ALIYUN_OSS_ENDPOINT', '')
+        bucket_name = getattr(settings, 'ALIYUN_OSS_BUCKET', '')
+        return oss2.Bucket(auth, endpoint, bucket_name)
+
+    else:
+        raise ImportError(f"不支持{oss_type}云存储或相关SDK未安装")
+
+
+def upload_to_oss(file_obj, file_path, content_type=None):
+    """
+    通用上传文件到OSS
+    file_obj: Django的UploadedFile对象或类文件对象
+    file_path: 在OSS中的相对路径，如 'avatar/123/abc.jpg'
+    content_type: 可选，MIME类型；若不传则根据文件扩展名自动推断
+    返回: 文件访问URL
+    """
+    try:
+        oss_type = getattr(settings, 'OSS_TYPE', 'tencent')
+
+        if oss_type == 'tencent':
+            return _upload_to_tencent_cos(file_obj, file_path, content_type)
+        elif oss_type == 'aliyun':
+            return _upload_to_aliyun_oss(file_obj, file_path)
+        else:
+            raise ValueError(f"不支持的OSS类型: {oss_type}")
+
+    except Exception as e:
+        print(f"OSS上传失败: {e}")
+        return None
+
+
+def _upload_to_tencent_cos(file_obj, file_path, content_type=None):
+    """
+    上传到腾讯云COS（扩展支持任意文件类型）
+    """
+    client = get_oss_client()
+
+    # 若调用方未指定 Content-Type，则根据扩展名自动推断
+    if not content_type:
+        ext = file_path.rsplit('.', 1)[-1].lower() if '.' in file_path else ''
+        content_type = MIME_TYPES.get(ext, 'application/octet-stream')
+
+    # 读取文件内容（兼容 Django UploadedFile 和普通 bytes）
+    if hasattr(file_obj, 'read'):
+        file_content = file_obj.read()
+    else:
+        file_content = file_obj
+
+    # 上传文件
+    response = client.put_object(
+        Bucket=getattr(settings, 'COS_BUCKET', ''),
+        Body=file_content,
+        Key=file_path,
+        ContentType=content_type,
+        ContentDisposition='inline'
+    )
+
+    # 返回完整URL
+    domain = getattr(settings, 'COS_DOMAIN', '')
+    return f"{domain.rstrip('/')}/{file_path.lstrip('/')}"
+
+
+def _upload_to_aliyun_oss(file_obj, file_path):
+    """
+    上传到阿里云OSS（保持原样，未修改）
+    """
+    bucket = get_oss_client()
+
+    # 如果是Django的UploadedFile，需要读取内容
+    if hasattr(file_obj, 'read'):
+        file_content = file_obj.read()
+    else:
+        file_content = file_obj
+
+    # 上传文件
+    result = bucket.put_object(file_path, file_content)
+
+    if result.status == 200:
+        # 阿里云OSS返回的URL
+        domain = getattr(settings, 'ALIYUN_OSS_DOMAIN', '')
+        return f"{domain}/{file_path}"
+    else:
+        return None
+
+
+def delete_from_oss(file_url):
+    """
+    从OSS删除文件
+    file_url: 可以是完整URL或相对路径
+    """
+    try:
+        if not file_url:
+            return False
+
+        oss_type = getattr(settings, 'OSS_TYPE', 'tencent')
+
+        # 从URL中提取文件路径
+        if oss_type == 'tencent':
+            domain = getattr(settings, 'COS_DOMAIN', '')
+
+            # 判断是完整URL还是相对路径
+            if file_url.startswith('http'):
+                # 完整URL
+                if domain not in file_url:
+                    return False  # URL不属于我们的域名
+                file_key = file_url.replace(f"{domain}/", "")
+            else:
+                # 相对路径，直接使用
+                file_key = file_url
+
+            return _delete_from_tencent_cos(file_key)
+
+        elif oss_type == 'aliyun':
+            domain = getattr(settings, 'ALIYUN_OSS_DOMAIN', '')
+
+            if file_url.startswith('http'):
+                if domain not in file_url:
+                    return False
+                file_key = file_url.replace(f"{domain}/", "")
+            else:
+                file_key = file_url
+
+            return _delete_from_aliyun_oss(file_key)
+
+        else:
+            return False
+
+    except Exception as e:
+        print(f"OSS删除失败: {e}")
+        return False
+
+
+def _delete_from_tencent_cos(file_key):
+    """
+    从腾讯云COS删除文件
+    """
+    client = get_oss_client()
+
+    try:
+        client.delete_object(
+            Bucket=getattr(settings, 'COS_BUCKET', ''),
+            Key=file_key
+        )
+        return True
+    except Exception as e:
+        print(f"腾讯云COS删除失败: {e}")
+        return False
+
+
+def _delete_from_aliyun_oss(file_key):
+    """
+    从阿里云OSS删除文件
+    """
+    bucket = get_oss_client()
+
+    try:
+        bucket.delete_object(file_key)
+        return True
+    except Exception as e:
+        print(f"阿里云OSS删除失败: {e}")
+        return False
\ No newline at end of file
diff --git a/utils/phone-auth.js b/utils/phone-auth.js
new file mode 100644
index 0000000..0b8a654
--- /dev/null
+++ b/utils/phone-auth.js
@@ -0,0 +1,165 @@
+/**
+ * 手机号强制认证 - 完全自包含逻辑模块
+ * 
+ * 特点：
+ *   1. 不引用项目中的 request.js / upload.js，避免其顶层 getApp() 带来的加载顺序错误
+ *   2. 所有请求直接使用 wx.request / wx.uploadFile，基础 URL 写死（与 app.globalData.apiBaseUrl 保持一致）
+ *   3. check() 内部捕获所有异常，永远返回 false 或 true，不会抛出错误
+ *   4. submit() 抛出错误由认证页面自己处理，不影响主流程
+ * 
+ * 用法：
+ *   app.js 中：
+ *     try {
+ *       const { check } = require('./utils/phone-auth');
+ *       if (await check()) { wx.reLaunch(...); return; }
+ *     } catch(e) {}
+ * 
+ *   认证页面中：
+ *     const { submit } = require('../../utils/phone-auth');
+ *     await submit(phoneCode, avatarPath);
+ */
+
+// ==================== 基础配置 ====================
+const API_BASE = 'https://6ccy.top/hqhd';   // 与你 app.js 里的 apiBaseUrl 一致
+const AUTH_CHECK_URL = '/peizhi/yhbdsjh';        // 检查是否需要认证
+const AUTH_SUBMIT_URL = '/yonghu/xiugai';        // 提交认证（复用修改信息接口）
+
+// ==================== 内部封装：wx.request ====================
+function innerRequest(url, data = {}) {
+  return new Promise((resolve, reject) => {
+    const token = wx.getStorageSync('token');   // 运行时获取 token，不提前取
+    const header = {
+      'Content-Type': 'application/json'
+    };
+    if (token) {
+      header['Authorization'] = 'Bearer ' + token;
+    }
+
+    wx.request({
+      url: API_BASE + url,
+      method: 'POST',
+      data,
+      header,
+      success: (res) => {
+        // 正常响应直接 resolve 整个响应对象，让上层自己解析
+        resolve(res);
+      },
+      fail: (err) => {
+        reject(err);
+      }
+    });
+  });
+}
+
+// ==================== 内部封装：wx.uploadFile ====================
+function innerUpload(url, filePath, formData = {}, fileName = 'avatar') {
+  return new Promise((resolve, reject) => {
+    const token = wx.getStorageSync('token');
+    if (!token) {
+      reject(new Error('未登录'));
+      return;
+    }
+
+    // 先验证文件是否存在
+    wx.getFileInfo({
+      filePath,
+      success: () => {
+        wx.uploadFile({
+          url: API_BASE + url,
+          filePath,
+          name: fileName,
+          formData,
+          header: {
+            'Authorization': 'Bearer ' + token
+          },
+          success: (res) => {
+            // ✅ 修复：wx.uploadFile 成功时 statusCode 为 200
+            if (res.statusCode === 200) {
+              try {
+                const data = JSON.parse(res.data);
+                resolve(data);   // 直接返回解析后的对象，方便下游使用
+              } catch (e) {
+                reject(new Error('解析响应数据失败'));
+              }
+            } else if (res.statusCode === 401) {
+              wx.removeStorageSync('token');
+              reject(new Error('认证失败'));
+            } else {
+              reject(new Error(`上传失败，状态码：${res.statusCode}`));
+            }
+          },
+          fail: (err) => {
+            reject(new Error('网络请求失败'));
+          }
+        });
+      },
+      fail: () => {
+        reject(new Error('文件不存在或无法访问'));
+      }
+    });
+  });
+}
+
+// ==================== 公开方法 ====================
+
+/**
+ * 检查是否需要手机号认证
+ * - 无 token 或 任何异常 → 返回 false
+ * - 后端明确 need_auth: true → 返回 true
+ */
+async function check() {
+  const token = wx.getStorageSync('token');
+  if (!token) return false;
+
+  try {
+    const res = await innerRequest(AUTH_CHECK_URL, {});
+    // 假设后端返回格式：{ data: { need_auth: true/false } } 或直接在顶层
+    const body = res.data;
+    return body && body.need_auth === true;
+  } catch (e) {
+    // 任何错误（网络、后端异常）都吞掉，不影响主流程
+    return false;
+  }
+}
+
+/**
+ * 提交认证（手机号 code + 头像文件）
+ * @param {string} phoneCode  微信 getPhoneNumber 返回的 code
+ * @param {string} avatarPath 头像临时路径
+ * @returns {Promise<object>} 后端返回的完整数据
+ */
+async function submit(phoneCode, avatarPath) {
+  if (!phoneCode || !avatarPath) {
+    throw new Error('缺少参数');
+  }
+
+  // 将手机号 code 放入 formData
+  const formData = {
+    shoujihao_code: phoneCode
+  };
+
+  // 调用上传
+  const data = await innerUpload(AUTH_SUBMIT_URL, avatarPath, formData);
+
+  // ✅ 修复：正确判断后端返回的 code 字段，后端成功时 code === 0
+  if (data && data.code === 0) {
+    // data.data 包含 { touxiang: '相对路径', phone: '...' }
+    const respData = data.data || data;
+    
+    // 存储手机号
+    if (respData.phone) {
+      wx.setStorageSync('phone', respData.phone);
+    }
+    
+    // ✅ 修复：存储头像相对路径，与 xiugai 页面处理方式一致
+    if (respData.touxiang) {
+      wx.setStorageSync('touxiang', respData.touxiang);
+    }
+    
+    return respData;
+  } else {
+    throw new Error((data && data.msg) || '认证失败');
+  }
+}
+
+module.exports = { check, submit };
\ No newline at end of file
diff --git a/utils/redis_lock.py b/utils/redis_lock.py
new file mode 100644
index 0000000..c46d078
--- /dev/null
+++ b/utils/redis_lock.py
@@ -0,0 +1,18 @@
+import redis
+from django.conf import settings
+
+redis_client = redis.Redis(
+    host=settings.REDIS_HOST,
+    port=settings.REDIS_PORT,
+    password=settings.REDIS_PASSWORD,
+    db=2,
+    decode_responses=True
+)
+
+def acquire_lock(lock_key, timeout=10):
+    """获取锁，返回是否成功"""
+    return redis_client.set(lock_key, '1', nx=True, ex=timeout)
+
+def release_lock(lock_key):
+    """释放锁"""
+    redis_client.delete(lock_key)
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
new file mode 100644
index 0000000..8498d27
--- /dev/null
+++ b/utils/request.js
@@ -0,0 +1,66 @@
+// utils/request.js
+const app = getApp();
+
+function request(options) {
+  const token = wx.getStorageSync('token');
+  const header = {
+    'Content-Type': 'application/json',
+    ...options.header,
+  };
+  if (token) {
+    header['Authorization'] = 'Bearer ' + token;
+  }
+
+  return new Promise((resolve, reject) => {
+    wx.request({
+      url: app.globalData.apiBaseUrl + options.url,
+      method: options.method,
+      data: options.data || {},
+      header,
+      success: async (res) => {
+        if (res.statusCode === 401 || res.statusCode === 403) {
+          // 如果当前正在执行静默登录，等待登录完成后重试一次
+          if (app.globalData.loginPromise) {
+            try {
+              await app.globalData.loginPromise;   // 等待登录成功
+              // 登录成功后重新发起原请求，并将结果返回给调用方
+              const retryRes = await request(options);
+              resolve(retryRes);
+            } catch (err) {
+              // 登录失败，按原逻辑弹窗
+              wx.showModal({
+                content: '操作失败，请先登录',
+                success: (modalRes) => {
+                  if (modalRes.confirm) {
+                    wx.removeStorageSync('token');
+                    wx.reLaunch({ url: '/pages/wode/wode' });
+                  }
+                },
+              });
+              resolve(res);   // 返回原始响应让调用方知晓
+            }
+            return;
+          }
+
+          // 无登录流程进行中，直接弹窗（原逻辑）
+          wx.showModal({
+            content: '操作失败，请先登录',
+            success: (modalRes) => {
+              if (modalRes.confirm) {
+                wx.removeStorageSync('token');
+                wx.reLaunch({ url: '/pages/wode/wode' });
+              }
+            },
+          });
+          resolve(res);
+          return;
+        }
+        // 正常响应
+        resolve(res);
+      },
+      fail: reject,
+    });
+  });
+}
+
+export default request;
\ No newline at end of file
diff --git a/utils/role-manager.js b/utils/role-manager.js
new file mode 100644
index 0000000..e69de29
diff --git a/utils/tests.py b/utils/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/utils/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/utils/upload.js b/utils/upload.js
new file mode 100644
index 0000000..060e5ee
--- /dev/null
+++ b/utils/upload.js
@@ -0,0 +1,95 @@
+// utils/upload.js
+import request from './request.js'
+
+const app = getApp()
+
+/**
+ * 统一的异步上传方法
+ * @param {object} options 配置项
+ * @returns {Promise} Promise对象
+ */
+const upload = async (options) => {
+  const {
+    url,
+    formData = {},
+    filePath = null,
+    fileName = 'file'
+  } = options
+  
+  // 获取token
+  const token = wx.getStorageSync('token')
+  
+  if (!token) {
+    throw new Error('未登录')
+  }
+  
+  // 拼接完整URL
+  const fullUrl = `${app.globalData.apiBaseUrl}${url}`
+  
+  if (filePath) {
+    // 有文件上传，使用wx.uploadFile
+    return new Promise((resolve, reject) => {
+      // 先验证文件是否存在
+      wx.getFileInfo({
+        filePath,
+        success: () => {
+          // 文件存在，开始上传
+          wx.uploadFile({
+            url: fullUrl,
+            filePath,
+            name: fileName,
+            formData,
+            header: {
+              'Authorization': `Bearer ${token}`
+            },
+            success: (res) => {
+              
+              if (res.statusCode === 200) {
+                try {
+                  const data = JSON.parse(res.data)
+                  resolve({
+                    statusCode: res.statusCode,
+                    data
+                  })
+                } catch (e) {
+                  console.error('解析JSON失败:', e, '原始数据:', res.data)
+                  reject(new Error('解析响应数据失败'))
+                }
+              } else if (res.statusCode === 401) {
+                // token过期或无效
+                wx.removeStorageSync('token')
+                wx.removeStorageSync('userInfo')
+                reject(new Error('认证失败'))
+              } else {
+                console.error('上传失败，状态码:', res.statusCode, '响应:', res)
+                reject(new Error(`上传失败，状态码：${res.statusCode}`))
+              }
+            },
+            fail: (err) => {
+              console.error('wx.uploadFile失败:', err)
+              reject(new Error('网络请求失败'))
+            }
+          })
+        },
+        fail: (err) => {
+          console.error('文件不存在或无法访问:', err)
+          reject(new Error('文件不存在或无法访问'))
+        }
+      })
+    })
+  } else {
+    // 没有文件，使用封装的request
+    // 注意：这里应该使用传入的url，而不是硬编码
+    return request({
+      url,  // 使用传入的url
+      method: 'POST',
+      data: formData,
+      header: {
+        'Content-Type': 'application/json',
+        'Authorization': `Bearer ${token}`
+      }
+    })
+  }
+}
+
+export default upload
\ No newline at end of file
diff --git a/utils/views.py b/utils/views.py
new file mode 100644
index 0000000..91ea44a
--- /dev/null
+++ b/utils/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
diff --git a/utils/wechat_v3.py b/utils/wechat_v3.py
new file mode 100644
index 0000000..4fa097c
--- /dev/null
+++ b/utils/wechat_v3.py
@@ -0,0 +1,207 @@
+# utils/wechat_v3.py
+'''import time
+import hashlib
+import base64
+import json
+from urllib.parse import urlparse
+
+import rsa
+from Crypto.Cipher import AES
+
+from django.conf import settings
+
+
+def load_private_key():
+    """加载商户私钥（PEM格式）"""
+    with open(settings.WECHAT_PAY_V3_CONFIG['PRIVATE_KEY_PATH'], 'rb') as f:
+        key_data = f.read()
+    return rsa.PrivateKey.load_pkcs1(key_data)
+
+
+def build_authorization(method, url, body):
+    """
+    生成V3接口的Authorization头
+    :param method: GET/POST
+    :param url: 完整URL（含域名和路径）
+    :param body: 请求体JSON字符串
+    :return: Authorization字符串
+    """
+    private_key = load_private_key()
+    mchid = settings.WECHAT_PAY_V3_CONFIG['MCHID']
+    serial_no = settings.WECHAT_PAY_V3_CONFIG['CERT_SERIAL_NO']
+
+    # 提取URL路径（不含query）
+    parsed = urlparse(url)
+    path = parsed.path
+    if parsed.query:
+        path += '?' + parsed.query
+
+    timestamp = str(int(time.time()))
+    nonce = hashlib.md5((timestamp + 'wechat').encode()).hexdigest()[:32]
+
+    # 构造签名串
+    message = '\n'.join([method, path, timestamp, nonce, body]) + '\n'
+
+    # 使用私钥签名（SHA256）
+    signature = rsa.sign(message.encode('utf-8'), private_key, 'SHA-256')
+    signature_b64 = base64.b64encode(signature).decode('utf-8')
+
+    # 组装Authorization
+    auth = f'WECHATPAY2-SHA256-RSA2048 mchid="{mchid}",nonce_str="{nonce}",timestamp="{timestamp}",serial_no="{serial_no}",signature="{signature_b64}"'
+    return auth
+
+
+def verify_wechat_sign(headers, body):
+    """
+    验证微信回调的签名
+    需要提前从微信平台下载证书公钥，存放在 PLATFORM_CERT_DIR 下，文件名 = 序列号.pem
+    :param headers: 请求头
+    :param body: 原始请求体字符串
+    :return: bool
+    """
+    serial = headers.get('Wechatpay-Serial')
+    signature = headers.get('Wechatpay-Signature')
+    timestamp = headers.get('Wechatpay-Timestamp')
+    nonce = headers.get('Wechatpay-Nonce')
+
+    if not all([serial, signature, timestamp, nonce]):
+        return False
+
+    # 构造验签名串
+    message = '\n'.join([timestamp, nonce, body]) + '\n'
+
+    # 读取对应序列号的平台证书公钥
+    cert_path = f"{settings.WECHAT_PAY_V3_CONFIG['PLATFORM_CERT_DIR']}/{serial}.pem"
+    try:
+        with open(cert_path, 'rb') as f:
+            pub_key = rsa.PublicKey.load_pkcs1_openssl_pem(f.read())
+    except FileNotFoundError:
+        # 如果证书不存在，可尝试下载（生产环境建议定时下载）
+        return False
+
+    signature_bytes = base64.b64decode(signature)
+    try:
+        rsa.verify(message.encode('utf-8'), signature_bytes, pub_key)
+        return True
+    except rsa.VerificationError:
+        return False
+
+
+def decrypt_callback_ciphertext(associated_data, nonce, ciphertext):
+    """
+    使用APIv3密钥解密回调中的加密数据
+    :param associated_data: 附加数据
+    :param nonce: 随机串
+    :param ciphertext: 密文（Base64）
+    :return: 解密后的JSON字符串
+    """
+    api_v3_key = settings.WECHAT_PAY_V3_CONFIG['API_V3_KEY'].encode('utf-8')
+    nonce_bytes = nonce.encode('utf-8')
+    ciphertext_bytes = base64.b64decode(ciphertext)
+
+    # AES-GCM解密
+    cipher = AES.new(api_v3_key, AES.MODE_GCM, nonce=nonce_bytes)
+    if associated_data:
+        cipher.update(associated_data.encode('utf-8'))
+    plaintext = cipher.decrypt_and_verify(ciphertext_bytes[:-16], ciphertext_bytes[-16:])
+    return plaintext.decode('utf-8')'''
+
+# utils/wechat_v3.py
+import time
+import hashlib
+import base64
+import json
+from urllib.parse import urlparse
+
+from cryptography.hazmat.primitives import serialization, hashes
+from cryptography.hazmat.primitives.asymmetric import padding
+from cryptography.hazmat.backends import default_backend
+from Crypto.Cipher import AES
+
+from django.conf import settings
+import os
+
+
+def load_private_key():
+    """加载私钥（支持 PKCS#1 和 PKCS#8）"""
+    key_path = settings.WECHAT_PAY_V3_CONFIG['PRIVATE_KEY_PATH']
+    with open(key_path, 'rb') as f:
+        key_data = f.read()
+
+    # cryptography 自动识别格式
+    private_key = serialization.load_pem_private_key(
+        key_data,
+        password=None,
+        backend=default_backend()
+    )
+    return private_key
+
+
+def build_authorization(method, url, body):
+    """生成V3接口的Authorization头"""
+    private_key = load_private_key()
+    mchid = settings.WECHAT_PAY_V3_CONFIG['MCHID']
+    serial_no = settings.WECHAT_PAY_V3_CONFIG['CERT_SERIAL_NO']
+
+    parsed = urlparse(url)
+    path = parsed.path
+    if parsed.query:
+        path += '?' + parsed.query
+
+    timestamp = str(int(time.time()))
+    nonce = hashlib.md5((timestamp + 'wechat').encode()).hexdigest()[:32]
+
+    # 构造签名串
+    message = '\n'.join([method, path, timestamp, nonce, body]) + '\n'
+
+    # 使用 cryptography 签名
+    signature = private_key.sign(
+        message.encode('utf-8'),
+        padding.PKCS1v15(),
+        hashes.SHA256()
+    )
+    signature_b64 = base64.b64encode(signature).decode('utf-8')
+
+    auth = f'WECHATPAY2-SHA256-RSA2048 mchid="{mchid}",nonce_str="{nonce}",timestamp="{timestamp}",serial_no="{serial_no}",signature="{signature_b64}"'
+    return auth
+
+
+def verify_wechat_sign(headers, body):
+    """验证微信回调签名（需提前下载平台证书）"""
+    # 这部分使用 rsa 库验签，也可以改用 cryptography，但 rsa 已足够
+    import rsa
+    serial = headers.get('Wechatpay-Serial')
+    signature = headers.get('Wechatpay-Signature')
+    timestamp = headers.get('Wechatpay-Timestamp')
+    nonce = headers.get('Wechatpay-Nonce')
+
+    if not all([serial, signature, timestamp, nonce]):
+        return False
+
+    message = '\n'.join([timestamp, nonce, body]) + '\n'
+    cert_path = f"{settings.WECHAT_PAY_V3_CONFIG['PLATFORM_CERT_DIR']}/{serial}.pem"
+    if not os.path.exists(cert_path):
+        return False
+
+    with open(cert_path, 'rb') as f:
+        pub_key = rsa.PublicKey.load_pkcs1_openssl_pem(f.read())
+
+    signature_bytes = base64.b64decode(signature)
+    try:
+        rsa.verify(message.encode('utf-8'), signature_bytes, pub_key)
+        return True
+    except rsa.VerificationError:
+        return False
+
+
+def decrypt_callback_ciphertext(associated_data, nonce, ciphertext):
+    """解密回调数据（使用 AES-GCM）"""
+    api_v3_key = settings.WECHAT_PAY_V3_CONFIG['API_V3_KEY'].encode('utf-8')
+    nonce_bytes = nonce.encode('utf-8')
+    ciphertext_bytes = base64.b64decode(ciphertext)
+
+    cipher = AES.new(api_v3_key, AES.MODE_GCM, nonce=nonce_bytes)
+    if associated_data:
+        cipher.update(associated_data.encode('utf-8'))
+    plaintext = cipher.decrypt_and_verify(ciphertext_bytes[:-16], ciphertext_bytes[-16:])
+    return plaintext.decode('utf-8')
\ No newline at end of file
diff --git a/utils/weixin_broadcast.py b/utils/weixin_broadcast.py
new file mode 100644
index 0000000..d7a2cb7
--- /dev/null
+++ b/utils/weixin_broadcast.py
@@ -0,0 +1,201 @@
+# utils/weixin_broadcast.py - 强调试版本
+import time
+import logging
+import json  # 新增，用于格式化打印
+import requests
+from django.core.cache import cache
+from django.conf import settings
+from yonghu.models import OfficialAccountUser
+
+logger = logging.getLogger('weixin_broadcast')
+
+
+class WeixinBroadcastSender:
+    """
+    微信模板消息广播发送器 - 调试版
+    """
+
+    def __init__(self):
+        self.appid = getattr(settings, 'WEIXIN_OFFICIAL_APPID', '')
+        self.secret = getattr(settings, 'WEIXIN_OFFICIAL_SECRET', '')
+        self.template_id = getattr(settings, 'WEIXIN_TEMPLATE_ID', '')
+
+        # 发送控制参数
+        self.batch_size = 100
+        self.delay_between_batches = 1.5
+
+    def get_access_token(self):
+        """获取服务号access_token"""
+        cache_key = f'weixin_official_token_{self.appid}'
+        token = cache.get(cache_key)
+        if token:
+            return token
+
+        url = 'https://api.weixin.qq.com/cgi-bin/token'
+        params = {'grant_type': 'client_credential', 'appid': self.appid, 'secret': self.secret}
+        try:
+            response = requests.get(url, params=params, timeout=10)
+            result = response.json()
+            if 'access_token' in result:
+                token = result['access_token']
+                expires_in = result.get('expires_in', 7200) - 300
+                cache.set(cache_key, token, expires_in)
+                logger.info("✅ 获取access_token成功")
+                return token
+            else:
+                logger.error(f"❌ 获取access_token失败: {result}")
+                return None
+        except Exception as e:
+            logger.error(f"❌ 获取access_token异常: {str(e)}")
+            return None
+
+    def build_order_message_data(self, order_info):
+        """
+        构建订单消息数据 - 【调试关键点1】
+        打印传入的 order_info 和构建出的最终数据
+        """
+        # 🟡 调试点1：打印传入的参数
+        logger.info(
+            f"🟡【调试-输入】build_order_message_data 收到的 order_info: {json.dumps(order_info, ensure_ascii=False, indent=2)}")
+
+        # 这是你现在的构建逻辑，我们原样保留但加上调试
+        # 注意：这里保持你目前的字段名（short_thing5, short_thing4, thing15, amount8）
+        data = {
+            "short_thing5": {
+                "value": order_info.get('order_type', '平台发单'),
+                "color": "#173177"
+            },
+            "short_thing4": {
+                "value": order_info.get('game_type', '游戏订单'),
+                "color": "#173177"
+            },
+            "thing15": {
+                "value": str(order_info.get('order_desc', '新订单'))[:20],
+                "color": "#173177"
+            },
+            "amount8": {
+                "value": f"{order_info.get('amount', '0')}元",
+                "color": "#173177"
+            }
+        }
+
+        # 🟡 调试点2：打印构建出的最终数据结构
+        logger.info(f"🟡【调试-输出】构建完成的模板数据 data 字段：")
+        for key, content in data.items():
+            logger.info(f"      字段名: '{key}' -> 值: '{content.get('value', '')}'")
+        logger.info(f"🟡【调试-输出】完整 data 结构: {json.dumps(data, ensure_ascii=False)}")
+
+        # 🔴 关键检查：确认 short_thing5 是否存在，值是否为空
+        if 'short_thing5' not in data:
+            logger.error("❌【致命错误】构建的数据中根本没有 'short_thing5' 这个字段！")
+        else:
+            st5_value = data['short_thing5'].get('value', '')
+            if not st5_value:
+                logger.error(f"❌【致命错误】'short_thing5' 字段的值为空！")
+            else:
+                logger.info(f"✅ 'short_thing5' 字段存在，值为: '{st5_value}'")
+
+        return data
+
+    def send_to_user(self, official_openid, template_data, order_id=None):
+        """发送模板消息给单个用户 - 【调试关键点2】"""
+        # 🟡 调试点3：打印每次发送前的数据
+        logger.info(f"🟡【调试-发送前】准备发送给 {official_openid[:10]}... 的数据:")
+        logger.info(f"      模板ID: {self.template_id}")
+        logger.info(
+            f"      pagepath: pages/dingdan-xiangqing/dingdan-xiangqing?id={order_id}" if order_id else "      无pagepath")
+        for key, content in template_data.items():
+            logger.info(f"      字段 '{key}': '{content.get('value', '')}'")
+
+        access_token = self.get_access_token()
+        if not access_token:
+            return {'success': False, 'msg': '获取access_token失败', 'retry': True}
+
+        request_data = {
+            "touser": official_openid,
+            "template_id": self.template_id,
+            "data": template_data
+        }
+
+        if order_id and hasattr(settings, 'WEIXIN_APPID'):
+            request_data["miniprogram"] = {
+                "appid": settings.WEIXIN_APPID,
+                "pagepath": f"pages/jiedan/jiedan?id={order_id}"
+            }
+
+        send_url = f'https://api.weixin.qq.com/cgi-bin/message/template/send?access_token={access_token}'
+        try:
+            response = requests.post(send_url, json=request_data, timeout=10)
+            result = response.json()
+            logger.info(f"🟡【调试-微信响应】{official_openid[:10]}... 的发送结果: {result}")
+
+            if result.get('errcode') == 0:
+                return {'success': True, 'msg': '发送成功', 'msgid': result.get('msgid')}
+            else:
+                # 如果是未关注或拒收，更新本地状态
+                if result.get('errcode') in [43004, 43101]:
+                    try:
+                        OfficialAccountUser.objects.filter(official_openid=official_openid).update(is_subscribed=False)
+                    except:
+                        pass
+                return {'success': False, 'msg': f"[{result.get('errcode')}]{result.get('errmsg')}", 'retry': False}
+
+        except Exception as e:
+            logger.error(f"❌ 发送给用户异常: {official_openid[:10]}..., 错误: {str(e)}")
+            return {'success': False, 'msg': f'请求异常: {str(e)}', 'retry': True}
+
+    def broadcast_order(self, order_info):
+        """广播订单消息给所有关注用户 - 【调试入口】"""
+        logger.info(f"🚀【开始广播】订单: {order_info.get('dingdan_id')}")
+
+        # 1. 获取所有关注用户
+        try:
+            subscribed_users = OfficialAccountUser.objects.filter(is_subscribed=True).values_list('official_openid',
+                                                                                                  flat=True)
+            total_users = subscribed_users.count()
+            logger.info(f"📊【广播统计】将从数据库查询到 {total_users} 个订阅用户")
+            if total_users == 0:
+                return {'success': True, 'msg': '无订阅用户', 'total': 0}
+        except Exception as e:
+            logger.error(f"❌ 获取订阅用户列表失败: {str(e)}")
+            return {'success': False, 'msg': f'获取用户失败: {str(e)}'}
+
+        # 2. 构建模板数据（这里会触发上面的调试打印）
+        template_data = self.build_order_message_data(order_info)
+        order_id = order_info.get('dingdan_id')
+
+        # 3. 分批发送
+        success_count = 0
+        fail_count = 0
+        current_batch = 0
+        openid_list = list(subscribed_users)
+
+        logger.info(f"🟡【调试-广播循环】开始遍历 {len(openid_list)} 个用户进行发送...")
+        for i, openid in enumerate(openid_list):
+            try:
+                result = self.send_to_user(openid, template_data, order_id)
+                if result['success']:
+                    success_count += 1
+                else:
+                    fail_count += 1
+                    if fail_count <= 5:  # 只打印前几个失败原因
+                        logger.warning(f"⚠️ 发送失败 {openid[:10]}...: {result.get('msg')}")
+
+                # 分批控制
+                current_batch += 1
+                if current_batch >= self.batch_size:
+                    time.sleep(self.delay_between_batches)
+                    current_batch = 0
+
+            except Exception as e:
+                fail_count += 1
+                logger.error(f"❌ 处理用户 {openid[:10]}... 异常: {str(e)}")
+
+        logger.info(f"🏁【广播完成】订单 {order_id}，总计: {total_users}，成功: {success_count}，失败: {fail_count}")
+        return {
+            'success': True,
+            'msg': f'广播完成: 成功{success_count}, 失败{fail_count}',
+            'total': total_users,
+            'success_count': success_count,
+            'fail_count': fail_count
+        }
\ No newline at end of file
diff --git a/utils/xiaoxilj.js b/utils/xiaoxilj.js
new file mode 100644
index 0000000..e7a0cff
--- /dev/null
+++ b/utils/xiaoxilj.js
@@ -0,0 +1,214 @@
+/**
+ * 连接管理模块 - xiaoxilj.js (根治发送失败：跳转前确保群组已订阅)
+ * 从详情页跳转订单群聊时，提前订阅群组，避免发送消息时订阅未完成而失败
+ */
+const app = getApp();
+
+function waitForConnection(expectedUserId, timeout = 10000) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      app.off('connectionChanged', handler);
+      reject(new Error('连接超时'));
+    }, timeout);
+
+    const handler = (event) => {
+      if (event.status === 'connected') {
+        if (event.userId === expectedUserId) {
+          clearTimeout(timer);
+          app.off('connectionChanged', handler);
+          resolve();
+        } else {
+          console.error(`连接身份不匹配: 期望 ${expectedUserId}, 实际 ${event.userId}`);
+          wx.removeStorageSync('savedGoEasyConnection');
+          wx.removeStorageSync('goEasyUserId');
+          wx.removeStorageSync('currentGoEasyIdentity');
+          if (app.clearSavedConnection) app.clearSavedConnection();
+          clearTimeout(timer);
+          app.off('connectionChanged', handler);
+          reject(new Error(`连接身份不匹配: 期望 ${expectedUserId}, 实际 ${event.userId}`));
+        }
+      } else if (event.status === 'disconnected' && !event.manual) {
+        wx.removeStorageSync('savedGoEasyConnection');
+        wx.removeStorageSync('goEasyUserId');
+        wx.removeStorageSync('currentGoEasyIdentity');
+        if (app.clearSavedConnection) app.clearSavedConnection();
+        clearTimeout(timer);
+        app.off('connectionChanged', handler);
+        reject(new Error('连接失败'));
+      }
+    };
+    app.on('connectionChanged', handler);
+  });
+}
+
+class ConnectionManager {
+  // 原有的私聊方法保持不变
+  async connectAndChat(params) {
+    const { identityType, userId, targetUser } = params;
+    if (!identityType || !userId || !targetUser || !targetUser.id) {
+      throw new Error('参数不完整');
+    }
+
+    if (identityType === 'dashou' && !userId.startsWith('Ds')) {
+      throw new Error(`打手身份的用户ID必须以Ds开头，实际为 ${userId}`);
+    }
+    if (identityType === 'shangjia' && !userId.startsWith('Sj')) {
+      throw new Error(`商家身份的用户ID必须以Sj开头，实际为 ${userId}`);
+    }
+    if (identityType === 'boss' && !userId.startsWith('Boss')) {
+      throw new Error(`老板身份的用户ID必须以Boss开头，实际为 ${userId}`);
+    }
+
+    wx.removeStorageSync('savedGoEasyConnection');
+    wx.removeStorageSync('goEasyUserId');
+    wx.removeStorageSync('currentGoEasyIdentity');
+    if (app.clearSavedConnection) app.clearSavedConnection();
+
+    if (wx.goEasy && wx.goEasy.getConnectionStatus() === 'connected') {
+      wx.goEasy.disconnect();
+    }
+
+    const waitPromise = waitForConnection(userId);
+    app.connectWithIdentity(identityType, userId, false);
+
+    try {
+      await waitPromise;
+
+      const currentUser = {
+        id: userId,
+        name: app.globalData.currentUser?.name || '用户',
+        avatar: app.globalData.currentUser?.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
+      };
+
+      const to = {
+        id: targetUser.id,
+        name: targetUser.name || '用户',
+        avatar: targetUser.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
+      };
+
+      const param = { to, currentUser };
+      const path = '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param));
+      wx.navigateTo({ url: path });
+    } catch (err) {
+      console.error('连接失败:', err);
+      wx.showToast({ title: err.message || '连接失败', icon: 'none' });
+      throw err;
+    }
+  }
+
+  async connectToGroupChat(params) {
+    const { identityType, userId, orderId, groupName, groupAvatar, isCross } = params;
+    if (!identityType || !userId || !orderId) {
+      throw new Error('参数不完整：identityType, userId, orderId 必填');
+    }
+
+    // 校验 userId 前缀
+    if (identityType === 'dashou' && !userId.startsWith('Ds')) {
+      throw new Error(`打手身份的用户ID必须以Ds开头，实际为 ${userId}`);
+    }
+    if (identityType === 'shangjia' && !userId.startsWith('Sj')) {
+      throw new Error(`商家身份的用户ID必须以Sj开头，实际为 ${userId}`);
+    }
+    if (identityType === 'boss' && !userId.startsWith('Boss')) {
+      throw new Error(`老板身份的用户ID必须以Boss开头，实际为 ${userId}`);
+    }
+
+    // 1. 同步全局角色，确保群聊页初始化正确
+    app.globalData.currentRole = identityType;
+    wx.setStorageSync('currentRole', identityType);
+
+    const uid = userId.replace(/^(Ds|Sj|Boss|Gs|Zz)/, '');
+    const avatar = wx.getStorageSync('touxiang') ||
+                   (app.globalData.ossImageUrl + app.globalData.morentouxiang);
+    app.globalData.currentUser = {
+      id: userId,
+      name: app.globalData.currentUser?.name || `用户${uid}`,
+      avatar: avatar
+    };
+
+    // 2. 确保 GoEasy 已使用目标身份连接
+    let needConnect = false;
+    if (!wx.goEasy || !wx.goEasy.getConnectionStatus || wx.goEasy.getConnectionStatus() !== 'connected') {
+      needConnect = true;
+    } else {
+      const currentUserId = wx.goEasy.im?.userId;
+      if (currentUserId !== userId) {
+        needConnect = true;
+      }
+    }
+
+    if (needConnect) {
+      wx.removeStorageSync('savedGoEasyConnection');
+      wx.removeStorageSync('goEasyUserId');
+      if (app.clearSavedConnection) app.clearSavedConnection();
+      if (wx.goEasy && wx.goEasy.getConnectionStatus() === 'connected') {
+        wx.goEasy.disconnect();
+      }
+      const waitPromise = waitForConnection(userId);
+      app.connectWithIdentity(identityType, userId, false);
+      try {
+        await waitPromise;
+      } catch (err) {
+        wx.showToast({ title: '连接失败', icon: 'none' });
+        throw err;
+      }
+    }
+
+    // 3. 从会话列表查找真实群组ID
+    let realGroupId = null;
+    try {
+      const result = await new Promise((resolve, reject) => {
+        wx.goEasy.im.latestConversations({
+          onSuccess: (res) => {
+            const conversations = res.content?.conversations || [];
+            const found = conversations.find(c => c.type === 'group' && c.data && c.data.orderId === orderId);
+            resolve(found ? found.groupId : null);
+          },
+          onFailed: reject
+        });
+      });
+      realGroupId = result;
+    } catch (err) {
+      console.error('获取会话列表失败:', err);
+      wx.showToast({ title: '获取群聊信息失败', icon: 'none' });
+      throw err;
+    }
+
+    if (!realGroupId) {
+      wx.showToast({ title: '暂未创建群聊', icon: 'none' });
+      return;
+    }
+
+    // 4. 🔥 关键：主动订阅群组并等待成功，确保发送消息时订阅已完成
+    try {
+      await new Promise((resolve, reject) => {
+        wx.goEasy.im.subscribeGroup({
+          groupIds: [realGroupId],
+          onSuccess: () => {
+            resolve();
+          },
+          onFailed: (error) => {
+            console.error('订阅群组失败:', error);
+            reject(error);
+          }
+        });
+      });
+    } catch (err) {
+      wx.showToast({ title: '订阅群组失败', icon: 'none' });
+      throw err;
+    }
+
+    // 5. 跳转群聊页（参数与消息列表完全一致）
+    const param = {
+      groupId: realGroupId,
+      orderId: orderId,
+      groupName: groupName || '订单群聊',
+      groupAvatar: groupAvatar || '',
+      isCross: isCross || 0
+    };
+    const path = '/pages/qunliaotian/qunliaotian?data=' + encodeURIComponent(JSON.stringify(param));
+    wx.navigateTo({ url: path });
+  }
+}
+
+export default new ConnectionManager();
\ No newline at end of file
diff --git a/utils/yaoqingma_utils.py b/utils/yaoqingma_utils.py
new file mode 100644
index 0000000..6ddcfbc
--- /dev/null
+++ b/utils/yaoqingma_utils.py
@@ -0,0 +1,89 @@
+"""
+阿龙电竞陪玩平台 - 邀请码生成工具
+生成规则：毫秒时间戳 + 用户ID + 随机数 -> Base62编码 -> 固定20位邀请码
+特点：唯一性高、生成快、无序不可读
+"""
+import time
+import random
+
+# Base62 编码字符集 (数字+小写字母+大写字母)
+_BASE62_CHARS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+_BASE62_LENGTH = 62
+
+
+def base62_encode(num):
+    """将数字转换为Base62字符串"""
+    if num == 0:
+        return _BASE62_CHARS[0]
+
+    result = []
+    while num > 0:
+        num, remainder = divmod(num, _BASE62_LENGTH)
+        result.append(_BASE62_CHARS[remainder])
+
+    # 反转结果字符串
+    return ''.join(reversed(result))
+
+
+def chuangjianYaoqingma(yonghuid_str):
+    """
+    创建唯一邀请码 (20位固定长度)
+
+    参数:
+        yonghuid_str: 用户ID字符串，如 "123456"
+
+    返回:
+        20位的Base62编码邀请码字符串
+    """
+    # 1. 获取当前毫秒时间戳 (13位)
+    timestamp_ms = int(time.time() * 1000)
+
+    # 2. 将用户ID字符串转换为数字 (确保处理字符串)
+    try:
+        # 先尝试直接转换整数
+        yonghuid_num = int(yonghuid_str)
+    except ValueError:
+        # 如果用户ID不是纯数字，使用哈希值
+        yonghuid_num = abs(hash(yonghuid_str)) % (10 ** 8)  # 取8位数字
+
+    # 3. 生成一个随机数 (0-9999)
+    random_salt = random.randint(0, 9999)
+
+    # 4. 组合数字: 时间戳(13位) + 用户ID数字(最多8位) + 随机数(4位)
+    # 示例: 1647850123456 + 123456 + 7890 = 16478501234561234567890
+    combined_num = int(f"{timestamp_ms}{yonghuid_num:08d}{random_salt:04d}")
+
+    # 5. Base62编码
+    encoded_str = base62_encode(combined_num)
+
+    # 6. 确保固定20位长度: 不足补0，超过取后20位
+    # 理论上组合数字非常大，编码后通常会超过20位
+    if len(encoded_str) < 20:
+        # 左补0 (理论上不会发生，但保持安全)
+        encoded_str = encoded_str.rjust(20, _BASE62_CHARS[0])
+    else:
+        # 取后20位 (更随机)
+        encoded_str = encoded_str[-20:]
+
+    return encoded_str
+
+
+def yanzhengYaoqingmaWeiyixing(yaoqingma):
+    """
+    验证邀请码是否有效 (简单的格式验证)
+
+    参数:
+        yaoqingma: 待验证的邀请码
+
+    返回:
+        bool: 邀请码格式是否有效
+    """
+    if not yaoqingma or len(yaoqingma) != 20:
+        return False
+
+    # 检查是否只包含Base62字符
+    for char in yaoqingma:
+        if char not in _BASE62_CHARS:
+            return False
+
+    return True
\ No newline at end of file
diff --git a/yonghu/__init__.py b/yonghu/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/yonghu/__pycache__/__init__.cpython-312.pyc b/yonghu/__pycache__/__init__.cpython-312.pyc
new file mode 100644
index 0000000..961851c
Binary files /dev/null and b/yonghu/__pycache__/__init__.cpython-312.pyc differ
diff --git a/yonghu/__pycache__/__init__.cpython-313.pyc b/yonghu/__pycache__/__init__.cpython-313.pyc
new file mode 100644
index 0000000..c570691
Binary files /dev/null and b/yonghu/__pycache__/__init__.cpython-313.pyc differ
diff --git a/yonghu/__pycache__/admin.cpython-313.pyc b/yonghu/__pycache__/admin.cpython-313.pyc
new file mode 100644
index 0000000..6a4eb5b
Binary files /dev/null and b/yonghu/__pycache__/admin.cpython-313.pyc differ
diff --git a/yonghu/__pycache__/apps.cpython-313.pyc b/yonghu/__pycache__/apps.cpython-313.pyc
new file mode 100644
index 0000000..b6b3e44
Binary files /dev/null and b/yonghu/__pycache__/apps.cpython-313.pyc differ
diff --git a/yonghu/__pycache__/models.cpython-312.pyc b/yonghu/__pycache__/models.cpython-312.pyc
new file mode 100644
index 0000000..281805b
Binary files /dev/null and b/yonghu/__pycache__/models.cpython-312.pyc differ
diff --git a/yonghu/__pycache__/models.cpython-313.pyc b/yonghu/__pycache__/models.cpython-313.pyc
new file mode 100644
index 0000000..1b373d6
Binary files /dev/null and b/yonghu/__pycache__/models.cpython-313.pyc differ
diff --git a/yonghu/__pycache__/paihang_views.cpython-313.pyc b/yonghu/__pycache__/paihang_views.cpython-313.pyc
new file mode 100644
index 0000000..253baa1
Binary files /dev/null and b/yonghu/__pycache__/paihang_views.cpython-313.pyc differ
diff --git a/yonghu/__pycache__/tixian_shenhe_apply_b.cpython-312.pyc b/yonghu/__pycache__/tixian_shenhe_apply_b.cpython-312.pyc
new file mode 100644
index 0000000..2b3b310
Binary files /dev/null and b/yonghu/__pycache__/tixian_shenhe_apply_b.cpython-312.pyc differ
diff --git a/yonghu/__pycache__/tixian_shenhe_collect_b.cpython-312.pyc b/yonghu/__pycache__/tixian_shenhe_collect_b.cpython-312.pyc
new file mode 100644
index 0000000..c93aaad
Binary files /dev/null and b/yonghu/__pycache__/tixian_shenhe_collect_b.cpython-312.pyc differ
diff --git a/yonghu/__pycache__/tixian_shenhe_services.cpython-312.pyc b/yonghu/__pycache__/tixian_shenhe_services.cpython-312.pyc
new file mode 100644
index 0000000..6d10504
Binary files /dev/null and b/yonghu/__pycache__/tixian_shenhe_services.cpython-312.pyc differ
diff --git a/yonghu/__pycache__/tixian_shenhe_services.cpython-313.pyc b/yonghu/__pycache__/tixian_shenhe_services.cpython-313.pyc
new file mode 100644
index 0000000..b220364
Binary files /dev/null and b/yonghu/__pycache__/tixian_shenhe_services.cpython-313.pyc differ
diff --git a/yonghu/__pycache__/tixian_shenhe_views.cpython-312.pyc b/yonghu/__pycache__/tixian_shenhe_views.cpython-312.pyc
new file mode 100644
index 0000000..3d86165
Binary files /dev/null and b/yonghu/__pycache__/tixian_shenhe_views.cpython-312.pyc differ
diff --git a/yonghu/__pycache__/tixian_shenhe_views.cpython-313.pyc b/yonghu/__pycache__/tixian_shenhe_views.cpython-313.pyc
new file mode 100644
index 0000000..d553d17
Binary files /dev/null and b/yonghu/__pycache__/tixian_shenhe_views.cpython-313.pyc differ
diff --git a/yonghu/__pycache__/urls.cpython-313.pyc b/yonghu/__pycache__/urls.cpython-313.pyc
new file mode 100644
index 0000000..8e1a9c2
Binary files /dev/null and b/yonghu/__pycache__/urls.cpython-313.pyc differ
diff --git a/yonghu/__pycache__/views.cpython-312.pyc b/yonghu/__pycache__/views.cpython-312.pyc
new file mode 100644
index 0000000..9ea95e3
Binary files /dev/null and b/yonghu/__pycache__/views.cpython-312.pyc differ
diff --git a/yonghu/__pycache__/views.cpython-313.pyc b/yonghu/__pycache__/views.cpython-313.pyc
new file mode 100644
index 0000000..f236bb2
Binary files /dev/null and b/yonghu/__pycache__/views.cpython-313.pyc differ
diff --git a/yonghu/admin.py b/yonghu/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/yonghu/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/yonghu/apps.py b/yonghu/apps.py
new file mode 100644
index 0000000..36f20dc
--- /dev/null
+++ b/yonghu/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class YonghuConfig(AppConfig):
+    name = "yonghu"
diff --git a/yonghu/fadan_fenhong_utils.py b/yonghu/fadan_fenhong_utils.py
new file mode 100644
index 0000000..c816b50
--- /dev/null
+++ b/yonghu/fadan_fenhong_utils.py
@@ -0,0 +1,168 @@
+# yonghu/fadan_fenhong_utils.py
+# 罚款缴纳分红处理公共方法（支持更新罚单中的申请人分红金额）
+
+import decimal
+import logging
+from decimal import Decimal
+from django.db import transaction
+from django.core.exceptions import ObjectDoesNotExist
+
+from dingdan.models import Fadan, FadanFenhong, FadanFenhongLilv
+from yonghu.models import UserShangjia
+
+logger = logging.getLogger(__name__)
+
+
+# 身份映射字典
+IDENTITY_MAP = {
+    1: {'fenhong': 2, 'lilv': 1},   # 客服
+    2: {'fenhong': 5, 'lilv': 2},   # 售后
+    3: {'fenhong': 3, 'lilv': 3},   # 管理员
+    4: {'fenhong': 4, 'lilv': 4},   # 店铺
+    5: {'fenhong': 1, 'lilv': 5},   # 商家
+}
+
+
+def process_fadan_fenhong(fadan_id):
+    """
+    罚款缴纳后的分红处理（在回调中调用）
+    参数：
+        fadan_id: 罚单 ID
+    返回：
+        (success, message)
+    """
+    try:
+        # 1. 获取罚单对象（必须是已缴纳状态）
+        try:
+            fadan = Fadan.objects.get(id=fadan_id, zhuangtai=2)
+        except Fadan.DoesNotExist:
+            logger.error(f"罚单 {fadan_id} 不存在或状态不是已缴纳")
+            return False, "罚单不存在或状态异常"
+
+        # 2. 获取申请处罚者ID和身份（源身份数字）
+        shenqing_chufa = fadan.shenqing_chufa
+        src_shenfen = fadan.shenqingren_shenfen
+
+        if not shenqing_chufa:
+            logger.info(f"罚单 {fadan_id} 无申请处罚者，不进行分红")
+            # 即使无申请者，也可将分红金额字段设为0（默认已是0）
+            return True, "无申请处罚者，无需分红"
+
+        # 3. 映射身份数字
+        if src_shenfen not in IDENTITY_MAP:
+            logger.error(f"未知的申请处罚者身份: {src_shenfen}，罚单 {fadan_id}")
+            return False, f"未知身份 {src_shenfen}"
+
+        mapped = IDENTITY_MAP[src_shenfen]
+        fenhong_shenfen = mapped['fenhong']   # 用于 FadanFenhong.shenfen
+        lilv_shenfen = mapped['lilv']         # 用于 FadanFenhongLilv.shenfen
+
+        # 4. 获取罚款金额
+        fakuan_jine = fadan.fakuanjine
+        if fakuan_jine <= 0:
+            logger.info(f"罚单 {fadan_id} 罚款金额为0，不产生分红")
+            fadan.shenqingren_fenhong_jine = Decimal('0.00')
+            fadan.save(update_fields=['shenqingren_fenhong_jine'])
+            return True, "罚款金额为0，无分红"
+
+        # 5. 确定分红利率
+        rate = _get_fenhong_rate(shenqing_chufa, fenhong_shenfen, lilv_shenfen)
+        if rate is None:
+            logger.warning(f"未找到身份 {src_shenfen} (映射后 fenhong_shenfen={fenhong_shenfen}, lilv_shenfen={lilv_shenfen}) 的分红利率，罚单 {fadan_id} 不进行分红")
+            fadan.shenqingren_fenhong_jine = Decimal('0.00')
+            fadan.save(update_fields=['shenqingren_fenhong_jine'])
+            return True, "未配置分红利率，无分红"
+
+        # 6. 计算分红金额
+        fenhong_jine = (Decimal(str(fakuan_jine)) * Decimal(str(rate))).quantize(Decimal('0.01'))
+        if fenhong_jine <= 0:
+            logger.info(f"罚单 {fadan_id} 计算分红金额为0，无需处理")
+            fadan.shenqingren_fenhong_jine = Decimal('0.00')
+            fadan.save(update_fields=['shenqingren_fenhong_jine'])
+            return True, "分红金额为0"
+
+        # 7. 根据申请处罚者身份执行不同的分红逻辑
+        #    src_shenfen == 5 代表商家（源身份）
+        if src_shenfen == 5:
+            # 商家特殊处理：只记录总额，可提现分红永远为0，直接加到商家余额
+            with transaction.atomic():
+                fenhong_record, created = FadanFenhong.objects.get_or_create(
+                    fenhongzhe_id=shenqing_chufa,
+                    shenfen=fenhong_shenfen,
+                    defaults={
+                        'zonge': Decimal('0.00'),
+                        'ketixian_fenhong': Decimal('0.00'),
+                        'fenhong_cishu': 0,
+                        'yingde_lilv': rate,
+                        'is_individual_rate': False
+                    }
+                )
+                fenhong_record.zonge += fenhong_jine
+                # 可提现分红不累加，保持0
+                fenhong_record.fenhong_cishu += 1
+                fenhong_record.save()
+
+                # 直接增加商家余额（UserShangjia.yue）
+                try:
+                    shangjia = UserShangjia.objects.get(user__yonghuid=shenqing_chufa)
+                    shangjia.yue += fenhong_jine
+                    shangjia.save(update_fields=['yue'])
+                    logger.info(f"商家 {shenqing_chufa} 余额增加 {fenhong_jine} 元")
+                except UserShangjia.DoesNotExist:
+                    logger.error(f"商家 {shenqing_chufa} 扩展表不存在，无法增加余额")
+                    raise Exception(f"商家 {shenqing_chufa} 扩展表不存在，无法增加余额")
+
+                # 更新罚单中的申请人分红金额
+                fadan.shenqingren_fenhong_jine = fenhong_jine
+                fadan.save(update_fields=['shenqingren_fenhong_jine'])
+
+        else:
+            # 其他身份（客服、售后、管理员、店铺）：同时增加总额和可提现分红
+            with transaction.atomic():
+                fenhong_record, created = FadanFenhong.objects.get_or_create(
+                    fenhongzhe_id=shenqing_chufa,
+                    shenfen=fenhong_shenfen,
+                    defaults={
+                        'zonge': Decimal('0.00'),
+                        'ketixian_fenhong': Decimal('0.00'),
+                        'fenhong_cishu': 0,
+                        'yingde_lilv': rate,
+                        'is_individual_rate': False
+                    }
+                )
+                fenhong_record.zonge += fenhong_jine
+                fenhong_record.ketixian_fenhong += fenhong_jine
+                fenhong_record.fenhong_cishu += 1
+                fenhong_record.save()
+
+                # 更新罚单中的申请人分红金额
+                fadan.shenqingren_fenhong_jine = fenhong_jine
+                fadan.save(update_fields=['shenqingren_fenhong_jine'])
+
+        logger.info(f"罚单 {fadan_id} 分红处理成功: 申请者 {shenqing_chufa}, 分红金额 {fenhong_jine} 元, 源身份 {src_shenfen}, 映射后分红身份 {fenhong_shenfen}")
+        return True, "分红处理成功"
+
+    except Exception as e:
+        logger.error(f"罚单 {fadan_id} 分红处理异常: {str(e)}", exc_info=True)
+        return False, f"分红处理异常: {str(e)}"
+
+
+def _get_fenhong_rate(fenhongzhe_id, fenhong_shenfen, lilv_shenfen):
+    """
+    获取分红利率（优先使用个人单独配置，否则使用全局身份配置）
+    """
+    try:
+        individual = FadanFenhong.objects.get(
+            fenhongzhe_id=fenhongzhe_id,
+            shenfen=fenhong_shenfen,
+            is_individual_rate=True
+        )
+        return individual.yingde_lilv
+    except FadanFenhong.DoesNotExist:
+        pass
+
+    try:
+        global_rate = FadanFenhongLilv.objects.get(shenfen=lilv_shenfen)
+        return global_rate.lilv
+    except FadanFenhongLilv.DoesNotExist:
+        return None
\ No newline at end of file
diff --git a/yonghu/management/__init__.py b/yonghu/management/__init__.py
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/yonghu/management/__init__.py
@@ -0,0 +1 @@
+
diff --git a/yonghu/management/commands/__init__.py b/yonghu/management/commands/__init__.py
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/yonghu/management/commands/__init__.py
@@ -0,0 +1 @@
+
diff --git a/yonghu/management/commands/__pycache__/reconcile_pending_transfers.cpython-313.pyc b/yonghu/management/commands/__pycache__/reconcile_pending_transfers.cpython-313.pyc
new file mode 100644
index 0000000..fdb8be5
Binary files /dev/null and b/yonghu/management/commands/__pycache__/reconcile_pending_transfers.cpython-313.pyc differ
diff --git a/yonghu/migrations/0001_initial.py b/yonghu/migrations/0001_initial.py
new file mode 100644
index 0000000..8885537
--- /dev/null
+++ b/yonghu/migrations/0001_initial.py
@@ -0,0 +1,517 @@
+# Generated by Django 6.0 on 2025-12-20 23:54
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="UserMain",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True, serialize=False, verbose_name="主键ID"
+                    ),
+                ),
+                (
+                    "yonghuid",
+                    models.CharField(
+                        db_index=True, max_length=7, unique=True, verbose_name="用户ID"
+                    ),
+                ),
+                (
+                    "openid",
+                    models.CharField(
+                        db_index=True,
+                        max_length=64,
+                        unique=True,
+                        verbose_name="微信OpenID",
+                    ),
+                ),
+                (
+                    "avatar",
+                    models.URLField(
+                        blank=True, max_length=255, null=True, verbose_name="头像URL"
+                    ),
+                ),
+                (
+                    "phone",
+                    models.CharField(
+                        blank=True,
+                        db_index=True,
+                        max_length=11,
+                        null=True,
+                        verbose_name="手机号",
+                    ),
+                ),
+                (
+                    "user_type",
+                    models.CharField(
+                        choices=[
+                            ("normal", "普通用户"),
+                            ("dashou", "打手"),
+                            ("shop", "商家"),
+                            ("guanshi", "管事"),
+                            ("admin", "管理员"),
+                        ],
+                        default="normal",
+                        max_length=10,
+                        verbose_name="用户类型",
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+                (
+                    "yaoqingma",
+                    models.CharField(
+                        blank=True, max_length=20, null=True, verbose_name="邀请码"
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "用户主表",
+                "verbose_name_plural": "用户主表",
+                "db_table": "user_main",
+                "indexes": [
+                    models.Index(
+                        fields=["yonghuid"], name="user_main_yonghui_b8b2fe_idx"
+                    ),
+                    models.Index(fields=["openid"], name="user_main_openid_c9edbe_idx"),
+                    models.Index(fields=["phone"], name="user_main_phone_c76495_idx"),
+                    models.Index(
+                        fields=["user_type"], name="user_main_user_ty_8515fd_idx"
+                    ),
+                ],
+            },
+        ),
+        migrations.CreateModel(
+            name="UserGuanshi",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("dianhua", models.CharField(max_length=20, verbose_name="管事电话")),
+                (
+                    "wechat",
+                    models.CharField(
+                        blank=True, max_length=50, verbose_name="管事微信号"
+                    ),
+                ),
+                (
+                    "yaogingshuliang",
+                    models.IntegerField(default=0, verbose_name="邀请打手总数"),
+                ),
+                (
+                    "zhuangtai",
+                    models.IntegerField(
+                        choices=[(0, "禁用"), (1, "正常")],
+                        default=1,
+                        verbose_name="管事状态",
+                    ),
+                ),
+                (
+                    "jinrichongzhi",
+                    models.IntegerField(default=0, verbose_name="今日充值打手数量"),
+                ),
+                (
+                    "jinyuechongzhi",
+                    models.IntegerField(default=0, verbose_name="今月充值打手数量"),
+                ),
+                (
+                    "chongzhifenrun",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="充值分佣总额",
+                    ),
+                ),
+                (
+                    "yue",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="可提现余额",
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="guanshi_profile",
+                        to="yonghu.usermain",
+                        verbose_name="关联用户",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "管事扩展表",
+                "verbose_name_plural": "管事扩展表",
+                "db_table": "user_guanshi",
+                "indexes": [
+                    models.Index(fields=["user"], name="user_guansh_user_id_cbadac_idx")
+                ],
+            },
+        ),
+        migrations.CreateModel(
+            name="UserDashou",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "nicheng",
+                    models.CharField(
+                        db_index=True,
+                        max_length=50,
+                        unique=True,
+                        verbose_name="打手昵称",
+                    ),
+                ),
+                (
+                    "zhuangtai",
+                    models.IntegerField(
+                        choices=[(0, "离线"), (1, "在线"), (2, "忙碌")],
+                        default=0,
+                        verbose_name="打手状态",
+                    ),
+                ),
+                ("jieshao", models.TextField(blank=True, verbose_name="打手介绍")),
+                (
+                    "jiedanzongliang",
+                    models.IntegerField(default=0, verbose_name="接单总量"),
+                ),
+                (
+                    "tuiguanliang",
+                    models.IntegerField(default=0, verbose_name="退款订单总量"),
+                ),
+                (
+                    "yue",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="可提现余额",
+                    ),
+                ),
+                (
+                    "zonge",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="打单赚取总额",
+                    ),
+                ),
+                (
+                    "dianhua",
+                    models.CharField(
+                        blank=True, max_length=20, verbose_name="打手电话"
+                    ),
+                ),
+                (
+                    "wechat",
+                    models.CharField(
+                        blank=True, max_length=50, verbose_name="打手微信号"
+                    ),
+                ),
+                (
+                    "jinrijiedan",
+                    models.IntegerField(default=0, verbose_name="今日接单数量"),
+                ),
+                (
+                    "jinrishouyi",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="今日收益金额",
+                    ),
+                ),
+                (
+                    "jinyuejiedan",
+                    models.IntegerField(default=0, verbose_name="今月接单数量"),
+                ),
+                (
+                    "jinyueshouyi",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="今月收益金额",
+                    ),
+                ),
+                ("jifen", models.IntegerField(default=100, verbose_name="打手积分")),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="dashou_profile",
+                        to="yonghu.usermain",
+                        verbose_name="关联用户",
+                    ),
+                ),
+                (
+                    "yaoqingren",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="yaoqing_dashou",
+                        to="yonghu.usermain",
+                        verbose_name="打手邀请人ID",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "打手扩展表",
+                "verbose_name_plural": "打手扩展表",
+                "db_table": "user_dashou",
+                "indexes": [
+                    models.Index(
+                        fields=["user"], name="user_dashou_user_id_cf0410_idx"
+                    ),
+                    models.Index(
+                        fields=["zhuangtai"], name="user_dashou_zhuangt_f427c0_idx"
+                    ),
+                    models.Index(
+                        fields=["yaoqingren"], name="user_dashou_yaoqing_dd346f_idx"
+                    ),
+                    models.Index(
+                        fields=["nicheng"], name="user_dashou_nicheng_6025cb_idx"
+                    ),
+                ],
+            },
+        ),
+        migrations.CreateModel(
+            name="UserBoss",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("nickname", models.CharField(max_length=50, verbose_name="老板昵称")),
+                (
+                    "zonge",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="消费总额",
+                    ),
+                ),
+                ("alldingdan", models.IntegerField(default=0, verbose_name="订单总数")),
+                ("alltui", models.IntegerField(default=0, verbose_name="退款总数")),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="boss_profile",
+                        to="yonghu.usermain",
+                        verbose_name="关联用户",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "老板扩展表",
+                "verbose_name_plural": "老板扩展表",
+                "db_table": "user_boss",
+                "indexes": [
+                    models.Index(fields=["user"], name="user_boss_user_id_4e81a4_idx")
+                ],
+            },
+        ),
+        migrations.CreateModel(
+            name="AdminProfile",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("password", models.CharField(max_length=255, verbose_name="密码")),
+                (
+                    "wechat",
+                    models.CharField(
+                        blank=True, max_length=50, verbose_name="管理员微信"
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="admin_profile",
+                        to="yonghu.usermain",
+                        verbose_name="关联用户",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "管理员扩展表",
+                "verbose_name_plural": "管理员扩展表",
+                "db_table": "admin_profile",
+                "indexes": [
+                    models.Index(fields=["user"], name="admin_profi_user_id_7d067d_idx")
+                ],
+            },
+        ),
+        migrations.CreateModel(
+            name="UserShangjia",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "nicheng",
+                    models.CharField(
+                        db_index=True,
+                        max_length=50,
+                        unique=True,
+                        verbose_name="商家昵称",
+                    ),
+                ),
+                (
+                    "zhuangtai",
+                    models.IntegerField(
+                        choices=[(0, "待审核"), (1, "正常"), (2, "禁用")],
+                        default=1,
+                        verbose_name="商家状态",
+                    ),
+                ),
+                ("dianhua", models.CharField(max_length=20, verbose_name="商家电话")),
+                (
+                    "wechat",
+                    models.CharField(
+                        blank=True, max_length=50, verbose_name="商家微信号"
+                    ),
+                ),
+                ("fabu", models.IntegerField(default=0, verbose_name="发布订单总数量")),
+                (
+                    "tuiguan",
+                    models.IntegerField(default=0, verbose_name="退款订单总量"),
+                ),
+                (
+                    "yue",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="商家余额",
+                    ),
+                ),
+                (
+                    "chengjiao",
+                    models.IntegerField(default=0, verbose_name="商家成交订单总量"),
+                ),
+                (
+                    "jinridingdan",
+                    models.IntegerField(default=0, verbose_name="商家今日订单总量"),
+                ),
+                (
+                    "jinriliushui",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="商家今日流水",
+                    ),
+                ),
+                (
+                    "jinyuedingdan",
+                    models.IntegerField(default=0, verbose_name="商家今月订单总量"),
+                ),
+                (
+                    "jinyueliushui",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="商家今月流水",
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="shop_profile",
+                        to="yonghu.usermain",
+                        verbose_name="关联用户",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "商家扩展表",
+                "verbose_name_plural": "商家扩展表",
+                "db_table": "user_shangjia",
+                "indexes": [
+                    models.Index(
+                        fields=["user"], name="user_shangj_user_id_823c5c_idx"
+                    ),
+                    models.Index(
+                        fields=["nicheng"], name="user_shangj_nicheng_6967bc_idx"
+                    ),
+                ],
+            },
+        ),
+    ]
diff --git a/yonghu/migrations/0002_alter_usermain_avatar.py b/yonghu/migrations/0002_alter_usermain_avatar.py
new file mode 100644
index 0000000..6ba7340
--- /dev/null
+++ b/yonghu/migrations/0002_alter_usermain_avatar.py
@@ -0,0 +1,20 @@
+# Generated by Django 6.0 on 2025-12-21 18:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="usermain",
+            name="avatar",
+            field=models.CharField(
+                blank=True, max_length=500, null=True, verbose_name="头像"
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0003_rename_user_dashou_yaoqing_dd346f_idx_user_dashou_yaoqing_894658_idx_and_more.py b/yonghu/migrations/0003_rename_user_dashou_yaoqing_dd346f_idx_user_dashou_yaoqing_894658_idx_and_more.py
new file mode 100644
index 0000000..83a1b7f
--- /dev/null
+++ b/yonghu/migrations/0003_rename_user_dashou_yaoqing_dd346f_idx_user_dashou_yaoqing_894658_idx_and_more.py
@@ -0,0 +1,36 @@
+# Generated by Django 6.0 on 2025-12-23 21:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0002_alter_usermain_avatar"),
+    ]
+
+    operations = [
+        migrations.RenameIndex(
+            model_name="userdashou",
+            new_name="user_dashou_yaoqing_894658_idx",
+            old_name="user_dashou_yaoqing_dd346f_idx",
+        ),
+        migrations.AddField(
+            model_name="userdashou",
+            name="yongjin",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                max_digits=10,
+                null=True,
+                verbose_name="佣金要求",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="userdashou",
+            name="yaoqingren",
+            field=models.CharField(
+                db_index=True, max_length=7, null=True, verbose_name="邀请人ID"
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0004_rename_tuiguanliang_userdashou_tuikuanliang_and_more.py b/yonghu/migrations/0004_rename_tuiguanliang_userdashou_tuikuanliang_and_more.py
new file mode 100644
index 0000000..9df91dd
--- /dev/null
+++ b/yonghu/migrations/0004_rename_tuiguanliang_userdashou_tuikuanliang_and_more.py
@@ -0,0 +1,31 @@
+# Generated by Django 6.0 on 2025-12-23 22:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "yonghu",
+            "0003_rename_user_dashou_yaoqing_dd346f_idx_user_dashou_yaoqing_894658_idx_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="userdashou",
+            old_name="tuiguanliang",
+            new_name="tuikuanliang",
+        ),
+        migrations.AddField(
+            model_name="userdashou",
+            name="zaixianzhuangtai",
+            field=models.IntegerField(default=0, verbose_name="打手在线状态"),
+        ),
+        migrations.AlterField(
+            model_name="userdashou",
+            name="zhuangtai",
+            field=models.IntegerField(default=1, verbose_name="打手状态"),
+        ),
+    ]
diff --git a/yonghu/migrations/0005_alter_userdashou_zhuangtai.py b/yonghu/migrations/0005_alter_userdashou_zhuangtai.py
new file mode 100644
index 0000000..8408398
--- /dev/null
+++ b/yonghu/migrations/0005_alter_userdashou_zhuangtai.py
@@ -0,0 +1,20 @@
+# Generated by Django 6.0 on 2025-12-24 23:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0004_rename_tuiguanliang_userdashou_tuikuanliang_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="userdashou",
+            name="zhuangtai",
+            field=models.IntegerField(
+                db_index=True, default=1, verbose_name="打手状态"
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0006_remove_usermain_yaoqingma_usermain_last_login_and_more.py b/yonghu/migrations/0006_remove_usermain_yaoqingma_usermain_last_login_and_more.py
new file mode 100644
index 0000000..85a76e6
--- /dev/null
+++ b/yonghu/migrations/0006_remove_usermain_yaoqingma_usermain_last_login_and_more.py
@@ -0,0 +1,31 @@
+# Generated by Django 6.0 on 2025-12-25 16:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0005_alter_userdashou_zhuangtai"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="usermain",
+            name="yaoqingma",
+        ),
+        migrations.AddField(
+            model_name="usermain",
+            name="last_login",
+            field=models.DateTimeField(
+                blank=True, null=True, verbose_name="last login"
+            ),
+        ),
+        migrations.AddField(
+            model_name="usermain",
+            name="password",
+            field=models.CharField(
+                blank=True, max_length=200, null=True, verbose_name="密码"
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0007_userdashou_chengjiaozongliang.py b/yonghu/migrations/0007_userdashou_chengjiaozongliang.py
new file mode 100644
index 0000000..5b55f55
--- /dev/null
+++ b/yonghu/migrations/0007_userdashou_chengjiaozongliang.py
@@ -0,0 +1,18 @@
+# Generated by Django 6.0 on 2025-12-26 17:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0006_remove_usermain_yaoqingma_usermain_last_login_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="userdashou",
+            name="chengjiaozongliang",
+            field=models.IntegerField(default=0, verbose_name="成交单总量"),
+        ),
+    ]
diff --git a/yonghu/migrations/0008_userdashou_chenghao_userdashou_zhanghaozhuangtai_and_more.py b/yonghu/migrations/0008_userdashou_chenghao_userdashou_zhanghaozhuangtai_and_more.py
new file mode 100644
index 0000000..af82ae3
--- /dev/null
+++ b/yonghu/migrations/0008_userdashou_chenghao_userdashou_zhanghaozhuangtai_and_more.py
@@ -0,0 +1,37 @@
+# Generated by Django 6.0 on 2025-12-27 22:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0007_userdashou_chengjiaozongliang"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="userdashou",
+            name="chenghao",
+            field=models.CharField(
+                db_index=True, max_length=50, null=True, verbose_name="打手称号"
+            ),
+        ),
+        migrations.AddField(
+            model_name="userdashou",
+            name="zhanghaozhuangtai",
+            field=models.IntegerField(default=1, verbose_name="打手账号状态"),
+        ),
+        migrations.AlterField(
+            model_name="userdashou",
+            name="nicheng",
+            field=models.CharField(
+                db_index=True, max_length=50, null=True, verbose_name="打手昵称"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="userdashou",
+            name="zaixianzhuangtai",
+            field=models.IntegerField(default=1, verbose_name="打手在线状态"),
+        ),
+    ]
diff --git a/yonghu/migrations/0009_alter_userdashou_dianhua_alter_userdashou_wechat.py b/yonghu/migrations/0009_alter_userdashou_dianhua_alter_userdashou_wechat.py
new file mode 100644
index 0000000..e7950d5
--- /dev/null
+++ b/yonghu/migrations/0009_alter_userdashou_dianhua_alter_userdashou_wechat.py
@@ -0,0 +1,23 @@
+# Generated by Django 6.0 on 2025-12-27 22:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0008_userdashou_chenghao_userdashou_zhanghaozhuangtai_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="userdashou",
+            name="dianhua",
+            field=models.CharField(max_length=20, null=True, verbose_name="打手电话"),
+        ),
+        migrations.AlterField(
+            model_name="userdashou",
+            name="wechat",
+            field=models.CharField(max_length=50, null=True, verbose_name="打手微信号"),
+        ),
+    ]
diff --git a/yonghu/migrations/0010_userdashou_yajin_alter_userdashou_jieshao_and_more.py b/yonghu/migrations/0010_userdashou_yajin_alter_userdashou_jieshao_and_more.py
new file mode 100644
index 0000000..2c826fc
--- /dev/null
+++ b/yonghu/migrations/0010_userdashou_yajin_alter_userdashou_jieshao_and_more.py
@@ -0,0 +1,30 @@
+# Generated by Django 6.0 on 2025-12-27 22:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0009_alter_userdashou_dianhua_alter_userdashou_wechat"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="userdashou",
+            name="yajin",
+            field=models.DecimalField(
+                decimal_places=2, default=0.0, max_digits=12, verbose_name="打手押金"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="userdashou",
+            name="jieshao",
+            field=models.TextField(null=True, verbose_name="打手介绍"),
+        ),
+        migrations.AlterField(
+            model_name="userdashou",
+            name="jifen",
+            field=models.IntegerField(default=0, verbose_name="打手积分"),
+        ),
+    ]
diff --git a/yonghu/migrations/0011_alter_userguanshi_dianhua_alter_userguanshi_wechat_and_more.py b/yonghu/migrations/0011_alter_userguanshi_dianhua_alter_userguanshi_wechat_and_more.py
new file mode 100644
index 0000000..277f08e
--- /dev/null
+++ b/yonghu/migrations/0011_alter_userguanshi_dianhua_alter_userguanshi_wechat_and_more.py
@@ -0,0 +1,33 @@
+# Generated by Django 6.0 on 2025-12-28 23:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0010_userdashou_yajin_alter_userdashou_jieshao_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="userguanshi",
+            name="dianhua",
+            field=models.CharField(max_length=20, null=True, verbose_name="管事电话"),
+        ),
+        migrations.AlterField(
+            model_name="userguanshi",
+            name="wechat",
+            field=models.CharField(max_length=50, null=True, verbose_name="管事微信号"),
+        ),
+        migrations.AlterField(
+            model_name="usershangjia",
+            name="dianhua",
+            field=models.CharField(max_length=20, null=True, verbose_name="商家电话"),
+        ),
+        migrations.AlterField(
+            model_name="usershangjia",
+            name="wechat",
+            field=models.CharField(max_length=50, null=True, verbose_name="商家微信号"),
+        ),
+    ]
diff --git a/yonghu/migrations/0012_rename_tuiguan_usershangjia_tuikuan.py b/yonghu/migrations/0012_rename_tuiguan_usershangjia_tuikuan.py
new file mode 100644
index 0000000..15b57ca
--- /dev/null
+++ b/yonghu/migrations/0012_rename_tuiguan_usershangjia_tuikuan.py
@@ -0,0 +1,18 @@
+# Generated by Django 6.0 on 2025-12-29 12:34
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0011_alter_userguanshi_dianhua_alter_userguanshi_wechat_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="usershangjia",
+            old_name="tuiguan",
+            new_name="tuikuan",
+        ),
+    ]
diff --git a/yonghu/migrations/0013_remove_userdashou_yongjin.py b/yonghu/migrations/0013_remove_userdashou_yongjin.py
new file mode 100644
index 0000000..c45fa6b
--- /dev/null
+++ b/yonghu/migrations/0013_remove_userdashou_yongjin.py
@@ -0,0 +1,17 @@
+# Generated by Django 6.0 on 2025-12-31 11:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0012_rename_tuiguan_usershangjia_tuikuan"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="userdashou",
+            name="yongjin",
+        ),
+    ]
diff --git a/yonghu/migrations/0014_userguanshi_yaoqingma_and_more.py b/yonghu/migrations/0014_userguanshi_yaoqingma_and_more.py
new file mode 100644
index 0000000..84db4ea
--- /dev/null
+++ b/yonghu/migrations/0014_userguanshi_yaoqingma_and_more.py
@@ -0,0 +1,26 @@
+# Generated by Django 6.0 on 2026-01-06 10:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0013_remove_userdashou_yongjin"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="userguanshi",
+            name="yaoqingma",
+            field=models.CharField(
+                db_index=True, max_length=20, null=True, verbose_name="邀请码"
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="userguanshi",
+            index=models.Index(
+                fields=["yaoqingma"], name="user_guansh_yaoqing_21d1d4_idx"
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0015_remove_userdashou_user_dashou_zhuangt_f427c0_idx_and_more.py b/yonghu/migrations/0015_remove_userdashou_user_dashou_zhuangt_f427c0_idx_and_more.py
new file mode 100644
index 0000000..0242f2e
--- /dev/null
+++ b/yonghu/migrations/0015_remove_userdashou_user_dashou_zhuangt_f427c0_idx_and_more.py
@@ -0,0 +1,36 @@
+# Generated by Django 6.0 on 2026-01-06 23:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0014_userguanshi_yaoqingma_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveIndex(
+            model_name="userdashou",
+            name="user_dashou_zhuangt_f427c0_idx",
+        ),
+        migrations.RemoveIndex(
+            model_name="userdashou",
+            name="user_dashou_nicheng_6025cb_idx",
+        ),
+        migrations.AlterField(
+            model_name="userdashou",
+            name="chenghao",
+            field=models.CharField(max_length=50, null=True, verbose_name="打手称号"),
+        ),
+        migrations.AlterField(
+            model_name="userdashou",
+            name="nicheng",
+            field=models.CharField(max_length=50, null=True, verbose_name="打手昵称"),
+        ),
+        migrations.AlterField(
+            model_name="userdashou",
+            name="zhuangtai",
+            field=models.IntegerField(default=1, verbose_name="打手状态"),
+        ),
+    ]
diff --git a/yonghu/migrations/0016_tixianjilu_and_more.py b/yonghu/migrations/0016_tixianjilu_and_more.py
new file mode 100644
index 0000000..4775da1
--- /dev/null
+++ b/yonghu/migrations/0016_tixianjilu_and_more.py
@@ -0,0 +1,168 @@
+# Generated by Django 6.0 on 2026-01-07 22:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0015_remove_userdashou_user_dashou_zhuangt_f427c0_idx_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Tixianjilu",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True, serialize=False, verbose_name="提现记录ID"
+                    ),
+                ),
+                (
+                    "yonghuid",
+                    models.CharField(
+                        db_index=True, max_length=7, verbose_name="提现用户ID"
+                    ),
+                ),
+                (
+                    "avatar",
+                    models.CharField(
+                        blank=True, max_length=500, null=True, verbose_name="头像"
+                    ),
+                ),
+                (
+                    "phone",
+                    models.CharField(
+                        blank=True, max_length=11, null=True, verbose_name="手机号"
+                    ),
+                ),
+                (
+                    "nicheng",
+                    models.CharField(max_length=50, null=True, verbose_name="打手昵称"),
+                ),
+                (
+                    "leixing",
+                    models.PositiveIntegerField(
+                        blank=True, null=True, verbose_name="提现类型1:打手2：管事"
+                    ),
+                ),
+                (
+                    "zhifu",
+                    models.CharField(
+                        blank=True, max_length=500, null=True, verbose_name="收款码图片"
+                    ),
+                ),
+                (
+                    "skzhanghao",
+                    models.CharField(
+                        blank=True, max_length=11, null=True, verbose_name="收款账号"
+                    ),
+                ),
+                (
+                    "jine",
+                    models.DecimalField(
+                        blank=True,
+                        decimal_places=2,
+                        max_digits=10,
+                        null=True,
+                        verbose_name="提现金额",
+                    ),
+                ),
+                (
+                    "zhuangtai",
+                    models.IntegerField(
+                        blank=True,
+                        db_index=True,
+                        default=1,
+                        null=True,
+                        verbose_name="订单状态",
+                    ),
+                ),
+                (
+                    "fangshi",
+                    models.IntegerField(
+                        blank=True,
+                        db_index=True,
+                        null=True,
+                        verbose_name="收款方式1:微信2：支付宝",
+                    ),
+                ),
+                (
+                    "shenheid",
+                    models.CharField(
+                        db_index=True,
+                        max_length=7,
+                        null=True,
+                        verbose_name="审核用户ID",
+                    ),
+                ),
+                (
+                    "bhliyou",
+                    models.TextField(blank=True, null=True, verbose_name="驳回理由"),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "提现记录表",
+                "verbose_name_plural": "提现记录表",
+                "db_table": "tixianjilu",
+            },
+        ),
+        migrations.RemoveIndex(
+            model_name="usermain",
+            name="user_main_phone_c76495_idx",
+        ),
+        migrations.AddField(
+            model_name="usermain",
+            name="skzhanghao",
+            field=models.CharField(
+                blank=True, max_length=11, null=True, verbose_name="收款账号"
+            ),
+        ),
+        migrations.AddField(
+            model_name="usermain",
+            name="zhifu",
+            field=models.CharField(
+                blank=True, max_length=500, null=True, verbose_name="收款码图片"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="usermain",
+            name="phone",
+            field=models.CharField(
+                blank=True, max_length=11, null=True, verbose_name="手机号"
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="tixianjilu",
+            index=models.Index(
+                fields=["yonghuid"], name="tixianjilu_yonghui_8083bb_idx"
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="tixianjilu",
+            index=models.Index(
+                fields=["zhuangtai"], name="tixianjilu_zhuangt_839d8e_idx"
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="tixianjilu",
+            index=models.Index(
+                fields=["shenheid"], name="tixianjilu_shenhei_470e0c_idx"
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="tixianjilu",
+            index=models.Index(
+                fields=["fangshi"], name="tixianjilu_fangshi_a1e0bc_idx"
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0017_usermain_ip_usermain_last_login_time_and_more.py b/yonghu/migrations/0017_usermain_ip_usermain_last_login_time_and_more.py
new file mode 100644
index 0000000..32e3c20
--- /dev/null
+++ b/yonghu/migrations/0017_usermain_ip_usermain_last_login_time_and_more.py
@@ -0,0 +1,34 @@
+# Generated by Django 6.0 on 2026-01-08 22:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0016_tixianjilu_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="usermain",
+            name="ip",
+            field=models.CharField(
+                blank=True, max_length=50, null=True, verbose_name="来访用户ip"
+            ),
+        ),
+        migrations.AddField(
+            model_name="usermain",
+            name="last_login_time",
+            field=models.DateTimeField(
+                blank=True, null=True, verbose_name="最后登录时间"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="tixianjilu",
+            name="leixing",
+            field=models.PositiveIntegerField(
+                blank=True, null=True, verbose_name="提现类型1:打手佣金2：管事分红"
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0018_xiugaijilu.py b/yonghu/migrations/0018_xiugaijilu.py
new file mode 100644
index 0000000..d83d4a5
--- /dev/null
+++ b/yonghu/migrations/0018_xiugaijilu.py
@@ -0,0 +1,140 @@
+# Generated by Django 6.0 on 2026-01-12 16:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0017_usermain_ip_usermain_last_login_time_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Xiugaijilu",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True, serialize=False, verbose_name="记录ID"
+                    ),
+                ),
+                (
+                    "yonghuid",
+                    models.CharField(max_length=7, verbose_name="被修改用户ID"),
+                ),
+                (
+                    "xiugaiid",
+                    models.CharField(max_length=30, verbose_name="修改人账号ID"),
+                ),
+                ("leixing", models.IntegerField(verbose_name="被修改用户类型")),
+                (
+                    "xiugaitijiao",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="修改后的打手提现金额",
+                    ),
+                ),
+                (
+                    "xiugaitijiaoq",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="修改前的打手提现金额",
+                    ),
+                ),
+                (
+                    "jifen",
+                    models.IntegerField(default=0, verbose_name="修改后的打手积分"),
+                ),
+                (
+                    "yjifen",
+                    models.IntegerField(default=0, verbose_name="修改前的打手积分"),
+                ),
+                (
+                    "yajin",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="修改后的打手押金",
+                    ),
+                ),
+                (
+                    "yyajin",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="修改前的打手押金",
+                    ),
+                ),
+                (
+                    "shangjiayue",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="修改后的商家余额",
+                    ),
+                ),
+                (
+                    "shangjiayueq",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="修改前的商家余额",
+                    ),
+                ),
+                (
+                    "guanshiyue",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="修改后的管事余额",
+                    ),
+                ),
+                (
+                    "guanshiyueq",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="修改前的管事余额",
+                    ),
+                ),
+                (
+                    "huiyuants",
+                    models.IntegerField(default=0, verbose_name="添加会员天数"),
+                ),
+                (
+                    "huiyuan_id",
+                    models.CharField(
+                        blank=True, max_length=6, null=True, verbose_name="会员ID"
+                    ),
+                ),
+                (
+                    "qitashuoming",
+                    models.TextField(blank=True, null=True, verbose_name="其他说明"),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "修改记录表",
+                "verbose_name_plural": "修改记录表",
+                "db_table": "xiugaijilu",
+            },
+        ),
+    ]
diff --git a/yonghu/migrations/0019_alter_tixianjilu_zhuangtai.py b/yonghu/migrations/0019_alter_tixianjilu_zhuangtai.py
new file mode 100644
index 0000000..593b7df
--- /dev/null
+++ b/yonghu/migrations/0019_alter_tixianjilu_zhuangtai.py
@@ -0,0 +1,24 @@
+# Generated by Django 6.0 on 2026-01-13 00:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0018_xiugaijilu"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="tixianjilu",
+            name="zhuangtai",
+            field=models.IntegerField(
+                blank=True,
+                db_index=True,
+                default=1,
+                null=True,
+                verbose_name="提现状态1:审核2：成功3：失败",
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0020_adminprofile_yaoqingma.py b/yonghu/migrations/0020_adminprofile_yaoqingma.py
new file mode 100644
index 0000000..ae95c8a
--- /dev/null
+++ b/yonghu/migrations/0020_adminprofile_yaoqingma.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.27 on 2026-01-21 11:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0019_alter_tixianjilu_zhuangtai"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="adminprofile",
+            name="yaoqingma",
+            field=models.CharField(
+                db_index=True, max_length=20, null=True, verbose_name="管理员邀请码"
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0021_rankingrecord.py b/yonghu/migrations/0021_rankingrecord.py
new file mode 100644
index 0000000..afb30f7
--- /dev/null
+++ b/yonghu/migrations/0021_rankingrecord.py
@@ -0,0 +1,90 @@
+# Generated by Django 4.2.27 on 2026-02-06 15:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0020_adminprofile_yaoqingma"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="RankingRecord",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                (
+                    "zhouqi",
+                    models.IntegerField(
+                        choices=[(1, "日榜"), (2, "月榜")], verbose_name="周期类型"
+                    ),
+                ),
+                (
+                    "tongji_date",
+                    models.DateField(db_index=True, verbose_name="统计日期"),
+                ),
+                (
+                    "shenfen",
+                    models.IntegerField(
+                        choices=[(2, "打手"), (3, "管事"), (4, "商家")],
+                        verbose_name="用户身份",
+                    ),
+                ),
+                (
+                    "yonghuid",
+                    models.CharField(
+                        db_index=True, max_length=7, verbose_name="用户ID"
+                    ),
+                ),
+                ("paiming", models.IntegerField(verbose_name="排名")),
+                (
+                    "zhizhi",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="指标值",
+                    ),
+                ),
+                (
+                    "nicheng",
+                    models.CharField(max_length=50, null=True, verbose_name="用户昵称"),
+                ),
+                (
+                    "avatar",
+                    models.CharField(
+                        blank=True, max_length=500, null=True, verbose_name="头像"
+                    ),
+                ),
+                (
+                    "chuangjian_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "排行榜记录",
+                "verbose_name_plural": "排行榜记录",
+                "db_table": "ranking_record",
+                "indexes": [
+                    models.Index(
+                        fields=["zhouqi", "tongji_date", "shenfen", "paiming"],
+                        name="ranking_rec_zhouqi_fc9f4d_idx",
+                    ),
+                    models.Index(
+                        fields=["yonghuid", "zhouqi"],
+                        name="ranking_rec_yonghui_e5be77_idx",
+                    ),
+                    models.Index(
+                        fields=["tongji_date"], name="ranking_rec_tongji__820158_idx"
+                    ),
+                ],
+                "unique_together": {("zhouqi", "tongji_date", "shenfen", "paiming")},
+            },
+        ),
+    ]
diff --git a/yonghu/migrations/0022_officialaccountuser_usermain_unionid.py b/yonghu/migrations/0022_officialaccountuser_usermain_unionid.py
new file mode 100644
index 0000000..dc6870d
--- /dev/null
+++ b/yonghu/migrations/0022_officialaccountuser_usermain_unionid.py
@@ -0,0 +1,74 @@
+# Generated by Django 4.2.27 on 2026-02-07 18:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0021_rankingrecord"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="OfficialAccountUser",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "unionid",
+                    models.CharField(
+                        db_index=True, max_length=64, verbose_name="UnionID"
+                    ),
+                ),
+                (
+                    "official_openid",
+                    models.CharField(
+                        db_index=True,
+                        max_length=64,
+                        unique=True,
+                        verbose_name="服务号OpenID",
+                    ),
+                ),
+                (
+                    "subscribe_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="关注时间"),
+                ),
+                (
+                    "is_subscribed",
+                    models.BooleanField(default=True, verbose_name="是否关注"),
+                ),
+                (
+                    "created_at",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "updated_at",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "服务号用户",
+                "verbose_name_plural": "服务号用户",
+                "db_table": "official_account_user",
+            },
+        ),
+        migrations.AddField(
+            model_name="usermain",
+            name="unionid",
+            field=models.CharField(
+                blank=True,
+                db_index=True,
+                max_length=64,
+                null=True,
+                verbose_name="微信UnionID",
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0023_alter_officialaccountuser_unionid.py b/yonghu/migrations/0023_alter_officialaccountuser_unionid.py
new file mode 100644
index 0000000..a463d99
--- /dev/null
+++ b/yonghu/migrations/0023_alter_officialaccountuser_unionid.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.27 on 2026-02-13 22:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0022_officialaccountuser_usermain_unionid"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="officialaccountuser",
+            name="unionid",
+            field=models.CharField(
+                db_index=True, max_length=64, null=True, verbose_name="UnionID"
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0024_userkefu.py b/yonghu/migrations/0024_userkefu.py
new file mode 100644
index 0000000..0f15740
--- /dev/null
+++ b/yonghu/migrations/0024_userkefu.py
@@ -0,0 +1,79 @@
+# Generated by Django 4.2.27 on 2026-02-19 00:03
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0023_alter_officialaccountuser_unionid"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="UserKefu",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("nicheng", models.CharField(max_length=50, verbose_name="客服昵称")),
+                ("erjimima", models.CharField(max_length=128, verbose_name="二级密码")),
+                (
+                    "zhuangtai",
+                    models.IntegerField(
+                        choices=[(0, "禁用"), (1, "正常")],
+                        default=1,
+                        verbose_name="客服状态",
+                    ),
+                ),
+                (
+                    "jinrichuli",
+                    models.IntegerField(default=0, verbose_name="今日处理订单数"),
+                ),
+                (
+                    "jinyuechuli",
+                    models.IntegerField(default=0, verbose_name="本月处理订单数"),
+                ),
+                (
+                    "zongchuli",
+                    models.IntegerField(default=0, verbose_name="累计处理订单数"),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="kefu_profile",
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="关联用户",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "客服扩展表",
+                "verbose_name_plural": "客服扩展表",
+                "db_table": "user_kefu",
+                "indexes": [
+                    models.Index(fields=["user"], name="user_kefu_user_id_5fe3a1_idx"),
+                    models.Index(
+                        fields=["zhuangtai"], name="user_kefu_zhuangt_317491_idx"
+                    ),
+                ],
+            },
+        ),
+    ]
diff --git a/yonghu/migrations/0025_userguanshi_fenghong_erci_and_more.py b/yonghu/migrations/0025_userguanshi_fenghong_erci_and_more.py
new file mode 100644
index 0000000..c865b9e
--- /dev/null
+++ b/yonghu/migrations/0025_userguanshi_fenghong_erci_and_more.py
@@ -0,0 +1,38 @@
+# Generated by Django 4.2.27 on 2026-03-01 23:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0024_userkefu"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="userguanshi",
+            name="fenghong_erci",
+            field=models.DecimalField(
+                decimal_places=2,
+                default=0.0,
+                max_digits=10,
+                verbose_name="二次分红金额",
+            ),
+        ),
+        migrations.AddField(
+            model_name="userguanshi",
+            name="fenghong_erci_enabled",
+            field=models.BooleanField(default=False, verbose_name="开启二次分红"),
+        ),
+        migrations.AddField(
+            model_name="userguanshi",
+            name="fenhong_yici",
+            field=models.DecimalField(
+                decimal_places=2,
+                default=0.0,
+                max_digits=10,
+                verbose_name="首次分红金额",
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0026_tixianautorecord_alter_userdashou_options_and_more.py b/yonghu/migrations/0026_tixianautorecord_alter_userdashou_options_and_more.py
new file mode 100644
index 0000000..2047ffb
--- /dev/null
+++ b/yonghu/migrations/0026_tixianautorecord_alter_userdashou_options_and_more.py
@@ -0,0 +1,216 @@
+# Generated by Django 4.2.27 on 2026-03-09 15:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0025_userguanshi_fenghong_erci_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="TixianAutoRecord",
+            fields=[
+                ("id", models.BigAutoField(primary_key=True, serialize=False)),
+                (
+                    "tixian_id",
+                    models.CharField(
+                        db_index=True,
+                        max_length=32,
+                        unique=True,
+                        verbose_name="提现订单号(自定义)",
+                    ),
+                ),
+                (
+                    "yonghuid",
+                    models.CharField(
+                        db_index=True, max_length=7, verbose_name="用户ID"
+                    ),
+                ),
+                ("leixing", models.IntegerField(verbose_name="提现类型 1打手 2管事")),
+                (
+                    "jine",
+                    models.DecimalField(
+                        decimal_places=2, max_digits=10, verbose_name="申请提现金额"
+                    ),
+                ),
+                (
+                    "shouxufei",
+                    models.DecimalField(
+                        decimal_places=2, max_digits=10, verbose_name="手续费"
+                    ),
+                ),
+                (
+                    "shijidaozhang",
+                    models.DecimalField(
+                        decimal_places=2, max_digits=10, verbose_name="实际到账金额"
+                    ),
+                ),
+                (
+                    "feilv",
+                    models.DecimalField(
+                        decimal_places=4, max_digits=5, verbose_name="费率"
+                    ),
+                ),
+                (
+                    "zhuangtai",
+                    models.IntegerField(
+                        choices=[(0, "处理中"), (1, "成功"), (2, "失败")],
+                        default=0,
+                        verbose_name="状态",
+                    ),
+                ),
+                (
+                    "wechat_transfer_no",
+                    models.CharField(
+                        blank=True,
+                        max_length=64,
+                        null=True,
+                        verbose_name="微信转账单号",
+                    ),
+                ),
+                (
+                    "wechat_package",
+                    models.TextField(
+                        blank=True,
+                        null=True,
+                        verbose_name="微信返回的package_info(JSON)",
+                    ),
+                ),
+                (
+                    "fail_reason",
+                    models.TextField(blank=True, null=True, verbose_name="失败原因"),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+            ],
+            options={
+                "verbose_name": "自动提现记录",
+                "verbose_name_plural": "自动提现记录",
+                "db_table": "tixian_auto_record",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="userdashou",
+            options={},
+        ),
+        migrations.RemoveIndex(
+            model_name="userdashou",
+            name="user_dashou_user_id_cf0410_idx",
+        ),
+        migrations.RemoveIndex(
+            model_name="userdashou",
+            name="user_dashou_yaoqing_894658_idx",
+        ),
+        migrations.AddField(
+            model_name="userdashou",
+            name="ewai_xiane",
+            field=models.DecimalField(
+                decimal_places=2,
+                default=0.0,
+                max_digits=10,
+                verbose_name="额外提现限额(元)",
+            ),
+        ),
+        migrations.AddField(
+            model_name="userdashou",
+            name="jinritixian_jine",
+            field=models.DecimalField(
+                decimal_places=2,
+                default=0.0,
+                max_digits=10,
+                verbose_name="今日已提现金额",
+            ),
+        ),
+        migrations.AddField(
+            model_name="userdashou",
+            name="kaioi_ewai_xiane",
+            field=models.BooleanField(
+                default=False, verbose_name="是否开启额外提现限额"
+            ),
+        ),
+        migrations.AddField(
+            model_name="userdashou",
+            name="last_tixian_date",
+            field=models.DateField(blank=True, null=True, verbose_name="最近提现日期"),
+        ),
+        migrations.AddField(
+            model_name="userguanshi",
+            name="ewai_xiane",
+            field=models.DecimalField(
+                decimal_places=2,
+                default=0.0,
+                max_digits=10,
+                verbose_name="额外提现限额(元)",
+            ),
+        ),
+        migrations.AddField(
+            model_name="userguanshi",
+            name="invite_qrcode_url",
+            field=models.CharField(
+                blank=True,
+                max_length=500,
+                null=True,
+                verbose_name="邀请码二维码图片URL",
+            ),
+        ),
+        migrations.AddField(
+            model_name="userguanshi",
+            name="jinritixian_jine",
+            field=models.DecimalField(
+                decimal_places=2,
+                default=0.0,
+                max_digits=10,
+                verbose_name="今日已提现金额",
+            ),
+        ),
+        migrations.AddField(
+            model_name="userguanshi",
+            name="kaioi_ewai_xiane",
+            field=models.BooleanField(
+                default=False, verbose_name="是否开启额外提现限额"
+            ),
+        ),
+        migrations.AddField(
+            model_name="userguanshi",
+            name="last_tixian_date",
+            field=models.DateField(blank=True, null=True, verbose_name="最近提现日期"),
+        ),
+        migrations.AlterField(
+            model_name="tixianjilu",
+            name="shenheid",
+            field=models.CharField(
+                db_index=True, max_length=11, null=True, verbose_name="审核用户ID"
+            ),
+        ),
+        migrations.AlterModelTable(
+            name="userdashou",
+            table=None,
+        ),
+        migrations.AddIndex(
+            model_name="tixianautorecord",
+            index=models.Index(
+                fields=["tixian_id"], name="tixian_auto_tixian__273dac_idx"
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="tixianautorecord",
+            index=models.Index(
+                fields=["yonghuid"], name="tixian_auto_yonghui_61c5b6_idx"
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="tixianautorecord",
+            index=models.Index(
+                fields=["zhuangtai"], name="tixian_auto_zhuangt_24d9fa_idx"
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0027_userguanshi_yaoqingren_userzuzhang.py b/yonghu/migrations/0027_userguanshi_yaoqingren_userzuzhang.py
new file mode 100644
index 0000000..720d065
--- /dev/null
+++ b/yonghu/migrations/0027_userguanshi_yaoqingren_userzuzhang.py
@@ -0,0 +1,173 @@
+# Generated by Django 4.2.27 on 2026-03-17 13:49
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0026_tixianautorecord_alter_userdashou_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="userguanshi",
+            name="yaoqingren",
+            field=models.CharField(
+                db_index=True, max_length=7, null=True, verbose_name="邀请人ID"
+            ),
+        ),
+        migrations.CreateModel(
+            name="UserZuzhang",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "yaoqingma",
+                    models.CharField(
+                        db_index=True,
+                        max_length=20,
+                        null=True,
+                        verbose_name="组长邀请码",
+                    ),
+                ),
+                (
+                    "fenyong_zonge",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="分佣总额(元)",
+                    ),
+                ),
+                (
+                    "ketixian_jine",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=12,
+                        verbose_name="可提现金额(元)",
+                    ),
+                ),
+                (
+                    "yaoqing_zongshu",
+                    models.IntegerField(default=0, verbose_name="邀请总数"),
+                ),
+                (
+                    "jinri_fenyong",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="今日分佣(元)",
+                    ),
+                ),
+                (
+                    "jinyue_fenyong",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="今月分佣(元)",
+                    ),
+                ),
+                (
+                    "zhuangtai",
+                    models.IntegerField(
+                        choices=[(0, "禁用"), (1, "正常")],
+                        default=1,
+                        verbose_name="账号状态",
+                    ),
+                ),
+                (
+                    "haibao_url",
+                    models.CharField(
+                        blank=True,
+                        max_length=500,
+                        null=True,
+                        verbose_name="推广海报相对URL",
+                    ),
+                ),
+                (
+                    "jinri_tixian",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="今日提现金额(元)",
+                    ),
+                ),
+                (
+                    "last_tixian_time",
+                    models.DateTimeField(
+                        blank=True, null=True, verbose_name="最后提现时间"
+                    ),
+                ),
+                (
+                    "ewai_tixian_xiane",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="额外提现限额(元)",
+                    ),
+                ),
+                (
+                    "kaioi_ewai_tixian",
+                    models.BooleanField(default=False, verbose_name="开启额外提现"),
+                ),
+                (
+                    "kaioi_ewai_fenhong",
+                    models.BooleanField(default=False, verbose_name="开启额外分红"),
+                ),
+                (
+                    "ewai_fenhong_jine",
+                    models.DecimalField(
+                        decimal_places=2,
+                        default=0.0,
+                        max_digits=10,
+                        verbose_name="额外分红金额(元)",
+                    ),
+                ),
+                (
+                    "create_time",
+                    models.DateTimeField(auto_now_add=True, verbose_name="创建时间"),
+                ),
+                (
+                    "update_time",
+                    models.DateTimeField(auto_now=True, verbose_name="更新时间"),
+                ),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="zuzhang_profile",
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="关联用户",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "组长扩展表",
+                "verbose_name_plural": "组长扩展表",
+                "db_table": "user_zuzhang",
+                "indexes": [
+                    models.Index(
+                        fields=["user"], name="user_zuzhan_user_id_8064f2_idx"
+                    ),
+                    models.Index(
+                        fields=["yaoqingma"], name="user_zuzhan_yaoqing_cba91d_idx"
+                    ),
+                ],
+            },
+        ),
+    ]
diff --git a/yonghu/migrations/0028_alter_userguanshi_yaoqingma_and_more.py b/yonghu/migrations/0028_alter_userguanshi_yaoqingma_and_more.py
new file mode 100644
index 0000000..6d64b41
--- /dev/null
+++ b/yonghu/migrations/0028_alter_userguanshi_yaoqingma_and_more.py
@@ -0,0 +1,37 @@
+# Generated by Django 4.2.27 on 2026-03-18 21:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0027_userguanshi_yaoqingren_userzuzhang"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="userguanshi",
+            name="yaoqingma",
+            field=models.CharField(
+                db_index=True,
+                default=1,
+                max_length=20,
+                unique=True,
+                verbose_name="邀请码",
+            ),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="userzuzhang",
+            name="yaoqingma",
+            field=models.CharField(
+                db_index=True,
+                default=1,
+                max_length=20,
+                unique=True,
+                verbose_name="组长邀请码",
+            ),
+            preserve_default=False,
+        ),
+    ]
diff --git a/yonghu/migrations/0029_remove_userguanshi_fenhong_yici_and_more.py b/yonghu/migrations/0029_remove_userguanshi_fenhong_yici_and_more.py
new file mode 100644
index 0000000..227aa33
--- /dev/null
+++ b/yonghu/migrations/0029_remove_userguanshi_fenhong_yici_and_more.py
@@ -0,0 +1,27 @@
+# Generated by Django 4.2.27 on 2026-03-22 22:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("yonghu", "0028_alter_userguanshi_yaoqingma_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="userguanshi",
+            name="fenhong_yici",
+        ),
+        migrations.AlterField(
+            model_name="usermain",
+            name="user_type",
+            field=models.CharField(
+                choices=[("normal", "普通用户")],
+                default="normal",
+                max_length=10,
+                verbose_name="用户类型",
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0030_tixian_shenhe_jilu.py b/yonghu/migrations/0030_tixian_shenhe_jilu.py
new file mode 100644
index 0000000..e720db8
--- /dev/null
+++ b/yonghu/migrations/0030_tixian_shenhe_jilu.py
@@ -0,0 +1,74 @@
+# Generated manually for tixian audit flow
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('yonghu', '0029_remove_userguanshi_fenhong_yici_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TixianShenheJilu',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('shenhe_danhao', models.CharField(db_index=True, max_length=32, unique=True, verbose_name='审核单号')),
+                ('yonghuid', models.CharField(db_index=True, max_length=7, verbose_name='用户ID')),
+                ('leixing', models.PositiveSmallIntegerField(db_index=True, verbose_name='提现类型')),
+                ('zhuangtai', models.IntegerField(db_index=True, default=1, verbose_name='审核状态(1审核中2提现成功3提现失败4审核成功5审核失败6待收款)')),
+                ('shenqing_jine', models.DecimalField(decimal_places=2, max_digits=10, verbose_name='申请提现金额(扣款额)')),
+                ('shouxufei', models.DecimalField(decimal_places=2, default=0, max_digits=10, verbose_name='手续费')),
+                ('shijidaozhang', models.DecimalField(decimal_places=2, max_digits=10, verbose_name='实际到账金额')),
+                ('feilv', models.DecimalField(decimal_places=4, default=0, max_digits=5, verbose_name='手续费率')),
+                ('bhliyou', models.TextField(blank=True, null=True, verbose_name='驳回/失败原因')),
+                ('bo_hui_ren_id', models.CharField(blank=True, db_index=True, max_length=11, null=True, verbose_name='驳回人用户ID')),
+                ('shenhe_ren_id', models.CharField(blank=True, db_index=True, max_length=11, null=True, verbose_name='审核通过操作人ID')),
+                ('tixianjilu_id', models.IntegerField(blank=True, db_index=True, null=True, verbose_name='关联Tixianjilu.id')),
+                ('tixian_auto_id', models.CharField(blank=True, db_index=True, max_length=32, null=True, unique=True, verbose_name='关联TixianAutoRecord.tixian_id')),
+                ('fail_reason', models.TextField(blank=True, null=True, verbose_name='微信打款失败原因')),
+                ('create_time', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
+            ],
+            options={
+                'verbose_name': '提现审核记录',
+                'verbose_name_plural': '提现审核记录',
+                'db_table': 'tixian_shenhe_jilu',
+            },
+        ),
+        migrations.AddField(
+            model_name='tixianjilu',
+            name='shenhe_danhao',
+            field=models.CharField(blank=True, db_index=True, max_length=32, null=True, verbose_name='关联提现审核单号'),
+        ),
+        migrations.AddField(
+            model_name='tixianjilu',
+            name='shenhe_jilu_id',
+            field=models.IntegerField(blank=True, db_index=True, null=True, verbose_name='关联提现审核记录ID(TixianShenheJilu.id)'),
+        ),
+        migrations.AddField(
+            model_name='tixianautorecord',
+            name='shenhe_danhao',
+            field=models.CharField(blank=True, db_index=True, max_length=32, null=True, verbose_name='关联审核单号'),
+        ),
+        migrations.AddIndex(
+            model_name='tixianjilu',
+            index=models.Index(fields=['shenhe_danhao'], name='tixianjilu_shenhe_danhao_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='tixianjilu',
+            index=models.Index(fields=['shenhe_jilu_id'], name='tixianjilu_shenhe_jilu_id_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='tixianshenhejilu',
+            index=models.Index(fields=['yonghuid', 'zhuangtai'], name='txsh_yonghu_zhuangtai_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='tixianshenhejilu',
+            index=models.Index(fields=['yonghuid', 'leixing'], name='txsh_yonghu_leixing_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='tixianshenhejilu',
+            index=models.Index(fields=['shenhe_danhao'], name='txsh_shenhe_danhao_idx'),
+        ),
+    ]
diff --git a/yonghu/migrations/0031_alter_tixianshenhejilu_tixian_auto_id.py b/yonghu/migrations/0031_alter_tixianshenhejilu_tixian_auto_id.py
new file mode 100644
index 0000000..e2ad51b
--- /dev/null
+++ b/yonghu/migrations/0031_alter_tixianshenhejilu_tixian_auto_id.py
@@ -0,0 +1,22 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('yonghu', '0030_tixian_shenhe_jilu'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tixianshenhejilu',
+            name='tixian_auto_id',
+            field=models.CharField(
+                blank=True,
+                db_index=True,
+                max_length=32,
+                null=True,
+                verbose_name='最近一次打款单号(非唯一，重试收款会更新)',
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/0032_tixianshenhejilu_dakuan_mode.py b/yonghu/migrations/0032_tixianshenhejilu_dakuan_mode.py
new file mode 100644
index 0000000..c3fc7d5
--- /dev/null
+++ b/yonghu/migrations/0032_tixianshenhejilu_dakuan_mode.py
@@ -0,0 +1,18 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('yonghu', '0031_alter_tixianshenhejilu_tixian_auto_id'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tixianshenhejilu',
+            name='dakuan_mode',
+            field=models.PositiveSmallIntegerField(
+                db_index=True, default=1, verbose_name='打款方式(1手动2自动)'
+            ),
+        ),
+    ]
diff --git a/yonghu/migrations/__init__.py b/yonghu/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/yonghu/migrations/__pycache__/0001_initial.cpython-313.pyc b/yonghu/migrations/__pycache__/0001_initial.cpython-313.pyc
new file mode 100644
index 0000000..f2451ef
Binary files /dev/null and b/yonghu/migrations/__pycache__/0001_initial.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0002_alter_usermain_avatar.cpython-313.pyc b/yonghu/migrations/__pycache__/0002_alter_usermain_avatar.cpython-313.pyc
new file mode 100644
index 0000000..267a6ce
Binary files /dev/null and b/yonghu/migrations/__pycache__/0002_alter_usermain_avatar.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0003_rename_user_dashou_yaoqing_dd346f_idx_user_dashou_yaoqing_894658_idx_and_more.cpython-313.pyc b/yonghu/migrations/__pycache__/0003_rename_user_dashou_yaoqing_dd346f_idx_user_dashou_yaoqing_894658_idx_and_more.cpython-313.pyc
new file mode 100644
index 0000000..3097127
Binary files /dev/null and b/yonghu/migrations/__pycache__/0003_rename_user_dashou_yaoqing_dd346f_idx_user_dashou_yaoqing_894658_idx_and_more.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0004_rename_tuiguanliang_userdashou_tuikuanliang_and_more.cpython-313.pyc b/yonghu/migrations/__pycache__/0004_rename_tuiguanliang_userdashou_tuikuanliang_and_more.cpython-313.pyc
new file mode 100644
index 0000000..cc31d71
Binary files /dev/null and b/yonghu/migrations/__pycache__/0004_rename_tuiguanliang_userdashou_tuikuanliang_and_more.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0005_alter_userdashou_zhuangtai.cpython-313.pyc b/yonghu/migrations/__pycache__/0005_alter_userdashou_zhuangtai.cpython-313.pyc
new file mode 100644
index 0000000..d16e92c
Binary files /dev/null and b/yonghu/migrations/__pycache__/0005_alter_userdashou_zhuangtai.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0006_remove_usermain_yaoqingma_usermain_last_login_and_more.cpython-313.pyc b/yonghu/migrations/__pycache__/0006_remove_usermain_yaoqingma_usermain_last_login_and_more.cpython-313.pyc
new file mode 100644
index 0000000..1c22588
Binary files /dev/null and b/yonghu/migrations/__pycache__/0006_remove_usermain_yaoqingma_usermain_last_login_and_more.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0007_userdashou_chengjiaozongliang.cpython-313.pyc b/yonghu/migrations/__pycache__/0007_userdashou_chengjiaozongliang.cpython-313.pyc
new file mode 100644
index 0000000..d3538b0
Binary files /dev/null and b/yonghu/migrations/__pycache__/0007_userdashou_chengjiaozongliang.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0008_userdashou_chenghao_userdashou_zhanghaozhuangtai_and_more.cpython-313.pyc b/yonghu/migrations/__pycache__/0008_userdashou_chenghao_userdashou_zhanghaozhuangtai_and_more.cpython-313.pyc
new file mode 100644
index 0000000..d6aae1d
Binary files /dev/null and b/yonghu/migrations/__pycache__/0008_userdashou_chenghao_userdashou_zhanghaozhuangtai_and_more.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0009_alter_userdashou_dianhua_alter_userdashou_wechat.cpython-313.pyc b/yonghu/migrations/__pycache__/0009_alter_userdashou_dianhua_alter_userdashou_wechat.cpython-313.pyc
new file mode 100644
index 0000000..00b2320
Binary files /dev/null and b/yonghu/migrations/__pycache__/0009_alter_userdashou_dianhua_alter_userdashou_wechat.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0010_userdashou_yajin_alter_userdashou_jieshao_and_more.cpython-313.pyc b/yonghu/migrations/__pycache__/0010_userdashou_yajin_alter_userdashou_jieshao_and_more.cpython-313.pyc
new file mode 100644
index 0000000..6136ad8
Binary files /dev/null and b/yonghu/migrations/__pycache__/0010_userdashou_yajin_alter_userdashou_jieshao_and_more.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0011_alter_userguanshi_dianhua_alter_userguanshi_wechat_and_more.cpython-313.pyc b/yonghu/migrations/__pycache__/0011_alter_userguanshi_dianhua_alter_userguanshi_wechat_and_more.cpython-313.pyc
new file mode 100644
index 0000000..2d9a222
Binary files /dev/null and b/yonghu/migrations/__pycache__/0011_alter_userguanshi_dianhua_alter_userguanshi_wechat_and_more.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0012_rename_tuiguan_usershangjia_tuikuan.cpython-313.pyc b/yonghu/migrations/__pycache__/0012_rename_tuiguan_usershangjia_tuikuan.cpython-313.pyc
new file mode 100644
index 0000000..900adf6
Binary files /dev/null and b/yonghu/migrations/__pycache__/0012_rename_tuiguan_usershangjia_tuikuan.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0013_remove_userdashou_yongjin.cpython-313.pyc b/yonghu/migrations/__pycache__/0013_remove_userdashou_yongjin.cpython-313.pyc
new file mode 100644
index 0000000..7d67bfb
Binary files /dev/null and b/yonghu/migrations/__pycache__/0013_remove_userdashou_yongjin.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0014_userguanshi_yaoqingma_and_more.cpython-313.pyc b/yonghu/migrations/__pycache__/0014_userguanshi_yaoqingma_and_more.cpython-313.pyc
new file mode 100644
index 0000000..0ba79ea
Binary files /dev/null and b/yonghu/migrations/__pycache__/0014_userguanshi_yaoqingma_and_more.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0015_remove_userdashou_user_dashou_zhuangt_f427c0_idx_and_more.cpython-313.pyc b/yonghu/migrations/__pycache__/0015_remove_userdashou_user_dashou_zhuangt_f427c0_idx_and_more.cpython-313.pyc
new file mode 100644
index 0000000..cc1e168
Binary files /dev/null and b/yonghu/migrations/__pycache__/0015_remove_userdashou_user_dashou_zhuangt_f427c0_idx_and_more.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0016_tixianjilu_and_more.cpython-313.pyc b/yonghu/migrations/__pycache__/0016_tixianjilu_and_more.cpython-313.pyc
new file mode 100644
index 0000000..c0fbc2f
Binary files /dev/null and b/yonghu/migrations/__pycache__/0016_tixianjilu_and_more.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0017_usermain_ip_usermain_last_login_time_and_more.cpython-313.pyc b/yonghu/migrations/__pycache__/0017_usermain_ip_usermain_last_login_time_and_more.cpython-313.pyc
new file mode 100644
index 0000000..cc7a935
Binary files /dev/null and b/yonghu/migrations/__pycache__/0017_usermain_ip_usermain_last_login_time_and_more.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0018_xiugaijilu.cpython-313.pyc b/yonghu/migrations/__pycache__/0018_xiugaijilu.cpython-313.pyc
new file mode 100644
index 0000000..8261282
Binary files /dev/null and b/yonghu/migrations/__pycache__/0018_xiugaijilu.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0019_alter_tixianjilu_zhuangtai.cpython-313.pyc b/yonghu/migrations/__pycache__/0019_alter_tixianjilu_zhuangtai.cpython-313.pyc
new file mode 100644
index 0000000..3869586
Binary files /dev/null and b/yonghu/migrations/__pycache__/0019_alter_tixianjilu_zhuangtai.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0020_adminprofile_yaoqingma.cpython-313.pyc b/yonghu/migrations/__pycache__/0020_adminprofile_yaoqingma.cpython-313.pyc
new file mode 100644
index 0000000..7c78b37
Binary files /dev/null and b/yonghu/migrations/__pycache__/0020_adminprofile_yaoqingma.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0021_rankingrecord.cpython-313.pyc b/yonghu/migrations/__pycache__/0021_rankingrecord.cpython-313.pyc
new file mode 100644
index 0000000..a880b02
Binary files /dev/null and b/yonghu/migrations/__pycache__/0021_rankingrecord.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0022_officialaccountuser_usermain_unionid.cpython-313.pyc b/yonghu/migrations/__pycache__/0022_officialaccountuser_usermain_unionid.cpython-313.pyc
new file mode 100644
index 0000000..3fd4352
Binary files /dev/null and b/yonghu/migrations/__pycache__/0022_officialaccountuser_usermain_unionid.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0023_alter_officialaccountuser_unionid.cpython-313.pyc b/yonghu/migrations/__pycache__/0023_alter_officialaccountuser_unionid.cpython-313.pyc
new file mode 100644
index 0000000..a2058d0
Binary files /dev/null and b/yonghu/migrations/__pycache__/0023_alter_officialaccountuser_unionid.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0024_userkefu.cpython-313.pyc b/yonghu/migrations/__pycache__/0024_userkefu.cpython-313.pyc
new file mode 100644
index 0000000..f9fd482
Binary files /dev/null and b/yonghu/migrations/__pycache__/0024_userkefu.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0025_userguanshi_fenghong_erci_and_more.cpython-313.pyc b/yonghu/migrations/__pycache__/0025_userguanshi_fenghong_erci_and_more.cpython-313.pyc
new file mode 100644
index 0000000..e039c07
Binary files /dev/null and b/yonghu/migrations/__pycache__/0025_userguanshi_fenghong_erci_and_more.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0026_tixianautorecord_alter_userdashou_options_and_more.cpython-313.pyc b/yonghu/migrations/__pycache__/0026_tixianautorecord_alter_userdashou_options_and_more.cpython-313.pyc
new file mode 100644
index 0000000..e5edc49
Binary files /dev/null and b/yonghu/migrations/__pycache__/0026_tixianautorecord_alter_userdashou_options_and_more.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0027_userguanshi_yaoqingren_userzuzhang.cpython-313.pyc b/yonghu/migrations/__pycache__/0027_userguanshi_yaoqingren_userzuzhang.cpython-313.pyc
new file mode 100644
index 0000000..baa189d
Binary files /dev/null and b/yonghu/migrations/__pycache__/0027_userguanshi_yaoqingren_userzuzhang.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0028_alter_userguanshi_yaoqingma_and_more.cpython-313.pyc b/yonghu/migrations/__pycache__/0028_alter_userguanshi_yaoqingma_and_more.cpython-313.pyc
new file mode 100644
index 0000000..ef6f388
Binary files /dev/null and b/yonghu/migrations/__pycache__/0028_alter_userguanshi_yaoqingma_and_more.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/0029_remove_userguanshi_fenhong_yici_and_more.cpython-313.pyc b/yonghu/migrations/__pycache__/0029_remove_userguanshi_fenhong_yici_and_more.cpython-313.pyc
new file mode 100644
index 0000000..bba210e
Binary files /dev/null and b/yonghu/migrations/__pycache__/0029_remove_userguanshi_fenhong_yici_and_more.cpython-313.pyc differ
diff --git a/yonghu/migrations/__pycache__/__init__.cpython-313.pyc b/yonghu/migrations/__pycache__/__init__.cpython-313.pyc
new file mode 100644
index 0000000..4734b13
Binary files /dev/null and b/yonghu/migrations/__pycache__/__init__.cpython-313.pyc differ
diff --git a/yonghu/models.py b/yonghu/models.py
new file mode 100644
index 0000000..2fdf5fc
--- /dev/null
+++ b/yonghu/models.py
@@ -0,0 +1,610 @@
+# models.py
+from django.db import models
+import random
+import string
+from django.contrib.auth.models import AbstractBaseUser, BaseUserManager
+
+# ==================== 用户主表 ====================
+class UserMain(AbstractBaseUser):
+    # ID字段
+    id = models.AutoField(primary_key=True, verbose_name='主键ID')
+    yonghuid = models.CharField(max_length=7, unique=True, db_index=True, verbose_name='用户ID')
+
+    # 微信相关字段
+    openid = models.CharField(max_length=64, unique=True, db_index=True, verbose_name='微信OpenID')
+    unionid = models.CharField(max_length=64, null=True, blank=True, db_index=True, verbose_name='微信UnionID')
+    session_key = models.CharField(max_length=100, blank=True, null=True,verbose_name='微信虚拟支付')
+
+    # 基础信息字段
+    #tupian_url = models.CharField(max_length=500, null=True, blank=True, verbose_name='商品图片URL')  # 用CharField
+    avatar = models.CharField(max_length=500, null=True, blank=True, verbose_name='头像')  # 用CharField
+    phone = models.CharField(max_length=11, blank=True, null=True, verbose_name='手机号')
+    shoujihao_renzheng = models.BooleanField(default=False, verbose_name='手机号是否已认证')
+    password = models.CharField(max_length=200, null=True, blank=True, verbose_name='密码')
+    zhifu = models.CharField(max_length=500, null=True, blank=True, verbose_name='收款码图片')  # 用CharField
+    skzhanghao = models.CharField(max_length=11, blank=True, null=True, verbose_name='收款账号')
+    ip = models.CharField(max_length=50, blank=True, null=True, verbose_name='来访用户ip')
+    last_login_time = models.DateTimeField(null=True, blank=True, verbose_name='最后登录时间')
+
+
+    # 用户类型字段
+    user_type = models.CharField(
+        max_length=10,
+        choices=[
+            ('normal', '普通用户')
+        ],
+        default='normal',
+        verbose_name='用户类型'
+    )
+
+    # 状态和时间字段
+    #is_active = models.BooleanField(default=True, verbose_name='是否激活')
+    #last_login = models.DateTimeField(blank=True, null=True, verbose_name='最后登录时间')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    # 邀请码字段
+    #yaoqingma = models.CharField(max_length=20, blank=True, null=True, verbose_name='邀请码')
+
+    # 只需要添加这3行
+    USERNAME_FIELD = 'openid'  # 用openid作为用户名
+    REQUIRED_FIELDS = ['yonghuid']  # 必填字段
+
+    class Meta:
+        db_table = 'user_main'
+        verbose_name = '用户主表'
+        verbose_name_plural = verbose_name
+        indexes = [
+            models.Index(fields=['yonghuid']),
+            models.Index(fields=['openid']),
+            #models.Index(fields=['phone']),
+            models.Index(fields=['user_type']),
+            #models.Index(fields=['create_time']),
+        ]
+
+    def __str__(self):
+        return f'{self.yonghuid}'
+
+
+# 新增服务号用户表
+class OfficialAccountUser(models.Model):
+    unionid = models.CharField(max_length=64, null =True,db_index=True, verbose_name='UnionID')
+    official_openid = models.CharField(max_length=64, db_index=True, unique=True, verbose_name='服务号OpenID')
+    subscribe_time = models.DateTimeField(auto_now_add=True, verbose_name='关注时间')
+    is_subscribed = models.BooleanField(default=True, verbose_name='是否关注')
+    created_at = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    updated_at = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'official_account_user'
+        verbose_name = '服务号用户'
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        return f"{self.unionid[:8]}... (关注: {self.is_subscribed})"
+
+
+# ==================== 老板扩展表 ====================
+class UserBoss(models.Model):
+    user = models.OneToOneField(UserMain, on_delete=models.CASCADE, related_name='boss_profile',
+                                verbose_name='关联用户')
+    nickname = models.CharField(max_length=50, verbose_name='老板昵称')
+    zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='消费总额')
+    alldingdan = models.IntegerField(default=0, verbose_name='订单总数')
+    alltui = models.IntegerField(default=0, verbose_name='退款总数')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+
+    class Meta:
+        db_table = 'user_boss'
+        verbose_name = '老板扩展表'
+        verbose_name_plural = verbose_name
+        indexes = [models.Index(fields=['user']), ]
+
+
+# ==================== 打手扩展表 ====================
+class UserDashou(models.Model):
+    user = models.OneToOneField(UserMain, on_delete=models.CASCADE, related_name='dashou_profile',
+                                verbose_name='关联用户')
+    nicheng = models.CharField(max_length=50, null=True,  verbose_name='打手昵称')
+    chenghao = models.CharField(max_length=50, null=True,verbose_name='打手称号')
+    zhuangtai = models.IntegerField(default=1, verbose_name='打手状态')
+    zaixianzhuangtai = models.IntegerField(default=1, verbose_name='打手在线状态')
+    zhanghaozhuangtai = models.IntegerField(default=1, verbose_name='打手账号状态')
+    jieshao = models.TextField(null=True, verbose_name='打手介绍')
+    jiedanzongliang = models.IntegerField(default=0, verbose_name='接单总量')
+    chengjiaozongliang = models.IntegerField(default=0, verbose_name='成交单总量')
+    tuikuanliang = models.IntegerField(default=0, verbose_name='退款订单总量')
+    yue = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='可提现余额')
+    zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='打单赚取总额')
+    dianhua = models.CharField(max_length=20, null=True, verbose_name='打手电话')
+    wechat = models.CharField(max_length=50,null=True, verbose_name='打手微信号')
+    yaoqingren = models.CharField(max_length=7,null=True, db_index=True, verbose_name='邀请人ID')
+    jinrijiedan = models.IntegerField(default=0, verbose_name='今日接单数量')
+    jinrishouyi = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='今日收益金额')
+    jinyuejiedan = models.IntegerField(default=0, verbose_name='今月接单数量')
+    jinyueshouyi = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='今月收益金额')
+    jifen = models.IntegerField(default=0, verbose_name='打手积分')
+    yajin= models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='打手押金')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+
+    last_tixian_date = models.DateField(null=True, blank=True, verbose_name='最近提现日期')  # 用于重置今日提现金额
+    jinritixian_jine = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='今日已提现金额')
+    kaioi_ewai_xiane = models.BooleanField(default=False, verbose_name='是否开启额外提现限额')  # True=开启额外限额
+    ewai_xiane = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='额外提现限额(元)')
+
+class Meta:
+        db_table = 'user_dashou'
+        verbose_name = '打手扩展表'
+        verbose_name_plural = verbose_name
+        indexes = [
+            models.Index(fields=['user']),
+            #models.Index(fields=['zhuangtai']),
+            models.Index(fields=['yaoqingren']),
+            #models.Index(fields=['nicheng']),
+
+        ]
+
+
+# ==================== 商家扩展表 ====================
+class UserShangjia(models.Model):
+    user = models.OneToOneField(UserMain, on_delete=models.CASCADE, related_name='shop_profile',
+                                verbose_name='关联用户')
+    nicheng = models.CharField(max_length=50, unique=True, db_index=True, verbose_name='商家昵称')
+    zhuangtai = models.IntegerField(choices=[(0, '待审核'), (1, '正常'), (2, '禁用')], default=1,
+                                    verbose_name='商家状态')
+    dianhua = models.CharField(max_length=20,null=True,verbose_name='商家电话')
+    wechat = models.CharField(max_length=50, null=True, verbose_name='商家微信号')
+    fabu = models.IntegerField(default=0, verbose_name='发布订单总数量')
+    tuikuan = models.IntegerField(default=0, verbose_name='退款订单总量')
+    yue = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='商家余额')
+    chengjiao = models.IntegerField(default=0, verbose_name='商家成交订单总量')
+    jinridingdan = models.IntegerField(default=0, verbose_name='商家今日订单总量')
+    jinriliushui = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='商家今日流水')
+    jinyuedingdan = models.IntegerField(default=0, verbose_name='商家今月订单总量')
+    jinyueliushui = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='商家今月流水')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+
+    class Meta:
+        db_table = 'user_shangjia'
+        verbose_name = '商家扩展表'
+        verbose_name_plural = verbose_name
+        indexes = [
+            models.Index(fields=['user']),
+            models.Index(fields=['nicheng']),
+        ]
+
+
+# ==================== 管事扩展表 ====================
+class UserGuanshi(models.Model):
+    user = models.OneToOneField(UserMain, on_delete=models.CASCADE, related_name='guanshi_profile',
+                                verbose_name='关联用户')
+    yaoqingma =  models.CharField(max_length=20,unique=True,db_index=True, verbose_name='邀请码')
+    yaoqingren = models.CharField(max_length=7, null=True, db_index=True, verbose_name='邀请人ID')
+
+    invite_qrcode_url = models.CharField(max_length=500, null=True, blank=True, verbose_name='邀请码二维码图片URL')
+
+    dianhua = models.CharField(max_length=20,null=True, verbose_name='管事电话')
+    wechat = models.CharField(max_length=50,null=True, verbose_name='管事微信号')
+    yaogingshuliang = models.IntegerField(default=0, verbose_name='邀请打手总数')
+    zhuangtai = models.IntegerField(choices=[(0, '禁用'), (1, '正常')], default=1, verbose_name='管事状态')
+    jinrichongzhi = models.IntegerField(default=0, verbose_name='今日充值打手数量')
+    jinyuechongzhi = models.IntegerField(default=0, verbose_name='今月充值打手数量')
+    chongzhifenrun = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='充值分佣总额')
+    yue = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='可提现余额')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    # 新增：首次分红金额（针对特殊用户）
+    #fenhong_yici = models.DecimalField(max_digits=10,decimal_places=2,default=0.00,verbose_name='首次分红金额')
+
+    # 新增：二次分红开关
+    fenghong_erci_enabled = models.BooleanField(default=False,verbose_name='开启二次分红')
+
+    # 新增：二次分红金额
+    fenghong_erci = models.DecimalField(max_digits=10,decimal_places=2,default=0.00,verbose_name='二次分红金额')
+
+    last_tixian_date = models.DateField(null=True, blank=True, verbose_name='最近提现日期')
+    jinritixian_jine = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='今日已提现金额')
+    kaioi_ewai_xiane = models.BooleanField(default=False, verbose_name='是否开启额外提现限额')
+    ewai_xiane = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='额外提现限额(元)')
+
+    class Meta:
+        db_table = 'user_guanshi'
+        verbose_name = '管事扩展表'
+        verbose_name_plural = verbose_name
+        indexes = [models.Index(fields=['user']),
+                   models.Index(fields=['yaoqingma']),
+                   ]
+
+
+
+
+class UserZuzhang(models.Model):
+    """组长扩展表（与UserMain一对一关联）"""
+    user = models.OneToOneField(
+        UserMain,
+        on_delete=models.CASCADE,
+        related_name='zuzhang_profile',
+        verbose_name='关联用户',
+        db_index=True
+    )
+    # 组长邀请码
+    yaoqingma = models.CharField(max_length=20, unique=True, db_index=True, verbose_name='组长邀请码')
+    # 分佣总额
+    fenyong_zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='分佣总额(元)')
+    # 可提现金额
+    ketixian_jine = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='可提现金额(元)')
+    # 邀请总数
+    yaoqing_zongshu = models.IntegerField(default=0, verbose_name='邀请总数')
+    # 今日分佣
+    jinri_fenyong = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='今日分佣(元)')
+    # 今月分佣
+    jinyue_fenyong = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='今月分佣(元)')
+    # 账号状态
+    zhuangtai = models.IntegerField(choices=[(0, '禁用'), (1, '正常')], default=1, verbose_name='账号状态')
+    # 推广海报相对URL
+    haibao_url = models.CharField(max_length=500, null=True, blank=True, verbose_name='推广海报相对URL')
+    # 今日提现
+    jinri_tixian = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='今日提现金额(元)')
+    # 最后提现时间
+    last_tixian_time = models.DateTimeField(null=True, blank=True, verbose_name='最后提现时间')
+    # 额外提现限额
+    ewai_tixian_xiane = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='额外提现限额(元)')
+    # 是否开启额外提现
+    kaioi_ewai_tixian = models.BooleanField(default=False, verbose_name='开启额外提现')
+    # 是否开启额外分红
+    kaioi_ewai_fenhong = models.BooleanField(default=False, verbose_name='开启额外分红')
+    # 额外分红金额
+    ewai_fenhong_jine = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='额外分红金额(元)')
+    # 创建时间
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    # 更新时间
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'user_zuzhang'
+        verbose_name = '组长扩展表'
+        verbose_name_plural = verbose_name
+        indexes = [
+            models.Index(fields=['user']),
+            models.Index(fields=['yaoqingma']),
+        ]
+
+    def __str__(self):
+        return f"组长 {self.user.yonghuid}"
+
+
+class UserShenheguan(models.Model):
+    """审核官扩展表（与UserMain一对一关联）"""
+    user = models.OneToOneField(UserMain, on_delete=models.CASCADE, related_name='shenheguan_profile', verbose_name='关联用户', db_index=True)
+    zhuangtai = models.IntegerField(choices=[(0, '禁用'), (1, '正常')], default=1, verbose_name='账号状态')
+    is_renzheng = models.BooleanField(default=False, verbose_name='是否认证')
+    shenhe_zhuangtai = models.IntegerField(choices=[(0, '空闲'), (1, '审核中')], default=0, verbose_name='审核官状态')
+    shenhe_zongshu = models.IntegerField(default=0, verbose_name='审核总数')
+    tongguo_zongshu = models.IntegerField(default=0, verbose_name='通过总数')
+    yue = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='可提现余额')
+    zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='赚取总额')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'user_shenheguan'
+        verbose_name = '审核官扩展表'
+        verbose_name_plural = verbose_name
+        indexes = [models.Index(fields=['user'])]
+
+
+
+
+
+# ==================== 管理员扩展表 ====================
+class AdminProfile(models.Model):
+    user = models.OneToOneField(UserMain, on_delete=models.CASCADE, related_name='admin_profile',
+                                verbose_name='关联用户')
+    password = models.CharField(max_length=255, verbose_name='密码')
+    wechat = models.CharField(max_length=50, blank=True, verbose_name='管理员微信')
+    yaoqingma = models.CharField(max_length=20, null=True, db_index=True,verbose_name='管理员邀请码')  # 🟢 新增字段
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+
+    class Meta:
+        db_table = 'admin_profile'
+        verbose_name = '管理员扩展表'
+        verbose_name_plural = verbose_name
+        indexes = [models.Index(fields=['user']), ]
+
+
+
+
+class UserKefu(models.Model):
+    user = models.OneToOneField(UserMain, on_delete=models.CASCADE, related_name='kefu_profile', verbose_name='关联用户')
+    nicheng = models.CharField(max_length=50, verbose_name='客服昵称')
+    erjimima = models.CharField(max_length=128, verbose_name='二级密码')
+    zhuangtai = models.IntegerField(choices=[(0, '禁用'), (1, '正常')], default=1, verbose_name='客服状态')
+    jinrichuli = models.IntegerField(default=0, verbose_name='今日处理订单数')
+    jinyuechuli = models.IntegerField(default=0, verbose_name='本月处理订单数')
+    zongchuli = models.IntegerField(default=0, verbose_name='累计处理订单数')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'user_kefu'
+        verbose_name = '客服扩展表'
+        verbose_name_plural = verbose_name
+        indexes = [
+            models.Index(fields=['user']),
+            models.Index(fields=['zhuangtai']),
+        ]
+
+    def __str__(self):
+        return f"{self.nicheng} ({self.user.yonghuid})"
+
+
+
+class Tixianjilu(models.Model):
+    id = models.AutoField(primary_key=True, verbose_name='提现记录ID')
+    yonghuid = models.CharField(max_length=7, db_index=True, verbose_name='提现用户ID')
+    avatar = models.CharField(max_length=500, null=True, blank=True, verbose_name='头像')  # 用CharField
+    phone = models.CharField(max_length=11, blank=True, null=True, verbose_name='手机号')
+    nicheng = models.CharField(max_length=50, null=True, verbose_name='打手昵称')
+    leixing = models.PositiveIntegerField(null=True, blank=True, verbose_name='提现类型1:打手佣金2：管事分红')
+    zhifu = models.CharField(max_length=500, null=True, blank=True, verbose_name='收款码图片')  # 用CharField
+    skzhanghao = models.CharField(max_length=11, blank=True, null=True,  verbose_name='收款账号')
+    jine = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name='提现金额')
+    # 状态与平台：用整数表示，具体含义由业务逻辑定义
+    zhuangtai = models.IntegerField(default=1, null=True, blank=True, db_index=True, verbose_name='提现状态1:审核2：成功3：失败')
+    fangshi = models.IntegerField(null=True, blank=True,db_index=True, verbose_name='收款方式1:微信2：支付宝')
+    shenheid = models.CharField(max_length=11, null=True, db_index=True, verbose_name='审核用户ID')
+    bhliyou = models.TextField(null=True, blank=True, verbose_name='驳回理由')
+    # ---------- 自动提现审核新流程关联字段（旧数据为空，兼容历史记录） ----------
+    shenhe_jilu_id = models.IntegerField(
+        null=True, blank=True, db_index=True,
+        verbose_name='关联提现审核记录ID(TixianShenheJilu.id)'
+    )
+    shenhe_danhao = models.CharField(
+        max_length=32, null=True, blank=True, db_index=True,
+        verbose_name='关联提现审核单号'
+    )
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'tixianjilu'
+        verbose_name = '提现记录表'
+        verbose_name_plural = verbose_name
+        indexes = [
+            models.Index(fields=['yonghuid']),
+            models.Index(fields=['zhuangtai']),
+            models.Index(fields=['shenheid']),
+            models.Index(fields=['fangshi']),
+            models.Index(fields=['shenhe_danhao']),
+            models.Index(fields=['shenhe_jilu_id']),
+        ]
+
+
+class TixianShenheJilu(models.Model):
+    """
+    提现审核记录表（自动打款新流程）
+    状态码与前端 TX_STATUS / Tixianjilu.zhuangtai 完全对标：
+        1=审核中  2=提现成功(已收款)  3=提现失败  4=审核成功  5=审核失败  6=待收款
+    """
+    # 审核单号（唯一，前端字段 shenhe_danhao）
+    shenhe_danhao = models.CharField(
+        max_length=32, unique=True, db_index=True, verbose_name='审核单号'
+    )
+    yonghuid = models.CharField(max_length=7, db_index=True, verbose_name='用户ID')
+    # 提现类型：1打手佣金 2管事分红 3组长分红 4考核官分佣 5打手押金 6商家余额
+    leixing = models.PositiveSmallIntegerField(db_index=True, verbose_name='提现类型')
+    zhuangtai = models.IntegerField(
+        default=1, db_index=True,
+        verbose_name='审核状态(1审核中2提现成功3提现失败4审核成功5审核失败6待收款)'
+    )
+    # 金额：shenqing_jine=申请扣款金额；shijidaozhang=实际打款到账金额
+    shenqing_jine = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='申请提现金额(扣款额)')
+    shouxufei = models.DecimalField(max_digits=10, decimal_places=2, default=0, verbose_name='手续费')
+    shijidaozhang = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='实际到账金额')
+    feilv = models.DecimalField(max_digits=5, decimal_places=4, default=0, verbose_name='手续费率')
+    # 审核/驳回
+    bhliyou = models.TextField(null=True, blank=True, verbose_name='驳回/失败原因')
+    bo_hui_ren_id = models.CharField(
+        max_length=11, null=True, blank=True, db_index=True, verbose_name='驳回人用户ID'
+    )
+    shenhe_ren_id = models.CharField(
+        max_length=11, null=True, blank=True, db_index=True, verbose_name='审核通过操作人ID'
+    )
+    # 关联提现记录表主键
+    tixianjilu_id = models.IntegerField(null=True, blank=True, db_index=True, verbose_name='关联Tixianjilu.id')
+    # 最近一次打款单号（仅作记录，不唯一；同一审核单可多次收款产生多条打款记录）
+    tixian_auto_id = models.CharField(
+        max_length=32, null=True, blank=True, db_index=True,
+        verbose_name='最近一次打款单号(非唯一，重试收款会更新)'
+    )
+    fail_reason = models.TextField(null=True, blank=True, verbose_name='微信打款失败原因')
+    # 打款方式：1=手动打款  2=自动打款（微信商家转账）
+    dakuan_mode = models.PositiveSmallIntegerField(
+        default=1, db_index=True, verbose_name='打款方式(1手动2自动)'
+    )
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'tixian_shenhe_jilu'
+        verbose_name = '提现审核记录'
+        verbose_name_plural = verbose_name
+        indexes = [
+            models.Index(fields=['yonghuid', 'zhuangtai']),
+            models.Index(fields=['yonghuid', 'leixing']),
+            models.Index(fields=['shenhe_danhao']),
+        ]
+
+    def __str__(self):
+        return f'{self.shenhe_danhao}({self.yonghuid})'
+
+
+class TixianAutoRecord(models.Model):
+    """
+    自动提现记录表（微信自动打款）
+    """
+    id = models.BigAutoField(primary_key=True)
+    tixian_id = models.CharField(
+        max_length=32,
+        unique=True,
+        db_index=True,
+        verbose_name='提现订单号(自定义)'
+    )
+    yonghuid = models.CharField(max_length=7, db_index=True, verbose_name='用户ID')
+    leixing = models.IntegerField(verbose_name='提现类型 1打手 2管事')
+    jine = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='申请提现金额')
+    shouxufei = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='手续费')
+    shijidaozhang = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='实际到账金额')
+    feilv = models.DecimalField(max_digits=5, decimal_places=4, verbose_name='费率')
+    zhuangtai = models.IntegerField(
+        default=0,
+        choices=[(0, '处理中'), (1, '成功'), (2, '失败')],
+        verbose_name='状态'
+    )
+    wechat_transfer_no = models.CharField(
+        max_length=64,
+        null=True,
+        blank=True,
+        verbose_name='微信转账单号'
+    )
+    wechat_package = models.TextField(
+        null=True,
+        blank=True,
+        verbose_name='微信返回的package_info(JSON)'
+    )
+    fail_reason = models.TextField(null=True, blank=True, verbose_name='失败原因')
+    # 关联提现审核单号（新流程必填，旧数据为空）
+    shenhe_danhao = models.CharField(
+        max_length=32, null=True, blank=True, db_index=True, verbose_name='关联审核单号'
+    )
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'tixian_auto_record'
+        verbose_name = '自动提现记录'
+        verbose_name_plural = verbose_name
+        indexes = [
+            models.Index(fields=['tixian_id']),
+            models.Index(fields=['yonghuid']),
+            models.Index(fields=['zhuangtai']),
+        ]
+
+    def __str__(self):
+        return f"{self.tixian_id} - {self.get_zhuangtai_display()}"
+
+
+
+
+# yonghu/models.py
+class Xiugaijilu(models.Model):
+    id = models.AutoField(primary_key=True, verbose_name='记录ID')
+    yonghuid = models.CharField(max_length=7, verbose_name='被修改用户ID')
+    xiugaiid = models.CharField(max_length=30, verbose_name='修改人账号ID')
+    leixing = models.IntegerField(verbose_name='被修改用户类型')
+
+    # 打手相关金钱字段
+    xiugaitijiao = models.DecimalField(max_digits=12, decimal_places=2, default=0.00,
+                                       verbose_name='修改后的打手提现金额')
+    xiugaitijiaoq = models.DecimalField(max_digits=12, decimal_places=2, default=0.00,
+                                        verbose_name='修改前的打手提现金额')
+
+    # 打手积分
+    jifen = models.IntegerField(default=0, verbose_name='修改后的打手积分')
+    yjifen = models.IntegerField(default=0, verbose_name='修改前的打手积分')
+
+    # 打手押金
+    yajin = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='修改后的打手押金')
+    yyajin = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='修改前的打手押金')
+
+    # 商家余额
+    shangjiayue = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='修改后的商家余额')
+    shangjiayueq = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='修改前的商家余额')
+
+    # 管事余额
+    guanshiyue = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='修改后的管事余额')
+    guanshiyueq = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='修改前的管事余额')
+
+    # 会员相关
+    huiyuants = models.IntegerField(default=0, verbose_name='添加会员天数')
+    huiyuan_id = models.CharField(max_length=6, null=True, blank=True, verbose_name='会员ID')
+
+    # 其他字段
+    qitashuoming = models.TextField(null=True, blank=True, verbose_name='其他说明')
+    create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'xiugaijilu'
+        verbose_name = '修改记录表'
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        return f"修改记录-用户{self.yonghuid}"
+
+
+
+
+# yonghu/models.py - 新增排行榜模型
+class RankingRecord(models.Model):
+    # id: 主键ID
+    id = models.AutoField(primary_key=True, verbose_name='ID')
+
+    # zhouqi: 周期类型，1=日榜，2=月榜
+    zhouqi = models.IntegerField(choices=[(1, '日榜'), (2, '月榜')], verbose_name='周期类型')
+
+    # tongji_date: 统计日期（日榜存具体日期，月榜存月份第一天）
+    tongji_date = models.DateField(db_index=True, verbose_name='统计日期')
+
+    # shenfen: 用户身份，2=打手，3=管事，4=商家（1=普通用户不统计）
+    shenfen = models.IntegerField(choices=[(2, '打手'), (3, '管事'), (4, '商家')], verbose_name='用户身份')
+
+    # yonghuid: 用户ID（冗余存储，避免连表查询）
+    yonghuid = models.CharField(max_length=7, db_index=True, verbose_name='用户ID')
+
+    # paiming: 排名（从1开始）
+    paiming = models.IntegerField(verbose_name='排名')
+
+    # zhizhi: 指标数值（打手：收益金额，管事：充值人数，商家：流水金额）
+    zhizhi = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='指标值')
+
+    # nicheng: 用户昵称
+    nicheng = models.CharField(max_length=50, null=True, verbose_name='用户昵称')
+
+    # avatar: 用户头像URL
+    avatar = models.CharField(max_length=500, blank=True, null=True, verbose_name='头像')
+
+    # chuangjian_time: 记录创建时间
+    chuangjian_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+
+    class Meta:
+        db_table = 'ranking_record'
+        verbose_name = '排行榜记录'
+        verbose_name_plural = verbose_name
+        indexes = [
+            models.Index(fields=['zhouqi', 'tongji_date', 'shenfen', 'paiming']),
+            models.Index(fields=['yonghuid', 'zhouqi']),
+            models.Index(fields=['tongji_date']),
+        ]
+        unique_together = [['zhouqi', 'tongji_date', 'shenfen', 'paiming']]
+
+    def __str__(self):
+        zhouqi_str = '日' if self.zhouqi == 1 else '月'
+        shenfen_map = {2: '打手', 3: '管事', 4: '商家'}
+        return f"{self.tongji_date} {zhouqi_str}榜 {shenfen_map.get(self.shenfen)} 第{self.paiming}名"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yonghu/paihang_views.py b/yonghu/paihang_views.py
new file mode 100644
index 0000000..6b686a7
--- /dev/null
+++ b/yonghu/paihang_views.py
@@ -0,0 +1,217 @@
+"""
+排行榜接口 — 基于 houtai 日统计表聚合查询
+POST /yonghu/phbhqsj
+"""
+import logging
+from datetime import date, timedelta
+from decimal import Decimal
+
+from django.db.models import Sum
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework.views import APIView
+
+from houtai.models import (
+    DashouRiTongji,
+    GuanshiRiTongji,
+    ZuzhangRiTongji,
+    ShangjiaRiTongji,
+)
+from yonghu.models import UserMain, UserDashou, UserShangjia, UserBoss
+
+logger = logging.getLogger(__name__)
+
+MAX_RANK = 50
+
+RIQI_OPTIONS = frozenset({'今日', '本周', '本月', '总榜', '昨日', '上周', '上月'})
+SHENFEN_OPTIONS = frozenset({'dashou', 'guanshi', 'zuzhang', 'shangjia'})
+
+ROLE_CONFIG = {
+    'dashou': {
+        'model': DashouRiTongji,
+        'sort_field': 'chengjiao_zonge',
+        'fields': ('jiedan_zongliang', 'chengjiao_zongliang', 'jiedan_zonge', 'chengjiao_zonge'),
+        'int_fields': frozenset({'jiedan_zongliang', 'chengjiao_zongliang'}),
+    },
+    'guanshi': {
+        'model': GuanshiRiTongji,
+        'sort_field': 'shouru_zonge',
+        'fields': ('yaoqing_dashou_shu', 'chongzhi_dashou_shu', 'shouru_zonge'),
+        'int_fields': frozenset({'yaoqing_dashou_shu', 'chongzhi_dashou_shu'}),
+    },
+    'zuzhang': {
+        'model': ZuzhangRiTongji,
+        'sort_field': 'shouru_zonge',
+        'fields': ('yaoqing_guanshi_shu', 'fenyong_jine', 'shouru_zonge'),
+        'int_fields': frozenset({'yaoqing_guanshi_shu'}),
+    },
+    'shangjia': {
+        'model': ShangjiaRiTongji,
+        'sort_field': 'jiesuan_jine',
+        'fields': ('paifa_dingdan_shu', 'paifa_jine', 'jiesuan_dingdan_shu', 'jiesuan_jine'),
+        'int_fields': frozenset({'paifa_dingdan_shu', 'jiesuan_dingdan_shu'}),
+    },
+}
+
+
+def _resolve_date_range(riqi: str):
+    """根据前端 riqi 参数返回 (start_date, end_date) 闭区间。"""
+    today = date.today()
+    if riqi == '今日':
+        return today, today
+    if riqi == '昨日':
+        d = today - timedelta(days=1)
+        return d, d
+    if riqi == '本周':
+        monday = today - timedelta(days=today.weekday())
+        return monday, today
+    if riqi == '上周':
+        this_monday = today - timedelta(days=today.weekday())
+        last_sunday = this_monday - timedelta(days=1)
+        last_monday = last_sunday - timedelta(days=6)
+        return last_monday, last_sunday
+    if riqi == '本月':
+        return today.replace(day=1), today
+    if riqi == '上月':
+        first_this_month = today.replace(day=1)
+        last_day_prev = first_this_month - timedelta(days=1)
+        return last_day_prev.replace(day=1), last_day_prev
+    return None
+
+
+def _fmt_value(val, is_int: bool):
+    if val is None:
+        return 0 if is_int else 0.0
+    if is_int:
+        return int(val)
+    if isinstance(val, Decimal):
+        return float(val.quantize(Decimal('0.01')))
+    return float(val)
+
+
+class PhbHqsjView(APIView):
+    """
+    排行榜数据接口
+    POST /yonghu/phbhqsj
+
+    请求参数:
+      shenfen: dashou | guanshi | zuzhang | shangjia
+      riqi:    今日 | 本周 | 本月 | 总榜 | 昨日 | 上周 | 上月
+
+    响应 data.list[]（最多50条，已按各身份排序字段降序）:
+      mingci, yonghuid, nicheng, touxiang + 各身份统计字段
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        shenfen = (request.data.get('shenfen') or '').strip()
+        riqi = (request.data.get('riqi') or '').strip()
+
+        if shenfen not in SHENFEN_OPTIONS:
+            return Response({
+                'code': 400,
+                'msg': '参数错误：shenfen 必须为 dashou/guanshi/zuzhang/shangjia',
+                'data': {'list': []},
+            })
+        if riqi not in RIQI_OPTIONS:
+            return Response({
+                'code': 400,
+                'msg': '参数错误：riqi 必须为 今日/本周/本月/总榜/昨日/上周/上月',
+                'data': {'list': []},
+            })
+
+        try:
+            if riqi == '总榜':
+                rows = self._query_rank_rows(shenfen, all_time=True)
+            else:
+                date_range = _resolve_date_range(riqi)
+                if date_range is None:
+                    return Response({
+                        'code': 400,
+                        'msg': '参数错误：无效的日期范围',
+                        'data': {'list': []},
+                    })
+                rows = self._query_rank_rows(shenfen, date_range[0], date_range[1])
+            nick_map, avatar_map = self._load_user_display(rows, shenfen)
+            cfg = ROLE_CONFIG[shenfen]
+            int_fields = cfg['int_fields']
+
+            result_list = []
+            for idx, row in enumerate(rows):
+                yonghuid = row['yonghuid']
+                item = {
+                    'mingci': idx + 1,
+                    'yonghuid': yonghuid,
+                    'nicheng': nick_map.get(yonghuid, '用户'),
+                    'touxiang': avatar_map.get(yonghuid, '') or '',
+                }
+                for field in cfg['fields']:
+                    item[field] = _fmt_value(row.get(field), field in int_fields)
+                result_list.append(item)
+
+            return Response({
+                'code': 200,
+                'msg': '获取成功',
+                'data': {'list': result_list},
+            })
+        except Exception as e:
+            logger.error('排行榜查询失败 shenfen=%s riqi=%s: %s', shenfen, riqi, e, exc_info=True)
+            return Response({
+                'code': 500,
+                'msg': '服务器内部错误',
+                'data': {'list': []},
+            })
+
+    def _query_rank_rows(self, shenfen, start_date=None, end_date=None, all_time=False):
+        cfg = ROLE_CONFIG[shenfen]
+        model = cfg['model']
+        sort_field = cfg['sort_field']
+        fields = cfg['fields']
+        annotate_kwargs = {f: Sum(f) for f in fields}
+
+        if all_time:
+            rows = (
+                model.objects
+                .values('yonghuid')
+                .annotate(**annotate_kwargs)
+                .order_by(f'-{sort_field}')[:MAX_RANK]
+            )
+            return list(rows)
+
+        if start_date == end_date:
+            qs = model.objects.filter(riqi=start_date).order_by(f'-{sort_field}')[:MAX_RANK]
+            return [
+                {'yonghuid': r.yonghuid, **{f: getattr(r, f) for f in fields}}
+                for r in qs
+            ]
+
+        rows = (
+            model.objects
+            .filter(riqi__gte=start_date, riqi__lte=end_date)
+            .values('yonghuid')
+            .annotate(**annotate_kwargs)
+            .order_by(f'-{sort_field}')[:MAX_RANK]
+        )
+        return list(rows)
+
+    def _load_user_display(self, rows, shenfen):
+        yonghuids = [r['yonghuid'] for r in rows if r.get('yonghuid')]
+        if not yonghuids:
+            return {}, {}
+
+        users = UserMain.objects.filter(yonghuid__in=yonghuids)
+        avatar_map = {u.yonghuid: u.avatar or '' for u in users}
+
+        nick_map = {}
+        if shenfen == 'dashou':
+            for p in UserDashou.objects.filter(user__yonghuid__in=yonghuids).select_related('user'):
+                nick_map[p.user.yonghuid] = p.nicheng or '用户'
+        elif shenfen == 'shangjia':
+            for p in UserShangjia.objects.filter(user__yonghuid__in=yonghuids).select_related('user'):
+                nick_map[p.user.yonghuid] = p.nicheng or '用户'
+        else:
+            for b in UserBoss.objects.filter(user__yonghuid__in=yonghuids).select_related('user'):
+                nick_map[b.user.yonghuid] = b.nickname or '用户'
+
+        return nick_map, avatar_map
diff --git a/yonghu/tasks.py b/yonghu/tasks.py
new file mode 100644
index 0000000..ce07131
--- /dev/null
+++ b/yonghu/tasks.py
@@ -0,0 +1,176 @@
+"""
+阿龙电竞 - 用户定时任务
+处理每日/每月清零等用户相关定时任务
+完整版本，包含所有异常处理
+"""
+
+from celery import shared_task
+from django.db import transaction
+from django.db.models import F, Q
+from django.utils import timezone
+from datetime import datetime
+import logging
+
+# 导入模型
+from yonghu.models import UserDashou, UserShangjia, UserGuanshi
+from utils.celery_utils import log_task_execution, rollback_on_failure
+
+logger = logging.getLogger(__name__)
+
+@shared_task
+@rollback_on_failure("每日清零任务")
+def daily_reset_task():
+    """
+    每日清零任务 - 每天凌晨0点执行
+    清零打手、商家、管事的今日相关字段
+    """
+    try:
+        with transaction.atomic():
+            start_time = timezone.now()
+            today = datetime.now().strftime('%Y-%m-%d')
+
+            logger.info(f"开始执行每日清零任务，日期: {today}")
+
+            # 1. 清零打手今日数据
+            dashou_updated = UserDashou.objects.filter(
+                Q(jinrijiedan__gt=0) | Q(jinrishouyi__gt=0)
+            ).update(
+                jinrijiedan=0,
+                jinrishouyi=0
+            )
+
+            logger.info(f"打手今日数据清零完成，影响记录: {dashou_updated}条")
+
+            # 2. 清零商家今日数据
+            shangjia_updated = UserShangjia.objects.filter(
+                Q(jinridingdan__gt=0) | Q(jinriliushui__gt=0)
+            ).update(
+                jinridingdan=0,
+                jinriliushui=0
+            )
+
+            logger.info(f"商家今日数据清零完成，影响记录: {shangjia_updated}条")
+
+            # 3. 清零管事今日数据
+            guanshi_updated = UserGuanshi.objects.filter(
+                jinrichongzhi__gt=0
+            ).update(
+                jinrichongzhi=0
+            )
+
+            logger.info(f"管事今日数据清零完成，影响记录: {guanshi_updated}条")
+
+            end_time = timezone.now()
+            duration = (end_time - start_time).total_seconds()
+
+            # 记录执行结果
+            result_msg = (
+                f"每日清零完成 - 日期: {today}, "
+                f"打手: {dashou_updated}条, "
+                f"商家: {shangjia_updated}条, "
+                f"管事: {guanshi_updated}条, "
+                f"耗时: {duration:.2f}秒"
+            )
+
+            log_task_execution("每日清零任务", True, result_msg)
+
+            return {
+                "success": True,
+                "date": today,
+                "updated_dashou": dashou_updated,
+                "updated_shangjia": shangjia_updated,
+                "updated_guanshi": guanshi_updated,
+                "duration_seconds": duration,
+                "message": result_msg
+            }
+
+    except Exception as e:
+        error_msg = f"每日清零任务失败: {str(e)}"
+        logger.error(error_msg)
+        log_task_execution("每日清零任务", False, error_msg)
+
+        return {
+            "success": False,
+            "error": str(e),
+            "date": datetime.now().strftime('%Y-%m-%d'),
+            "message": error_msg
+        }
+
+@shared_task
+@rollback_on_failure("每月清零任务")
+def monthly_reset_task():
+    """
+    每月清零任务 - 每月1日凌晨0点执行
+    清零打手、商家、管事的本月相关字段
+    """
+    try:
+        with transaction.atomic():
+            start_time = timezone.now()
+            current_month = datetime.now().strftime('%Y-%m')
+
+            logger.info(f"开始执行每月清零任务，月份: {current_month}")
+
+            # 1. 清零打手本月数据
+            dashou_updated = UserDashou.objects.filter(
+                Q(jinyuejiedan__gt=0) | Q(jinyueshouyi__gt=0)
+            ).update(
+                jinyuejiedan=0,
+                jinyueshouyi=0
+            )
+
+            logger.info(f"打手本月数据清零完成，影响记录: {dashou_updated}条")
+
+            # 2. 清零商家本月数据
+            shangjia_updated = UserShangjia.objects.filter(
+                Q(jinyuedingdan__gt=0) | Q(jinyueliushui__gt=0)
+            ).update(
+                jinyuedingdan=0,
+                jinyueliushui=0
+            )
+
+            logger.info(f"商家本月数据清零完成，影响记录: {shangjia_updated}条")
+
+            # 3. 清零管事本月数据
+            guanshi_updated = UserGuanshi.objects.filter(
+                jinyuechongzhi__gt=0
+            ).update(
+                jinyuechongzhi=0
+            )
+
+            logger.info(f"管事本月数据清零完成，影响记录: {guanshi_updated}条")
+
+            end_time = timezone.now()
+            duration = (end_time - start_time).total_seconds()
+
+            # 记录执行结果
+            result_msg = (
+                f"每月清零完成 - 月份: {current_month}, "
+                f"打手: {dashou_updated}条, "
+                f"商家: {shangjia_updated}条, "
+                f"管事: {guanshi_updated}条, "
+                f"耗时: {duration:.2f}秒"
+            )
+
+            log_task_execution("每月清零任务", True, result_msg)
+
+            return {
+                "success": True,
+                "month": current_month,
+                "updated_dashou": dashou_updated,
+                "updated_shangjia": shangjia_updated,
+                "updated_guanshi": guanshi_updated,
+                "duration_seconds": duration,
+                "message": result_msg
+            }
+
+    except Exception as e:
+        error_msg = f"每月清零任务失败: {str(e)}"
+        logger.error(error_msg)
+        log_task_execution("每月清零任务", False, error_msg)
+
+        return {
+            "success": False,
+            "error": str(e),
+            "month": datetime.now().strftime('%Y-%m'),
+            "message": error_msg
+        }
\ No newline at end of file
diff --git a/yonghu/tests.py b/yonghu/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/yonghu/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/yonghu/tixian_shenhe_apply_b.py b/yonghu/tixian_shenhe_apply_b.py
new file mode 100644
index 0000000..634e60a
--- /dev/null
+++ b/yonghu/tixian_shenhe_apply_b.py
@@ -0,0 +1,1337 @@
+# yonghu/tixian_shenhe_apply_b.py
+"""
+自动提现审核流程业务服务层（仅服务于 zddksh 申请接口 与 tixiansq 收款接口）
+
+流程：
+  ① zddksh 提交审核：资格校验 → 扣款(shenqing_jine) → 写审核表+提现记录表(状态=1)
+     （不在申请阶段校验/占用每日限额）
+  ② 后台审核通过：状态变为 6（待收款）—— 由原有后台接口处理，此处不改动
+  ③ tixiansq 收款：资格校验 → 只读预估 → 事务内原子预占限额 → 新建打款记录 → 调微信
+     微信明确失败/取消则回滚预占；待查单期间保留预占防并发超额
+  ④ 打款成功（tixianqr/回调/查单）：若收款前已预占则不再累加；未预占的旧单/查单直成则补记
+
+状态码（与前端 TX_STATUS 一致）：
+  1=审核中  2=提现成功  3=提现失败  4=审核成功  5=审核失败  6=待收款
+"""
+import decimal
+import json
+import logging
+import random
+import time
+from datetime import date, timedelta
+
+import requests
+from django.conf import settings
+from django.db import transaction
+from django.utils import timezone
+
+from dingdan.models import Dingdan, DingdanShangjia, Fadan, Lilubiao
+from peizhi.models import Szjilu, TixianQuotaDefault
+
+from utils.fadan_utils import check_fadan_qiangdan_eligible
+
+from .models import (
+    TixianAutoRecord,
+    TixianShenheJilu,
+    Tixianjilu,
+    UserDashou,
+    UserGuanshi,
+    UserMain,
+    UserShenheguan,
+    UserShangjia,
+    UserZuzhang,
+)
+
+logger = logging.getLogger('yonghu.tixian_shenhe')
+
+ORDER_STATUS_COMPLETED = 3
+ORDER_STATUS_REFUNDED = 5
+
+LEIXING_RATE_KEY = {
+    1: '5',
+    2: '6',
+    3: '8',
+    4: '9',
+    5: '11',
+    6: '10',
+}
+
+# 进行中的审核状态（不允许重复提交申请）
+PENDING_AUDIT_STATUSES = [1, 4, 6]
+
+DAKUAN_MODE_MANUAL = 1
+DAKUAN_MODE_AUTO = 2
+
+# 微信转账单状态（查单接口返回 state 字段）
+WX_STATE_SUCCESS = ('SUCCESS',)
+WX_STATE_WAIT = ('WAIT_USER_CONFIRM', 'TRANSFERING', 'ACCEPTED', 'PROCESSING')
+WX_STATE_FAIL = ('FAIL', 'CLOSED', 'CANCELLED')
+WX_STATE_CANCELING = ('CANCELING',)  # 撤销中，非终态，禁止换新单号
+
+RECONCILE_COMPLETED = 'completed'
+RECONCILE_WAIT_CONFIRM = 'wait_confirm'
+RECONCILE_ALLOW_NEW = 'allow_new'
+RECONCILE_PENDING = 'pending_query'
+
+# 查单失败且本地 zhuangtai=0 超过该分钟数，才允许新建打款记录
+PENDING_QUERY_GRACE_MINUTES = 10
+
+
+def has_dakuan_mode_field():
+    """生产库未跑 0032 迁移时模型无此字段，需兼容"""
+    try:
+        TixianShenheJilu._meta.get_field('dakuan_mode')
+        return True
+    except Exception:
+        return False
+
+
+def is_auto_dakuan_audit(audit):
+    """判断是否自动打款审核单；无 dakuan_mode 属性时，有审核记录即视为 zddksh 自动流程"""
+    if audit is None:
+        return False
+    mode = getattr(audit, 'dakuan_mode', None)
+    if mode is None:
+        return True
+    try:
+        return int(mode) == DAKUAN_MODE_AUTO
+    except (TypeError, ValueError):
+        return True
+
+
+def load_audit_dakuan_mode_map(audit_ids):
+    """批量取审核单打款方式；字段不存在时有关联审核即视为自动(2)"""
+    return {
+        aid: meta.get('dakuan_mode', DAKUAN_MODE_AUTO)
+        for aid, meta in load_audit_meta_map(audit_ids).items()
+    }
+
+
+def load_audit_meta_map(audit_ids):
+    """
+    批量取审核表元数据（供后台列表等）
+    返回 {审核记录id: {'dakuan_mode': int, 'shenhe_danhao': str}}
+    """
+    if not audit_ids:
+        return {}
+    value_fields = ['id', 'shenhe_danhao']
+    if has_dakuan_mode_field():
+        value_fields.append('dakuan_mode')
+    result = {}
+    for row in TixianShenheJilu.objects.filter(id__in=audit_ids).values(*value_fields):
+        result[row['id']] = {
+            'shenhe_danhao': row.get('shenhe_danhao') or '',
+            'dakuan_mode': row.get('dakuan_mode', DAKUAN_MODE_AUTO),
+        }
+    return result
+
+
+def generate_shenhe_danhao():
+    """生成唯一审核单号：TXSH + 时间戳后10位 + 4位随机数"""
+    for _ in range(10):
+        timestamp = str(int(time.time() * 1000))[-10:]
+        random_part = str(random.randint(1000, 9999))
+        danhao = f'TXSH{timestamp}{random_part}'
+        if not TixianShenheJilu.objects.filter(shenhe_danhao=danhao).exists():
+            return danhao
+    raise RuntimeError('生成审核单号失败，请重试')
+
+
+def get_tixian_feilv(leixing):
+    rate_key = LEIXING_RATE_KEY.get(leixing)
+    if not rate_key:
+        raise ValueError('无效的提现类型')
+    rate_obj = Lilubiao.objects.filter(fadanpingtai=rate_key).first()
+    if not rate_obj:
+        raise ValueError(f'提现费率未配置（类型{leixing}）')
+    return decimal.Decimal(str(rate_obj.lilu))
+
+
+def calc_fee_amounts(jine, feilv):
+    """申请金额 jine；实际到账 = jine - 手续费"""
+    shouxufei = (jine * feilv).quantize(decimal.Decimal('0.01'))
+    shijidaozhang = (jine - shouxufei).quantize(decimal.Decimal('0.01'))
+    return shouxufei, shijidaozhang
+
+
+def check_dashou_has_valid_huiyuan(yonghuid):
+    """
+    打手至少持有一个未过期会员（Huiyuangoumai + jiance_shifou_daoqi 同步状态）
+    返回 (True, '') 或 (False, 原因)
+    """
+    from shangpin.models import Huiyuangoumai
+
+    records = Huiyuangoumai.objects.filter(yonghu_id=yonghuid)
+    if not records.exists():
+        return False, '您暂无会员记录，无法提现'
+
+    for record in records:
+        is_expired = record.jiance_shifou_daoqi()
+        if not is_expired and record.huiyuan_zhuangtai == 1:
+            return True, ''
+    return False, '您的会员已全部过期，请先续费后再操作'
+
+
+def validate_withdraw_eligibility(user_main, leixing, jine):
+    """
+    提现资格校验（对齐手动提现 TixianShenqingView）
+    """
+    yonghuid = user_main.yonghuid
+
+    fadan_ok, fadan_msg = check_fadan_qiangdan_eligible(yonghuid, 2)
+    if not fadan_ok:
+        return False, fadan_msg, {}
+
+    if leixing == 1:
+        try:
+            dashou = UserDashou.objects.get(user=user_main)
+        except UserDashou.DoesNotExist:
+            return False, '您不是打手身份，无法提现佣金', {}
+        if dashou.zhanghaozhuangtai != 1:
+            return False, '打手账号已被封禁，无法提现', {}
+        if dashou.zhuangtai != 1:
+            return False, '有订单进行中，请完成后提现', {}
+        if dashou.yue < jine:
+            return False, f'余额不足，当前余额: {dashou.yue}', {}
+        return True, '', {'nicheng': dashou.nicheng or ''}
+
+    if leixing == 2:
+        try:
+            guanshi = UserGuanshi.objects.get(user=user_main)
+        except UserGuanshi.DoesNotExist:
+            return False, '您不是管事身份，无法提现分红', {}
+        if guanshi.zhuangtai != 1:
+            return False, '管事账号已被封禁，无法提现', {}
+        if guanshi.yue < jine:
+            return False, f'余额不足，当前余额: {guanshi.yue}', {}
+        return True, '', {'nicheng': '管事用户'}
+
+    if leixing == 3:
+        try:
+            zuzhang = UserZuzhang.objects.get(user=user_main)
+        except UserZuzhang.DoesNotExist:
+            return False, '您不是组长身份，无法提现组长分红', {}
+        if zuzhang.zhuangtai != 1:
+            return False, '组长账号已被封禁，无法提现', {}
+        if zuzhang.ketixian_jine < jine:
+            return False, f'可提现金额不足，当前可提: {zuzhang.ketixian_jine}', {}
+        return True, '', {'nicheng': ''}
+
+    if leixing == 4:
+        try:
+            kaoheguan = UserShenheguan.objects.get(user=user_main)
+        except UserShenheguan.DoesNotExist:
+            return False, '您不是考核官身份，无法提现分佣', {}
+        if kaoheguan.zhuangtai != 1:
+            return False, '考核官账号已被封禁，无法提现', {}
+        if kaoheguan.yue < jine:
+            return False, f'考核官可提现金额不足，当前余额: {kaoheguan.yue}', {}
+        return True, '', {'nicheng': '考核官'}
+
+    if leixing == 5:
+        try:
+            dashou = UserDashou.objects.get(user=user_main)
+        except UserDashou.DoesNotExist:
+            return False, '您不是打手身份，无法提取押金', {}
+        if dashou.zhanghaozhuangtai != 1:
+            return False, '打手账号已禁用，无法提取押金', {}
+        if dashou.zhuangtai != 1:
+            return False, '您有订单进行中，请完成后提取押金', {}
+        if dashou.yajin < jine:
+            return False, f'押金余额不足，当前押金: {dashou.yajin}', {}
+        unfinished = Dingdan.objects.filter(
+            jiedan_dashou_id=yonghuid,
+        ).exclude(zhuangtai__in=[ORDER_STATUS_COMPLETED, ORDER_STATUS_REFUNDED]).exists()
+        if unfinished:
+            return False, '您还有未完成或未退款的订单，请先处理完毕再提取押金', {}
+        self_fadan = Fadan.objects.filter(beichufa_id=yonghuid).exclude(zhuangtai__in=[2, 4]).exists()
+        if self_fadan:
+            return False, '您有未处理完毕的自身罚单（待缴纳/申诉中），请先处理', {}
+        return True, '', {'nicheng': dashou.nicheng or ''}
+
+    if leixing == 6:
+        try:
+            shangjia = UserShangjia.objects.get(user=user_main)
+        except UserShangjia.DoesNotExist:
+            return False, '您不是商家身份，无法提现商家余额', {}
+        if shangjia.zhuangtai != 1:
+            return False, '商家账号已被禁用，无法提现', {}
+        if shangjia.yue < jine:
+            return False, f'商家余额不足，当前余额: {shangjia.yue}', {}
+        unfinished_orders = DingdanShangjia.objects.filter(
+            shangjia_id=yonghuid,
+        ).exclude(dingdan__zhuangtai__in=[ORDER_STATUS_COMPLETED, ORDER_STATUS_REFUNDED]).exists()
+        if unfinished_orders:
+            return False, '您还有未完成或未退款的订单，请先处理完毕再提现余额', {}
+        self_fadan = Fadan.objects.filter(beichufa_id=yonghuid).exclude(zhuangtai__in=[2, 4]).exists()
+        if self_fadan:
+            return False, '您有未处理完毕的自身罚单（待缴纳/申诉中），请先处理', {}
+        applied_fadan = Fadan.objects.filter(shenqing_chufa=yonghuid).exclude(zhuangtai__in=[2, 4]).exists()
+        if applied_fadan:
+            return False, '您发起的对其他用户的处罚尚未处理完毕，请等待完结', {}
+        return True, '', {'nicheng': shangjia.nicheng or ''}
+
+    return False, '无效的提现类型', {}
+
+
+def validate_collect_eligibility(user_main, leixing):
+    """
+    收款前二次校验（申请时已扣款，不再校余额/金额）。
+    打手佣金/押金：罚单、封禁、接单中、积分、会员等；
+    其他身份：账号状态、罚单/订单等（不含金额）。
+    """
+    yonghuid = user_main.yonghuid
+
+    fadan_ok, fadan_msg = check_fadan_qiangdan_eligible(yonghuid, 2)
+    if not fadan_ok:
+        return False, fadan_msg
+
+    if leixing == 1:
+        try:
+            dashou = UserDashou.objects.get(user=user_main)
+        except UserDashou.DoesNotExist:
+            return False, '您不是打手身份，无法收款'
+        if dashou.zhanghaozhuangtai != 1:
+            return False, '打手账号已被封禁，无法收款'
+        if dashou.zhuangtai != 1:
+            return False, '您有订单进行中，请完成后再收款'
+        return True, ''
+
+    if leixing == 5:
+        try:
+            dashou = UserDashou.objects.get(user=user_main)
+        except UserDashou.DoesNotExist:
+            return False, '您不是打手身份，无法收款'
+        if dashou.zhanghaozhuangtai != 1:
+            return False, '打手账号已禁用，无法收款'
+        if dashou.zhuangtai != 1:
+            return False, '您有订单进行中，请完成后再收款'
+        unfinished = Dingdan.objects.filter(
+            jiedan_dashou_id=yonghuid,
+        ).exclude(zhuangtai__in=[ORDER_STATUS_COMPLETED, ORDER_STATUS_REFUNDED]).exists()
+        if unfinished:
+            return False, '您还有未完成或未退款的订单，无法收款'
+        self_fadan = Fadan.objects.filter(beichufa_id=yonghuid).exclude(zhuangtai__in=[2, 4]).exists()
+        if self_fadan:
+            return False, '您有未处理完毕的自身罚单，无法收款'
+        return True, ''
+
+    if leixing == 2:
+        try:
+            guanshi = UserGuanshi.objects.get(user=user_main)
+        except UserGuanshi.DoesNotExist:
+            return False, '您不是管事身份，无法收款'
+        if guanshi.zhuangtai != 1:
+            return False, '管事账号已被封禁，无法收款'
+        return True, ''
+
+    if leixing == 3:
+        try:
+            zuzhang = UserZuzhang.objects.get(user=user_main)
+        except UserZuzhang.DoesNotExist:
+            return False, '您不是组长身份，无法收款'
+        if zuzhang.zhuangtai != 1:
+            return False, '组长账号已被封禁，无法收款'
+        return True, ''
+
+    if leixing == 4:
+        try:
+            kaoheguan = UserShenheguan.objects.get(user=user_main)
+        except UserShenheguan.DoesNotExist:
+            return False, '您不是考核官身份，无法收款'
+        if kaoheguan.zhuangtai != 1:
+            return False, '考核官账号已被封禁，无法收款'
+        return True, ''
+
+    if leixing == 6:
+        try:
+            shangjia = UserShangjia.objects.get(user=user_main)
+        except UserShangjia.DoesNotExist:
+            return False, '您不是商家身份，无法收款'
+        if shangjia.zhuangtai != 1:
+            return False, '商家账号已被禁用，无法收款'
+        unfinished_orders = DingdanShangjia.objects.filter(
+            shangjia_id=yonghuid,
+        ).exclude(dingdan__zhuangtai__in=[ORDER_STATUS_COMPLETED, ORDER_STATUS_REFUNDED]).exists()
+        if unfinished_orders:
+            return False, '您还有未完成或未退款的订单，无法收款'
+        self_fadan = Fadan.objects.filter(beichufa_id=yonghuid).exclude(zhuangtai__in=[2, 4]).exists()
+        if self_fadan:
+            return False, '您有未处理完毕的自身罚单，无法收款'
+        applied_fadan = Fadan.objects.filter(shenqing_chufa=yonghuid).exclude(zhuangtai__in=[2, 4]).exists()
+        if applied_fadan:
+            return False, '您发起的处罚尚未处理完毕，无法收款'
+        return True, ''
+
+    return False, '无效的提现类型'
+
+
+def _get_personal_daily_quota(leixing, profile):
+    """打手/管事/组长个人每日限额：额外开启优先，否则默认配置"""
+    if leixing == 1:
+        if profile.kaioi_ewai_xiane and profile.ewai_xiane > 0:
+            return profile.ewai_xiane
+        return TixianQuotaDefault.objects.get(leixing=1).default_quota
+    if leixing == 2:
+        if profile.kaioi_ewai_xiane and profile.ewai_xiane > 0:
+            return profile.ewai_xiane
+        return TixianQuotaDefault.objects.get(leixing=2).default_quota
+    if leixing == 3:
+        try:
+            default_quota = TixianQuotaDefault.objects.get(leixing=3).default_quota
+        except TixianQuotaDefault.DoesNotExist:
+            default_quota = decimal.Decimal('0.00')
+        if profile.kaioi_ewai_tixian and profile.ewai_tixian_xiane > 0:
+            return profile.ewai_tixian_xiane
+        return default_quota
+    raise ValueError('无效的个人限额身份')
+
+
+def _get_active_auto_record(shenhe_danhao):
+    if not shenhe_danhao:
+        return None
+    return (
+        TixianAutoRecord.objects.filter(
+            shenhe_danhao=shenhe_danhao,
+            zhuangtai__in=[0, 1],
+        )
+        .order_by('-create_time')
+        .first()
+    )
+
+
+def _get_platform_daily_total(leixing, today=None):
+    """平台今日已提现总额：只读 houtai.TixianRiTongji（到账金额口径）"""
+    from houtai.models import TixianRiTongji
+
+    if today is None:
+        today = date.today()
+    try:
+        return TixianRiTongji.objects.get(riqi=today, leixing=leixing).total_amount
+    except TixianRiTongji.DoesNotExist:
+        return decimal.Decimal('0.00')
+
+
+def _calc_platform_projected(leixing, shijidaozhang, shenhe_danhao=''):
+    """
+    平台今日预占后总额（收款前只读预估）。
+    本审核单若已有进行中打款记录，其金额尚未写入统计表，但不应重复加计。
+    返回 (daily_used, projected_total, additional_amount)
+    """
+    daily_used = _get_platform_daily_total(leixing)
+    active_rec = _get_active_auto_record(shenhe_danhao)
+    if active_rec:
+        return daily_used, daily_used, decimal.Decimal('0.00')
+    additional = shijidaozhang or decimal.Decimal('0.00')
+    return daily_used, daily_used + additional, additional
+
+
+def _projected_personal_total(personal_today, jine, shenhe_danhao=''):
+    """个人今日占用预估（申请金额口径）"""
+    rec = _get_active_auto_record(shenhe_danhao)
+    already_counted = rec.jine if rec else decimal.Decimal('0.00')
+    return personal_today - already_counted + jine
+
+
+def _get_platform_daily_limit(leixing):
+    """
+    平台每日总限额（peizhi.TixianQuotaDefault）：
+    提现身份1打手→配置4，2管事→5，3组长→6，4考核官→7，5押金→8，6商家→9
+    """
+    quota_leixing = leixing + 3
+    try:
+        return TixianQuotaDefault.objects.get(leixing=quota_leixing).default_quota
+    except TixianQuotaDefault.DoesNotExist:
+        logger.warning(
+            '平台每日总限额未配置 leixing=%s(读取quota_leixing=%s)，按0处理禁止新增收款',
+            leixing, quota_leixing,
+        )
+        return decimal.Decimal('0.00')
+
+
+def _check_personal_quota_readonly(user_main, leixing, jine, shenhe_danhao=''):
+    """个人每日限额只读校验（打手/管事/组长）"""
+    if leixing not in (1, 2, 3):
+        return True, '', ''
+
+    today = date.today()
+    if leixing == 1:
+        try:
+            profile = UserDashou.objects.get(user=user_main)
+        except UserDashou.DoesNotExist:
+            return False, '打手信息不存在', 'personal'
+        if profile.last_tixian_date != today:
+            personal_today = decimal.Decimal('0.00')
+        else:
+            personal_today = profile.jinritixian_jine
+    elif leixing == 2:
+        try:
+            profile = UserGuanshi.objects.get(user=user_main)
+        except UserGuanshi.DoesNotExist:
+            return False, '管事信息不存在', 'personal'
+        if profile.last_tixian_date != today:
+            personal_today = decimal.Decimal('0.00')
+        else:
+            personal_today = profile.jinritixian_jine
+    else:
+        try:
+            profile = UserZuzhang.objects.get(user=user_main)
+        except UserZuzhang.DoesNotExist:
+            return False, '组长信息不存在', 'personal'
+        if profile.last_tixian_time and profile.last_tixian_time.date() == today:
+            personal_today = profile.jinri_tixian
+        else:
+            personal_today = decimal.Decimal('0.00')
+
+    personal_quota = _get_personal_daily_quota(leixing, profile)
+    projected_personal = _projected_personal_total(personal_today, jine, shenhe_danhao)
+    if projected_personal > personal_quota:
+        return (
+            False,
+            f'今日提现已达个人限额，今日已提{personal_today}元，本次申请{jine}元，限额{personal_quota}元',
+            'personal',
+        )
+    return True, '', ''
+
+
+def _check_platform_quota_readonly(leixing, shijidaozhang, shenhe_danhao=''):
+    """平台每日总限额只读校验：今日已用 + 本笔到账 > 总限额 则拒绝"""
+    platform_limit = _get_platform_daily_limit(leixing)
+    shijidaozhang = shijidaozhang or decimal.Decimal('0.00')
+
+    if platform_limit <= 0 and shijidaozhang > 0:
+        return False, '今日该角色提现已关闭（总限额为0），暂无法收款', 'platform'
+
+    daily_used, projected, additional = _calc_platform_projected(
+        leixing, shijidaozhang, shenhe_danhao,
+    )
+    if projected > platform_limit:
+        logger.warning(
+            '平台总限额拦截 leixing=%s shenhe_danhao=%s daily_used=%s additional=%s '
+            'projected=%s limit=%s',
+            leixing, shenhe_danhao, daily_used, additional, projected, platform_limit,
+        )
+        return (
+            False,
+            f'今日该角色提现总额已达上限，今日已提{daily_used}元，本次到账{additional}元，限额{platform_limit}元',
+            'platform',
+        )
+
+    return True, '', ''
+
+
+def check_collect_quota_limits(user_main, leixing, jine, shijidaozhang, shenhe_danhao=''):
+    """
+    收款限额只读校验（复用待确认打款单等场景，不写入）。
+    返回 (True, '', '') 或 (False, msg, 'personal'|'platform')
+    """
+    ok, msg, kind = _check_personal_quota_readonly(user_main, leixing, jine, shenhe_danhao)
+    if not ok:
+        return False, msg, kind
+    return _check_platform_quota_readonly(leixing, shijidaozhang, shenhe_danhao)
+
+
+def reserve_collect_quota_limits(user_main, leixing, jine, shijidaozhang, shenhe_danhao=''):
+    """
+    收款前原子预占每日限额（必须在 transaction.atomic 内调用）。
+    锁定 TixianRiTongji + 用户行，校验通过后立即写入统计，防止高并发超额。
+    本审核单已有进行中/成功打款记录则视为已预占，不重复加计。
+    返回 (True, '', '') 或 (False, msg, 'personal'|'platform')
+    """
+    from houtai.models import TixianRiTongji
+
+    today = date.today()
+    shijidaozhang = shijidaozhang or decimal.Decimal('0.00')
+
+    if _get_active_auto_record(shenhe_danhao):
+        return True, '', ''
+
+    personal_profile = None
+    if leixing in (1, 2, 3):
+        if leixing == 1:
+            personal_profile = UserDashou.objects.select_for_update().get(user=user_main)
+            if personal_profile.last_tixian_date != today:
+                personal_profile.jinritixian_jine = decimal.Decimal('0.00')
+                personal_profile.last_tixian_date = today
+            personal_today = personal_profile.jinritixian_jine
+        elif leixing == 2:
+            personal_profile = UserGuanshi.objects.select_for_update().get(user=user_main)
+            if personal_profile.last_tixian_date != today:
+                personal_profile.jinritixian_jine = decimal.Decimal('0.00')
+                personal_profile.last_tixian_date = today
+            personal_today = personal_profile.jinritixian_jine
+        else:
+            personal_profile = UserZuzhang.objects.select_for_update().get(user=user_main)
+            if personal_profile.last_tixian_time and personal_profile.last_tixian_time.date() != today:
+                personal_profile.jinri_tixian = decimal.Decimal('0.00')
+            elif not personal_profile.last_tixian_time:
+                personal_profile.jinri_tixian = decimal.Decimal('0.00')
+            personal_today = personal_profile.jinri_tixian
+
+        personal_quota = _get_personal_daily_quota(leixing, personal_profile)
+        if personal_today + jine > personal_quota:
+            return (
+                False,
+                f'今日提现已达个人限额，今日已提{personal_today}元，本次申请{jine}元，限额{personal_quota}元',
+                'personal',
+            )
+
+    platform_stat, _ = TixianRiTongji.objects.select_for_update().get_or_create(
+        riqi=today,
+        leixing=leixing,
+        defaults={'total_amount': decimal.Decimal('0.00')},
+    )
+    platform_limit = _get_platform_daily_limit(leixing)
+    if platform_limit <= 0 and shijidaozhang > 0:
+        return False, '今日该角色提现已关闭（总限额为0），暂无法收款', 'platform'
+    if platform_stat.total_amount + shijidaozhang > platform_limit:
+        return (
+            False,
+            f'今日该角色提现总额已达上限，今日已提{platform_stat.total_amount}元，'
+            f'本次到账{shijidaozhang}元，限额{platform_limit}元',
+            'platform',
+        )
+
+    if personal_profile is not None:
+        if leixing == 1:
+            personal_profile.jinritixian_jine += jine
+            personal_profile.save(update_fields=['jinritixian_jine', 'last_tixian_date'])
+        elif leixing == 2:
+            personal_profile.jinritixian_jine += jine
+            personal_profile.save(update_fields=['jinritixian_jine', 'last_tixian_date'])
+        else:
+            personal_profile.jinri_tixian += jine
+            personal_profile.last_tixian_time = timezone.now()
+            personal_profile.save(update_fields=['jinri_tixian', 'last_tixian_time'])
+
+    platform_stat.total_amount += shijidaozhang
+    platform_stat.save(update_fields=['total_amount'])
+
+    logger.info(
+        '收款限额预占成功 yonghuid=%s leixing=%s shenhe_danhao=%s jine=%s shijidaozhang=%s platform_total=%s',
+        user_main.yonghuid, leixing, shenhe_danhao, jine, shijidaozhang, platform_stat.total_amount,
+    )
+    return True, '', ''
+
+
+def release_collect_quota_reservation(user_main, leixing, jine, shijidaozhang):
+    """微信打款明确失败/用户取消时回滚收款预占的限额"""
+    from houtai.models import TixianRiTongji
+
+    today = date.today()
+    shijidaozhang = shijidaozhang or decimal.Decimal('0.00')
+    try:
+        with transaction.atomic():
+            if leixing == 1:
+                dashou = UserDashou.objects.select_for_update().get(user=user_main)
+                if dashou.last_tixian_date == today and dashou.jinritixian_jine >= jine:
+                    dashou.jinritixian_jine -= jine
+                    dashou.save(update_fields=['jinritixian_jine'])
+            elif leixing == 2:
+                guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+                if guanshi.last_tixian_date == today and guanshi.jinritixian_jine >= jine:
+                    guanshi.jinritixian_jine -= jine
+                    guanshi.save(update_fields=['jinritixian_jine'])
+            elif leixing == 3:
+                zuzhang = UserZuzhang.objects.select_for_update().get(user=user_main)
+                if zuzhang.jinri_tixian >= jine:
+                    zuzhang.jinri_tixian -= jine
+                    zuzhang.save(update_fields=['jinri_tixian'])
+
+            try:
+                stat = TixianRiTongji.objects.select_for_update().get(
+                    riqi=today, leixing=leixing,
+                )
+                stat.total_amount = max(
+                    stat.total_amount - shijidaozhang,
+                    decimal.Decimal('0.00'),
+                )
+                stat.save(update_fields=['total_amount'])
+            except TixianRiTongji.DoesNotExist:
+                pass
+    except Exception as e:
+        logger.error(
+            '回滚收款限额预占失败 yonghuid=%s leixing=%s err=%s',
+            user_main.yonghuid, leixing, e, exc_info=True,
+        )
+        return
+
+    logger.info(
+        '收款限额预占已回滚 yonghuid=%s leixing=%s jine=%s shijidaozhang=%s',
+        user_main.yonghuid, leixing, jine, shijidaozhang,
+    )
+
+
+def release_collect_quota_for_record(auto_record):
+    """幂等回滚单笔打款对应的收款预占（查单/回调/取消等多路径共用，防重复扣减）"""
+    if not auto_record.shenhe_danhao:
+        return
+    if not _quota_already_reserved_for_record(auto_record):
+        return
+    try:
+        user_main = UserMain.objects.get(yonghuid=auto_record.yonghuid)
+    except UserMain.DoesNotExist:
+        logger.error('回滚限额预占失败：用户不存在 %s', auto_record.yonghuid)
+        return
+    release_collect_quota_reservation(
+        user_main,
+        auto_record.leixing,
+        auto_record.jine,
+        auto_record.shijidaozhang,
+    )
+
+
+def _quota_already_reserved_for_record(auto_record):
+    """判断本笔打款是否已在收款预占时写入日统计（避免成功时重复累加）"""
+    if not auto_record.shenhe_danhao:
+        return False
+    from django.db.models import Sum
+
+    today = date.today()
+    shijidaozhang = auto_record.shijidaozhang or decimal.Decimal('0.00')
+    stat_total = _get_platform_daily_total(auto_record.leixing, today)
+    other_sum = TixianAutoRecord.objects.filter(
+        leixing=auto_record.leixing,
+        zhuangtai__in=[0, 1],
+        create_time__date=today,
+    ).exclude(tixian_id=auto_record.tixian_id).aggregate(
+        total=Sum('shijidaozhang'),
+    )['total'] or decimal.Decimal('0.00')
+    return stat_total >= other_sum + shijidaozhang
+
+
+def apply_transfer_success_quota(auto_record):
+    """
+    打款成功时累加每日限额统计（仅自动审核流程 shenhe_danhao 非空）。
+    - houtai.TixianRiTongji.total_amount += 实际到账
+    - 用户扩展表个人今日已提 += 申请金额（打手/管事/组长）
+    须在 transaction.atomic 内、且打款记录 zhuangtai 由 0→1 时调用一次。
+    """
+    if not auto_record.shenhe_danhao:
+        return
+
+    from houtai.models import TixianRiTongji
+
+    today = date.today()
+    leixing = auto_record.leixing
+    jine = auto_record.jine
+    shijidaozhang = auto_record.shijidaozhang or decimal.Decimal('0.00')
+
+    try:
+        user_main = UserMain.objects.get(yonghuid=auto_record.yonghuid)
+    except UserMain.DoesNotExist:
+        logger.error('打款成功累加限额失败：用户不存在 %s', auto_record.yonghuid)
+        return
+
+    platform_stat, _ = TixianRiTongji.objects.select_for_update().get_or_create(
+        riqi=today,
+        leixing=leixing,
+        defaults={'total_amount': decimal.Decimal('0.00')},
+    )
+    platform_stat.total_amount += shijidaozhang
+    platform_stat.save(update_fields=['total_amount'])
+
+    if leixing == 1:
+        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+        if dashou.last_tixian_date != today:
+            dashou.jinritixian_jine = decimal.Decimal('0.00')
+            dashou.last_tixian_date = today
+        dashou.jinritixian_jine += jine
+        dashou.save(update_fields=['jinritixian_jine', 'last_tixian_date'])
+    elif leixing == 2:
+        guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+        if guanshi.last_tixian_date != today:
+            guanshi.jinritixian_jine = decimal.Decimal('0.00')
+            guanshi.last_tixian_date = today
+        guanshi.jinritixian_jine += jine
+        guanshi.save(update_fields=['jinritixian_jine', 'last_tixian_date'])
+    elif leixing == 3:
+        zuzhang = UserZuzhang.objects.select_for_update().get(user=user_main)
+        if zuzhang.last_tixian_time and zuzhang.last_tixian_time.date() != today:
+            zuzhang.jinri_tixian = decimal.Decimal('0.00')
+        elif not zuzhang.last_tixian_time:
+            zuzhang.jinri_tixian = decimal.Decimal('0.00')
+        zuzhang.jinri_tixian += jine
+        zuzhang.last_tixian_time = timezone.now()
+        zuzhang.save(update_fields=['jinri_tixian', 'last_tixian_time'])
+
+    logger.info(
+        '打款成功已累加限额 bill=%s yonghuid=%s leixing=%s jine=%s shijidaozhang=%s '
+        'platform_total=%s',
+        auto_record.tixian_id, auto_record.yonghuid, leixing, jine, shijidaozhang,
+        platform_stat.total_amount,
+    )
+
+
+def refund_balance(user_main, leixing, jine):
+    """审核拒绝时退还可到账金额 shijidaozhang（须在 transaction.atomic 内；手续费已在申请扣款时扣除不退还）"""
+    if leixing == 1:
+        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+        dashou.yue += jine
+        dashou.save()
+    elif leixing == 2:
+        guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+        guanshi.yue += jine
+        guanshi.save()
+    elif leixing == 3:
+        zuzhang = UserZuzhang.objects.select_for_update().get(user=user_main)
+        zuzhang.ketixian_jine += jine
+        zuzhang.save()
+    elif leixing == 4:
+        kaoheguan = UserShenheguan.objects.select_for_update().get(user=user_main)
+        kaoheguan.yue += jine
+        kaoheguan.save()
+    elif leixing == 5:
+        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+        dashou.yajin += jine
+        dashou.zhanghaozhuangtai = 1
+        dashou.save()
+    elif leixing == 6:
+        shangjia = UserShangjia.objects.select_for_update().get(user=user_main)
+        shangjia.yue += jine
+        shangjia.save()
+    else:
+        raise ValueError('无效的提现类型')
+
+
+def deduct_balance(user_main, leixing, jine):
+    """扣减申请金额 jine（必须在 transaction.atomic 内调用）"""
+    if leixing == 1:
+        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+        if dashou.yue < jine:
+            raise ValueError('余额不足')
+        dashou.yue -= jine
+        dashou.save()
+        return dashou.nicheng or ''
+    if leixing == 2:
+        guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+        if guanshi.yue < jine:
+            raise ValueError('余额不足')
+        guanshi.yue -= jine
+        guanshi.save()
+        return '管事用户'
+    if leixing == 3:
+        zuzhang = UserZuzhang.objects.select_for_update().get(user=user_main)
+        if zuzhang.ketixian_jine < jine:
+            raise ValueError('可提现金额不足')
+        zuzhang.ketixian_jine -= jine
+        zuzhang.save()
+        return ''
+    if leixing == 4:
+        kaoheguan = UserShenheguan.objects.select_for_update().get(user=user_main)
+        if kaoheguan.yue < jine:
+            raise ValueError('可提现金额不足')
+        kaoheguan.yue -= jine
+        kaoheguan.save()
+        return '考核官'
+    if leixing == 5:
+        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+        if dashou.yajin < jine:
+            raise ValueError('押金余额不足')
+        dashou.yajin -= jine
+        dashou.zhanghaozhuangtai = 0
+        dashou.save()
+        return dashou.nicheng or ''
+    if leixing == 6:
+        shangjia = UserShangjia.objects.select_for_update().get(user=user_main)
+        if shangjia.yue < jine:
+            raise ValueError('商家余额不足')
+        shangjia.yue -= jine
+        shangjia.save()
+        return shangjia.nicheng or ''
+    raise ValueError('无效的提现类型')
+
+
+def get_balance_response_data(user_main, leixing):
+    data = {}
+    if leixing == 1:
+        try:
+            dashou = UserDashou.objects.get(user=user_main)
+            data['new_yongjin'] = str(dashou.yue.quantize(decimal.Decimal('0.01')))
+        except UserDashou.DoesNotExist:
+            pass
+    elif leixing == 2:
+        try:
+            guanshi = UserGuanshi.objects.get(user=user_main)
+            data['new_fenyong'] = str(guanshi.yue.quantize(decimal.Decimal('0.01')))
+        except UserGuanshi.DoesNotExist:
+            pass
+    elif leixing == 3:
+        try:
+            zuzhang = UserZuzhang.objects.get(user=user_main)
+            data['new_zuzhang_ketixian'] = str(zuzhang.ketixian_jine.quantize(decimal.Decimal('0.01')))
+        except UserZuzhang.DoesNotExist:
+            pass
+    elif leixing == 4:
+        try:
+            kg = UserShenheguan.objects.get(user=user_main)
+            data['new_kaoheguan_yue'] = str(kg.yue.quantize(decimal.Decimal('0.01')))
+        except UserShenheguan.DoesNotExist:
+            pass
+    return data
+
+
+def has_pending_audit(yonghuid):
+    return TixianShenheJilu.objects.filter(
+        yonghuid=yonghuid,
+        zhuangtai__in=PENDING_AUDIT_STATUSES,
+    ).exists()
+
+
+def sync_audit_and_jilu_status(audit, new_status, **extra_fields):
+    audit.zhuangtai = new_status
+    for k, v in extra_fields.items():
+        setattr(audit, k, v)
+    audit.save()
+    if audit.tixianjilu_id:
+        update_fields = {'zhuangtai': new_status, 'update_time': timezone.now()}
+        if 'bhliyou' in extra_fields:
+            update_fields['bhliyou'] = extra_fields['bhliyou']
+        Tixianjilu.objects.filter(id=audit.tixianjilu_id).update(**update_fields)
+
+
+def query_wechat_transfer_bill(out_bill_no):
+    """
+    向微信查转账单状态
+    GET /v3/fund-app/mch-transfer/transfer-bills/out-bill-no/{out_bill_no}
+    返回 dict；网络/系统异常返回 None；微信无此单返回 {'_not_found': True}
+    """
+    from utils.wechat_v3 import build_authorization
+
+    url = (
+        'https://api.mch.weixin.qq.com/v3/fund-app/mch-transfer/'
+        f'transfer-bills/out-bill-no/{out_bill_no}'
+    )
+    try:
+        auth = build_authorization('GET', url, '')
+        headers = {
+            'Authorization': auth,
+            'Accept': 'application/json',
+            'User-Agent': 'Mozilla/5.0',
+        }
+        resp = requests.get(url, headers=headers, timeout=10)
+        if resp.status_code == 200:
+            return resp.json()
+        if resp.status_code == 404:
+            return {'_not_found': True}
+        logger.error(
+            '微信查单失败 bill=%s HTTP%s body=%s',
+            out_bill_no, resp.status_code, resp.text[:300],
+        )
+        return None
+    except (requests.RequestException, OSError, ValueError) as e:
+        logger.error('微信查单异常 bill=%s err=%s', out_bill_no, e, exc_info=True)
+        return None
+    except Exception as e:
+        logger.error('微信查单未知异常 bill=%s err=%s', out_bill_no, e, exc_info=True)
+        return None
+
+
+def _parse_package_info(raw):
+    if not raw:
+        return None
+    if isinstance(raw, dict):
+        return raw
+    try:
+        return json.loads(raw)
+    except (TypeError, ValueError):
+        return None
+
+
+def _apply_platform_accounting(auto_record):
+    """平台收支统计（幂等由 mark_transfer_success 外层保证只调一次）"""
+    from dingdan.utils import update_daily_payout
+
+    update_daily_payout(auto_record.shijidaozhang)
+    try:
+        szjilu = Szjilu.objects.select_for_update().get(id=1)
+        szjilu.zongsy -= auto_record.shijidaozhang
+        szjilu.zongzc += auto_record.shijidaozhang
+        szjilu.jrzc += auto_record.shijidaozhang
+        szjilu.save()
+    except Szjilu.DoesNotExist:
+        Szjilu.objects.create(
+            id=1,
+            zongsy=-auto_record.shijidaozhang,
+            zongzc=auto_record.shijidaozhang,
+            jrzc=auto_record.shijidaozhang,
+        )
+
+
+def mark_transfer_success(auto_record, *, wechat_transfer_no=None, with_accounting=True):
+    """
+    打款成功落库（tixianqr / callback / 查单对账 共用）
+    select_for_update + zhuangtai==0 才更新并记账，防双写
+    返回 True=本次新标记成功；False=已处理过
+    """
+    with transaction.atomic():
+        ar = TixianAutoRecord.objects.select_for_update().get(pk=auto_record.pk)
+        if ar.zhuangtai != 0:
+            return False
+
+        ar.zhuangtai = 1
+        update_fields = ['zhuangtai', 'update_time']
+        if wechat_transfer_no:
+            ar.wechat_transfer_no = wechat_transfer_no
+            update_fields.append('wechat_transfer_no')
+        ar.save(update_fields=update_fields)
+
+        if ar.shenhe_danhao:
+            try:
+                audit = TixianShenheJilu.objects.select_for_update().get(
+                    shenhe_danhao=ar.shenhe_danhao,
+                )
+                if audit.zhuangtai != 2:
+                    sync_audit_and_jilu_status(audit, 2)
+            except TixianShenheJilu.DoesNotExist:
+                logger.warning('打款成功但审核记录不存在: %s', ar.shenhe_danhao)
+
+        if ar.shenhe_danhao and not _quota_already_reserved_for_record(ar):
+            apply_transfer_success_quota(ar)
+
+        if with_accounting:
+            _apply_platform_accounting(ar)
+
+    return True
+
+
+def _sync_record_from_wx_query(auto_record, wx_data):
+    """根据微信查单结果修正本地打款记录，返回 (action, payload)"""
+    if wx_data.get('_not_found'):
+        age = timezone.now() - auto_record.create_time
+        if auto_record.zhuangtai == 0 and age < timedelta(minutes=PENDING_QUERY_GRACE_MINUTES):
+            return RECONCILE_PENDING, {
+                'msg': '有收款处理中，请稍后再试',
+                'tixian_id': auto_record.tixian_id,
+            }
+        if auto_record.zhuangtai == 0:
+            auto_record.zhuangtai = 2
+            auto_record.fail_reason = '微信未找到该打款单，请重新发起收款'
+            auto_record.save(update_fields=['zhuangtai', 'fail_reason', 'update_time'])
+            release_collect_quota_for_record(auto_record)
+        return RECONCILE_ALLOW_NEW, {}
+
+    state = (wx_data.get('state') or '').upper()
+
+    if state in WX_STATE_SUCCESS:
+        mark_transfer_success(
+            auto_record,
+            wechat_transfer_no=wx_data.get('transfer_bill_no') or wx_data.get('transfer_no'),
+        )
+        return RECONCILE_COMPLETED, {'msg': '该提现已完成，请勿重复操作'}
+
+    if state in WX_STATE_WAIT:
+        package = wx_data.get('package_info') or _parse_package_info(auto_record.wechat_package)
+        if not package:
+            return RECONCILE_PENDING, {
+                'msg': '有收款处理中，请稍后再试',
+                'tixian_id': auto_record.tixian_id,
+            }
+        if auto_record.zhuangtai == 0:
+            auto_record.wechat_package = json.dumps(package, ensure_ascii=False)
+            auto_record.save(update_fields=['wechat_package', 'update_time'])
+        wx_cfg = settings.WECHAT_PAY_V3_CONFIG
+        return RECONCILE_WAIT_CONFIRM, {
+            'tixian_id': auto_record.tixian_id,
+            'package_info': package,
+            'shouxufei': str(auto_record.shouxufei),
+            'shijidaozhang': str(auto_record.shijidaozhang),
+            'current_rate': str(auto_record.feilv),
+            'mch_id': wx_cfg.get('MCHID', ''),
+            'shenhe_danhao': auto_record.shenhe_danhao or '',
+        }
+
+    if state in WX_STATE_CANCELING:
+        return RECONCILE_PENDING, {
+            'msg': '收款撤销处理中，请稍后再试',
+            'tixian_id': auto_record.tixian_id,
+        }
+
+    if state in WX_STATE_FAIL:
+        if auto_record.zhuangtai != 1:
+            auto_record.zhuangtai = 2
+            auto_record.fail_reason = (
+                wx_data.get('fail_reason') or wx_data.get('close_reason') or state
+            )[:500]
+            auto_record.save(update_fields=['zhuangtai', 'fail_reason', 'update_time'])
+            release_collect_quota_for_record(auto_record)
+        return RECONCILE_ALLOW_NEW, {}
+
+    if auto_record.zhuangtai == 0:
+        return RECONCILE_PENDING, {
+            'msg': f'收款处理中（微信状态:{state or "未知"}），请稍后再试',
+            'tixian_id': auto_record.tixian_id,
+        }
+    return RECONCILE_ALLOW_NEW, {}
+
+
+def get_auto_record_for_collect(shenhe_danhao):
+    """
+    取本笔提现申请应对接微信的那条打款记录：
+    优先 zhuangtai=0（进行中），否则取最新一条（可能本地误标失败但微信未终态）
+    """
+    pending = (
+        TixianAutoRecord.objects.filter(shenhe_danhao=shenhe_danhao, zhuangtai=0)
+        .order_by('-create_time')
+        .first()
+    )
+    if pending:
+        return pending
+    return (
+        TixianAutoRecord.objects.filter(shenhe_danhao=shenhe_danhao)
+        .order_by('-create_time')
+        .first()
+    )
+
+
+def reconcile_shenhe_wechat_bills(shenhe_danhao):
+    """
+    P0 防双笔：同一 shenhe_danhao 下所有打款记录逐条问微信
+    任一 SUCCESS / 进行中 → 禁止新建；全部终态失败才 ALLOW_NEW
+    返回 (action, payload)
+    """
+    records = list(
+        TixianAutoRecord.objects.filter(shenhe_danhao=shenhe_danhao).order_by('-create_time')
+    )
+
+    if any(r.zhuangtai == 1 for r in records):
+        try:
+            audit = TixianShenheJilu.objects.get(shenhe_danhao=shenhe_danhao)
+            if audit.zhuangtai != 2:
+                sync_audit_and_jilu_status(audit, 2)
+        except TixianShenheJilu.DoesNotExist:
+            pass
+        return RECONCILE_COMPLETED, {'msg': '该提现已完成，请勿重复操作'}
+
+    if not records:
+        return RECONCILE_ALLOW_NEW, {}
+
+    pending_hit = None
+    for rec in records:
+        if rec.zhuangtai == 1:
+            return RECONCILE_COMPLETED, {'msg': '该提现已完成，请勿重复操作'}
+
+        wx_data = query_wechat_transfer_bill(rec.tixian_id)
+        if wx_data is None:
+            logger.error(
+                '对账查单不可用 shenhe_danhao=%s bill=%s',
+                shenhe_danhao, rec.tixian_id,
+            )
+            return RECONCILE_PENDING, {
+                'msg': '有收款处理中，系统正在核对微信状态，请稍后再试',
+                'tixian_id': rec.tixian_id,
+            }
+
+        action, payload = _sync_record_from_wx_query(rec, wx_data)
+        if action == RECONCILE_COMPLETED:
+            return action, payload
+        if action == RECONCILE_WAIT_CONFIRM:
+            return action, payload
+        if action == RECONCILE_PENDING:
+            if pending_hit is None:
+                pending_hit = (action, payload)
+            continue
+
+    if pending_hit:
+        return pending_hit
+    return RECONCILE_ALLOW_NEW, {}
+
+
+def resolve_collect_context(yonghuid, tixianjilu_id=None, shenhe_danhao='', shenhe_jilu_id=None):
+    """
+    从提现记录 ID 进门（P0 收款主路径）：
+    Tixianjilu → TixianShenheJilu，校验归属、状态=6 待收款
+    返回 ({jilu, audit}, err_msg)
+    """
+    if tixianjilu_id is None and not shenhe_danhao:
+        return None, '缺少提现记录ID'
+
+    jilu = None
+    if tixianjilu_id is not None:
+        try:
+            jilu = Tixianjilu.objects.get(id=int(tixianjilu_id), yonghuid=yonghuid)
+        except (Tixianjilu.DoesNotExist, TypeError, ValueError):
+            return None, '提现记录不存在或不属于当前用户'
+
+        if jilu.zhuangtai != 6:
+            return None, f'当前状态不可收款（状态{jilu.zhuangtai}），请等待审核通过'
+        if not jilu.shenhe_jilu_id or not jilu.shenhe_danhao:
+            return None, '提现记录未关联审核单，无法收款'
+
+        if shenhe_jilu_id is not None:
+            try:
+                if int(shenhe_jilu_id) != jilu.shenhe_jilu_id:
+                    return None, '审核记录ID与提现记录不匹配'
+            except (TypeError, ValueError):
+                return None, '审核记录ID格式错误'
+
+        if shenhe_danhao and shenhe_danhao != jilu.shenhe_danhao:
+            return None, '审核单号与提现记录不匹配'
+
+        shenhe_danhao = jilu.shenhe_danhao
+        shenhe_jilu_id = jilu.shenhe_jilu_id
+
+    try:
+        if shenhe_jilu_id:
+            audit = TixianShenheJilu.objects.get(
+                id=int(shenhe_jilu_id),
+                shenhe_danhao=shenhe_danhao,
+                yonghuid=yonghuid,
+            )
+        else:
+            audit = TixianShenheJilu.objects.get(
+                shenhe_danhao=shenhe_danhao,
+                yonghuid=yonghuid,
+            )
+    except (TixianShenheJilu.DoesNotExist, TypeError, ValueError):
+        return None, '审核记录不存在'
+
+    if audit.zhuangtai == 2:
+        return None, '该提现已完成，请勿重复操作'
+    if audit.zhuangtai != 6:
+        return None, f'当前状态不可收款（状态{audit.zhuangtai}），请等待审核通过'
+    if not is_auto_dakuan_audit(audit):
+        return None, '该提现单为手动打款，无法使用自动收款'
+
+    if jilu is None:
+        try:
+            jilu = Tixianjilu.objects.get(
+                id=audit.tixianjilu_id,
+                yonghuid=yonghuid,
+            ) if audit.tixianjilu_id else None
+        except Tixianjilu.DoesNotExist:
+            jilu = None
+
+    return {'jilu': jilu, 'audit': audit, 'shenhe_danhao': shenhe_danhao}, ''
+
+
+def handle_post_transfer_failure(tixian_id, shenhe_danhao, err_code='', err_msg=''):
+    """
+    发起转账 HTTP 非成功时：先查微信再决定是否标失败（P0，禁止盲目标失败导致双笔）
+    返回 (action, payload_or_user_msg)
+    """
+    try:
+        ar = TixianAutoRecord.objects.get(tixian_id=tixian_id)
+    except TixianAutoRecord.DoesNotExist:
+        return RECONCILE_PENDING, '收款处理中，请稍后再试'
+
+    wx_data = query_wechat_transfer_bill(tixian_id)
+    if wx_data is None:
+        logger.error(
+            '发起转账失败且查单不可用 bill=%s code=%s msg=%s，保持待查单',
+            tixian_id, err_code, err_msg,
+        )
+        return RECONCILE_PENDING, '收款请求已提交，系统正在核对状态，请稍后再试，切勿重复点击'
+
+    action, payload = _sync_record_from_wx_query(ar, wx_data)
+    if action == RECONCILE_ALLOW_NEW:
+        return RECONCILE_ALLOW_NEW, payload
+    if action == RECONCILE_WAIT_CONFIRM:
+        return RECONCILE_WAIT_CONFIRM, payload
+    if action == RECONCILE_COMPLETED:
+        return RECONCILE_COMPLETED, payload
+    return RECONCILE_PENDING, payload.get('msg', '收款处理中，请稍后再试')
+
+
+def get_audit_for_collect(shenhe_danhao, yonghuid, shenhe_jilu_id=None):
+    """
+    收款前数据库校验（须在 transaction.atomic 内调用；微信查单在事务外单独做）
+    """
+    try:
+        audit = TixianShenheJilu.objects.select_for_update().get(
+            shenhe_danhao=shenhe_danhao,
+            yonghuid=yonghuid,
+        )
+    except TixianShenheJilu.DoesNotExist:
+        return None, '审核记录不存在'
+
+    if shenhe_jilu_id is not None:
+        try:
+            if int(shenhe_jilu_id) != audit.id:
+                return None, '审核记录ID不匹配'
+        except (TypeError, ValueError):
+            return None, '审核记录ID格式错误'
+
+    if audit.zhuangtai == 2:
+        return None, '该提现已完成，请勿重复操作'
+
+    if audit.zhuangtai != 6:
+        return None, f'当前状态不可收款（状态{audit.zhuangtai}），请等待审核通过'
+
+    if not is_auto_dakuan_audit(audit):
+        return None, '该提现单为手动打款，无法使用自动收款'
+
+    return audit, ''
+
+
+def create_audit_application(user_main, leixing, jine):
+    """
+    提交审核申请：校验 → 扣款 → 写审核表 + 提现记录表
+    不创建打款记录表（TixianAutoRecord 仅在收款时创建）
+    """
+    yonghuid = user_main.yonghuid
+
+    if has_pending_audit(yonghuid):
+        raise ValueError('账户余额不足或您有进行中的提现申请，请等待处理完成或10分钟后后再提交')
+
+    ok, msg, extra = validate_withdraw_eligibility(user_main, leixing, jine)
+    if not ok:
+        raise ValueError(msg)
+
+    feilv = get_tixian_feilv(leixing)
+    shouxufei, shijidaozhang = calc_fee_amounts(jine, feilv)
+    if shijidaozhang <= 0:
+        raise ValueError('提现金额过低，扣除手续费后无实际到账')
+
+    shenhe_danhao = generate_shenhe_danhao()
+    nicheng = extra.get('nicheng', '')
+
+    with transaction.atomic():
+        nicheng = deduct_balance(user_main, leixing, jine) or nicheng
+
+        audit_kwargs = {
+            'shenhe_danhao': shenhe_danhao,
+            'yonghuid': yonghuid,
+            'leixing': leixing,
+            'zhuangtai': 1,
+            'shenqing_jine': jine,
+            'shouxufei': shouxufei,
+            'shijidaozhang': shijidaozhang,
+            'feilv': feilv,
+        }
+        if has_dakuan_mode_field():
+            audit_kwargs['dakuan_mode'] = DAKUAN_MODE_AUTO
+        audit = TixianShenheJilu.objects.create(**audit_kwargs)
+
+        tixian_record = Tixianjilu.objects.create(
+            yonghuid=yonghuid,
+            avatar=user_main.avatar or '',
+            phone=user_main.phone or '',
+            nicheng=nicheng,
+            leixing=leixing,
+            zhifu=user_main.zhifu or '',
+            skzhanghao=user_main.skzhanghao or '',
+            jine=shijidaozhang,
+            zhuangtai=1,
+            fangshi=1,
+            shenheid=None,
+            bhliyou='',
+            shenhe_jilu_id=audit.id,
+            shenhe_danhao=shenhe_danhao,
+        )
+
+        audit.tixianjilu_id = tixian_record.id
+        audit.save(update_fields=['tixianjilu_id'])
+
+    response_data = get_balance_response_data(user_main, leixing)
+    response_data.update({
+        'shenhe_danhao': shenhe_danhao,
+        'shenhe_jilu_id': audit.id,
+        'tixianjilu_id': tixian_record.id,
+        'shouxufei': str(shouxufei),
+        'shijidaozhang': str(shijidaozhang),
+        'current_rate': str(feilv.quantize(decimal.Decimal('0.0001'))),
+        'leixing': leixing,
+        'zhuangtai': 1,
+    })
+    return response_data
diff --git a/yonghu/tixian_shenhe_collect_b.py b/yonghu/tixian_shenhe_collect_b.py
new file mode 100644
index 0000000..519b2ed
--- /dev/null
+++ b/yonghu/tixian_shenhe_collect_b.py
@@ -0,0 +1,383 @@
+# yonghu/tixian_shenhe_collect_b.py
+"""
+自动提现审核 — 用户侧接口：
+  ① TixianZddkshApplyView  → POST /yonghu/zddksh   提交审核（扣款）
+  ② process_audit_collect  → POST /yonghu/tixiansq  收款（P0：一单到底，先查微信再决定是否新建）
+"""
+import decimal
+import json
+import logging
+import random
+import string
+import time
+
+import requests
+from django.conf import settings
+from django.db import transaction
+from django.utils import timezone
+from rest_framework import permissions
+from rest_framework.response import Response
+from rest_framework.views import APIView
+
+from .models import TixianAutoRecord, TixianShenheJilu
+from .tixian_shenhe_services import (
+    RECONCILE_ALLOW_NEW,
+    RECONCILE_COMPLETED,
+    RECONCILE_PENDING,
+    RECONCILE_WAIT_CONFIRM,
+    check_collect_quota_limits,
+    create_audit_application,
+    get_audit_for_collect,
+    handle_post_transfer_failure,
+    reconcile_shenhe_wechat_bills,
+    release_collect_quota_for_record,
+    reserve_collect_quota_limits,
+    resolve_collect_context,
+    validate_collect_eligibility,
+)
+
+logger = logging.getLogger('yonghu.tixian_shenhe')
+
+
+def generate_tixian_id():
+    """生成唯一微信商户打款单号：TX + 时间戳(13位) + 4位随机数"""
+    timestamp = str(int(time.time() * 1000))
+    rand = ''.join(random.choices(string.digits, k=4))
+    return f'TX{timestamp}{rand}'
+
+
+def _build_collect_success_response(payload):
+    return Response({
+        'code': 0,
+        'msg': '请确认收款',
+        'data': payload,
+    })
+
+
+def _is_wx_balance_insufficient(err_code='', err_msg=''):
+    blob = f'{err_code} {err_msg}'.upper()
+    return any(k in blob for k in ('NOT_ENOUGH', 'INSUFFICIENT', '余额不足', '资金不足'))
+
+
+def _verify_collect_quota_or_response(user_main, audit, shenhe_danhao):
+    """收款限额校验；不通过时直接返回 Response"""
+    ok, msg, limit_kind = check_collect_quota_limits(
+        user_main,
+        audit.leixing,
+        audit.shenqing_jine,
+        audit.shijidaozhang,
+        shenhe_danhao,
+    )
+    if not ok:
+        limit_code = 33 if limit_kind == 'platform' else 400
+        logger.warning(
+            '收款限额校验未通过 yonghuid=%s shenhe_danhao=%s leixing=%s kind=%s msg=%s',
+            user_main.yonghuid, shenhe_danhao, audit.leixing, limit_kind, msg,
+        )
+        return Response({'code': limit_code, 'msg': msg})
+    return None
+
+
+def _mark_auto_record_failed(tixian_id, fail_reason):
+    """微信明确失败时标记打款记录终态，避免后续一直被当成「处理中」"""
+    TixianAutoRecord.objects.filter(tixian_id=tixian_id, zhuangtai=0).update(
+        zhuangtai=2,
+        fail_reason=(fail_reason or '打款失败')[:500],
+        update_time=timezone.now(),
+    )
+
+
+def _build_wx_transfer_body(wx_cfg, tixian_id, openid, yonghuid, leixing, shijidaozhang):
+    transfer_scene_id = wx_cfg['TRANSFER_SCENE_ID']
+    role_map = {1: '打手', 2: '管事', 3: '组长', 4: '考核官', 5: '打手', 6: '商家'}
+    desc_map = {1: '佣金提现', 2: '分红提现', 3: '分红提现', 4: '分佣提现', 5: '押金提现', 6: '余额提现'}
+    transfer_scene_report_infos = []
+    if transfer_scene_id == '1005':
+        transfer_scene_report_infos = [
+            {'info_type': '岗位类型', 'info_content': role_map.get(leixing, '用户')},
+            {'info_type': '报酬说明', 'info_content': desc_map.get(leixing, '提现')},
+        ]
+    elif transfer_scene_id == '1009':
+        transfer_scene_report_infos = [
+            {'info_type': '采购商品名称', 'info_content': '平台服务'},
+        ]
+    return {
+        'appid': wx_cfg['APPID'],
+        'out_bill_no': tixian_id,
+        'transfer_scene_id': transfer_scene_id,
+        'openid': openid,
+        'transfer_amount': int(shijidaozhang * 100),
+        'transfer_remark': f'平台提现-{yonghuid}',
+        'transfer_scene_report_infos': transfer_scene_report_infos,
+    }
+
+
+def _call_wechat_transfer(body, wx_cfg):
+    from utils.wechat_v3 import build_authorization
+
+    url = 'https://api.mch.weixin.qq.com/v3/fund-app/mch-transfer/transfer-bills'
+    body_json = json.dumps(body, separators=(',', ':'))
+    auth = build_authorization('POST', url, body_json)
+    headers = {
+        'Authorization': auth,
+        'Content-Type': 'application/json',
+        'Accept': 'application/json',
+        'User-Agent': 'Mozilla/5.0',
+    }
+    resp = requests.post(url, data=body_json, headers=headers, timeout=15)
+    try:
+        wx_result = resp.json()
+    except ValueError:
+        wx_result = {}
+    return resp, wx_result
+
+
+class TixianZddkshApplyView(APIView):
+    """POST /yonghu/zddksh  提交审核申请（扣款，不创建 TixianAutoRecord）"""
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        from utils.redis_lock import acquire_lock, release_lock
+
+        user_main = request.user
+        lock_key = f'tixian_audit_apply:{user_main.yonghuid}'
+        if not acquire_lock(lock_key, timeout=10):
+            return Response({'code': 429, 'msg': '操作频繁，请稍后重试'})
+
+        try:
+            leixing = request.data.get('leixing')
+            jine_str = request.data.get('jine')
+            if leixing is None or jine_str is None:
+                return Response({'code': 1, 'msg': '缺少参数: leixing 或 jine'})
+
+            try:
+                leixing = int(leixing)
+                jine = decimal.Decimal(str(jine_str))
+            except (ValueError, decimal.InvalidOperation):
+                return Response({'code': 2, 'msg': '参数格式错误'})
+
+            if leixing not in [1, 2, 3, 4, 5, 6]:
+                return Response({'code': 3, 'msg': '提现类型无效'})
+            if jine <= decimal.Decimal('0.1'):
+                return Response({'code': 4, 'msg': '提现金额必须大于0.1'})
+
+            try:
+                data = create_audit_application(user_main, leixing, jine)
+            except ValueError as e:
+                return Response({'code': 400, 'msg': str(e)})
+            except Exception as e:
+                logger.error(f'提现审核申请异常: {e}', exc_info=True)
+                return Response({'code': 99, 'msg': '提现申请失败，请稍后重试'})
+
+            return Response({'code': 0, 'msg': '提现申请已提交，请等待审核', 'data': data})
+
+        finally:
+            release_lock(lock_key)
+
+
+def process_audit_collect(request):
+    """
+    POST /yonghu/tixiansq  用户收款（P0 防多提）
+
+    主路径：tixianjilu_id → Tixianjilu → TixianShenheJilu(状态6)
+    若 TixianAutoRecord 已有 tixian_id → 只问微信，非终态绝不新建
+    仅微信 FAIL/CANCELLED 终态后才允许新建打款记录
+    """
+    from utils.redis_lock import acquire_lock, release_lock
+
+    user_main = request.user
+    yonghuid = user_main.yonghuid
+    tixianjilu_id = request.data.get('tixianjilu_id') or request.data.get('id')
+    shenhe_danhao = (request.data.get('shenhe_danhao') or '').strip()
+    shenhe_jilu_id = request.data.get('shenhe_jilu_id')
+
+    logger.info(
+        '收款请求 yonghuid=%s tixianjilu_id=%s shenhe_jilu_id=%s shenhe_danhao=%s',
+        yonghuid, tixianjilu_id, shenhe_jilu_id, shenhe_danhao,
+    )
+
+    try:
+        if not user_main.openid:
+            return Response({'code': 10, 'msg': '用户未绑定微信，无法收款'})
+
+        wx_cfg = settings.WECHAT_PAY_V3_CONFIG
+        if not wx_cfg.get('APPID') or not wx_cfg.get('MCHID') or not wx_cfg.get('TRANSFER_SCENE_ID'):
+            logger.error('微信打款配置不完整 APPID=%s MCHID=%s', wx_cfg.get('APPID'), wx_cfg.get('MCHID'))
+            return Response({'code': 11, 'msg': '系统配置异常，请联系客服'})
+
+        ctx, err = resolve_collect_context(
+            yonghuid,
+            tixianjilu_id=tixianjilu_id,
+            shenhe_danhao=shenhe_danhao,
+            shenhe_jilu_id=shenhe_jilu_id,
+        )
+        if not ctx:
+            return Response({'code': 400, 'msg': err})
+
+        audit = ctx['audit']
+        shenhe_danhao = ctx['shenhe_danhao']
+        tixianjilu_id_val = ctx['jilu'].id if ctx.get('jilu') else audit.tixianjilu_id
+        leixing = audit.leixing
+
+        # 二次资格校验：不通过仅返回错误，审核单保持待收款(6)，不退款，用户补齐资质后可再点收款
+        collect_ok, collect_msg = validate_collect_eligibility(user_main, leixing)
+        if not collect_ok:
+            logger.warning(
+                '收款校验未通过 yonghuid=%s shenhe_danhao=%s leixing=%s msg=%s',
+                yonghuid, shenhe_danhao, leixing, collect_msg,
+            )
+            return Response({'code': 400, 'msg': collect_msg})
+
+        quota_resp = _verify_collect_quota_or_response(user_main, audit, shenhe_danhao)
+        if quota_resp:
+            return quota_resp
+
+        lock_key = f'tixian_collect:{shenhe_danhao}'
+        if not acquire_lock(lock_key, timeout=15):
+            return Response({'code': 429, 'msg': '操作频繁，请稍后重试'})
+
+        tixian_id = None
+        quota_reserved = False
+        try:
+            action, payload = reconcile_shenhe_wechat_bills(shenhe_danhao)
+            if action == RECONCILE_COMPLETED:
+                return Response({'code': 8, 'msg': payload.get('msg', '该提现已完成，请勿重复操作')})
+            if action == RECONCILE_WAIT_CONFIRM:
+                quota_resp = _verify_collect_quota_or_response(user_main, audit, shenhe_danhao)
+                if quota_resp:
+                    return quota_resp
+                return _build_collect_success_response(payload)
+            if action == RECONCILE_PENDING:
+                msg = payload.get('msg') if isinstance(payload, dict) else payload
+                return Response({'code': 12, 'msg': msg or '有收款处理中，请稍后再试'})
+
+            if action != RECONCILE_ALLOW_NEW:
+                return Response({'code': 12, 'msg': '收款处理中，请稍后再试'})
+
+            with transaction.atomic():
+                audit, err = get_audit_for_collect(
+                    shenhe_danhao, yonghuid, audit.id,
+                )
+                if not audit:
+                    return Response({'code': 400, 'msg': err})
+
+                # 金额一律用审核表已落库数据（申请时扣款+算费），收款不再重算
+                jine = audit.shenqing_jine
+                shouxufei = audit.shouxufei
+                shijidaozhang = audit.shijidaozhang
+                feilv = audit.feilv
+
+                ok, msg, limit_kind = reserve_collect_quota_limits(
+                    user_main, leixing, jine, shijidaozhang, shenhe_danhao,
+                )
+                if not ok:
+                    limit_code = 33 if limit_kind == 'platform' else 400
+                    return Response({'code': limit_code, 'msg': msg})
+
+                quota_reserved = True
+
+                tixian_id = generate_tixian_id()
+                TixianAutoRecord.objects.create(
+                    tixian_id=tixian_id,
+                    yonghuid=yonghuid,
+                    leixing=leixing,
+                    jine=jine,
+                    shouxufei=shouxufei,
+                    shijidaozhang=shijidaozhang,
+                    feilv=feilv,
+                    zhuangtai=0,
+                    shenhe_danhao=shenhe_danhao,
+                )
+                audit.tixian_auto_id = tixian_id
+                audit.save(update_fields=['tixian_auto_id', 'update_time'])
+
+            body = _build_wx_transfer_body(
+                wx_cfg, tixian_id, user_main.openid, yonghuid, leixing, shijidaozhang,
+            )
+
+            try:
+                resp, wx_result = _call_wechat_transfer(body, wx_cfg)
+
+                if resp.status_code == 200 and wx_result.get('state') == 'WAIT_USER_CONFIRM':
+                    package_info = wx_result.get('package_info')
+                    auto_record = TixianAutoRecord.objects.get(tixian_id=tixian_id)
+                    auto_record.wechat_package = json.dumps(package_info, ensure_ascii=False)
+                    auto_record.save(update_fields=['wechat_package'])
+
+                    return _build_collect_success_response({
+                        'tixian_id': tixian_id,
+                        'package_info': package_info,
+                        'shouxufei': str(shouxufei),
+                        'shijidaozhang': str(shijidaozhang),
+                        'current_rate': str(feilv),
+                        'mch_id': wx_cfg['MCHID'],
+                        'shenhe_danhao': shenhe_danhao,
+                        'tixianjilu_id': tixianjilu_id_val,
+                    })
+
+                err_code = wx_result.get('code', '')
+                err_msg = wx_result.get('message', wx_result.get('detail', '微信接口调用失败'))
+                logger.error(
+                    '微信发起转账未进入待确认: bill=%s code=%s msg=%s HTTP%s',
+                    tixian_id, err_code, err_msg, resp.status_code,
+                )
+
+                is_balance_issue = _is_wx_balance_insufficient(err_code, err_msg)
+                if is_balance_issue:
+                    _mark_auto_record_failed(tixian_id, err_msg)
+                    if quota_reserved:
+                        release_collect_quota_for_record(
+                            TixianAutoRecord.objects.get(tixian_id=tixian_id),
+                        )
+                        quota_reserved = False
+                    return Response({
+                        'code': 99,
+                        'msg': '运营账户资金不足，需等管理员充值后才能提现',
+                    })
+
+                post_action, post_payload = handle_post_transfer_failure(
+                    tixian_id, shenhe_danhao, err_code, err_msg,
+                )
+                if post_action == RECONCILE_WAIT_CONFIRM:
+                    quota_resp = _verify_collect_quota_or_response(user_main, audit, shenhe_danhao)
+                    if quota_resp:
+                        return quota_resp
+                    return _build_collect_success_response(post_payload)
+                if post_action == RECONCILE_COMPLETED:
+                    return Response({'code': 8, 'msg': '该提现已完成，请勿重复操作'})
+                if post_action == RECONCILE_PENDING:
+                    pending_msg = (
+                        post_payload.get('msg', post_payload)
+                        if isinstance(post_payload, dict) else post_payload
+                    )
+                    return Response({'code': 12, 'msg': pending_msg or '有收款处理中，请稍后再试'})
+
+                user_msg = err_msg or '微信收款发起失败，请稍后重试'
+                _mark_auto_record_failed(tixian_id, user_msg)
+                if quota_reserved:
+                    release_collect_quota_for_record(
+                        TixianAutoRecord.objects.get(tixian_id=tixian_id),
+                    )
+                    quota_reserved = False
+                return Response({'code': 99, 'msg': user_msg})
+
+            except requests.RequestException as e:
+                logger.error(
+                    '微信打款网络异常(保持待查单): bill=%s err=%s',
+                    tixian_id, e, exc_info=True,
+                )
+                return Response({
+                    'code': 12,
+                    'msg': '收款请求已提交，系统正在核对状态，请稍后再试，切勿重复点击',
+                })
+
+        finally:
+            release_lock(lock_key)
+
+    except Exception as e:
+        logger.error(
+            '收款接口未捕获异常 yonghuid=%s tixianjilu_id=%s shenhe_danhao=%s err=%s',
+            yonghuid, tixianjilu_id, shenhe_danhao, e,
+            exc_info=True,
+        )
+        return Response({'code': 99, 'msg': '系统繁忙，请稍后重试'})
diff --git a/yonghu/tixian_shenhe_services.py b/yonghu/tixian_shenhe_services.py
new file mode 100644
index 0000000..1b0e5cd
--- /dev/null
+++ b/yonghu/tixian_shenhe_services.py
@@ -0,0 +1,1358 @@
+# yonghu/tixian_shenhe_services.py
+"""
+自动提现审核流程业务服务层（仅服务于 zddksh 申请接口 与 tixiansq 收款接口）
+
+流程：
+  ① zddksh 提交审核：资格校验 → 扣款(shenqing_jine) → 写审核表+提现记录表(状态=1)
+     （不在申请阶段校验/占用每日限额）
+  ② 后台审核通过：状态变为 6（待收款）—— 由原有后台接口处理，此处不改动
+  ③ tixiansq 收款：资格校验 → 只读预估 → 事务内原子预占限额 → 新建打款记录 → 调微信
+     微信明确失败/取消则回滚预占；待查单期间保留预占防并发超额
+  ④ 打款成功（tixianqr/回调/查单）：若收款前已预占则不再累加；未预占的旧单/查单直成则补记
+
+状态码（与前端 TX_STATUS 一致）：
+  1=审核中  2=提现成功  3=提现失败  4=审核成功  5=审核失败  6=待收款
+"""
+import decimal
+import json
+import logging
+import random
+import time
+from datetime import date, timedelta
+
+import requests
+from django.conf import settings
+from django.db import transaction
+from django.utils import timezone
+
+from dingdan.models import Dingdan, DingdanShangjia, Fadan, Lilubiao
+from peizhi.models import Szjilu, TixianQuotaDefault
+
+from utils.fadan_utils import check_fadan_qiangdan_eligible
+
+from .models import (
+    TixianAutoRecord,
+    TixianShenheJilu,
+    Tixianjilu,
+    UserDashou,
+    UserGuanshi,
+    UserMain,
+    UserShenheguan,
+    UserShangjia,
+    UserZuzhang,
+)
+
+logger = logging.getLogger('yonghu.tixian_shenhe')
+
+ORDER_STATUS_COMPLETED = 3
+ORDER_STATUS_REFUNDED = 5
+
+LEIXING_RATE_KEY = {
+    1: '5',
+    2: '6',
+    3: '8',
+    4: '9',
+    5: '11',
+    6: '10',
+}
+
+# 进行中的审核状态（不允许重复提交申请）
+PENDING_AUDIT_STATUSES = [1, 4, 6]
+
+DAKUAN_MODE_MANUAL = 1
+DAKUAN_MODE_AUTO = 2
+
+# 微信转账单状态（查单接口返回 state 字段）
+WX_STATE_SUCCESS = ('SUCCESS',)
+WX_STATE_WAIT = ('WAIT_USER_CONFIRM', 'TRANSFERING', 'ACCEPTED', 'PROCESSING')
+WX_STATE_FAIL = ('FAIL', 'CLOSED', 'CANCELLED')
+WX_STATE_CANCELING = ('CANCELING',)  # 撤销中，非终态，禁止换新单号
+
+RECONCILE_COMPLETED = 'completed'
+RECONCILE_WAIT_CONFIRM = 'wait_confirm'
+RECONCILE_ALLOW_NEW = 'allow_new'
+RECONCILE_PENDING = 'pending_query'
+
+# 查单失败且本地 zhuangtai=0 超过该分钟数，才允许新建打款记录
+PENDING_QUERY_GRACE_MINUTES = 10
+
+
+def has_dakuan_mode_field():
+    """生产库未跑 0032 迁移时模型无此字段，需兼容"""
+    try:
+        TixianShenheJilu._meta.get_field('dakuan_mode')
+        return True
+    except Exception:
+        return False
+
+
+def is_auto_dakuan_audit(audit):
+    """判断是否自动打款审核单；无 dakuan_mode 属性时，有审核记录即视为 zddksh 自动流程"""
+    if audit is None:
+        return False
+    mode = getattr(audit, 'dakuan_mode', None)
+    if mode is None:
+        return True
+    try:
+        return int(mode) == DAKUAN_MODE_AUTO
+    except (TypeError, ValueError):
+        return True
+
+
+def load_audit_dakuan_mode_map(audit_ids):
+    """批量取审核单打款方式；字段不存在时有关联审核即视为自动(2)"""
+    return {
+        aid: meta.get('dakuan_mode', DAKUAN_MODE_AUTO)
+        for aid, meta in load_audit_meta_map(audit_ids).items()
+    }
+
+
+def load_audit_meta_map(audit_ids):
+    """
+    批量取审核表元数据（供后台列表等）
+    返回 {审核记录id: {'dakuan_mode': int, 'shenhe_danhao': str}}
+    """
+    if not audit_ids:
+        return {}
+    value_fields = ['id', 'shenhe_danhao']
+    if has_dakuan_mode_field():
+        value_fields.append('dakuan_mode')
+    result = {}
+    for row in TixianShenheJilu.objects.filter(id__in=audit_ids).values(*value_fields):
+        result[row['id']] = {
+            'shenhe_danhao': row.get('shenhe_danhao') or '',
+            'dakuan_mode': row.get('dakuan_mode', DAKUAN_MODE_AUTO),
+        }
+    return result
+
+
+def generate_shenhe_danhao():
+    """生成唯一审核单号：TXSH + 时间戳后10位 + 4位随机数"""
+    for _ in range(10):
+        timestamp = str(int(time.time() * 1000))[-10:]
+        random_part = str(random.randint(1000, 9999))
+        danhao = f'TXSH{timestamp}{random_part}'
+        if not TixianShenheJilu.objects.filter(shenhe_danhao=danhao).exists():
+            return danhao
+    raise RuntimeError('生成审核单号失败，请重试')
+
+
+def get_tixian_feilv(leixing):
+    rate_key = LEIXING_RATE_KEY.get(leixing)
+    if not rate_key:
+        raise ValueError('无效的提现类型')
+    rate_obj = Lilubiao.objects.filter(fadanpingtai=rate_key).first()
+    if not rate_obj:
+        raise ValueError(f'提现费率未配置（类型{leixing}）')
+    return decimal.Decimal(str(rate_obj.lilu))
+
+
+def calc_fee_amounts(jine, feilv):
+    """申请金额 jine；实际到账 = jine - 手续费"""
+    shouxufei = (jine * feilv).quantize(decimal.Decimal('0.01'))
+    shijidaozhang = (jine - shouxufei).quantize(decimal.Decimal('0.01'))
+    return shouxufei, shijidaozhang
+
+
+def check_dashou_has_valid_huiyuan(yonghuid):
+    """
+    打手至少持有一个未过期会员（Huiyuangoumai + jiance_shifou_daoqi 同步状态）
+    返回 (True, '') 或 (False, 原因)
+    """
+    from shangpin.models import Huiyuangoumai
+
+    records = Huiyuangoumai.objects.filter(yonghu_id=yonghuid)
+    if not records.exists():
+        return False, '您暂无会员记录，无法提现'
+
+    for record in records:
+        is_expired = record.jiance_shifou_daoqi()
+        if not is_expired and record.huiyuan_zhuangtai == 1:
+            return True, ''
+    return False, '您的会员已全部过期，请先续费后再操作'
+
+
+def validate_withdraw_eligibility(user_main, leixing, jine):
+    """
+    提现资格校验（对齐手动提现 TixianShenqingView）
+    """
+    yonghuid = user_main.yonghuid
+
+    fadan_ok, fadan_msg = check_fadan_qiangdan_eligible(yonghuid, 2)
+    if not fadan_ok:
+        return False, fadan_msg, {}
+
+    if leixing == 1:
+        try:
+            dashou = UserDashou.objects.get(user=user_main)
+        except UserDashou.DoesNotExist:
+            return False, '您不是打手身份，无法提现佣金', {}
+        if dashou.zhanghaozhuangtai != 1:
+            return False, '打手账号已被封禁，无法提现', {}
+        if dashou.zhuangtai != 1:
+            return False, '有订单进行中，请完成后提现', {}
+        # 与手动提现一致：积分必须正好 10 分
+        if dashou.jifen != 10:
+            return False, '积分不足10分，请补充积分后提现', {}
+        huiyuan_ok, huiyuan_msg = check_dashou_has_valid_huiyuan(yonghuid)
+        if not huiyuan_ok:
+            return False, huiyuan_msg, {}
+        if dashou.yue < jine:
+            return False, f'余额不足，当前余额: {dashou.yue}', {}
+        return True, '', {'nicheng': dashou.nicheng or ''}
+
+    if leixing == 2:
+        try:
+            guanshi = UserGuanshi.objects.get(user=user_main)
+        except UserGuanshi.DoesNotExist:
+            return False, '您不是管事身份，无法提现分红', {}
+        if guanshi.zhuangtai != 1:
+            return False, '管事账号已被封禁，无法提现', {}
+        if guanshi.yue < jine:
+            return False, f'余额不足，当前余额: {guanshi.yue}', {}
+        return True, '', {'nicheng': '管事用户'}
+
+    if leixing == 3:
+        try:
+            zuzhang = UserZuzhang.objects.get(user=user_main)
+        except UserZuzhang.DoesNotExist:
+            return False, '您不是组长身份，无法提现组长分红', {}
+        if zuzhang.zhuangtai != 1:
+            return False, '组长账号已被封禁，无法提现', {}
+        if zuzhang.ketixian_jine < jine:
+            return False, f'可提现金额不足，当前可提: {zuzhang.ketixian_jine}', {}
+        return True, '', {'nicheng': ''}
+
+    if leixing == 4:
+        try:
+            kaoheguan = UserShenheguan.objects.get(user=user_main)
+        except UserShenheguan.DoesNotExist:
+            return False, '您不是考核官身份，无法提现分佣', {}
+        if kaoheguan.zhuangtai != 1:
+            return False, '考核官账号已被封禁，无法提现', {}
+        if kaoheguan.yue < jine:
+            return False, f'考核官可提现金额不足，当前余额: {kaoheguan.yue}', {}
+        return True, '', {'nicheng': '考核官'}
+
+    if leixing == 5:
+        try:
+            dashou = UserDashou.objects.get(user=user_main)
+        except UserDashou.DoesNotExist:
+            return False, '您不是打手身份，无法提取押金', {}
+        if dashou.zhanghaozhuangtai != 1:
+            return False, '打手账号已禁用，无法提取押金', {}
+        if dashou.zhuangtai != 1:
+            return False, '您有订单进行中，请完成后提取押金', {}
+        if dashou.jifen != 10:
+            return False, '积分不足10分，请补充积分后提取押金', {}
+        huiyuan_ok, huiyuan_msg = check_dashou_has_valid_huiyuan(yonghuid)
+        if not huiyuan_ok:
+            return False, huiyuan_msg, {}
+        if dashou.yajin < jine:
+            return False, f'押金余额不足，当前押金: {dashou.yajin}', {}
+        unfinished = Dingdan.objects.filter(
+            jiedan_dashou_id=yonghuid,
+        ).exclude(zhuangtai__in=[ORDER_STATUS_COMPLETED, ORDER_STATUS_REFUNDED]).exists()
+        if unfinished:
+            return False, '您还有未完成或未退款的订单，请先处理完毕再提取押金', {}
+        self_fadan = Fadan.objects.filter(beichufa_id=yonghuid).exclude(zhuangtai__in=[2, 4]).exists()
+        if self_fadan:
+            return False, '您有未处理完毕的自身罚单（待缴纳/申诉中），请先处理', {}
+        return True, '', {'nicheng': dashou.nicheng or ''}
+
+    if leixing == 6:
+        try:
+            shangjia = UserShangjia.objects.get(user=user_main)
+        except UserShangjia.DoesNotExist:
+            return False, '您不是商家身份，无法提现商家余额', {}
+        if shangjia.zhuangtai != 1:
+            return False, '商家账号已被禁用，无法提现', {}
+        if shangjia.yue < jine:
+            return False, f'商家余额不足，当前余额: {shangjia.yue}', {}
+        unfinished_orders = DingdanShangjia.objects.filter(
+            shangjia_id=yonghuid,
+        ).exclude(dingdan__zhuangtai__in=[ORDER_STATUS_COMPLETED, ORDER_STATUS_REFUNDED]).exists()
+        if unfinished_orders:
+            return False, '您还有未完成或未退款的订单，请先处理完毕再提现余额', {}
+        self_fadan = Fadan.objects.filter(beichufa_id=yonghuid).exclude(zhuangtai__in=[2, 4]).exists()
+        if self_fadan:
+            return False, '您有未处理完毕的自身罚单（待缴纳/申诉中），请先处理', {}
+        applied_fadan = Fadan.objects.filter(shenqing_chufa=yonghuid).exclude(zhuangtai__in=[2, 4]).exists()
+        if applied_fadan:
+            return False, '您发起的对其他用户的处罚尚未处理完毕，请等待完结', {}
+        return True, '', {'nicheng': shangjia.nicheng or ''}
+
+    return False, '无效的提现类型', {}
+
+
+def validate_collect_eligibility(user_main, leixing):
+    """
+    收款前二次校验（申请时已扣款，不再校余额/金额）。
+    打手佣金/押金：罚单、封禁、接单中、积分、会员等；
+    其他身份：账号状态、罚单/订单等（不含金额）。
+    """
+    yonghuid = user_main.yonghuid
+
+    fadan_ok, fadan_msg = check_fadan_qiangdan_eligible(yonghuid, 2)
+    if not fadan_ok:
+        return False, fadan_msg
+
+    if leixing == 1:
+        try:
+            dashou = UserDashou.objects.get(user=user_main)
+        except UserDashou.DoesNotExist:
+            return False, '您不是打手身份，无法收款'
+        if dashou.zhanghaozhuangtai != 1:
+            return False, '打手账号已被封禁，无法收款'
+        if dashou.zhuangtai != 1:
+            return False, '您有订单进行中，请完成后再收款'
+        if dashou.jifen != 10:
+            return False, '积分不足10分，无法收款'
+        huiyuan_ok, huiyuan_msg = check_dashou_has_valid_huiyuan(yonghuid)
+        if not huiyuan_ok:
+            return False, huiyuan_msg
+        return True, ''
+
+    if leixing == 5:
+        try:
+            dashou = UserDashou.objects.get(user=user_main)
+        except UserDashou.DoesNotExist:
+            return False, '您不是打手身份，无法收款'
+        if dashou.zhanghaozhuangtai != 1:
+            return False, '打手账号已禁用，无法收款'
+        if dashou.zhuangtai != 1:
+            return False, '您有订单进行中，请完成后再收款'
+        if dashou.jifen != 10:
+            return False, '积分不足10分，无法收款'
+        huiyuan_ok, huiyuan_msg = check_dashou_has_valid_huiyuan(yonghuid)
+        if not huiyuan_ok:
+            return False, huiyuan_msg
+        unfinished = Dingdan.objects.filter(
+            jiedan_dashou_id=yonghuid,
+        ).exclude(zhuangtai__in=[ORDER_STATUS_COMPLETED, ORDER_STATUS_REFUNDED]).exists()
+        if unfinished:
+            return False, '您还有未完成或未退款的订单，无法收款'
+        self_fadan = Fadan.objects.filter(beichufa_id=yonghuid).exclude(zhuangtai__in=[2, 4]).exists()
+        if self_fadan:
+            return False, '您有未处理完毕的自身罚单，无法收款'
+        return True, ''
+
+    if leixing == 2:
+        try:
+            guanshi = UserGuanshi.objects.get(user=user_main)
+        except UserGuanshi.DoesNotExist:
+            return False, '您不是管事身份，无法收款'
+        if guanshi.zhuangtai != 1:
+            return False, '管事账号已被封禁，无法收款'
+        return True, ''
+
+    if leixing == 3:
+        try:
+            zuzhang = UserZuzhang.objects.get(user=user_main)
+        except UserZuzhang.DoesNotExist:
+            return False, '您不是组长身份，无法收款'
+        if zuzhang.zhuangtai != 1:
+            return False, '组长账号已被封禁，无法收款'
+        return True, ''
+
+    if leixing == 4:
+        try:
+            kaoheguan = UserShenheguan.objects.get(user=user_main)
+        except UserShenheguan.DoesNotExist:
+            return False, '您不是考核官身份，无法收款'
+        if kaoheguan.zhuangtai != 1:
+            return False, '考核官账号已被封禁，无法收款'
+        return True, ''
+
+    if leixing == 6:
+        try:
+            shangjia = UserShangjia.objects.get(user=user_main)
+        except UserShangjia.DoesNotExist:
+            return False, '您不是商家身份，无法收款'
+        if shangjia.zhuangtai != 1:
+            return False, '商家账号已被禁用，无法收款'
+        unfinished_orders = DingdanShangjia.objects.filter(
+            shangjia_id=yonghuid,
+        ).exclude(dingdan__zhuangtai__in=[ORDER_STATUS_COMPLETED, ORDER_STATUS_REFUNDED]).exists()
+        if unfinished_orders:
+            return False, '您还有未完成或未退款的订单，无法收款'
+        self_fadan = Fadan.objects.filter(beichufa_id=yonghuid).exclude(zhuangtai__in=[2, 4]).exists()
+        if self_fadan:
+            return False, '您有未处理完毕的自身罚单，无法收款'
+        applied_fadan = Fadan.objects.filter(shenqing_chufa=yonghuid).exclude(zhuangtai__in=[2, 4]).exists()
+        if applied_fadan:
+            return False, '您发起的处罚尚未处理完毕，无法收款'
+        return True, ''
+
+    return False, '无效的提现类型'
+
+
+def _get_personal_daily_quota(leixing, profile):
+    """打手/管事/组长个人每日限额：额外开启优先，否则默认配置"""
+    if leixing == 1:
+        if profile.kaioi_ewai_xiane and profile.ewai_xiane > 0:
+            return profile.ewai_xiane
+        return TixianQuotaDefault.objects.get(leixing=1).default_quota
+    if leixing == 2:
+        if profile.kaioi_ewai_xiane and profile.ewai_xiane > 0:
+            return profile.ewai_xiane
+        return TixianQuotaDefault.objects.get(leixing=2).default_quota
+    if leixing == 3:
+        try:
+            default_quota = TixianQuotaDefault.objects.get(leixing=3).default_quota
+        except TixianQuotaDefault.DoesNotExist:
+            default_quota = decimal.Decimal('0.00')
+        if profile.kaioi_ewai_tixian and profile.ewai_tixian_xiane > 0:
+            return profile.ewai_tixian_xiane
+        return default_quota
+    raise ValueError('无效的个人限额身份')
+
+
+def _get_active_auto_record(shenhe_danhao):
+    if not shenhe_danhao:
+        return None
+    return (
+        TixianAutoRecord.objects.filter(
+            shenhe_danhao=shenhe_danhao,
+            zhuangtai__in=[0, 1],
+        )
+        .order_by('-create_time')
+        .first()
+    )
+
+
+def _get_platform_daily_total(leixing, today=None):
+    """平台今日已提现总额：只读 houtai.TixianRiTongji（到账金额口径）"""
+    from houtai.models import TixianRiTongji
+
+    if today is None:
+        today = date.today()
+    try:
+        return TixianRiTongji.objects.get(riqi=today, leixing=leixing).total_amount
+    except TixianRiTongji.DoesNotExist:
+        return decimal.Decimal('0.00')
+
+
+def _calc_platform_projected(leixing, shijidaozhang, shenhe_danhao=''):
+    """
+    平台今日预占后总额（收款前只读预估）。
+    本审核单若已有进行中打款记录，其金额尚未写入统计表，但不应重复加计。
+    返回 (daily_used, projected_total, additional_amount)
+    """
+    daily_used = _get_platform_daily_total(leixing)
+    active_rec = _get_active_auto_record(shenhe_danhao)
+    if active_rec:
+        return daily_used, daily_used, decimal.Decimal('0.00')
+    additional = shijidaozhang or decimal.Decimal('0.00')
+    return daily_used, daily_used + additional, additional
+
+
+def _projected_personal_total(personal_today, jine, shenhe_danhao=''):
+    """个人今日占用预估（申请金额口径）"""
+    rec = _get_active_auto_record(shenhe_danhao)
+    already_counted = rec.jine if rec else decimal.Decimal('0.00')
+    return personal_today - already_counted + jine
+
+
+def _get_platform_daily_limit(leixing):
+    """
+    平台每日总限额（peizhi.TixianQuotaDefault）：
+    提现身份1打手→配置4，2管事→5，3组长→6，4考核官→7，5押金→8，6商家→9
+    """
+    quota_leixing = leixing + 3
+    try:
+        return TixianQuotaDefault.objects.get(leixing=quota_leixing).default_quota
+    except TixianQuotaDefault.DoesNotExist:
+        logger.warning(
+            '平台每日总限额未配置 leixing=%s(读取quota_leixing=%s)，按0处理禁止新增收款',
+            leixing, quota_leixing,
+        )
+        return decimal.Decimal('0.00')
+
+
+def _check_personal_quota_readonly(user_main, leixing, jine, shenhe_danhao=''):
+    """个人每日限额只读校验（打手/管事/组长）"""
+    if leixing not in (1, 2, 3):
+        return True, '', ''
+
+    today = date.today()
+    if leixing == 1:
+        try:
+            profile = UserDashou.objects.get(user=user_main)
+        except UserDashou.DoesNotExist:
+            return False, '打手信息不存在', 'personal'
+        if profile.last_tixian_date != today:
+            personal_today = decimal.Decimal('0.00')
+        else:
+            personal_today = profile.jinritixian_jine
+    elif leixing == 2:
+        try:
+            profile = UserGuanshi.objects.get(user=user_main)
+        except UserGuanshi.DoesNotExist:
+            return False, '管事信息不存在', 'personal'
+        if profile.last_tixian_date != today:
+            personal_today = decimal.Decimal('0.00')
+        else:
+            personal_today = profile.jinritixian_jine
+    else:
+        try:
+            profile = UserZuzhang.objects.get(user=user_main)
+        except UserZuzhang.DoesNotExist:
+            return False, '组长信息不存在', 'personal'
+        if profile.last_tixian_time and profile.last_tixian_time.date() == today:
+            personal_today = profile.jinri_tixian
+        else:
+            personal_today = decimal.Decimal('0.00')
+
+    personal_quota = _get_personal_daily_quota(leixing, profile)
+    projected_personal = _projected_personal_total(personal_today, jine, shenhe_danhao)
+    if projected_personal > personal_quota:
+        return (
+            False,
+            f'今日提现已达个人限额，今日已提{personal_today}元，本次申请{jine}元，限额{personal_quota}元',
+            'personal',
+        )
+    return True, '', ''
+
+
+def _check_platform_quota_readonly(leixing, shijidaozhang, shenhe_danhao=''):
+    """平台每日总限额只读校验：今日已用 + 本笔到账 > 总限额 则拒绝"""
+    platform_limit = _get_platform_daily_limit(leixing)
+    shijidaozhang = shijidaozhang or decimal.Decimal('0.00')
+
+    if platform_limit <= 0 and shijidaozhang > 0:
+        return False, '今日该角色提现已关闭（总限额为0），暂无法收款', 'platform'
+
+    daily_used, projected, additional = _calc_platform_projected(
+        leixing, shijidaozhang, shenhe_danhao,
+    )
+    if projected > platform_limit:
+        logger.warning(
+            '平台总限额拦截 leixing=%s shenhe_danhao=%s daily_used=%s additional=%s '
+            'projected=%s limit=%s',
+            leixing, shenhe_danhao, daily_used, additional, projected, platform_limit,
+        )
+        return (
+            False,
+            f'今日该角色提现总额已达上限，今日已提{daily_used}元，本次到账{additional}元，限额{platform_limit}元',
+            'platform',
+        )
+
+    return True, '', ''
+
+
+def check_collect_quota_limits(user_main, leixing, jine, shijidaozhang, shenhe_danhao=''):
+    """
+    收款限额只读校验（复用待确认打款单等场景，不写入）。
+    返回 (True, '', '') 或 (False, msg, 'personal'|'platform')
+    """
+    ok, msg, kind = _check_personal_quota_readonly(user_main, leixing, jine, shenhe_danhao)
+    if not ok:
+        return False, msg, kind
+    return _check_platform_quota_readonly(leixing, shijidaozhang, shenhe_danhao)
+
+
+def reserve_collect_quota_limits(user_main, leixing, jine, shijidaozhang, shenhe_danhao=''):
+    """
+    收款前原子预占每日限额（必须在 transaction.atomic 内调用）。
+    锁定 TixianRiTongji + 用户行，校验通过后立即写入统计，防止高并发超额。
+    本审核单已有进行中/成功打款记录则视为已预占，不重复加计。
+    返回 (True, '', '') 或 (False, msg, 'personal'|'platform')
+    """
+    from houtai.models import TixianRiTongji
+
+    today = date.today()
+    shijidaozhang = shijidaozhang or decimal.Decimal('0.00')
+
+    if _get_active_auto_record(shenhe_danhao):
+        return True, '', ''
+
+    personal_profile = None
+    if leixing in (1, 2, 3):
+        if leixing == 1:
+            personal_profile = UserDashou.objects.select_for_update().get(user=user_main)
+            if personal_profile.last_tixian_date != today:
+                personal_profile.jinritixian_jine = decimal.Decimal('0.00')
+                personal_profile.last_tixian_date = today
+            personal_today = personal_profile.jinritixian_jine
+        elif leixing == 2:
+            personal_profile = UserGuanshi.objects.select_for_update().get(user=user_main)
+            if personal_profile.last_tixian_date != today:
+                personal_profile.jinritixian_jine = decimal.Decimal('0.00')
+                personal_profile.last_tixian_date = today
+            personal_today = personal_profile.jinritixian_jine
+        else:
+            personal_profile = UserZuzhang.objects.select_for_update().get(user=user_main)
+            if personal_profile.last_tixian_time and personal_profile.last_tixian_time.date() != today:
+                personal_profile.jinri_tixian = decimal.Decimal('0.00')
+            elif not personal_profile.last_tixian_time:
+                personal_profile.jinri_tixian = decimal.Decimal('0.00')
+            personal_today = personal_profile.jinri_tixian
+
+        personal_quota = _get_personal_daily_quota(leixing, personal_profile)
+        if personal_today + jine > personal_quota:
+            return (
+                False,
+                f'今日提现已达个人限额，今日已提{personal_today}元，本次申请{jine}元，限额{personal_quota}元',
+                'personal',
+            )
+
+    platform_stat, _ = TixianRiTongji.objects.select_for_update().get_or_create(
+        riqi=today,
+        leixing=leixing,
+        defaults={'total_amount': decimal.Decimal('0.00')},
+    )
+    platform_limit = _get_platform_daily_limit(leixing)
+    if platform_limit <= 0 and shijidaozhang > 0:
+        return False, '今日该角色提现已关闭（总限额为0），暂无法收款', 'platform'
+    if platform_stat.total_amount + shijidaozhang > platform_limit:
+        return (
+            False,
+            f'今日该角色提现总额已达上限，今日已提{platform_stat.total_amount}元，'
+            f'本次到账{shijidaozhang}元，限额{platform_limit}元',
+            'platform',
+        )
+
+    if personal_profile is not None:
+        if leixing == 1:
+            personal_profile.jinritixian_jine += jine
+            personal_profile.save(update_fields=['jinritixian_jine', 'last_tixian_date'])
+        elif leixing == 2:
+            personal_profile.jinritixian_jine += jine
+            personal_profile.save(update_fields=['jinritixian_jine', 'last_tixian_date'])
+        else:
+            personal_profile.jinri_tixian += jine
+            personal_profile.last_tixian_time = timezone.now()
+            personal_profile.save(update_fields=['jinri_tixian', 'last_tixian_time'])
+
+    platform_stat.total_amount += shijidaozhang
+    platform_stat.save(update_fields=['total_amount'])
+
+    logger.info(
+        '收款限额预占成功 yonghuid=%s leixing=%s shenhe_danhao=%s jine=%s shijidaozhang=%s platform_total=%s',
+        user_main.yonghuid, leixing, shenhe_danhao, jine, shijidaozhang, platform_stat.total_amount,
+    )
+    return True, '', ''
+
+
+def release_collect_quota_reservation(user_main, leixing, jine, shijidaozhang):
+    """微信打款明确失败/用户取消时回滚收款预占的限额"""
+    from houtai.models import TixianRiTongji
+
+    today = date.today()
+    shijidaozhang = shijidaozhang or decimal.Decimal('0.00')
+    try:
+        with transaction.atomic():
+            if leixing == 1:
+                dashou = UserDashou.objects.select_for_update().get(user=user_main)
+                if dashou.last_tixian_date == today and dashou.jinritixian_jine >= jine:
+                    dashou.jinritixian_jine -= jine
+                    dashou.save(update_fields=['jinritixian_jine'])
+            elif leixing == 2:
+                guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+                if guanshi.last_tixian_date == today and guanshi.jinritixian_jine >= jine:
+                    guanshi.jinritixian_jine -= jine
+                    guanshi.save(update_fields=['jinritixian_jine'])
+            elif leixing == 3:
+                zuzhang = UserZuzhang.objects.select_for_update().get(user=user_main)
+                if zuzhang.jinri_tixian >= jine:
+                    zuzhang.jinri_tixian -= jine
+                    zuzhang.save(update_fields=['jinri_tixian'])
+
+            try:
+                stat = TixianRiTongji.objects.select_for_update().get(
+                    riqi=today, leixing=leixing,
+                )
+                stat.total_amount = max(
+                    stat.total_amount - shijidaozhang,
+                    decimal.Decimal('0.00'),
+                )
+                stat.save(update_fields=['total_amount'])
+            except TixianRiTongji.DoesNotExist:
+                pass
+    except Exception as e:
+        logger.error(
+            '回滚收款限额预占失败 yonghuid=%s leixing=%s err=%s',
+            user_main.yonghuid, leixing, e, exc_info=True,
+        )
+        return
+
+    logger.info(
+        '收款限额预占已回滚 yonghuid=%s leixing=%s jine=%s shijidaozhang=%s',
+        user_main.yonghuid, leixing, jine, shijidaozhang,
+    )
+
+
+def release_collect_quota_for_record(auto_record):
+    """幂等回滚单笔打款对应的收款预占（查单/回调/取消等多路径共用，防重复扣减）"""
+    if not auto_record.shenhe_danhao:
+        return
+    if not _quota_already_reserved_for_record(auto_record):
+        return
+    try:
+        user_main = UserMain.objects.get(yonghuid=auto_record.yonghuid)
+    except UserMain.DoesNotExist:
+        logger.error('回滚限额预占失败：用户不存在 %s', auto_record.yonghuid)
+        return
+    release_collect_quota_reservation(
+        user_main,
+        auto_record.leixing,
+        auto_record.jine,
+        auto_record.shijidaozhang,
+    )
+
+
+def _quota_already_reserved_for_record(auto_record):
+    """判断本笔打款是否已在收款预占时写入日统计（避免成功时重复累加）"""
+    if not auto_record.shenhe_danhao:
+        return False
+    from django.db.models import Sum
+
+    today = date.today()
+    shijidaozhang = auto_record.shijidaozhang or decimal.Decimal('0.00')
+    stat_total = _get_platform_daily_total(auto_record.leixing, today)
+    other_sum = TixianAutoRecord.objects.filter(
+        leixing=auto_record.leixing,
+        zhuangtai__in=[0, 1],
+        create_time__date=today,
+    ).exclude(tixian_id=auto_record.tixian_id).aggregate(
+        total=Sum('shijidaozhang'),
+    )['total'] or decimal.Decimal('0.00')
+    return stat_total >= other_sum + shijidaozhang
+
+
+def apply_transfer_success_quota(auto_record):
+    """
+    打款成功时累加每日限额统计（仅自动审核流程 shenhe_danhao 非空）。
+    - houtai.TixianRiTongji.total_amount += 实际到账
+    - 用户扩展表个人今日已提 += 申请金额（打手/管事/组长）
+    须在 transaction.atomic 内、且打款记录 zhuangtai 由 0→1 时调用一次。
+    """
+    if not auto_record.shenhe_danhao:
+        return
+
+    from houtai.models import TixianRiTongji
+
+    today = date.today()
+    leixing = auto_record.leixing
+    jine = auto_record.jine
+    shijidaozhang = auto_record.shijidaozhang or decimal.Decimal('0.00')
+
+    try:
+        user_main = UserMain.objects.get(yonghuid=auto_record.yonghuid)
+    except UserMain.DoesNotExist:
+        logger.error('打款成功累加限额失败：用户不存在 %s', auto_record.yonghuid)
+        return
+
+    platform_stat, _ = TixianRiTongji.objects.select_for_update().get_or_create(
+        riqi=today,
+        leixing=leixing,
+        defaults={'total_amount': decimal.Decimal('0.00')},
+    )
+    platform_stat.total_amount += shijidaozhang
+    platform_stat.save(update_fields=['total_amount'])
+
+    if leixing == 1:
+        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+        if dashou.last_tixian_date != today:
+            dashou.jinritixian_jine = decimal.Decimal('0.00')
+            dashou.last_tixian_date = today
+        dashou.jinritixian_jine += jine
+        dashou.save(update_fields=['jinritixian_jine', 'last_tixian_date'])
+    elif leixing == 2:
+        guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+        if guanshi.last_tixian_date != today:
+            guanshi.jinritixian_jine = decimal.Decimal('0.00')
+            guanshi.last_tixian_date = today
+        guanshi.jinritixian_jine += jine
+        guanshi.save(update_fields=['jinritixian_jine', 'last_tixian_date'])
+    elif leixing == 3:
+        zuzhang = UserZuzhang.objects.select_for_update().get(user=user_main)
+        if zuzhang.last_tixian_time and zuzhang.last_tixian_time.date() != today:
+            zuzhang.jinri_tixian = decimal.Decimal('0.00')
+        elif not zuzhang.last_tixian_time:
+            zuzhang.jinri_tixian = decimal.Decimal('0.00')
+        zuzhang.jinri_tixian += jine
+        zuzhang.last_tixian_time = timezone.now()
+        zuzhang.save(update_fields=['jinri_tixian', 'last_tixian_time'])
+
+    logger.info(
+        '打款成功已累加限额 bill=%s yonghuid=%s leixing=%s jine=%s shijidaozhang=%s '
+        'platform_total=%s',
+        auto_record.tixian_id, auto_record.yonghuid, leixing, jine, shijidaozhang,
+        platform_stat.total_amount,
+    )
+
+
+def refund_balance(user_main, leixing, jine):
+    """审核拒绝时退还可到账金额 shijidaozhang（须在 transaction.atomic 内；手续费已在申请扣款时扣除不退还）"""
+    if leixing == 1:
+        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+        dashou.yue += jine
+        dashou.save()
+    elif leixing == 2:
+        guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+        guanshi.yue += jine
+        guanshi.save()
+    elif leixing == 3:
+        zuzhang = UserZuzhang.objects.select_for_update().get(user=user_main)
+        zuzhang.ketixian_jine += jine
+        zuzhang.save()
+    elif leixing == 4:
+        kaoheguan = UserShenheguan.objects.select_for_update().get(user=user_main)
+        kaoheguan.yue += jine
+        kaoheguan.save()
+    elif leixing == 5:
+        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+        dashou.yajin += jine
+        dashou.zhanghaozhuangtai = 1
+        dashou.save()
+    elif leixing == 6:
+        shangjia = UserShangjia.objects.select_for_update().get(user=user_main)
+        shangjia.yue += jine
+        shangjia.save()
+    else:
+        raise ValueError('无效的提现类型')
+
+
+def deduct_balance(user_main, leixing, jine):
+    """扣减申请金额 jine（必须在 transaction.atomic 内调用）"""
+    if leixing == 1:
+        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+        if dashou.yue < jine:
+            raise ValueError('余额不足')
+        dashou.yue -= jine
+        dashou.save()
+        return dashou.nicheng or ''
+    if leixing == 2:
+        guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+        if guanshi.yue < jine:
+            raise ValueError('余额不足')
+        guanshi.yue -= jine
+        guanshi.save()
+        return '管事用户'
+    if leixing == 3:
+        zuzhang = UserZuzhang.objects.select_for_update().get(user=user_main)
+        if zuzhang.ketixian_jine < jine:
+            raise ValueError('可提现金额不足')
+        zuzhang.ketixian_jine -= jine
+        zuzhang.save()
+        return ''
+    if leixing == 4:
+        kaoheguan = UserShenheguan.objects.select_for_update().get(user=user_main)
+        if kaoheguan.yue < jine:
+            raise ValueError('可提现金额不足')
+        kaoheguan.yue -= jine
+        kaoheguan.save()
+        return '考核官'
+    if leixing == 5:
+        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+        if dashou.yajin < jine:
+            raise ValueError('押金余额不足')
+        dashou.yajin -= jine
+        dashou.zhanghaozhuangtai = 0
+        dashou.save()
+        return dashou.nicheng or ''
+    if leixing == 6:
+        shangjia = UserShangjia.objects.select_for_update().get(user=user_main)
+        if shangjia.yue < jine:
+            raise ValueError('商家余额不足')
+        shangjia.yue -= jine
+        shangjia.save()
+        return shangjia.nicheng or ''
+    raise ValueError('无效的提现类型')
+
+
+def get_balance_response_data(user_main, leixing):
+    data = {}
+    if leixing == 1:
+        try:
+            dashou = UserDashou.objects.get(user=user_main)
+            data['new_yongjin'] = str(dashou.yue.quantize(decimal.Decimal('0.01')))
+        except UserDashou.DoesNotExist:
+            pass
+    elif leixing == 2:
+        try:
+            guanshi = UserGuanshi.objects.get(user=user_main)
+            data['new_fenyong'] = str(guanshi.yue.quantize(decimal.Decimal('0.01')))
+        except UserGuanshi.DoesNotExist:
+            pass
+    elif leixing == 3:
+        try:
+            zuzhang = UserZuzhang.objects.get(user=user_main)
+            data['new_zuzhang_ketixian'] = str(zuzhang.ketixian_jine.quantize(decimal.Decimal('0.01')))
+        except UserZuzhang.DoesNotExist:
+            pass
+    elif leixing == 4:
+        try:
+            kg = UserShenheguan.objects.get(user=user_main)
+            data['new_kaoheguan_yue'] = str(kg.yue.quantize(decimal.Decimal('0.01')))
+        except UserShenheguan.DoesNotExist:
+            pass
+    return data
+
+
+def has_pending_audit(yonghuid):
+    return TixianShenheJilu.objects.filter(
+        yonghuid=yonghuid,
+        zhuangtai__in=PENDING_AUDIT_STATUSES,
+    ).exists()
+
+
+def sync_audit_and_jilu_status(audit, new_status, **extra_fields):
+    audit.zhuangtai = new_status
+    for k, v in extra_fields.items():
+        setattr(audit, k, v)
+    audit.save()
+    if audit.tixianjilu_id:
+        update_fields = {'zhuangtai': new_status, 'update_time': timezone.now()}
+        if 'bhliyou' in extra_fields:
+            update_fields['bhliyou'] = extra_fields['bhliyou']
+        Tixianjilu.objects.filter(id=audit.tixianjilu_id).update(**update_fields)
+
+
+def query_wechat_transfer_bill(out_bill_no):
+    """
+    向微信查转账单状态
+    GET /v3/fund-app/mch-transfer/transfer-bills/out-bill-no/{out_bill_no}
+    返回 dict；网络/系统异常返回 None；微信无此单返回 {'_not_found': True}
+    """
+    from utils.wechat_v3 import build_authorization
+
+    url = (
+        'https://api.mch.weixin.qq.com/v3/fund-app/mch-transfer/'
+        f'transfer-bills/out-bill-no/{out_bill_no}'
+    )
+    try:
+        auth = build_authorization('GET', url, '')
+        headers = {
+            'Authorization': auth,
+            'Accept': 'application/json',
+            'User-Agent': 'Mozilla/5.0',
+        }
+        resp = requests.get(url, headers=headers, timeout=10)
+        if resp.status_code == 200:
+            return resp.json()
+        if resp.status_code == 404:
+            return {'_not_found': True}
+        logger.error(
+            '微信查单失败 bill=%s HTTP%s body=%s',
+            out_bill_no, resp.status_code, resp.text[:300],
+        )
+        return None
+    except (requests.RequestException, OSError, ValueError) as e:
+        logger.error('微信查单异常 bill=%s err=%s', out_bill_no, e, exc_info=True)
+        return None
+    except Exception as e:
+        logger.error('微信查单未知异常 bill=%s err=%s', out_bill_no, e, exc_info=True)
+        return None
+
+
+def _parse_package_info(raw):
+    if not raw:
+        return None
+    if isinstance(raw, dict):
+        return raw
+    try:
+        return json.loads(raw)
+    except (TypeError, ValueError):
+        return None
+
+
+def _apply_platform_accounting(auto_record):
+    """平台收支统计（幂等由 mark_transfer_success 外层保证只调一次）"""
+    from dingdan.utils import update_daily_payout
+
+    update_daily_payout(auto_record.shijidaozhang)
+    try:
+        szjilu = Szjilu.objects.select_for_update().get(id=1)
+        szjilu.zongsy -= auto_record.shijidaozhang
+        szjilu.zongzc += auto_record.shijidaozhang
+        szjilu.jrzc += auto_record.shijidaozhang
+        szjilu.save()
+    except Szjilu.DoesNotExist:
+        Szjilu.objects.create(
+            id=1,
+            zongsy=-auto_record.shijidaozhang,
+            zongzc=auto_record.shijidaozhang,
+            jrzc=auto_record.shijidaozhang,
+        )
+
+
+def mark_transfer_success(auto_record, *, wechat_transfer_no=None, with_accounting=True):
+    """
+    打款成功落库（tixianqr / callback / 查单对账 共用）
+    select_for_update + zhuangtai==0 才更新并记账，防双写
+    返回 True=本次新标记成功；False=已处理过
+    """
+    with transaction.atomic():
+        ar = TixianAutoRecord.objects.select_for_update().get(pk=auto_record.pk)
+        if ar.zhuangtai != 0:
+            return False
+
+        ar.zhuangtai = 1
+        update_fields = ['zhuangtai', 'update_time']
+        if wechat_transfer_no:
+            ar.wechat_transfer_no = wechat_transfer_no
+            update_fields.append('wechat_transfer_no')
+        ar.save(update_fields=update_fields)
+
+        if ar.shenhe_danhao:
+            try:
+                audit = TixianShenheJilu.objects.select_for_update().get(
+                    shenhe_danhao=ar.shenhe_danhao,
+                )
+                if audit.zhuangtai != 2:
+                    sync_audit_and_jilu_status(audit, 2)
+            except TixianShenheJilu.DoesNotExist:
+                logger.warning('打款成功但审核记录不存在: %s', ar.shenhe_danhao)
+
+        if ar.shenhe_danhao and not _quota_already_reserved_for_record(ar):
+            apply_transfer_success_quota(ar)
+
+        if with_accounting:
+            _apply_platform_accounting(ar)
+
+    return True
+
+
+def _sync_record_from_wx_query(auto_record, wx_data):
+    """根据微信查单结果修正本地打款记录，返回 (action, payload)"""
+    if wx_data.get('_not_found'):
+        age = timezone.now() - auto_record.create_time
+        if auto_record.zhuangtai == 0 and age < timedelta(minutes=PENDING_QUERY_GRACE_MINUTES):
+            return RECONCILE_PENDING, {
+                'msg': '有收款处理中，请稍后再试',
+                'tixian_id': auto_record.tixian_id,
+            }
+        if auto_record.zhuangtai == 0:
+            auto_record.zhuangtai = 2
+            auto_record.fail_reason = '微信未找到该打款单，请重新发起收款'
+            auto_record.save(update_fields=['zhuangtai', 'fail_reason', 'update_time'])
+            release_collect_quota_for_record(auto_record)
+        return RECONCILE_ALLOW_NEW, {}
+
+    state = (wx_data.get('state') or '').upper()
+
+    if state in WX_STATE_SUCCESS:
+        mark_transfer_success(
+            auto_record,
+            wechat_transfer_no=wx_data.get('transfer_bill_no') or wx_data.get('transfer_no'),
+        )
+        return RECONCILE_COMPLETED, {'msg': '该提现已完成，请勿重复操作'}
+
+    if state in WX_STATE_WAIT:
+        package = wx_data.get('package_info') or _parse_package_info(auto_record.wechat_package)
+        if not package:
+            return RECONCILE_PENDING, {
+                'msg': '有收款处理中，请稍后再试',
+                'tixian_id': auto_record.tixian_id,
+            }
+        if auto_record.zhuangtai == 0:
+            auto_record.wechat_package = json.dumps(package, ensure_ascii=False)
+            auto_record.save(update_fields=['wechat_package', 'update_time'])
+        wx_cfg = settings.WECHAT_PAY_V3_CONFIG
+        return RECONCILE_WAIT_CONFIRM, {
+            'tixian_id': auto_record.tixian_id,
+            'package_info': package,
+            'shouxufei': str(auto_record.shouxufei),
+            'shijidaozhang': str(auto_record.shijidaozhang),
+            'current_rate': str(auto_record.feilv),
+            'mch_id': wx_cfg.get('MCHID', ''),
+            'shenhe_danhao': auto_record.shenhe_danhao or '',
+        }
+
+    if state in WX_STATE_CANCELING:
+        return RECONCILE_PENDING, {
+            'msg': '收款撤销处理中，请稍后再试',
+            'tixian_id': auto_record.tixian_id,
+        }
+
+    if state in WX_STATE_FAIL:
+        if auto_record.zhuangtai != 1:
+            auto_record.zhuangtai = 2
+            auto_record.fail_reason = (
+                wx_data.get('fail_reason') or wx_data.get('close_reason') or state
+            )[:500]
+            auto_record.save(update_fields=['zhuangtai', 'fail_reason', 'update_time'])
+            release_collect_quota_for_record(auto_record)
+        return RECONCILE_ALLOW_NEW, {}
+
+    if auto_record.zhuangtai == 0:
+        return RECONCILE_PENDING, {
+            'msg': f'收款处理中（微信状态:{state or "未知"}），请稍后再试',
+            'tixian_id': auto_record.tixian_id,
+        }
+    return RECONCILE_ALLOW_NEW, {}
+
+
+def get_auto_record_for_collect(shenhe_danhao):
+    """
+    取本笔提现申请应对接微信的那条打款记录：
+    优先 zhuangtai=0（进行中），否则取最新一条（可能本地误标失败但微信未终态）
+    """
+    pending = (
+        TixianAutoRecord.objects.filter(shenhe_danhao=shenhe_danhao, zhuangtai=0)
+        .order_by('-create_time')
+        .first()
+    )
+    if pending:
+        return pending
+    return (
+        TixianAutoRecord.objects.filter(shenhe_danhao=shenhe_danhao)
+        .order_by('-create_time')
+        .first()
+    )
+
+
+def reconcile_shenhe_wechat_bills(shenhe_danhao):
+    """
+    P0 防双笔：同一 shenhe_danhao 下所有打款记录逐条问微信
+    任一 SUCCESS / 进行中 → 禁止新建；全部终态失败才 ALLOW_NEW
+    返回 (action, payload)
+    """
+    records = list(
+        TixianAutoRecord.objects.filter(shenhe_danhao=shenhe_danhao).order_by('-create_time')
+    )
+
+    if any(r.zhuangtai == 1 for r in records):
+        try:
+            audit = TixianShenheJilu.objects.get(shenhe_danhao=shenhe_danhao)
+            if audit.zhuangtai != 2:
+                sync_audit_and_jilu_status(audit, 2)
+        except TixianShenheJilu.DoesNotExist:
+            pass
+        return RECONCILE_COMPLETED, {'msg': '该提现已完成，请勿重复操作'}
+
+    if not records:
+        return RECONCILE_ALLOW_NEW, {}
+
+    pending_hit = None
+    for rec in records:
+        if rec.zhuangtai == 1:
+            return RECONCILE_COMPLETED, {'msg': '该提现已完成，请勿重复操作'}
+
+        wx_data = query_wechat_transfer_bill(rec.tixian_id)
+        if wx_data is None:
+            logger.error(
+                '对账查单不可用 shenhe_danhao=%s bill=%s',
+                shenhe_danhao, rec.tixian_id,
+            )
+            return RECONCILE_PENDING, {
+                'msg': '有收款处理中，系统正在核对微信状态，请稍后再试',
+                'tixian_id': rec.tixian_id,
+            }
+
+        action, payload = _sync_record_from_wx_query(rec, wx_data)
+        if action == RECONCILE_COMPLETED:
+            return action, payload
+        if action == RECONCILE_WAIT_CONFIRM:
+            return action, payload
+        if action == RECONCILE_PENDING:
+            if pending_hit is None:
+                pending_hit = (action, payload)
+            continue
+
+    if pending_hit:
+        return pending_hit
+    return RECONCILE_ALLOW_NEW, {}
+
+
+def resolve_collect_context(yonghuid, tixianjilu_id=None, shenhe_danhao='', shenhe_jilu_id=None):
+    """
+    从提现记录 ID 进门（P0 收款主路径）：
+    Tixianjilu → TixianShenheJilu，校验归属、状态=6 待收款
+    返回 ({jilu, audit}, err_msg)
+    """
+    if tixianjilu_id is None and not shenhe_danhao:
+        return None, '缺少提现记录ID'
+
+    jilu = None
+    if tixianjilu_id is not None:
+        try:
+            jilu = Tixianjilu.objects.get(id=int(tixianjilu_id), yonghuid=yonghuid)
+        except (Tixianjilu.DoesNotExist, TypeError, ValueError):
+            return None, '提现记录不存在或不属于当前用户'
+
+        if jilu.zhuangtai != 6:
+            return None, f'当前状态不可收款（状态{jilu.zhuangtai}），请等待审核通过'
+        if not jilu.shenhe_jilu_id or not jilu.shenhe_danhao:
+            return None, '提现记录未关联审核单，无法收款'
+
+        if shenhe_jilu_id is not None:
+            try:
+                if int(shenhe_jilu_id) != jilu.shenhe_jilu_id:
+                    return None, '审核记录ID与提现记录不匹配'
+            except (TypeError, ValueError):
+                return None, '审核记录ID格式错误'
+
+        if shenhe_danhao and shenhe_danhao != jilu.shenhe_danhao:
+            return None, '审核单号与提现记录不匹配'
+
+        shenhe_danhao = jilu.shenhe_danhao
+        shenhe_jilu_id = jilu.shenhe_jilu_id
+
+    try:
+        if shenhe_jilu_id:
+            audit = TixianShenheJilu.objects.get(
+                id=int(shenhe_jilu_id),
+                shenhe_danhao=shenhe_danhao,
+                yonghuid=yonghuid,
+            )
+        else:
+            audit = TixianShenheJilu.objects.get(
+                shenhe_danhao=shenhe_danhao,
+                yonghuid=yonghuid,
+            )
+    except (TixianShenheJilu.DoesNotExist, TypeError, ValueError):
+        return None, '审核记录不存在'
+
+    if audit.zhuangtai == 2:
+        return None, '该提现已完成，请勿重复操作'
+    if audit.zhuangtai != 6:
+        return None, f'当前状态不可收款（状态{audit.zhuangtai}），请等待审核通过'
+    if not is_auto_dakuan_audit(audit):
+        return None, '该提现单为手动打款，无法使用自动收款'
+
+    if jilu is None:
+        try:
+            jilu = Tixianjilu.objects.get(
+                id=audit.tixianjilu_id,
+                yonghuid=yonghuid,
+            ) if audit.tixianjilu_id else None
+        except Tixianjilu.DoesNotExist:
+            jilu = None
+
+    return {'jilu': jilu, 'audit': audit, 'shenhe_danhao': shenhe_danhao}, ''
+
+
+def handle_post_transfer_failure(tixian_id, shenhe_danhao, err_code='', err_msg=''):
+    """
+    发起转账 HTTP 非成功时：先查微信再决定是否标失败（P0，禁止盲目标失败导致双笔）
+    返回 (action, payload_or_user_msg)
+    """
+    try:
+        ar = TixianAutoRecord.objects.get(tixian_id=tixian_id)
+    except TixianAutoRecord.DoesNotExist:
+        return RECONCILE_PENDING, '收款处理中，请稍后再试'
+
+    wx_data = query_wechat_transfer_bill(tixian_id)
+    if wx_data is None:
+        logger.error(
+            '发起转账失败且查单不可用 bill=%s code=%s msg=%s，保持待查单',
+            tixian_id, err_code, err_msg,
+        )
+        return RECONCILE_PENDING, '收款请求已提交，系统正在核对状态，请稍后再试，切勿重复点击'
+
+    action, payload = _sync_record_from_wx_query(ar, wx_data)
+    if action == RECONCILE_ALLOW_NEW:
+        return RECONCILE_ALLOW_NEW, payload
+    if action == RECONCILE_WAIT_CONFIRM:
+        return RECONCILE_WAIT_CONFIRM, payload
+    if action == RECONCILE_COMPLETED:
+        return RECONCILE_COMPLETED, payload
+    return RECONCILE_PENDING, payload.get('msg', '收款处理中，请稍后再试')
+
+
+def get_audit_for_collect(shenhe_danhao, yonghuid, shenhe_jilu_id=None):
+    """
+    收款前数据库校验（须在 transaction.atomic 内调用；微信查单在事务外单独做）
+    """
+    try:
+        audit = TixianShenheJilu.objects.select_for_update().get(
+            shenhe_danhao=shenhe_danhao,
+            yonghuid=yonghuid,
+        )
+    except TixianShenheJilu.DoesNotExist:
+        return None, '审核记录不存在'
+
+    if shenhe_jilu_id is not None:
+        try:
+            if int(shenhe_jilu_id) != audit.id:
+                return None, '审核记录ID不匹配'
+        except (TypeError, ValueError):
+            return None, '审核记录ID格式错误'
+
+    if audit.zhuangtai == 2:
+        return None, '该提现已完成，请勿重复操作'
+
+    if audit.zhuangtai != 6:
+        return None, f'当前状态不可收款（状态{audit.zhuangtai}），请等待审核通过'
+
+    if not is_auto_dakuan_audit(audit):
+        return None, '该提现单为手动打款，无法使用自动收款'
+
+    return audit, ''
+
+
+def create_audit_application(user_main, leixing, jine):
+    """
+    提交审核申请：校验 → 扣款 → 写审核表 + 提现记录表
+    不创建打款记录表（TixianAutoRecord 仅在收款时创建）
+    """
+    yonghuid = user_main.yonghuid
+
+    if has_pending_audit(yonghuid):
+        raise ValueError('账户余额不足或您有进行中的提现申请，请等待处理完成或10分钟后后再提交')
+
+    ok, msg, extra = validate_withdraw_eligibility(user_main, leixing, jine)
+    if not ok:
+        raise ValueError(msg)
+
+    feilv = get_tixian_feilv(leixing)
+    shouxufei, shijidaozhang = calc_fee_amounts(jine, feilv)
+    if shijidaozhang <= 0:
+        raise ValueError('提现金额过低，扣除手续费后无实际到账')
+
+    shenhe_danhao = generate_shenhe_danhao()
+    nicheng = extra.get('nicheng', '')
+
+    with transaction.atomic():
+        nicheng = deduct_balance(user_main, leixing, jine) or nicheng
+
+        audit_kwargs = {
+            'shenhe_danhao': shenhe_danhao,
+            'yonghuid': yonghuid,
+            'leixing': leixing,
+            'zhuangtai': 1,
+            'shenqing_jine': jine,
+            'shouxufei': shouxufei,
+            'shijidaozhang': shijidaozhang,
+            'feilv': feilv,
+        }
+        if has_dakuan_mode_field():
+            audit_kwargs['dakuan_mode'] = DAKUAN_MODE_AUTO
+        audit = TixianShenheJilu.objects.create(**audit_kwargs)
+
+        tixian_record = Tixianjilu.objects.create(
+            yonghuid=yonghuid,
+            avatar=user_main.avatar or '',
+            phone=user_main.phone or '',
+            nicheng=nicheng,
+            leixing=leixing,
+            zhifu=user_main.zhifu or '',
+            skzhanghao=user_main.skzhanghao or '',
+            jine=shijidaozhang,
+            zhuangtai=1,
+            fangshi=1,
+            shenheid=None,
+            bhliyou='',
+            shenhe_jilu_id=audit.id,
+            shenhe_danhao=shenhe_danhao,
+        )
+
+        audit.tixianjilu_id = tixian_record.id
+        audit.save(update_fields=['tixianjilu_id'])
+
+    response_data = get_balance_response_data(user_main, leixing)
+    response_data.update({
+        'shenhe_danhao': shenhe_danhao,
+        'shenhe_jilu_id': audit.id,
+        'tixianjilu_id': tixian_record.id,
+        'shouxufei': str(shouxufei),
+        'shijidaozhang': str(shijidaozhang),
+        'current_rate': str(feilv.quantize(decimal.Decimal('0.0001'))),
+        'leixing': leixing,
+        'zhuangtai': 1,
+    })
+    return response_data
diff --git a/yonghu/tixian_shenhe_views.py b/yonghu/tixian_shenhe_views.py
new file mode 100644
index 0000000..0886021
--- /dev/null
+++ b/yonghu/tixian_shenhe_views.py
@@ -0,0 +1,383 @@
+# yonghu/tixian_shenhe_views.py
+"""
+自动提现审核 — 用户侧接口：
+  ① TixianZddkshApplyView  → POST /yonghu/zddksh   提交审核（扣款）
+  ② process_audit_collect  → POST /yonghu/tixiansq  收款（P0：一单到底，先查微信再决定是否新建）
+"""
+import decimal
+import json
+import logging
+import random
+import string
+import time
+
+import requests
+from django.conf import settings
+from django.db import transaction
+from django.utils import timezone
+from rest_framework import permissions
+from rest_framework.response import Response
+from rest_framework.views import APIView
+
+from .models import TixianAutoRecord, TixianShenheJilu
+from .tixian_shenhe_services import (
+    RECONCILE_ALLOW_NEW,
+    RECONCILE_COMPLETED,
+    RECONCILE_PENDING,
+    RECONCILE_WAIT_CONFIRM,
+    check_collect_quota_limits,
+    create_audit_application,
+    get_audit_for_collect,
+    handle_post_transfer_failure,
+    reconcile_shenhe_wechat_bills,
+    release_collect_quota_for_record,
+    reserve_collect_quota_limits,
+    resolve_collect_context,
+    validate_collect_eligibility,
+)
+
+logger = logging.getLogger('yonghu.tixian_shenhe')
+
+
+def generate_tixian_id():
+    """生成唯一微信商户打款单号：TX + 时间戳(13位) + 4位随机数"""
+    timestamp = str(int(time.time() * 1000))
+    rand = ''.join(random.choices(string.digits, k=4))
+    return f'TX{timestamp}{rand}'
+
+
+def _build_collect_success_response(payload):
+    return Response({
+        'code': 0,
+        'msg': '请确认收款',
+        'data': payload,
+    })
+
+
+def _is_wx_balance_insufficient(err_code='', err_msg=''):
+    blob = f'{err_code} {err_msg}'.upper()
+    return any(k in blob for k in ('NOT_ENOUGH', 'INSUFFICIENT', '余额不足', '资金不足'))
+
+
+def _verify_collect_quota_or_response(user_main, audit, shenhe_danhao):
+    """收款限额校验；不通过时直接返回 Response"""
+    ok, msg, limit_kind = check_collect_quota_limits(
+        user_main,
+        audit.leixing,
+        audit.shenqing_jine,
+        audit.shijidaozhang,
+        shenhe_danhao,
+    )
+    if not ok:
+        limit_code = 33 if limit_kind == 'platform' else 400
+        logger.warning(
+            '收款限额校验未通过 yonghuid=%s shenhe_danhao=%s leixing=%s kind=%s msg=%s',
+            user_main.yonghuid, shenhe_danhao, audit.leixing, limit_kind, msg,
+        )
+        return Response({'code': limit_code, 'msg': msg})
+    return None
+
+
+def _mark_auto_record_failed(tixian_id, fail_reason):
+    """微信明确失败时标记打款记录终态，避免后续一直被当成「处理中」"""
+    TixianAutoRecord.objects.filter(tixian_id=tixian_id, zhuangtai=0).update(
+        zhuangtai=2,
+        fail_reason=(fail_reason or '打款失败')[:500],
+        update_time=timezone.now(),
+    )
+
+
+def _build_wx_transfer_body(wx_cfg, tixian_id, openid, yonghuid, leixing, shijidaozhang):
+    transfer_scene_id = wx_cfg['TRANSFER_SCENE_ID']
+    role_map = {1: '打手', 2: '管事', 3: '组长', 4: '考核官', 5: '打手', 6: '商家'}
+    desc_map = {1: '佣金提现', 2: '分红提现', 3: '分红提现', 4: '分佣提现', 5: '押金提现', 6: '余额提现'}
+    transfer_scene_report_infos = []
+    if transfer_scene_id == '1005':
+        transfer_scene_report_infos = [
+            {'info_type': '岗位类型', 'info_content': role_map.get(leixing, '用户')},
+            {'info_type': '报酬说明', 'info_content': desc_map.get(leixing, '提现')},
+        ]
+    elif transfer_scene_id == '1009':
+        transfer_scene_report_infos = [
+            {'info_type': '采购商品名称', 'info_content': '平台服务'},
+        ]
+    return {
+        'appid': wx_cfg['APPID'],
+        'out_bill_no': tixian_id,
+        'transfer_scene_id': transfer_scene_id,
+        'openid': openid,
+        'transfer_amount': int(shijidaozhang * 100),
+        'transfer_remark': f'平台提现-{yonghuid}',
+        'transfer_scene_report_infos': transfer_scene_report_infos,
+    }
+
+
+def _call_wechat_transfer(body, wx_cfg):
+    from utils.wechat_v3 import build_authorization
+
+    url = 'https://api.mch.weixin.qq.com/v3/fund-app/mch-transfer/transfer-bills'
+    body_json = json.dumps(body, separators=(',', ':'))
+    auth = build_authorization('POST', url, body_json)
+    headers = {
+        'Authorization': auth,
+        'Content-Type': 'application/json',
+        'Accept': 'application/json',
+        'User-Agent': 'Mozilla/5.0',
+    }
+    resp = requests.post(url, data=body_json, headers=headers, timeout=15)
+    try:
+        wx_result = resp.json()
+    except ValueError:
+        wx_result = {}
+    return resp, wx_result
+
+
+class TixianZddkshApplyView(APIView):
+    """POST /yonghu/zddksh  提交审核申请（扣款，不创建 TixianAutoRecord）"""
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        from utils.redis_lock import acquire_lock, release_lock
+
+        user_main = request.user
+        lock_key = f'tixian_audit_apply:{user_main.yonghuid}'
+        if not acquire_lock(lock_key, timeout=10):
+            return Response({'code': 429, 'msg': '操作频繁，请稍后重试'})
+
+        try:
+            leixing = request.data.get('leixing')
+            jine_str = request.data.get('jine')
+            if leixing is None or jine_str is None:
+                return Response({'code': 1, 'msg': '缺少参数: leixing 或 jine'})
+
+            try:
+                leixing = int(leixing)
+                jine = decimal.Decimal(str(jine_str))
+            except (ValueError, decimal.InvalidOperation):
+                return Response({'code': 2, 'msg': '参数格式错误'})
+
+            if leixing not in [1, 2, 3, 4, 5, 6]:
+                return Response({'code': 3, 'msg': '提现类型无效'})
+            if jine <= decimal.Decimal('0.1'):
+                return Response({'code': 4, 'msg': '提现金额必须大于0.1'})
+
+            try:
+                data = create_audit_application(user_main, leixing, jine)
+            except ValueError as e:
+                return Response({'code': 400, 'msg': str(e)})
+            except Exception as e:
+                logger.error(f'提现审核申请异常: {e}', exc_info=True)
+                return Response({'code': 99, 'msg': '提现申请失败，请稍后重试'})
+
+            return Response({'code': 0, 'msg': '提现申请已提交，请等待审核', 'data': data})
+
+        finally:
+            release_lock(lock_key)
+
+
+def process_audit_collect(request):
+    """
+    POST /yonghu/tixiansq  用户收款（P0 防多提）
+
+    主路径：tixianjilu_id → Tixianjilu → TixianShenheJilu(状态6)
+    若 TixianAutoRecord 已有 tixian_id → 只问微信，非终态绝不新建
+    仅微信 FAIL/CANCELLED 终态后才允许新建打款记录
+    """
+    from utils.redis_lock import acquire_lock, release_lock
+
+    user_main = request.user
+    yonghuid = user_main.yonghuid
+    tixianjilu_id = request.data.get('tixianjilu_id') or request.data.get('id')
+    shenhe_danhao = (request.data.get('shenhe_danhao') or '').strip()
+    shenhe_jilu_id = request.data.get('shenhe_jilu_id')
+
+    logger.info(
+        '收款请求 yonghuid=%s tixianjilu_id=%s shenhe_jilu_id=%s shenhe_danhao=%s',
+        yonghuid, tixianjilu_id, shenhe_jilu_id, shenhe_danhao,
+    )
+
+    try:
+        if not user_main.openid:
+            return Response({'code': 10, 'msg': '用户未绑定微信，无法收款'})
+
+        wx_cfg = settings.WECHAT_PAY_V3_CONFIG
+        if not wx_cfg.get('APPID') or not wx_cfg.get('MCHID') or not wx_cfg.get('TRANSFER_SCENE_ID'):
+            logger.error('微信打款配置不完整 APPID=%s MCHID=%s', wx_cfg.get('APPID'), wx_cfg.get('MCHID'))
+            return Response({'code': 11, 'msg': '系统配置异常，请联系客服'})
+
+        ctx, err = resolve_collect_context(
+            yonghuid,
+            tixianjilu_id=tixianjilu_id,
+            shenhe_danhao=shenhe_danhao,
+            shenhe_jilu_id=shenhe_jilu_id,
+        )
+        if not ctx:
+            return Response({'code': 400, 'msg': err})
+
+        audit = ctx['audit']
+        shenhe_danhao = ctx['shenhe_danhao']
+        tixianjilu_id_val = ctx['jilu'].id if ctx.get('jilu') else audit.tixianjilu_id
+        leixing = audit.leixing
+
+        # 二次资格校验：不通过仅返回错误，审核单保持待收款(6)，不退款，用户补齐资质后可再点收款
+        collect_ok, collect_msg = validate_collect_eligibility(user_main, leixing)
+        if not collect_ok:
+            logger.warning(
+                '收款校验未通过 yonghuid=%s shenhe_danhao=%s leixing=%s msg=%s',
+                yonghuid, shenhe_danhao, leixing, collect_msg,
+            )
+            return Response({'code': 400, 'msg': collect_msg})
+
+        quota_resp = _verify_collect_quota_or_response(user_main, audit, shenhe_danhao)
+        if quota_resp:
+            return quota_resp
+
+        lock_key = f'tixian_collect:{shenhe_danhao}'
+        if not acquire_lock(lock_key, timeout=15):
+            return Response({'code': 429, 'msg': '操作频繁，请稍后重试'})
+
+        tixian_id = None
+        quota_reserved = False
+        try:
+            action, payload = reconcile_shenhe_wechat_bills(shenhe_danhao)
+            if action == RECONCILE_COMPLETED:
+                return Response({'code': 8, 'msg': payload.get('msg', '该提现已完成，请勿重复操作')})
+            if action == RECONCILE_WAIT_CONFIRM:
+                quota_resp = _verify_collect_quota_or_response(user_main, audit, shenhe_danhao)
+                if quota_resp:
+                    return quota_resp
+                return _build_collect_success_response(payload)
+            if action == RECONCILE_PENDING:
+                msg = payload.get('msg') if isinstance(payload, dict) else payload
+                return Response({'code': 12, 'msg': msg or '有收款处理中，请稍后再试'})
+
+            if action != RECONCILE_ALLOW_NEW:
+                return Response({'code': 12, 'msg': '收款处理中，请稍后再试'})
+
+            with transaction.atomic():
+                audit, err = get_audit_for_collect(
+                    shenhe_danhao, yonghuid, audit.id,
+                )
+                if not audit:
+                    return Response({'code': 400, 'msg': err})
+
+                # 金额一律用审核表已落库数据（申请时扣款+算费），收款不再重算
+                jine = audit.shenqing_jine
+                shouxufei = audit.shouxufei
+                shijidaozhang = audit.shijidaozhang
+                feilv = audit.feilv
+
+                ok, msg, limit_kind = reserve_collect_quota_limits(
+                    user_main, leixing, jine, shijidaozhang, shenhe_danhao,
+                )
+                if not ok:
+                    limit_code = 33 if limit_kind == 'platform' else 400
+                    return Response({'code': limit_code, 'msg': msg})
+
+                quota_reserved = True
+
+                tixian_id = generate_tixian_id()
+                TixianAutoRecord.objects.create(
+                    tixian_id=tixian_id,
+                    yonghuid=yonghuid,
+                    leixing=leixing,
+                    jine=jine,
+                    shouxufei=shouxufei,
+                    shijidaozhang=shijidaozhang,
+                    feilv=feilv,
+                    zhuangtai=0,
+                    shenhe_danhao=shenhe_danhao,
+                )
+                audit.tixian_auto_id = tixian_id
+                audit.save(update_fields=['tixian_auto_id', 'update_time'])
+
+            body = _build_wx_transfer_body(
+                wx_cfg, tixian_id, user_main.openid, yonghuid, leixing, shijidaozhang,
+            )
+
+            try:
+                resp, wx_result = _call_wechat_transfer(body, wx_cfg)
+
+                if resp.status_code == 200 and wx_result.get('state') == 'WAIT_USER_CONFIRM':
+                    package_info = wx_result.get('package_info')
+                    auto_record = TixianAutoRecord.objects.get(tixian_id=tixian_id)
+                    auto_record.wechat_package = json.dumps(package_info, ensure_ascii=False)
+                    auto_record.save(update_fields=['wechat_package'])
+
+                    return _build_collect_success_response({
+                        'tixian_id': tixian_id,
+                        'package_info': package_info,
+                        'shouxufei': str(shouxufei),
+                        'shijidaozhang': str(shijidaozhang),
+                        'current_rate': str(feilv),
+                        'mch_id': wx_cfg['MCHID'],
+                        'shenhe_danhao': shenhe_danhao,
+                        'tixianjilu_id': tixianjilu_id_val,
+                    })
+
+                err_code = wx_result.get('code', '')
+                err_msg = wx_result.get('message', wx_result.get('detail', '微信接口调用失败'))
+                logger.error(
+                    '微信发起转账未进入待确认: bill=%s code=%s msg=%s HTTP%s',
+                    tixian_id, err_code, err_msg, resp.status_code,
+                )
+
+                is_balance_issue = _is_wx_balance_insufficient(err_code, err_msg)
+                if is_balance_issue:
+                    _mark_auto_record_failed(tixian_id, err_msg)
+                    if quota_reserved:
+                        release_collect_quota_for_record(
+                            TixianAutoRecord.objects.get(tixian_id=tixian_id),
+                        )
+                        quota_reserved = False
+                    return Response({
+                        'code': 99,
+                        'msg': '运营账户资金不足，需等管理员充值后才能提现',
+                    })
+
+                post_action, post_payload = handle_post_transfer_failure(
+                    tixian_id, shenhe_danhao, err_code, err_msg,
+                )
+                if post_action == RECONCILE_WAIT_CONFIRM:
+                    quota_resp = _verify_collect_quota_or_response(user_main, audit, shenhe_danhao)
+                    if quota_resp:
+                        return quota_resp
+                    return _build_collect_success_response(post_payload)
+                if post_action == RECONCILE_COMPLETED:
+                    return Response({'code': 8, 'msg': '该提现已完成，请勿重复操作'})
+                if post_action == RECONCILE_PENDING:
+                    pending_msg = (
+                        post_payload.get('msg', post_payload)
+                        if isinstance(post_payload, dict) else post_payload
+                    )
+                    return Response({'code': 12, 'msg': pending_msg or '有收款处理中，请稍后再试'})
+
+                user_msg = err_msg or '微信收款发起失败，请稍后重试'
+                _mark_auto_record_failed(tixian_id, user_msg)
+                if quota_reserved:
+                    release_collect_quota_for_record(
+                        TixianAutoRecord.objects.get(tixian_id=tixian_id),
+                    )
+                    quota_reserved = False
+                return Response({'code': 99, 'msg': user_msg})
+
+            except requests.RequestException as e:
+                logger.error(
+                    '微信打款网络异常(保持待查单): bill=%s err=%s',
+                    tixian_id, e, exc_info=True,
+                )
+                return Response({
+                    'code': 12,
+                    'msg': '收款请求已提交，系统正在核对状态，请稍后再试，切勿重复点击',
+                })
+
+        finally:
+            release_lock(lock_key)
+
+    except Exception as e:
+        logger.error(
+            '收款接口未捕获异常 yonghuid=%s tixianjilu_id=%s shenhe_danhao=%s err=%s',
+            yonghuid, tixianjilu_id, shenhe_danhao, e,
+            exc_info=True,
+        )
+        return Response({'code': 99, 'msg': '系统繁忙，请稍后重试'})
diff --git a/yonghu/urls.py b/yonghu/urls.py
new file mode 100644
index 0000000..9235a39
--- /dev/null
+++ b/yonghu/urls.py
@@ -0,0 +1,160 @@
+from django.urls import path
+from django.views.decorators.csrf import csrf_exempt
+
+from .views import WechatMiniProgramLoginView, UserInfoUpdateView, DashouXinxiAPIView, \
+    ZaixianZhuangtaiAPIView, GuanshiXinxiView, ShangJiaXinXiView, BossBiaoshiView, YaoqingmaView, \
+    DashouZhuceView, GuanshiYaoqingDashouListView, TixianXinxiHuoquView, ShoukuanXinxiShangchuanView, \
+    TixianShenqingView, TixianJiluHuoquViewV2, AdminLoginView, AdminFinancialDataView, AdGetDingdanList, \
+    AdGetOrderTypes, AdGuanLiYongHu, AdYaoQingDaShou, CfGuanLi, AdTongYiChuFa, AdckyhxqView, AdcjxgView, AddtxshView, \
+    AdtixianqkView, DashouZiliaoHuoquView, DashouGengxinView, ShangjiaZhuceView, WechatLoginAndDashouRegisterView, \
+    YonghuTixianShenheXiugaiView, ChufaJiluHuoquView, DashouShensuView, ShangjiaChufaJiluHuoquView, \
+    WeixinOfficialCallbackView, KefuLoginView, KefuStatsView, KefuGetOrderTypesView, KefuGetOrderListView, \
+    KefuGetShangjiaOrderListView, KefuGetOrderDetailView, KefuChangeDashouView, KefuRecoverOrderView, \
+    KefuPlatformRefundView, KefuRejectRefundView, KefuMerchantRefundView, KefuRejectSettlementView, \
+    KefuTransferHallView, KefuCancelDesignationView, KefuGetDashouListView, KefuGetDashouDetailView, \
+    KefuPunishmentListView, KefuPunishmentActionView, KefuPunishmentDetailView, \
+    KefuWithdrawListView, KefuWithdrawDetailView, KefuWithdrawActionView, KefuPunishView, AdKfglView, AdKftjView, \
+    AdKfxgView, TixianQueRenAutoView, TixianShenqingV3View, TixianCallbackV3View, KefuForceCompleteView, \
+    GuanshiRegisterView, WechatLoginAndGuanshiRegisterView, ZuzhangZhuceView, ZuzhangXinxiView, KefuUpdateDashouView, \
+    HuoQuYaoQingRenView, DashouJianquanView, LaobanJianquanView, FaKuanJiFenTongJiView, DaShouFaKuanLieBiaoView, \
+    FaKuanShenSuView,     FaKuanPayView, FaKuanPayPollView, FaKuanPayFailView, FaKuanHuitiaoView, KaohePayView, \
+    KaohePayCallbackView, KaohePayPollView, KaohePayFailView, TixianAssetView, GuanshiContactView
+from .tixian_shenhe_views import TixianZddkshApplyView
+from .paihang_views import PhbHqsjView
+
+urlpatterns = [
+    path('wechatlogin', WechatMiniProgramLoginView.as_view(), name='用户一键微信登录'),
+    path('xiugai', UserInfoUpdateView.as_view(), name='用户信息修改'),
+    # 打手信息接口
+    path('dashouxinxi', DashouXinxiAPIView.as_view(), name='打手信息查询'),
+    # 更改在线状态接口
+    path('zaixianzhuangtai', ZaixianZhuangtaiAPIView.as_view(), name='打手在线状态更改'),
+    path('guanshixinxi', GuanshiXinxiView.as_view(), name='获取管事信息'),
+    path('shangjiaxinxi', ShangJiaXinXiView.as_view(), name='获取商家信息'),
+    path('bossbiaoshi', BossBiaoshiView.as_view(), name='获取老板标识'),
+    path('yaoqingma', YaoqingmaView.as_view(), name='管事生成邀请码'),
+    path('dashouzhuce',DashouZhuceView.as_view(), name='打手邀请码注册'),
+    path('gshqyqds', GuanshiYaoqingDashouListView.as_view(), name='管事获取邀请打手'),
+    path('tixianhq', TixianXinxiHuoquView.as_view(), name='获取体现缓存信息'),  # 获取提现信息
+    path('sksc', ShoukuanXinxiShangchuanView.as_view(), name='上传提现相关数据或收款码'),  # 上传收款信息
+    path('tixian', TixianShenqingView.as_view(), name='提现申请'),  # 提交提现申请
+    path('tixianjiluhq', TixianJiluHuoquViewV2.as_view(), name='打手提现记录查询'),
+    path('adlog', AdminLoginView.as_view(), name='管理元登录'),
+    path('adhq', AdminFinancialDataView.as_view(), name='管理元获取收支记录'),
+    path('adgetordertypes', AdGetOrderTypes.as_view(), name='管理员获取订单类型'),
+
+    # 订单列表获取接口
+    path('adddhq', AdGetDingdanList.as_view(), name='管理员获取订单列表'),
+    path('adyqds', AdYaoQingDaShou.as_view(), name='管理员获取邀请码'),
+
+    # 用户管理列表接口
+    path('adgl', AdGuanLiYongHu.as_view(), name='管理员获取用户'),
+    path('cfgl', CfGuanLi.as_view(), name='处罚记录获取'),
+    path('adtycf', AdTongYiChuFa.as_view(), name='同意或拒绝处罚'),
+    path('adckyhxq', AdckyhxqView.as_view(), name='管理员获取用户具体数据'),
+
+    # 修改用户信息接口
+    path('adcjxg',AdcjxgView.as_view(), name='管理员修改用户数据'),
+    path('addtxsh', AddtxshView.as_view(), name='管理员获取提现审核'),
+
+    # 处理提现申请接口
+    path('adtixianqk', AdtixianqkView.as_view(), name='管理员提现修改'),
+    # 打手资料获取
+    path('dszjxxhq', DashouZiliaoHuoquView.as_view(), name='打手获取自己信息'),
+
+    # 打手信息更新
+    path('dsgxxx', DashouGengxinView.as_view(), name='打手修改自己信息'),
+    # 🔥🟢 新增商家路由
+    path('shangjiahuce', ShangjiaZhuceView.as_view(), name='商家注册'),
+    path('wdlyhdl', WechatLoginAndDashouRegisterView.as_view(), name='打手扫码注册'),
+    path('yonghutxshxg', YonghuTixianShenheXiugaiView.as_view(), name='用户自己体现修改'),
+    path('dshqcfjl', ChufaJiluHuoquView.as_view(), name='打手处罚记录获取'),
+
+    # 打手申诉接口
+    path('dscfss', DashouShensuView.as_view(), name='打手处罚上诉申请'),
+    path('sjcfjlhq', ShangjiaChufaJiluHuoquView.as_view(), name='商家处罚记录获取'),
+    path('officialcallback', csrf_exempt(WeixinOfficialCallbackView.as_view()), name='用户关注取关服务号回调'),
+    path('kefujinru', KefuLoginView.as_view(), name='客服登录'),
+    path('kfjrhqzl', KefuStatsView.as_view(), name='客服获取数据'),
+    path('kfhqptddlx', KefuGetOrderTypesView.as_view(), name='客服获取订单类型'),
+    path('kfhqddlb', KefuGetOrderListView.as_view(), name='客服获取订单列表'),
+
+    path('kfhqsjddlb', KefuGetShangjiaOrderListView.as_view(),name='客服获取商家订单列表'),
+    path('kefuhqddxq', KefuGetOrderDetailView.as_view(), name='获取订单详情页面'),
+    path('kefughds', KefuChangeDashouView.as_view(), name='客服更换打手'),
+    path('kefuhf', KefuRecoverOrderView.as_view(), name='客服恢复订单'),
+    path('kefupttk', KefuPlatformRefundView.as_view(), name='客服给平台订单退款'),
+    path('kefujjtk', KefuRejectRefundView.as_view(), name='客服拒绝商家退款'),
+    path('kefusjtk', KefuMerchantRefundView.as_view(), name='客服同意商家退款'),
+    path('kefujjjs', KefuRejectSettlementView.as_view(), name='客服拒绝结算'),
+    path('kefuzydt', KefuTransferHallView.as_view(), name='客服订单返回大厅'),
+    path('kefuqxzd', KefuCancelDesignationView.as_view(), name='客服取消指定'),
+    #path('kefuhqdslb', KefuGetDashouListView.as_view(), name='客服获取打手数据'),
+    #path('kefuhqdsxq', KefuGetDashouDetailView.as_view(), name='客服获取打手具体信息'),
+    #path('kefuxgds', KefuUpdateDashouView.as_view(), name='客服修改打手数据'),
+    path('kefu_cfgl', KefuPunishmentListView.as_view(), name='客服获取处罚记录'),
+    path('kefu_cf_detail', KefuPunishmentDetailView.as_view(), name='kefu_cf_detail'),
+    path('kefu_cf_action', KefuPunishmentActionView.as_view(), name='客服处理处罚'),
+    path('kefu_txsh_list', KefuWithdrawListView.as_view(), name='客服获取体现数据'),
+    path('kefu_txsh_detail', KefuWithdrawDetailView.as_view(), name='客服获取体现详情数据'),
+    path('kefu_txsh_action', KefuWithdrawActionView.as_view(), name='客服处理体现'),
+    path('kefuchufa', KefuPunishView.as_view(), name='客服申请出发打手'),
+    path('adkfgl', AdKfglView.as_view(), name='管理员获取客服数据'),
+    path('adkftj', AdKftjView.as_view(), name='管理添加客服'),
+    path('adkfxg', AdKfxgView.as_view(), name='管理修改客服'),
+
+    path('zddksh', TixianZddkshApplyView.as_view(), name='自动提现审核申请'),
+    path('tixiansq', TixianShenqingV3View.as_view(), name='自动提现收款'),
+    path('tixianqr', TixianQueRenAutoView.as_view(), name='自动提现确认'),
+    path('tixiancallback', csrf_exempt(TixianCallbackV3View.as_view()), name='提现回调'),
+    path('kefuqiangzhijiedan', KefuForceCompleteView.as_view(), name='客服强制结单'),
+
+
+    # 已登录用户注册管事
+    path('guanshizhuce', GuanshiRegisterView.as_view(), name='管事注册，已经登陆'),
+    # 未登录用户微信登录+管事注册
+    path('wdlyqmzc', WechatLoginAndGuanshiRegisterView.as_view(), name='管事注册，没有登录'),
+    path('zuzhangzhuce', ZuzhangZhuceView.as_view(), name='组长注册'),
+    path('zuzhangxinxi', ZuzhangXinxiView.as_view(), name='组长刷新获取信息'),
+
+    path('hqwdyqr', HuoQuYaoQingRenView.as_view(), name='打手联系获取管事'),
+
+
+
+    path('dshqltqx', DashouJianquanView.as_view(), name='前端鉴权打手是否有使用消息功能'),    # 打手鉴权
+    path('lbhqltqx', LaobanJianquanView.as_view(), name='鉴权老板是否有使用消息功能'),     # 老板鉴权
+
+
+
+# 获取罚款 + 积分处罚综合统计
+    path('cffktjhq', FaKuanJiFenTongJiView.as_view(), name='获取罚款 + 积分处罚综合统计'),
+
+    # 获取打手自己的罚款列表
+    path('dsfklbhq', DaShouFaKuanLieBiaoView.as_view(), name='获取打手自己的罚款列表'),
+
+    # 提交罚款申诉
+    path('fkss', FaKuanShenSuView.as_view(), name='提交罚款申诉'),
+
+    path('fkjn', FaKuanPayView.as_view(), name='提交罚款微信支付申请'),            # 下单
+    path('fk_huitiao', csrf_exempt(FaKuanHuitiaoView.as_view()), name='提交罚款微信支付回调'),  # 回调
+    path('fkzffc', FaKuanPayPollView.as_view(), name='提交罚款申微信支付成功轮询'),      # 轮询
+    path('fkzfsb', FaKuanPayFailView.as_view(), name='提交罚款微信支付失败'),      # 失败
+
+    path('khzf', KaohePayView.as_view(), name='考核支付下单'),
+    path('kh_huitiao', csrf_exempt(KaohePayCallbackView.as_view()), name='考核支付回调'),
+    path('khzffc', KaohePayPollView.as_view(), name='考核支付复查轮询'),
+    path('khzfsb', KaohePayFailView.as_view(), name='考核支付失败'),
+
+    path('tixianzichan', TixianAssetView.as_view(), name='小程序提现数据获取'),
+    path('guanshi_contact', GuanshiContactView.as_view(), name='获取组长'),
+
+    # 排行榜（打手/管事/组长/商家）
+    path('phbhqsj', PhbHqsjView.as_view(), name='排行榜数据'),
+]
+
+
+
+
+
+
+
diff --git a/yonghu/views.py b/yonghu/views.py
new file mode 100644
index 0000000..bc0164d
--- /dev/null
+++ b/yonghu/views.py
@@ -0,0 +1,18132 @@
+# yonghu/views.py
+import time
+import random
+import hashlib
+import requests
+from django.db import transaction
+from django.conf import settings
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework_simplejwt.tokens import RefreshToken
+
+from .models import UserMain, UserBoss, UserDashou, UserShangjia, UserGuanshi, UserShenheguan
+from dingdan.models import Dingdan, DingdanPingtai, Lilubiao
+from peizhi.models import Qunpeizhi  # 假设群配置表在这个模块
+from rest_framework.throttling import AnonRateThrottle
+from rest_framework.permissions import AllowAny  # 新增这行
+
+
+
+
+
+
+
+from django.conf import settings
+from django.utils import timezone
+from django.db import transaction
+from django.core.exceptions import ObjectDoesNotExist
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.throttling import AnonRateThrottle
+from rest_framework.permissions import AllowAny
+from rest_framework_simplejwt.tokens import RefreshToken
+from .models import UserMain, AdminProfile
+
+
+# 获取客户端真实IP的函数
+def huoquKehuduanIP(request):
+    """
+    获取客户端的真实IP地址
+    考虑反向代理（如Nginx）的情况
+    """
+    # 优先从HTTP_X_FORWARDED_FOR获取（经过代理的情况）
+    x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+    if x_forwarded_for:
+        # 可能有多个IP，取第一个
+        ip = x_forwarded_for.split(',')[0].strip()
+        if ip:
+            return ip
+
+    # 如果没有代理，直接从REMOTE_ADDR获取
+    ip = request.META.get('REMOTE_ADDR', '')
+
+    # 如果还是获取不到，返回默认值
+    if not ip:
+        ip = '0.0.0.0'
+
+    return ip
+
+
+# 获取用户代理信息（用于更详细的追踪）
+def huoquYonghuDaili(request):
+    """
+    获取用户浏览器/设备信息
+    """
+    user_agent = request.META.get('HTTP_USER_AGENT', '')
+
+    # 这里可以添加更复杂的用户代理解析
+    # 为简化，我们只返回原始字符串的前100个字符
+    return user_agent[:100] if user_agent else ''
+
+
+
+
+
+
+
+class WechatMiniProgramLoginView(APIView):
+    """
+    微信小程序登录接口
+    """
+    throttle_classes = [AnonRateThrottle]
+    permission_classes = [AllowAny]
+
+    def post(self, request):
+        try:
+            code = request.data.get('code', '').strip()
+            if not code:
+                return Response({'code': 1, 'msg': '微信授权码不能为空', 'data': None},
+                                status=status.HTTP_400_BAD_REQUEST)
+
+            # 获取微信openid和unionid
+            wechat_data = self.get_wechat_openid(code)
+            if not wechat_data or 'openid' not in wechat_data:
+                error_msg = wechat_data.get('errmsg', '微信授权失败')
+                return Response({'code': 2, 'msg': f'微信登录失败: {error_msg}', 'data': None},
+                                status=status.HTTP_400_BAD_REQUEST)
+
+            openid = wechat_data['openid']
+            session_key = wechat_data.get('session_key', '')
+            unionid = wechat_data.get('unionid', '')  # 🆕【新增】获取unionid
+
+            # 获取客户端真实IP
+            kehuduan_ip = self.huoquKehuduanIP(request)
+
+            with transaction.atomic():
+                # 创建或获取用户
+                user_main, created = UserMain.objects.select_for_update().get_or_create(
+                    openid=openid,
+                    defaults={'yonghuid': self.shengchengYonghuID(), 'user_type': 'normal'}
+                )
+
+                # 🆕【新增】保存unionid
+                if unionid and unionid != user_main.unionid:
+                    user_main.unionid = unionid
+
+                cunchu_ip = kehuduan_ip
+                user_main.ip = cunchu_ip
+                user_main.last_login_time = timezone.now()
+                user_main.save()
+
+                if created:
+                    UserBoss.objects.create(user=user_main, nickname='板板大人')
+
+                # 检查扩展表
+                dashou_status = 0
+                shangjia_status = 0
+                guanshi_status = 0
+                boss_nickname = '微信用户'
+
+                try:
+                    boss_profile = UserBoss.objects.get(user=user_main)
+                    boss_nickname = boss_profile.nickname if boss_profile.nickname else '微信用户'
+                except UserBoss.DoesNotExist:
+                    pass
+
+                try:
+                    UserDashou.objects.get(user=user_main)
+                    dashou_status = 1
+                except UserDashou.DoesNotExist:
+                    dashou_status = None
+
+                try:
+                    UserShangjia.objects.get(user=user_main)
+                    shangjia_status = 1
+                except UserShangjia.DoesNotExist:
+                    shangjia_status = None
+
+                try:
+                    UserGuanshi.objects.get(user=user_main)
+                    guanshi_status = 1
+                except UserGuanshi.DoesNotExist:
+                    guanshi_status = None
+                try:
+                    UserZuzhang.objects.get(user=user_main)
+                    zuzhang_status = 1
+                except UserZuzhang.DoesNotExist:
+                    zuzhang_status = None
+
+                # 在检查 zuzhang 扩展表之后，插入以下代码
+                try:
+                    kg = UserShenheguan.objects.get(user=user_main)
+                    kaoheguan_status = 1 if kg.zhuangtai == 1 else 0
+                except UserShenheguan.DoesNotExist:
+                    kaoheguan_status = 0
+
+
+                # 生成JWT token
+                refresh = RefreshToken.for_user(user_main)
+                token = str(refresh.access_token)
+
+                # 计算订单数量
+                order_counts = self.jisuanDingdanShuliang(user_main.yonghuid)
+
+                # 获取群配置
+                group_info = self.huoquQunPeizhi()
+
+            # 返回数据
+            response_data = {
+                'token': token,
+                'nicheng': boss_nickname,
+                'uid': user_main.yonghuid,
+                'touxiang': user_main.avatar or '',
+                'shangjiastatus': shangjia_status,
+                'dashoustatus': dashou_status,
+                'guanshistatus': guanshi_status,
+                'kaoheguanstatus': kaoheguan_status,
+                'zuzhangstatus': zuzhang_status,
+                'dingdantiaoshu': order_counts,
+                'dashouqun': group_info.get('dashouqun', ''),
+                'dashouqunid': group_info.get('dashouqunid', ''),
+                'guanshiqun': group_info.get('guanshiqun', ''),
+                'guanshiqunid': group_info.get('guanshiqunid', '')
+            }
+
+            return Response({'code': 0, 'msg': '登录成功', 'data': response_data})
+
+        except Exception as e:
+            import logging
+            logger = logging.getLogger(__name__)
+            error_openid = locals().get('openid', 'N/A')
+            logger.error(f"微信登录异常 - openid: {error_openid}, 错误类型: {type(e).__name__}, 错误详情: {str(e)}",
+                         exc_info=True)
+
+            return Response({'code': 99, 'msg': '系统繁忙，请稍后重试', 'data': None},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def get_wechat_openid(self, code):
+        """
+        调用微信接口获取openid和unionid
+        """
+        try:
+            appid = getattr(settings, 'WEIXIN_APPID', '')
+            secret = getattr(settings, 'WEIXIN_SECRET', '')
+
+            if not appid or not secret:
+                raise ValueError('微信配置未设置')
+
+            url = 'https://api.weixin.qq.com/sns/jscode2session'
+            params = {'appid': appid, 'secret': secret, 'js_code': code, 'grant_type': 'authorization_code'}
+
+            response = requests.get(url, params=params, timeout=10)
+            result = response.json()
+
+            if 'openid' in result:
+                return {'openid': result['openid'], 'session_key': result.get('session_key', ''),
+                        'unionid': result.get('unionid', '')}
+            else:
+                errcode = result.get('errcode', 'unknown')
+                errmsg = result.get('errmsg', '未知错误')
+                return {'errmsg': f'[{errcode}]{errmsg}'}
+
+        except requests.exceptions.Timeout:
+            return {'errmsg': '请求微信接口超时'}
+        except Exception as e:
+            return {'errmsg': f'请求微信接口异常: {str(e)}'}
+
+    def shengchengYonghuID(self):
+        """
+        生成7位数字用户ID
+        """
+        for _ in range(10):
+            timestamp_part = str(int(time.time()))[-5:].zfill(5)
+            random_part = str(random.randint(0, 99)).zfill(2)
+            user_id = timestamp_part + random_part
+
+            if len(user_id) == 7 and user_id.isdigit():
+                if not UserMain.objects.filter(yonghuid=user_id).exists():
+                    return user_id
+
+        raise Exception('生成用户ID失败')
+
+    def huoquKehuduanIP(self, request):
+        """
+        获取客户端真实IP地址
+        """
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0].strip()
+            if ip:
+                return ip
+
+        ip = request.META.get('REMOTE_ADDR', '')
+        return ip if ip else '0.0.0.0'
+
+    def jisuanDingdanShuliang(self, yonghuid):
+        """
+        统计订单数量
+        """
+        try:
+            if not DingdanPingtai.objects.filter(laoban_id=yonghuid).exists():
+                return {'daifuwu': 0, 'fuwuzhong': 0, 'yiwancheng': 0, 'yituikuan': 0}
+
+            dingdan_ids = DingdanPingtai.objects.filter(laoban_id=yonghuid).values_list('dingdan__id', flat=True)
+
+            from django.db.models import Q, Count
+            from django.db.models import Case, When, IntegerField
+
+            results = Dingdan.objects.filter(id__in=dingdan_ids).aggregate(
+                daifuwu=Count(Case(When(Q(zhuangtai=1) | Q(zhuangtai=7), then=1), output_field=IntegerField())),
+                fuwuzhong=Count(Case(When(zhuangtai=2, then=1), output_field=IntegerField())),
+                yiwancheng=Count(Case(When(zhuangtai=3, then=1), output_field=IntegerField())),
+                yituikuan=Count(Case(When(zhuangtai=5, then=1), output_field=IntegerField()))
+            )
+
+            return {
+                'daifuwu': results['daifuwu'] or 0,
+                'fuwuzhong': results['fuwuzhong'] or 0,
+                'yiwancheng': results['yiwancheng'] or 0,
+                'yituikuan': results['yituikuan'] or 0
+            }
+
+        except Exception:
+            return {'daifuwu': 0, 'fuwuzhong': 0, 'yiwancheng': 0, 'yituikuan': 0}
+
+    def huoquQunPeizhi(self):
+        """
+        获取群配置信息
+        """
+        try:
+            qun_configs = Qunpeizhi.objects.filter(id__in=[1, 2])
+
+            result = {
+                'dashouqun': '',
+                'dashouqunid': '',
+                'guanshiqun': '',
+                'guanshiqunid': ''
+            }
+
+            for config in qun_configs:
+                if config.id == 1:
+                    result['dashouqun'] = config.neirong or ''
+                    result['dashouqunid'] = config.qunid or ''
+                elif config.id == 2:
+                    result['guanshiqun'] = config.neirong or ''
+                    result['guanshiqunid'] = config.qunid or ''
+
+            return result
+
+        except Exception:
+            return {
+                'dashouqun': '',
+                'dashouqunid': '',
+                'guanshiqun': '',
+                'guanshiqunid': ''
+            }
+
+
+# views/weixin_official.py - 完整文件
+import hashlib
+import time
+import logging
+from django.views.decorators.csrf import csrf_exempt
+from django.http import HttpResponse
+from django.utils import timezone
+from xml.etree import ElementTree as ET
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from django.conf import settings
+from .models import OfficialAccountUser
+
+logger = logging.getLogger(__name__)
+
+
+
+class WeixinOfficialCallbackView(APIView):
+    """
+    微信服务号回调接口
+    处理用户关注、取消关注等事件
+    核心：有关注事件就存，不管有没有UnionID
+    """
+    throttle_classes = []
+    permission_classes = [AllowAny]
+    authentication_classes = []
+
+    def get(self, request):
+        """验证服务器配置（微信官方要求）"""
+        try:
+            signature = request.GET.get('signature', '')
+            timestamp = request.GET.get('timestamp', '')
+            nonce = request.GET.get('nonce', '')
+            echostr = request.GET.get('echostr', '')
+
+            token = getattr(settings, 'WEIXIN_OFFICIAL_TOKEN', '')
+
+            if not token:
+                logger.error("服务号Token未配置")
+                return HttpResponse('Token not configured', status=500)
+
+            # 验证签名
+            tmp_list = sorted([token, timestamp, nonce])
+            tmp_str = ''.join(tmp_list)
+            hash_str = hashlib.sha1(tmp_str.encode()).hexdigest()
+
+            if hash_str == signature:
+                return HttpResponse(echostr)
+            else:
+                logger.error(f"签名验证失败")
+                return HttpResponse('Signature verification failed', status=403)
+
+        except Exception as e:
+            logger.error(f"验证服务器异常: {str(e)}")
+            return HttpResponse('Internal Server Error', status=500)
+
+    def post(self, request):
+        """处理事件推送（关注、取关）"""
+        try:
+            xml_str = request.body.decode('utf-8')
+            logger.info(f"收到服务号事件，原始数据（前200字符）: {xml_str[:200]}")
+
+            root = ET.fromstring(xml_str)
+
+            msg_type = root.find('MsgType').text
+            from_user = root.find('FromUserName').text  # 服务号OpenID
+
+            if msg_type == 'event':
+                event = root.find('Event').text
+
+                if event == 'subscribe':
+                    return self.handle_subscribe_event(root, from_user)
+                elif event == 'unsubscribe':
+                    return self.handle_unsubscribe_event(root, from_user)
+                else:
+                    # 其他事件（如菜单点击）直接返回success
+                    return HttpResponse('success')
+
+            # 非事件消息也直接返回success
+            return HttpResponse('success')
+
+        except Exception as e:
+            logger.error(f"处理服务号事件异常: {str(e)}", exc_info=True)
+            # 即使异常也返回success，避免微信服务器重试
+            return HttpResponse('success')
+
+    def handle_subscribe_event(self, root, from_user):
+        """处理用户关注事件 - 简化版：有就存，没有拉倒"""
+        try:
+            # 尝试获取UnionID（有就有，没有也没关系）
+            unionid_elem = root.find('UnionId')
+            unionid = unionid_elem.text if unionid_elem is not None else None
+
+            logger.info(f"用户关注，OpenID: {from_user}, UnionID: {unionid}")
+
+            # 核心逻辑：更新或创建记录
+            obj, created = OfficialAccountUser.objects.update_or_create(
+                official_openid=from_user,
+                defaults={
+                    'unionid': unionid,
+                    'is_subscribed': True,
+                    'subscribe_time': timezone.now()
+                }
+            )
+
+            action = "新建" if created else "更新"
+            logger.info(f"{action}用户记录成功: OpenID={from_user}")
+
+            # 回复欢迎消息（可选）
+            return self.generate_text_response(root, "感谢关注星阙网络服务！平台有新订单时您会收到通知。")
+
+        except Exception as e:
+            logger.error(f"处理关注事件异常: {str(e)}", exc_info=True)
+            # 依然返回success，不让微信重试
+            return HttpResponse('success')
+
+    def handle_unsubscribe_event(self, root, from_user):
+        """处理用户取消关注事件 - 简化版：标记为未订阅"""
+        try:
+            updated_count = OfficialAccountUser.objects.filter(
+                official_openid=from_user
+            ).update(is_subscribed=False)
+
+            if updated_count > 0:
+                logger.info(f"用户取消关注，已标记为未订阅: {from_user}")
+            else:
+                logger.info(f"用户取消关注，但记录不存在（无需处理）: {from_user}")
+
+            return HttpResponse('success')
+
+        except Exception as e:
+            logger.error(f"处理取消关注事件异常: {str(e)}", exc_info=True)
+            return HttpResponse('success')
+
+    def generate_text_response(self, root, content):
+        """生成文本消息响应"""
+        try:
+            to_user = root.find('ToUserName').text
+            from_user = root.find('FromUserName').text
+
+            response_xml = f"""<xml>
+<ToUserName><![CDATA[{from_user}]]></ToUserName>
+<FromUserName><![CDATA[{to_user}]]></FromUserName>
+<CreateTime>{int(time.time())}</CreateTime>
+<MsgType><![CDATA[text]]></MsgType>
+<Content><![CDATA[{content}]]></Content>
+</xml>"""
+
+            return HttpResponse(response_xml, content_type='application/xml')
+
+        except Exception as e:
+            logger.error(f"生成回复消息异常: {str(e)}")
+            # 即使生成回复失败，也返回一个空的success
+            return HttpResponse('success')
+
+
+
+
+# yonghu/views.py
+from rest_framework.parsers import MultiPartParser, FormParser, JSONParser
+from rest_framework import permissions
+from django.db import transaction
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.views import APIView
+from .models import UserMain, UserBoss, UserDashou, UserShangjia, UserGuanshi
+from utils.oss_utils import validate_image, upload_to_oss, delete_from_oss
+import os
+import uuid
+
+
+
+class UserInfoUpdateView(APIView):
+    """
+    用户个人信息修改接口
+
+    功能：
+      - 上传 / 更新头像
+      - 修改昵称
+      - 更新手机号（支持明文 phone 或微信 getPhoneNumber 组件返回的 shoujihao_code）
+        当传 shoujihao_code 时，会通过微信接口解密得到真实手机号并自动设置 shoujihao_renzheng=True
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        """
+        处理 POST 请求，支持 multipart/form-data 格式
+        """
+        try:
+            # ---------- 获取当前用户 ----------
+            user_main = request.user
+
+            # ---------- 获取或创建老板扩展表记录 ----------
+            try:
+                user_boss = UserBoss.objects.get(user=user_main)
+            except UserBoss.DoesNotExist:
+                user_boss = UserBoss.objects.create(user=user_main, nickname='微信用户')
+
+            response_data = {}
+
+            # ==================== 1. 处理头像上传 ====================
+            avatar_file = request.FILES.get('avatar')
+            if avatar_file:
+                # 验证图片格式 / 大小
+                is_valid, error_msg = validate_image(avatar_file)
+                if not is_valid:
+                    return Response({
+                        'code': 1,
+                        'msg': f'图片验证失败: {error_msg}',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 上传头像到 OSS / COS
+                avatar_url = self.handle_avatar_upload(user_main, avatar_file)
+                if avatar_url:
+                    response_data['touxiang'] = avatar_url
+                    user_main.avatar = avatar_url
+                else:
+                    return Response({
+                        'code': 2,
+                        'msg': '头像上传失败',
+                        'data': None
+                    }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            # ==================== 2. 处理昵称更新 ====================
+            nicheng = request.data.get('nicheng')
+            if nicheng is not None:
+                nicheng = str(nicheng).strip()
+                if nicheng:
+                    if len(nicheng) > 20:
+                        return Response({
+                            'code': 3,
+                            'msg': '昵称不能超过20个字符',
+                            'data': None
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                    user_boss.nickname = nicheng
+                    response_data['nicheng'] = nicheng
+
+            # ==================== 3. 处理手机号更新 ====================
+            phone =None
+
+            shoujihao_code = request.data.get('shoujihao_code')   # 微信手机号快速验证组件返回的临时 code
+
+            if shoujihao_code:
+                # 如果前端传了 shoujihao_code，则通过微信接口解密得到真实手机号
+                try:
+                    phone = self._get_phone_by_code(shoujihao_code)
+                    logger.info(f"手机号解密成功: {phone}")
+                except Exception as e:
+                    logger.error(f"手机号解密失败: {str(e)}")
+                    return Response({
+                        'code': 6,
+                        'msg': f'获取手机号失败: {str(e)}',
+                        'data': None
+                    }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            if phone is not None:
+                phone = str(phone).strip()
+                if phone:
+                    # 验证手机号格式（11 位数字）
+                    if not phone.isdigit() or len(phone) != 11:
+                        return Response({
+                            'code': 4,
+                            'msg': '请输入11位有效的手机号码',
+                            'data': None
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                    # 更新主表手机号，并标记手机号已认证
+                    user_main.phone = phone
+                    user_main.shoujihao_renzheng = True
+                    response_data['phone'] = phone
+
+            # ==================== 4. 检查是否有任何更新 ====================
+            if not response_data:
+                return Response({
+                    'code': 5,
+                    'msg': '没有需要更新的数据',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # ==================== 5. 事务保存 ====================
+            with transaction.atomic():
+                user_main.save()
+                user_boss.save()
+
+            # ==================== 6. 返回成功 ====================
+            return Response({
+                'code': 0,
+                'msg': '更新成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            logger.exception("用户信息更新异常")
+            return Response({
+                'code': 99,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    # ==================== 原有方法：头像上传 ====================
+    def handle_avatar_upload(self, user_main, avatar_file):
+        """
+        上传头像到 OSS / COS，并返回存储的相对路径
+        """
+        try:
+            yonghuid = user_main.yonghuid
+            if not yonghuid:
+                logger.warning("用户 ID 为空，无法上传头像")
+                return None
+
+            # 获取旧头像，用于后续删除
+            old_avatar_url = user_main.avatar
+
+            # 生成新文件名
+            file_extension = os.path.splitext(avatar_file.name)[1].lower()
+            if not file_extension:
+                file_extension = '.jpg'
+            unique_filename = f"{uuid.uuid4().hex}{file_extension}"
+
+            # OSS 文件路径：avatar/{yonghuid}/{filename}
+            avatar_folder = 'avatar'
+            oss_file_path = f"{avatar_folder}/{yonghuid}/{unique_filename}"
+
+            # 删除旧头像（如果存在）
+            if old_avatar_url and old_avatar_url.strip():
+                delete_from_oss(old_avatar_url)
+
+            # 上传新头像
+            new_avatar_url = upload_to_oss(avatar_file, oss_file_path)
+            if new_avatar_url:
+                logger.info(f"头像上传成功: {oss_file_path}")
+                return oss_file_path
+            else:
+                logger.error("头像上传失败，upload_to_oss 返回 None")
+                return None
+
+        except Exception as e:
+            logger.exception("处理头像上传失败")
+            return None
+
+    # ==================== 新增方法：微信接口相关 ====================
+
+    def _get_access_token(self):
+        """
+        获取微信小程序全局 access_token，带缓存
+        access_token 有效期 7200 秒，提前 300 秒过期
+        """
+        import requests
+        from django.core.cache import cache
+
+        # 尝试从缓存中读取
+        token = cache.get('wechat_access_token')
+        if token:
+            return token
+
+        # 从 settings 读取 AppID 和 AppSecret
+        appid = getattr(settings, 'WEIXIN_APPID', None)
+        secret = getattr(settings, 'WEIXIN_SECRET', None)
+        if not appid or not secret:
+            raise ValueError(
+                'settings.py 中缺少 WECHAT_APPID 或 WECHAT_APPSECRET，'
+                '请添加:\n'
+                "WECHAT_APPID = 'wx0e4be86faac4a8d1'\n"
+                "WECHAT_APPSECRET = '你的小程序密钥'"
+            )
+
+        url = 'https://api.weixin.qq.com/cgi-bin/token'
+        params = {
+            'grant_type': 'client_credential',
+            'appid': appid,
+            'secret': secret
+        }
+        try:
+            resp = requests.get(url, params=params)
+            data = resp.json()
+        except Exception as e:
+            raise Exception(f'请求微信 access_token 接口异常: {str(e)}')
+
+        if 'access_token' in data:
+            token = data['access_token']
+            # 缓存时间设 7100 秒，提前 5 分钟过期
+            cache.set('wechat_access_token', token, timeout=7100)
+            logger.info("成功获取微信 access_token")
+            return token
+        else:
+            errcode = data.get('errcode')
+            errmsg = data.get('errmsg')
+            logger.error(f"获取 access_token 失败: errcode={errcode}, errmsg={errmsg}")
+            raise Exception(f"获取 access_token 失败: {errmsg}")
+
+    def _get_phone_by_code(self, code):
+        """
+        通过微信手机号快速验证组件返回的 code 换取真实手机号
+        接口文档：https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-info/phone-number/getPhoneNumber.html
+        """
+        import requests
+
+        # 先获取有效的 access_token
+        access_token = self._get_access_token()
+
+        # 构建请求 URL
+        url = f'https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token={access_token}'
+
+        # 请求体：code 必须放在 JSON 中
+        payload = {'code': code}
+
+        try:
+            resp = requests.post(url, json=payload, timeout=10)
+            data = resp.json()
+        except Exception as e:
+            raise Exception(f'请求微信手机号解密接口异常: {str(e)}')
+
+        errcode = data.get('errcode')
+        if errcode == 0:
+            phone_info = data.get('phone_info', {})
+            pure_phone = phone_info.get('purePhoneNumber')
+            if not pure_phone:
+                raise Exception('手机号为空，可能用户未授权真实手机号')
+            return pure_phone
+        else:
+            errmsg = data.get('errmsg')
+            logger.error(f"手机号解密失败: errcode={errcode}, errmsg={errmsg}")
+            raise Exception(f'微信接口错误 (errcode={errcode}): {errmsg}')
+
+
+# yonghu/views.py 或 yonghu/api_views.py
+
+from django.utils import timezone
+from django.shortcuts import get_object_or_404
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from rest_framework import status
+from .models import UserMain, UserDashou
+from shangpin.models import Huiyuangoumai, Gsfenhong  # 需要导入会员模型
+import logging
+
+
+class DashouXinxiAPIView(APIView):
+    """
+    获取打手信息接口
+    请求方式：POST
+    认证方式：JWT Token
+    返回：打手基本信息、资产信息、会员信息，金牌打手额外返回专属字段
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取当前登录用户
+            current_user = request.user
+            yonghuid = current_user.yonghuid
+
+            # 2. 查询打手扩展表
+            try:
+                dashou_profile = current_user.dashou_profile
+            except UserDashou.DoesNotExist:
+                return Response({
+                    'code': 400,
+                    'message': '您不是打手身份',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 构建基础信息响应（原有字段完全保留）
+            data = {
+                'dashounicheng': dashou_profile.nicheng or '',
+                'zhanghaostatus': dashou_profile.zhanghaozhuangtai,
+                'zaixianzhuangtai': dashou_profile.zaixianzhuangtai,
+                'dashouzhuangtai': dashou_profile.zhuangtai,
+                'yongjin': str(dashou_profile.yue) if dashou_profile.yue is not None else '0.00',
+                'zonge': str(dashou_profile.zonge) if dashou_profile.zonge is not None else '0.00',
+                'yajin': str(dashou_profile.yajin) if dashou_profile.yajin is not None else '0.00',
+                'chengjiaoliang': dashou_profile.chengjiaozongliang,
+                'jiedanZongliang': dashou_profile.jiedanzongliang if dashou_profile.jiedanzongliang is not None else '0',
+                'jifen': dashou_profile.jifen,
+                'zuijinTixian': str(dashou_profile.jinritixian_jine) if dashou_profile.jinritixian_jine is not None else '0.00',
+                'chenghao': dashou_profile.chenghao or '',
+
+            }
+
+            # 4. 查询会员信息（原有逻辑）
+            huiyuan_list = []
+            try:
+                huiyuan_records = Huiyuangoumai.objects.filter(
+                    yonghu_id=yonghuid
+                ).select_related()
+
+                for record in huiyuan_records:
+                    # 检查会员是否过期
+                    is_expired = record.jiance_shifou_daoqi()
+
+                    # 只返回未过期的会员（huiyuan_zhuangtai = 1）
+                    if record.huiyuan_zhuangtai == 1:
+                        huiyuan_list.append({
+                            'huiyuanid': record.huiyuan_id,
+                            'huiyuanming': record.jieshao or f"会员{record.huiyuan_id}",
+                            'daoqi': record.daoqi_time
+                        })
+            except Exception as e:
+                # 会员信息查询失败不影响主要功能，返回空列表
+                huiyuan_list = []
+
+            data['clumber'] = huiyuan_list
+
+            # 5. 如果是金牌打手，添加专属字段
+            if dashou_profile.chenghao == "金牌打手":
+                data.update({
+                    'jiedanZongliang': dashou_profile.jiedanzongliang,          # 接单总量
+                    'jinriJiedan': str(dashou_profile.jinrishouyi) if dashou_profile.jinrishouyi is not None else '0.00',  # 今日接单金额
+                    'zuijinTixian': str(dashou_profile.jinritixian_jine) if dashou_profile.jinritixian_jine is not None else '0.00',  # 最近提现金额（今日已提现）
+                })
+
+            # 6. 返回成功响应
+            return Response({
+                'code': 200,
+                'message': '获取成功',
+                'data': data
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            # 生产环境应使用 logging 记录错误，而不是 print
+            # logger.error(f"获取打手信息失败: {e}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': f'服务器内部错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+# yonghu/views.py 或 yonghu/api_views.py
+
+class ZaixianZhuangtaiAPIView(APIView):
+    """
+    更改打手在线状态接口
+    请求方式：POST
+    认证方式：JWT Token
+    请求参数：status（0=离线，1=在线）
+    返回：更新后的状态信息
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 1. 获取请求参数
+            new_status = request.data.get('status')
+
+            if new_status is None:
+                return Response({
+                    'code': 400,
+                    'message': '缺少状态参数',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 转换为整数，确保是0或1
+            try:
+                new_status = int(new_status)
+                if new_status not in [0, 1]:
+                    return Response({
+                        'code': 400,
+                        'message': '状态参数必须是0或1',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+            except ValueError:
+                return Response({
+                    'code': 400,
+                    'message': '状态参数必须是整数',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 获取当前登录用户
+            current_user = request.user
+            yonghuid = current_user.yonghuid
+
+
+
+            # 3. 查询打手扩展表
+            try:
+                dashou_profile = current_user.dashou_profile
+            except UserDashou.DoesNotExist:
+
+                return Response({
+                    'code': 400,
+                    'message': '您不是打手身份',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 4. 检查账号状态（是否被封禁）
+            if dashou_profile.zhanghaozhuangtai != 1:
+
+                return Response({
+                    'code': 403,
+                    'message': '账号状态异常，无法更改在线状态',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+
+            # 5. 更新在线状态
+            old_status = dashou_profile.zaixianzhuangtai
+
+            # 如果状态没有变化，直接返回成功
+            if old_status == new_status:
+
+                return Response({
+                    'code': 200,
+                    'message': '状态未变化',
+                    'data': {
+                        'zaixianzhuangtai': new_status,
+                        'status_text': '在线' if new_status == 1 else '离线'
+                    }
+                }, status=status.HTTP_200_OK)
+
+            # 更新状态
+            dashou_profile.zaixianzhuangtai = new_status
+            dashou_profile.save()
+
+
+
+            # 6. 返回成功响应
+            return Response({
+                'code': 200,
+                'message': '状态更新成功',
+                'data': {
+                    'zaixianzhuangtai': new_status,
+                    'status_text': '在线' if new_status == 1 else '离线'
+                }
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+
+            return Response({
+                'code': 500,
+                'message': f'服务器内部错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+from shangpin.models import Gsfenhong  # 需要导入会员模型
+class GuanshiXinxiView(APIView):
+    """
+    获取管事信息接口
+    路径：/yonghu/guanshixinxi
+    方法：POST
+    权限：JWT认证
+    功能：获取当前管事的详细信息，包括基本信息、分红信息以及已充值打手数量
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 获取当前用户（通过JWT认证）
+            current_user = request.user
+
+            # 查询管事扩展表
+            try:
+                guanshi_profile = UserGuanshi.objects.get(user=current_user)
+
+                # 🔥【新增】查询已充值打手数量（从分红表中统计）
+                # Gsfenhong 表中 guanshi 字段存储管事ID（yonghuid）
+                yichongzhi_count = Gsfenhong.objects.filter(guanshi=current_user.yonghuid).count()
+
+                # 返回管事信息
+                return Response({
+                    'code': 200,
+                    'msg': '获取成功',
+                    'data': {
+                        'gszhstatus': guanshi_profile.zhuangtai,                 # 管事账号状态
+                        'yaoqingzongshu': guanshi_profile.yaogingshuliang,       # 邀请打手总数
+                        'fenyongzonge': float(guanshi_profile.chongzhifenrun),   # 充值分佣总额
+                        'fenyongtixian': float(guanshi_profile.yue),             # 可提现余额
+                        'yichongzhiDashou': yichongzhi_count,                    # 已充值打手数量
+                    }
+                })
+
+            except UserGuanshi.DoesNotExist:
+                # 用户不是管事，返回错误
+                return Response({
+                    'code': 400,
+                    'msg': '您还不是管事，请先注册',
+                    'data': None
+                }, status=400)
+
+        except Exception as e:
+            # 捕获所有异常，返回错误信息并记录日志
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.error(f"获取管事信息异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'msg': f'获取信息失败: {str(e)}',
+                'data': None
+            }, status=500)
+
+
+
+
+# yonghu/views.py
+
+from rest_framework import status
+from django.core.exceptions import ObjectDoesNotExist
+
+
+
+
+from django.db.models import Sum
+from houtai.models import ShangjiaRiTongji        # 商家日统计表
+class ShangJiaXinXiView(APIView):
+    """
+    获取商家信息接口 (POST /yonghu/shangjiaxinxi)
+    权限：需JWT认证
+    返回：商家基本信息 + 称号列表 + 今日/本月统计
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 获取商家扩展资料
+            shangjia = request.user.shop_profile
+        except ObjectDoesNotExist:
+            return Response({
+                'code': 4001,
+                'msg': '您还未注册成为商家或商家资料不存在',
+                'data': None
+            }, status=status.HTTP_200_OK)
+
+        user = request.user
+        yonghuid = user.yonghuid
+        today = timezone.now().date()
+        this_month_start = today.replace(day=1)
+
+        # ------------------- 1. 从 UserShangjia 获取基础字段 -------------------
+        response_data = {
+            'sjzhzhuangtai': shangjia.zhuangtai,      # 商家账号状态
+            'fadanzong': shangjia.fabu,               # 发单总量（累计）
+            'tuikuanzong': shangjia.tuikuan,          # 退款总量（累计）
+            'sjyue': float(shangjia.yue),             # 商家余额
+            # 'riliushui' 和 'yueliushui' 将从统计表计算，不再使用原字段
+        }
+
+        # ------------------- 2. 获取称号列表（仅限商家称号） -------------------
+        chenghao_list = []
+        # 查询当前用户的所有称号关联
+        yonghu_chenghao_qs = YonghuChenghao.objects.filter(yonghu=user).select_related('chenghao')
+        for yc in yonghu_chenghao_qs:
+            chenghao_obj = yc.chenghao
+            # 只保留类型为“商家”的称号
+            if chenghao_obj.leixing == 'shangjia':
+                chenghao_list.append({
+                    'mingcheng': chenghao_obj.mingcheng,
+                    'texiao_json': chenghao_obj.texiao_miaoshu,  # 前端需要的特效描述
+                    # 如果还需要其他字段（如图标URL）可在此添加，打手端有 texiao_json
+                })
+        response_data['chenghao_list'] = chenghao_list
+
+        # ------------------- 3. 从 ShangjiaRiTongji 获取今日统计 -------------------
+        try:
+            today_stat = ShangjiaRiTongji.objects.get(yonghuid=yonghuid, riqi=today)
+            jinri_paifa_dingdan = today_stat.paifa_dingdan_shu
+            jinri_paifa_jine = float(today_stat.paifa_jine)
+            jinri_tuikuan_dingdan = today_stat.tuikuan_dingdan_shu
+        except ShangjiaRiTongji.DoesNotExist:
+            jinri_paifa_dingdan = 0
+            jinri_paifa_jine = 0.00
+            jinri_tuikuan_dingdan = 0
+
+        response_data['jinripaidan'] = jinri_paifa_dingdan          # 今日派单数（新增）
+        response_data['jinrituikuan'] = jinri_tuikuan_dingdan       # 今日退款数（新增）
+        response_data['riliushui'] = jinri_paifa_jine               # 今日流水（派发总金额）
+
+        # ------------------- 4. 从 ShangjiaRiTongji 获取本月统计 -------------------
+        month_stats = ShangjiaRiTongji.objects.filter(
+            yonghuid=yonghuid,
+            riqi__gte=this_month_start,
+            riqi__lte=today
+        ).aggregate(
+            total_paifa_jine=Sum('paifa_jine'),
+            total_paifa_dingdan=Sum('paifa_dingdan_shu')
+        )
+        yue_paifa_jine = float(month_stats.get('total_paifa_jine') or 0.00)
+        # yue_paifa_dingdan = month_stats.get('total_paifa_dingdan') or 0  # 如果前端不需要可不加
+
+        response_data['yueliushui'] = yue_paifa_jine                # 今月流水（派发总金额）
+
+        # （可选）如果前端还需要今月派单总数，取消下面注释
+        # response_data['jinyuepaidan'] = yue_paifa_dingdan
+
+        return Response({
+            'code': 200,
+            'msg': '获取商家信息成功',
+            'data': response_data
+        }, status=status.HTTP_200_OK)
+
+
+
+
+'''class ShangJiaXinXiView(APIView):
+    """
+    获取商家信息接口 (POST /yonghu/shangjiaxinxi)
+    权限：需JWT认证
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 关键：使用 get() 方法。如果反向关联不存在，会抛出 UserShangjia.DoesNotExist 异常。
+            shangjia = request.user.shop_profile
+            # 如果反向关系存在，但你想更显式地查询，也可以这样写（效果相同）：
+            # shangjia = UserShangjia.objects.get(user=request.user)
+
+        except ObjectDoesNotExist:
+            # 捕获“不存在”异常，说明当前用户还没有商家扩展资料
+            return Response({
+                'code': 4001,  # 你可以定义特定的业务错误码
+                'msg': '您还未注册成为商家或商家资料不存在',
+                'data': None
+            }, status=status.HTTP_200_OK) # 业务错误，HTTP状态码通常仍用200
+
+        # 构建返回给前端的数据
+        response_data = {
+            'sjzhzhuangtai': shangjia.zhuangtai,  # 商家账号状态
+            'fadanzong': shangjia.fabu,            # 发单总量
+            'tuikuanzong': shangjia.tuikuan,       # 退款总量
+            'sjyue': float(shangjia.yue),          # 商家余额
+            'riliushui': float(shangjia.jinriliushui),  # 今日流水
+            'yueliushui': float(shangjia.jinyueliushui), # 今月流水
+        }
+
+        return Response({
+            'code': 200,
+            'msg': '获取商家信息成功',
+            'data': response_data
+        })'''
+
+
+
+
+class BossBiaoshiView(APIView):
+    """
+    获取用户的GoEasy标识 - 极简实现
+    POST /yonghu/bossbiaoshi
+    需要JWT Token认证
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 1. 直接从request.user获取用户
+        user = request.user
+
+        # 2. 获取yonghuid（确保用户已登录）
+        if not user or not hasattr(user, 'yonghuid'):
+            return Response({
+                'code': 401,
+                'msg': '用户未认证或用户信息不完整'
+            }, status=401)
+
+        # 3. 生成标识：Boss + yonghuid（与前端约定）
+        boss_biaoshi = f"Boss{user.yonghuid}"
+
+        # 4. 返回给前端
+        return Response({
+            'code': 200,
+            'msg': '获取成功',
+            'data': {
+                'boss_biaoshi': boss_biaoshi,
+                'yonghuid': user.yonghuid,
+                'user_type': user.user_type
+            }
+        })
+
+
+"""
+阿龙电竞陪玩平台 - 邀请码相关API接口
+"""
+
+from utils.yaoqingma_utils import chuangjianYaoqingma, yanzhengYaoqingmaWeiyixing
+
+
+class YaoqingmaView(APIView):
+    """
+    获取或生成管事邀请码
+    访问路径: /api/yonghu/yaoqingma/
+    请求方法: GET
+    权限要求: JWT Token认证通过的用户
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        """
+        获取当前用户的邀请码
+        逻辑:
+          1. 通过JWT获取当前用户 (request.user)
+          2. 反向查询UserGuanshi扩展表
+          3. 验证管事状态(zhuangtai=1)
+          4. 已有邀请码直接返回，没有则生成并保存
+        """
+        # 获取当前认证用户
+        current_user = request.user
+
+        # 1. 使用反向查询获取管事扩展信息 (性能最优方式)
+        try:
+            guanshi_profile = current_user.guanshi_profile
+        except UserGuanshi.DoesNotExist:
+            # 用户不是管事，没有扩展表记录
+            return Response({
+                'code': 403,
+                'message': '当前用户不是管事身份，无法生成邀请码',
+                'data': None
+            }, status=status.HTTP_403_FORBIDDEN)
+
+        # 2. 验证管事状态 (zhuangtai 必须等于 1)
+        if guanshi_profile.zhuangtai != 1:
+            return Response({
+                'code': 403,
+                'message': '管事账号状态异常，无法生成邀请码',
+                'data': None
+            }, status=status.HTTP_403_FORBIDDEN)
+
+        # 3. 检查是否已存在邀请码
+        existing_yaoqingma = guanshi_profile.yaoqingma
+
+        # 如果存在且非空，直接返回
+        if existing_yaoqingma and existing_yaoqingma.strip() != '':
+            return Response({
+                'code': 200,
+                'message': '成功获取现有邀请码',
+                'data': {
+                    'yaoqingma': existing_yaoqingma,
+                    'is_new': False  # 标记是否为新生成的
+                }
+            })
+
+        # 4. 生成新的邀请码 (使用用户ID字符串)
+        # 注意: 这里使用yonghuid，不是主键id，如你要求的"123456"这种形式
+        yonghuid_str = str(current_user.yonghuid)
+        new_yaoqingma = chuangjianYaoqingma(yonghuid_str)
+
+        # 5. 验证生成的邀请码格式
+        if not yanzhengYaoqingmaWeiyixing(new_yaoqingma):
+            return Response({
+                'code': 500,
+                'message': '邀请码生成失败，格式验证错误',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 6. 保存到数据库 (使用事务确保数据一致性)
+        try:
+            with transaction.atomic():
+                guanshi_profile.yaoqingma = new_yaoqingma
+                guanshi_profile.save()
+        except Exception as e:
+            # 这里可以记录日志
+            return Response({
+                'code': 500,
+                'message': f'保存邀请码到数据库失败: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 7. 返回新生成的邀请码
+        return Response({
+            'code': 200,
+            'message': '成功生成新的邀请码',
+            'data': {
+                'yaoqingma': new_yaoqingma,
+                'is_new': True  # 标记是新生成的
+            }
+        })
+
+
+
+"""
+阿龙电竞陪玩平台 - 打手注册及相关API接口
+"""
+
+from shangpin.models import Huiyuangoumai  # 导入会员购买模型
+from utils.yaoqingma_utils import chuangjianYaoqingma  # 导入之前写的邀请码生成算法
+
+import traceback
+
+_dashou_zhuce_logger = logging.getLogger('yonghu.dashouzhuce')
+
+
+class DashouZhuceView(APIView):
+    """
+    打手注册接口 (通过管事邀请码)
+    访问路径: /api/yonghu/dashouzhuce/
+    请求方法: POST
+    权限要求: JWT Token认证通过的用户
+    请求体: { "inviteCode": "AbC123..." }
+    """
+    permission_classes = [IsAuthenticated]
+
+    def _log_dashou_zhuce_error(self, invite_code, yonghuid, exc):
+        """500 时打印完整堆栈，便于排查（gunicorn/1panel 可抓 stderr）。"""
+        err_text = traceback.format_exc()
+        _dashou_zhuce_logger.exception(
+            '打手注册失败 inviteCode=%s yonghuid=%s error=%s',
+            invite_code, yonghuid, exc,
+        )
+        print(
+            f'[DashouZhuce ERROR] inviteCode={invite_code} yonghuid={yonghuid} error={exc}\n{err_text}',
+            flush=True,
+        )
+
+    def post(self, request):
+        yaoqingma = ''
+        current_user = request.user
+        yonghuid = getattr(current_user, 'yonghuid', '')
+
+        try:
+            # 1. 获取并验证邀请码参数
+            yaoqingma = request.data.get('inviteCode')
+            if not yaoqingma:
+                return Response({
+                    'code': 400,
+                    'message': '邀请码不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            yaoqingma = yaoqingma.strip()
+            if len(yaoqingma) > 100:
+                return Response({
+                    'code': 400,
+                    'message': '邀请码长度超过限制',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 检查用户是否已是打手 (使用反向查询，性能最优)
+            try:
+                dashou_profile = current_user.dashou_profile
+                # 用户已是打手，直接返回现有信息
+                return self.fanhuiXianyouDashouXinxi(dashou_profile, current_user)
+            except UserDashou.DoesNotExist:
+                # 用户不是打手，继续注册流程
+                pass
+
+            # 3. 根据邀请码查找对应的管事
+            try:
+                guanshi_profile = UserGuanshi.objects.select_related('user').get(yaoqingma=yaoqingma)
+            except UserGuanshi.DoesNotExist:
+                return Response({
+                    'code': 404,
+                    'message': '邀请码无效或不存在',
+                    'data': None
+                }, status=status.HTTP_404_NOT_FOUND)
+
+            # 4. 验证管事状态
+            '''if guanshi_profile.zhuangtai != 1:
+                return Response({
+                    'code': 403,
+                    'message': '该邀请码对应的管事账号已被禁用',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)'''
+
+            # 5. 核心：在数据库事务中创建用户的所有身份
+            with transaction.atomic():
+                guanshi_yonghuid = guanshi_profile.user.yonghuid
+
+                dashou_profile = UserDashou.objects.create(
+                    user=current_user,
+                    nicheng='大手子',
+                    chenghao='普通大手',
+                    yaoqingren=guanshi_yonghuid,
+                )
+
+                locked_guanshi = UserGuanshi.objects.select_for_update().get(pk=guanshi_profile.pk)
+                locked_guanshi.yaogingshuliang += 1
+                locked_guanshi.save()
+
+                # 管事每日统计（邀请打手）— 失败不影响注册主流程
+                try:
+                    from decimal import Decimal
+                    from houtai.utils import update_guanshi_daily_by_action
+                    update_guanshi_daily_by_action(
+                        yonghuid=guanshi_yonghuid,
+                        action=1,
+                        amount=Decimal('0.00')
+                    )
+                    _dashou_zhuce_logger.info('管事每日统计更新成功（邀请打手）：管事%s', guanshi_yonghuid)
+                except Exception as stat_err:
+                    _dashou_zhuce_logger.warning('管事每日统计更新失败（邀请打手）：%s', stat_err)
+
+            # 6. 注册成功，返回信息
+            fanhui_data = self.zhuangbeiFanhuiShuju(dashou_profile, current_user, is_new=True)
+            return Response({
+                'code': 200,
+                'message': '注册成功！已开通打手、商家、管事身份。',
+                'data': fanhui_data
+            })
+
+        except Exception as e:
+            self._log_dashou_zhuce_error(yaoqingma, yonghuid, e)
+            return Response({
+                'code': 500,
+                'message': f'注册过程中发生系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def fanhuiXianyouDashouXinxi(self, dashou_profile, current_user):
+        """处理已是打手的用户，返回其现有信息"""
+        fanhui_data = self.zhuangbeiFanhuiShuju(dashou_profile, current_user, is_new=False)
+        return Response({
+            'code': 200,
+            'message': '您已是打手，返回当前信息。',
+            'data': fanhui_data
+        })
+
+    def zhuangbeiFanhuiShuju(self, dashou_profile, current_user, is_new=False):
+        """准备返回给前端的打手数据，字段名严格匹配前端"""
+
+
+
+        # 构建基础信息
+        data = {
+            'dashounicheng': dashou_profile.nicheng,
+            'zhanghaostatus': dashou_profile.zhanghaozhuangtai,
+            'yongjin': str(dashou_profile.yue),  # Decimal转字符串
+            'zonge': str(dashou_profile.zonge),
+            'yajin': str(dashou_profile.yajin),
+            'chenghao': dashou_profile.chenghao,
+            'jinfen': dashou_profile.jifen,
+            'chengjiaoliang': dashou_profile.chengjiaozongliang,
+            'zaixianzhuangtai': dashou_profile.zaixianzhuangtai,
+            'dashouzhuangtai': dashou_profile.zhuangtai,
+        }
+
+        # 查询并处理会员列表 (clumber)
+        # 使用当前用户的yonghuid进行查询
+        huiyuan_goumai_list = []
+        if not is_new:  # 如果是新用户，直接返回空列表，无需查询
+            goumai_records = Huiyuangoumai.objects.filter(yonghu_id=current_user.yonghuid)
+            for record in goumai_records:
+                # 调用方法检查是否到期，此方法内部会更新状态
+                shifou_daoqi = record.jiance_shifou_daoqi()
+                huiyuan_goumai_list.append({
+                    'huiyuan_id': record.huiyuan_id,
+                    'huiyuan_zhuangtai': record.huiyuan_zhuangtai,
+                    'daoqi_time': record.daoqi_time.isoformat() if record.daoqi_time else None,
+                    'shifou_daoqi': shifou_daoqi,
+                    'jieshao': record.jieshao
+                })
+
+        data['clumber'] = huiyuan_goumai_list
+        return data
+
+
+
+
+from django.core.paginator import Paginator, EmptyPage
+
+
+'''class GuanshiYaoqingDashouListView(APIView):
+    """
+    管事获取邀请的打手列表接口
+    访问路径: /api/yonghu/gshqyqds/
+    请求方法: POST
+    权限要求: JWT Token认证通过的用户（管事）
+    请求体: {
+        "page": 1,      // 当前页码（从1开始）
+        "pageSize": 30  // 每页条数
+    }
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        """
+        获取当前管事邀请的打手列表（分页）
+        """
+        try:
+            current_user = request.user
+
+            # 1. 获取并验证分页参数
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('pageSize', 30))
+
+            if page < 1 or page_size < 1:
+                return Response({
+                    'code': 400,
+                    'message': '分页参数必须大于0',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 限制每页最大数量，防止恶意请求
+            if page_size > 100:
+                page_size = 100
+
+            # 2. 获取当前管事的用户ID（yonghuid）
+            guanshi_yonghuid = current_user.yonghuid
+
+            with transaction.atomic():
+                # 3. 【性能关键】联表查询：一次性获取打手扩展表及其关联的主表信息
+                # 使用 select_related('user') 将打手表和用户主表在SQL层进行JOIN，避免N+1查询
+                # 过滤条件：打手表的邀请人ID(yaoqingren)等于当前管事的用户ID
+                dashou_queryset = UserDashou.objects.select_related('user').filter(
+                    yaoqingren=guanshi_yonghuid
+                ).order_by('-create_time')  # 按创建时间倒序，最新的在前面
+
+                # 4. 使用Django分页器进行分页（比手动切片更规范，能自动处理异常页码）
+                paginator = Paginator(dashou_queryset, page_size)
+
+                try:
+                    current_page_data = paginator.page(page)
+                except EmptyPage:
+                    # 如果请求的页码超出范围，返回空列表
+                    current_page_data = []
+                    has_more = False
+                    total_count = len(dashou_queryset)
+                else:
+                    # 计算是否还有更多数据
+                    has_more = current_page_data.has_next()
+                    total_count = paginator.count
+
+                # 5. 构建打手列表数据
+                dashou_list = []
+                for dashou in current_page_data:
+                    # 直接从联表查询结果中获取主表信息（dashou.user）
+                    user_main = dashou.user
+
+                    dashou_list.append({
+                        'uid': user_main.yonghuid,  # 从主表获取用户ID
+                        'nicheng': dashou.nicheng or '打手子',  # 打手昵称
+                        'zaixianzhuangtai': dashou.zaixianzhuangtai,  # 在线状态
+                        'zhanghaozhuangtai': dashou.zhanghaozhuangtai,  # 账号状态
+                        'touxiang': user_main.avatar or '',  # 头像相对URL（前端需拼接OSS地址）
+                        # 以下为额外信息，前端可能显示在卡片上
+                        'jiedanzongliang': dashou.jiedanzongliang,  # 接单总量
+                        'chengjiaozongliang': dashou.chengjiaozongliang,  # 成交总量
+                        'yue': str(dashou.zonge),  # 可提现余额（Decimal转字符串）
+                    })
+
+                # 6. 获取管事的邀请总数（从管事扩展表获取）
+                try:
+                    guanshi_profile = current_user.guanshi_profile
+                    yaoqingzongshu = guanshi_profile.yaogingshuliang
+                except:
+                    # 如果获取失败（理论上不会，因为用户已登录且是管事），则从查询结果计数
+                    yaoqingzongshu = total_count
+
+                # 7. 构建响应数据
+                response_data = {
+                    'dashouList': dashou_list,  # 打手列表
+                    'yaoqingzongshu': yaoqingzongshu,  # 邀请打手总数
+                    'currentPage': page,  # 当前页码
+                    'pageSize': page_size,  # 每页条数
+                    'totalCount': total_count,  # 符合条件的总记录数
+                    'hasMore': has_more,  # 是否还有更多数据（前端据此决定是否显示"上拉加载"）
+                }
+
+                return Response({
+                    'code': 200,
+                    'message': '获取成功',
+                    'data': response_data
+                })
+
+        except ValueError:
+            # 分页参数转换错误
+            return Response({
+                'code': 400,
+                'message': '分页参数格式错误',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+        except Exception as e:
+            # 记录详细的异常信息，便于调试
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.error(f'获取打手列表失败: {str(e)}', exc_info=True)
+
+            return Response({
+                'code': 500,
+                'message': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)'''
+
+
+
+
+class HuoQuYaoQingRenView(APIView):
+    """
+    获取当前打手的邀请人信息
+    POST /yonghu/hqwdyqr
+    Headers: Authorization: Bearer <token>
+    返回邀请人的用户ID、昵称（来自老板扩展表）、头像相对URL
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            current_user = request.user                     # 当前登录用户
+            yonghuid = current_user.yonghuid                # 7位用户ID
+
+            # 1. 校验打手身份及账号状态（只检查账号状态，不检查接单状态）
+            try:
+                dashou = UserDashou.objects.get(user=current_user)
+                if dashou.zhanghaozhuangtai != 1:
+                    return Response({
+                        'code': 403,
+                        'message': '您的账号已被封禁，无法查看邀请人',
+                        'data': None
+                    })
+            except UserDashou.DoesNotExist:
+                return Response({
+                    'code': 404,
+                    'message': '您还不是打手，无法查看邀请人',
+                    'data': None
+                })
+
+            # 2. 获取邀请人ID
+            yaoqingren_id = dashou.yaoqingren
+            if not yaoqingren_id:
+                return Response({
+                    'code': 404,
+                    'message': '您没有邀请人',
+                    'data': None
+                })
+
+            # 3. 查询邀请人主表（头像）
+            try:
+                inviter_main = UserMain.objects.get(yonghuid=yaoqingren_id)
+                touxiang = inviter_main.avatar or ''
+            except UserMain.DoesNotExist:
+                return Response({
+                    'code': 404,
+                    'message': '邀请人信息不存在',
+                    'data': None
+                })
+
+            # 4. 查询老板扩展表（昵称），如果没有则使用空字符串
+            nicheng = ''
+            try:
+                boss = UserBoss.objects.get(user=inviter_main)
+                nicheng = boss.nickname or ''
+            except UserBoss.DoesNotExist:
+                pass  # 邀请人可能不是老板，昵称留空
+
+            response_data = {
+                'uid': yaoqingren_id,
+                'nicheng': nicheng,
+                'touxiang': touxiang                   # 相对路径，前端自行拼接
+            }
+
+            return Response({
+                'code': 200,
+                'message': '获取成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            logger.error(f'获取邀请人失败: {str(e)}', exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '系统繁忙，请稍后重试',
+                'data': None
+            })
+
+class GuanshiYaoqingDashouListView(APIView):
+    """
+    管事获取已邀请打手列表（支持筛选、搜索、分页）
+    POST /api/yonghu/gshqyqds/
+    Headers: Authorization: Bearer <token>
+    Body:
+    {
+        "page": 1,                // 页码，从1开始
+        "pageSize": 30,           // 每页条数，最大100
+        "keyword": "",            // 搜索关键词（用户ID或昵称）
+        "zhanghaozhuangtai": 1,  // 账号状态：1=正常，2=封禁（可选）
+        "zaixianzhuangtai": 1    // 在线状态：1=在线，2=离线（可选）
+    }
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            current_user = request.user
+            guanshi_yonghuid = current_user.yonghuid
+
+            # 1. 分页参数
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('pageSize', 30))
+            if page < 1 or page_size < 1:
+                return Response({'code': 400, 'message': '分页参数必须大于0'}, status=400)
+            if page_size > 100:
+                page_size = 100
+
+            # 2. 筛选参数
+            keyword = request.data.get('keyword', '').strip()
+            zhanghaozhuangtai = request.data.get('zhanghaozhuangtai')  # 可选：1=正常，2=封禁
+            zaixianzhuangtai = request.data.get('zaixianzhuangtai')    # 可选：1=在线，2=离线
+
+            # 3. 基础查询：当前管事邀请的所有打手
+            base_qs = UserDashou.objects.select_related('user').filter(
+                yaoqingren=guanshi_yonghuid
+            )
+
+            # 4. 全局统计（不受筛选影响，直接基于 base_qs）
+            total_all = base_qs.count()
+            zaixian_all = base_qs.filter(zaixianzhuangtai=1).count()
+            zhengchang_all = base_qs.filter(zhanghaozhuangtai=1).count()
+            fengjin_all = total_all - zhengchang_all
+
+            # 5. 应用筛选条件
+            if keyword:
+                base_qs = base_qs.filter(
+                    Q(nicheng__icontains=keyword) | Q(user__yonghuid__icontains=keyword)
+                )
+            if zhanghaozhuangtai is not None:
+                try:
+                    val = int(zhanghaozhuangtai)
+                    if val == 1:
+                        base_qs = base_qs.filter(zhanghaozhuangtai=1)
+                    else:
+                        base_qs = base_qs.exclude(zhanghaozhuangtai=1)
+                except (ValueError, TypeError):
+                    pass
+            if zaixianzhuangtai is not None:
+                try:
+                    val = int(zaixianzhuangtai)
+                    if val == 1:
+                        base_qs = base_qs.filter(zaixianzhuangtai=1)
+                    else:
+                        base_qs = base_qs.exclude(zaixianzhuangtai=1)
+                except (ValueError, TypeError):
+                    pass
+
+            # 6. 排序和分页
+            base_qs = base_qs.order_by('-create_time')
+            paginator = Paginator(base_qs, page_size)
+            try:
+                page_obj = paginator.page(page)
+            except EmptyPage:
+                page_obj = []
+                has_more = False
+                filtered_total = paginator.count if paginator.count else 0
+            else:
+                has_more = page_obj.has_next()
+                filtered_total = paginator.count
+
+            # 7. 构建打手列表
+            dashou_list = []
+            for dashou in page_obj:
+                user_main = dashou.user
+                dashou_list.append({
+                    'uid': user_main.yonghuid,
+                    'nicheng': dashou.nicheng or '打手',
+                    'zaixianzhuangtai': dashou.zaixianzhuangtai,
+                    'zhanghaozhuangtai': dashou.zhanghaozhuangtai,
+                    'touxiang': user_main.avatar or '',
+                    'jiedanzongliang': dashou.jiedanzongliang,
+                    'chengjiaozongliang': dashou.chengjiaozongliang,
+                    'tuikuanliang': dashou.tuikuanliang,
+                    'yue': str(dashou.zonge),
+                })
+
+            # 8. 获取管事邀请总数（来自管事扩展表）
+            try:
+                yaoqingzongshu = current_user.guanshi_profile.yaogingshuliang
+            except Exception:
+                yaoqingzongshu = total_all
+
+            response_data = {
+                'dashouList': dashou_list,
+                'yaoqingzongshu': yaoqingzongshu,      # 邀请总数（全局）
+                'totalCount': filtered_total,           # 当前筛选条件下的总数
+                'zaixianCount': zaixian_all,            # 全局在线
+                'zhengchangCount': zhengchang_all,      # 全局正常
+                'fengjinCount': fengjin_all,            # 全局封禁
+                'currentPage': page,
+                'pageSize': page_size,
+                'hasMore': has_more,
+            }
+
+            return Response({'code': 200, 'message': '获取成功', 'data': response_data})
+
+        except ValueError:
+            return Response({'code': 400, 'message': '分页参数格式错误'}, status=400)
+        except Exception as e:
+            logger.error(f'获取打手列表失败: {str(e)}', exc_info=True)
+            return Response({'code': 500, 'message': '系统错误'}, status=500)
+
+
+from rest_framework.views import APIView
+from rest_framework import permissions, status
+from rest_framework.response import Response
+from django.db import transaction
+from .models import UserMain, UserDashou, UserGuanshi, Tixianjilu
+import os
+import uuid
+from utils.oss_utils import validate_image, upload_to_oss, delete_from_oss
+
+class TixianXinxiHuoquView(APIView):
+    """
+    获取用户提现收款信息接口
+    返回用户已设置的手机号、收款码、收款账号
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        """
+        处理获取收款信息的POST请求
+        直接返回用户当前的收款设置
+        """
+        try:
+            # 从request.user获取当前用户
+            user_main = request.user
+
+            # 🔥【修改开始 - 使用Decimal，字段名是lilu】
+            # 查询打手提现费率 (fadanpingtai='5')
+            dashou_rate_obj = Lilubiao.objects.filter(fadanpingtai='5').first()
+            dashou_rate = decimal.Decimal(str(dashou_rate_obj.lilu)) if dashou_rate_obj else decimal.Decimal('0.00')
+
+            # 查询管事提现费率 (fadanpingtai='6')
+            guanshi_rate_obj = Lilubiao.objects.filter(fadanpingtai='6').first()
+            guanshi_rate = decimal.Decimal(str(guanshi_rate_obj.lilu)) if guanshi_rate_obj else decimal.Decimal('0.00')
+            # 🔥【修改结束】
+
+            # 构建返回数据
+            response_data = {
+                'txdianhua': user_main.phone if user_main.phone else '',
+                'txtupian': user_main.zhifu if user_main.zhifu else '',
+                'txzh': user_main.skzhanghao if user_main.skzhanghao else '',
+                # 🔥【修改开始】
+                'dashou_rate': dashou_rate,   # 打手提现费率
+                'guanshi_rate': guanshi_rate, # 管事提现费率
+                # 🔥【修改结束】
+            }
+
+            # 返回成功响应
+            return Response({
+                'code': 0,
+                'msg': '获取成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            return Response({
+                'code': 99,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+'''class TixianXinxiHuoquView(APIView):
+    """
+    获取用户提现收款信息接口
+    返回用户已设置的手机号、收款码、收款账号
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        """
+        处理获取收款信息的POST请求
+        直接返回用户当前的收款设置
+        """
+        try:
+            # 从request.user获取当前用户
+            user_main = request.user
+
+            # 构建返回数据
+            response_data = {
+                'txdianhua': user_main.phone if user_main.phone else '',
+                'txtupian': user_main.zhifu if user_main.zhifu else '',
+                'txzh': user_main.skzhanghao if user_main.skzhanghao else ''
+            }
+
+            # 返回成功响应
+            return Response({
+                'code': 0,
+                'msg': '获取成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            return Response({
+                'code': 99,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+from rest_framework.parsers import MultiPartParser, FormParser'''
+
+
+class ShoukuanXinxiShangchuanView(APIView):
+    """
+    上传用户收款信息接口
+    支持同时上传手机号、收款账号、收款码图片
+    使用multipart/form-data格式
+    """
+    permission_classes = [permissions.IsAuthenticated]
+    parser_classes = (MultiPartParser, FormParser,JSONParser)
+
+    def post(self, request):
+        """
+        处理上传收款信息的POST请求
+        验证并保存用户的收款设置
+        """
+        try:
+            # 获取当前用户
+            user_main = request.user
+            yonghuid = user_main.yonghuid
+
+            # 准备响应数据
+            response_data = {}
+
+            # 1. 验证必填字段：手机号必须要有
+            txdianhua = request.data.get('txdianhua', '').strip()
+            if not txdianhua:
+                return Response({
+                    'code': 1,
+                    'msg': '收款人电话不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 验证手机号格式（11位数字）
+            if not txdianhua.isdigit() or len(txdianhua) != 11:
+                return Response({
+                    'code': 2,
+                    'msg': '请输入11位有效的手机号码',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 获取收款账号（可能为空）
+            txzh = request.data.get('txzh', '').strip()
+
+            # 3. 处理收款码图片上传（如果有）
+            txtupian_file = request.FILES.get('file')  # 注意：前端upload.js使用'file'作为字段名
+            txtupian_url = ''
+
+            if txtupian_file:
+                # 验证图片
+                is_valid, error_msg = validate_image(txtupian_file)
+                if not is_valid:
+                    return Response({
+                        'code': 3,
+                        'msg': f'图片验证失败: {error_msg}',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 上传收款码图片
+                txtupian_url = self.handle_shoukuanma_upload(user_main, txtupian_file)
+                if txtupian_url:
+                    response_data['txtupian'] = txtupian_url
+                else:
+                    return Response({
+                        'code': 4,
+                        'msg': '收款码上传失败',
+                        'data': None
+                    }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+            else:
+                response_data['txtupian'] = ''
+
+            # 4. 验证收款账号和收款码至少有一个
+            if not txzh and not txtupian_url:
+                return Response({
+                    'code': 5,
+                    'msg': '请填写收款账号或上传收款码',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 5. 保存所有信息到数据库
+            with transaction.atomic():
+                user_main.phone = txdianhua
+                user_main.skzhanghao = txzh if txzh else ''
+
+                # 只有上传了图片才更新zhifu字段
+                if txtupian_url:
+                    user_main.zhifu = txtupian_url
+
+                user_main.save()
+
+            # 6. 构建完整的返回数据
+            response_data['txdianhua'] = txdianhua
+            response_data['txzh'] = txzh if txzh else ''
+
+            # 7. 返回成功响应
+            return Response({
+                'code': 0,
+                'msg': '收款信息设置成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            import traceback
+            traceback.print_exc()  # 打印详细错误信息到控制台
+            return Response({
+                'code': 99,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def handle_shoukuanma_upload(self, user_main, image_file):
+        """
+        处理收款码图片上传到腾讯云COS
+        存储路径: tixian/{yonghuid}/{yonghuid}.扩展名
+        """
+        try:
+            yonghuid = user_main.yonghuid
+            if not yonghuid:
+                return None
+
+            # 获取旧收款码URL
+            old_shoukuanma_url = user_main.zhifu
+
+            # 生成文件扩展名
+            file_name = image_file.name
+            file_extension = os.path.splitext(file_name)[1].lower()
+            if not file_extension:
+                file_extension = '.jpg'
+
+            # 构建OSS文件路径: tixian/{yonghuid}/{yonghuid}{扩展名}
+            # 使用用户ID作为文件名，确保同一用户多次上传会覆盖
+            oss_file_name = f"{yonghuid}{file_extension}"
+            oss_file_path = f"tixian/{yonghuid}/{oss_file_name}"
+
+            # 删除旧收款码（如果存在）
+            if old_shoukuanma_url and old_shoukuanma_url.strip():
+                delete_from_oss(old_shoukuanma_url)
+
+            # 上传新收款码到OSS
+            new_shoukuanma_url = upload_to_oss(image_file, oss_file_path)
+
+            if new_shoukuanma_url:
+                # 返回相对路径（从tixian文件夹开始）
+                return oss_file_path
+            else:
+                return None
+
+        except Exception as e:
+            print(f"处理收款码上传失败: {e}")
+            return None
+
+
+from rest_framework.views import APIView
+from rest_framework import permissions, status
+from rest_framework.response import Response
+from django.db import transaction
+from django.db.models import F
+import decimal
+import traceback
+from .models import UserMain, UserDashou, UserGuanshi, Tixianjilu,UserShenheguan
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+from utils.fadan_utils import check_fadan_qiangdan_eligible
+
+
+# ========== 订单状态常量（请根据您的实际业务修改）==========
+# 假设状态值：已完成=9，已退款=10（示例，实际以您的项目为准）
+ORDER_STATUS_COMPLETED = 3   # 订单已完成
+ORDER_STATUS_REFUNDED = 5   # 订单已退款
+# 进行中状态（不可提现）例如：待接单、已接单、进行中等，您需要定义排除列表
+FORBIDDEN_STATUS_FOR_WITHDRAW = [1, 2, 3, 4, 5, 6, 7, 8]  # 除已完成和已退款外的所有状态
+
+
+class TixianShenqingView(APIView):
+    """
+    用户提现申请接口（完整版）
+    支持类型：
+        1-打手佣金提现
+        2-管事分红提现
+        3-组长分红提现
+        4-审核官分佣提现
+        5-打手押金提现（退出平台）
+        6-商家余额提现（退出平台）
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            user_main = request.user
+            yonghuid = user_main.yonghuid
+
+            # 1. 获取并验证参数
+            leixing = request.data.get('leixing')
+            jine = request.data.get('jine')
+            fangshi = request.data.get('fangshi')
+            txskfs = request.data.get('txskfs', 0)
+
+            # 罚单检查（共用）
+            fadan_ok, fadan_msg = check_fadan_qiangdan_eligible(yonghuid, 2)
+            if not fadan_ok:
+                return Response({'code': 400, 'msg': fadan_msg})
+
+            # 参数完整性
+            missing = []
+            if leixing is None: missing.append('leixing')
+            if jine is None: missing.append('jine')
+            if fangshi is None: missing.append('fangshi')
+            if missing:
+                return Response({'code': 1, 'msg': f'缺少参数: {", ".join(missing)}'},
+                                status=status.HTTP_400_BAD_REQUEST)
+
+            try:
+                leixing = int(leixing)
+                jine = decimal.Decimal(str(jine))
+                fangshi = int(fangshi)
+                txskfs = int(txskfs)
+            except (ValueError, TypeError, decimal.InvalidOperation) as e:
+                return Response({'code': 2, 'msg': f'参数格式错误: {str(e)}'},
+                                status=status.HTTP_400_BAD_REQUEST)
+
+            if jine <= decimal.Decimal('0'):
+                return Response({'code': 3, 'msg': '提现金额必须大于0'},
+                                status=status.HTTP_400_BAD_REQUEST)
+
+            # 支持的提现类型（1-6）
+            if leixing not in [1, 2, 3, 4, 5, 6]:
+                return Response({'code': 4, 'msg': '无效的提现类型'},
+                                status=status.HTTP_400_BAD_REQUEST)
+
+            if fangshi not in [1, 2]:
+                return Response({'code': 5, 'msg': '无效的收款方式，只能是1(微信)或2(支付宝)'},
+                                status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 获取对应费率及手续费
+            current_rate = decimal.Decimal('0.00')
+            rate_key = {
+                1: '5',   # 打手佣金
+                2: '6',   # 管事分红
+                3: '8',   # 组长分红
+                4: '9',   # 审核官分佣
+                5: '11',  # 打手押金提现
+                6: '10',  # 商家余额提现
+            }.get(leixing)
+
+            if rate_key:
+                rate_obj = Lilubiao.objects.filter(fadanpingtai=rate_key).first()
+                if rate_obj:
+                    current_rate = decimal.Decimal(str(rate_obj.lilu))
+                else:
+                    return Response({'code': 41, 'msg': f'提现费率未配置（类型{leixing}）'},
+                                    status=status.HTTP_400_BAD_REQUEST)
+
+            shouxufei = jine * current_rate
+            shijidaozhang = jine - shouxufei
+            if shijidaozhang <= decimal.Decimal('0'):
+                return Response({'code': 6, 'msg': '提现金额过低，扣除手续费后无实际到账'},
+                                status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 根据提现类型执行校验和扣款
+            nicheng = ''
+            if leixing == 1:
+                result = self._check_dashou_commission_withdraw(user_main, jine)
+                if result['code'] != 0:
+                    return Response(result, status=status.HTTP_400_BAD_REQUEST)
+                nicheng = result['data']['nicheng']
+                # 扣款（佣金）
+                with transaction.atomic():
+                    profile = UserDashou.objects.select_for_update().get(user=user_main)
+                    if profile.yue < jine:
+                        return Response({'code': 13, 'msg': '余额不足'})
+                    profile.yue = F('yue') - jine
+                    profile.save()
+            elif leixing == 2:
+                result = self._check_guanshi_dividend_withdraw(user_main, jine)
+                if result['code'] != 0:
+                    return Response(result, status=status.HTTP_400_BAD_REQUEST)
+                with transaction.atomic():
+                    profile = UserGuanshi.objects.select_for_update().get(user=user_main)
+                    if profile.yue < jine:
+                        return Response({'code': 22, 'msg': '余额不足'})
+                    profile.yue = F('yue') - jine
+                    profile.save()
+                nicheng = "管事用户"
+            elif leixing == 3:
+                result = self._check_zuzhang_withdraw(user_main, jine)
+                if result['code'] != 0:
+                    return Response(result, status=status.HTTP_400_BAD_REQUEST)
+                with transaction.atomic():
+                    profile = UserZuzhang.objects.select_for_update().get(user=user_main)
+                    if profile.ketixian_jine < jine:
+                        return Response({'code': 32, 'msg': '可提现金额不足'})
+                    profile.ketixian_jine = F('ketixian_jine') - jine
+                    profile.save()
+                nicheng = user_main.nicheng if hasattr(user_main, 'nicheng') else ''
+            elif leixing == 4:
+                result = self._check_shenheguan_withdraw(user_main, jine)
+                if result['code'] != 0:
+                    return Response(result, status=status.HTTP_400_BAD_REQUEST)
+                with transaction.atomic():
+                    profile = UserShenheguan.objects.select_for_update().get(user=user_main)
+                    if profile.yue < jine:
+                        return Response({'code': 42, 'msg': '可提现金额不足'})
+                    profile.yue = F('yue') - jine
+                    profile.save()
+                nicheng = "审核官"
+            elif leixing == 5:
+                # 打手押金提现（退出）
+                result = self._check_dashou_yajin_withdraw(user_main, jine)
+                if result['code'] != 0:
+                    return Response(result, status=status.HTTP_400_BAD_REQUEST)
+                with transaction.atomic():
+                    profile = UserDashou.objects.select_for_update().get(user=user_main)
+                    if profile.yajin < jine:
+                        return Response({'code': 53, 'msg': '押金余额不足'})
+                    profile.yajin = F('yajin') - jine
+                    # 押金提现后封禁打手账号
+                    profile.zhanghaozhuangtai = 0  # 0表示禁用
+                    profile.save()
+                nicheng = profile.nicheng or ''
+            elif leixing == 6:
+                # 商家余额提现（退出）
+                result = self._check_shangjia_withdraw(user_main, jine)
+                if result['code'] != 0:
+                    return Response(result, status=status.HTTP_400_BAD_REQUEST)
+                with transaction.atomic():
+                    profile = UserShangjia.objects.select_for_update().get(user=user_main)
+                    if profile.yue < jine:
+                        return Response({'code': 63, 'msg': '商家余额不足'})
+                    profile.yue = F('yue') - jine
+                    # 注意：是否封禁商家账号？根据需求，用户未明确要求封禁，暂时只扣款，可后续扩展。
+                    profile.save()
+                nicheng = profile.nicheng or ''
+
+            # 4. 创建提现记录（先扣款后创建，确保资金安全）
+            try:
+                avatar = user_main.avatar or ''
+                phone = user_main.phone or ''
+                zhifu = user_main.zhifu or ''
+                skzhanghao = user_main.skzhanghao or ''
+                tixian_record = Tixianjilu.objects.create(
+                    yonghuid=yonghuid,
+                    avatar=avatar,
+                    phone=phone,
+                    nicheng=nicheng,
+                    leixing=leixing,
+                    zhifu=zhifu,
+                    skzhanghao=skzhanghao,
+                    jine=shijidaozhang,      # 记录实际到账金额
+                    zhuangtai=1,              # 审核中
+                    fangshi=fangshi,
+                    shenheid=None,
+                    bhliyou='',
+                )
+            except Exception as e:
+                return Response({'code': 99, 'msg': f'创建提现记录失败: {str(e)}'},
+                                status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            # 5. 返回成功响应
+            return Response({
+                'code': 0,
+                'msg': '提现申请提交成功',
+                'data': {
+                    'tixian_id': tixian_record.id,
+                    'leixing': leixing,
+                    'jine': str(jine.quantize(decimal.Decimal('0.01'))),
+                    'fangshi': fangshi,
+                    'zhuangtai': 1,
+                    'create_time': tixian_record.create_time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'current_rate': str(current_rate.quantize(decimal.Decimal('0.0000'))),
+                    'shouxufei': str(shouxufei.quantize(decimal.Decimal('0.01'))),
+                    'shijidaozhang': str(shijidaozhang.quantize(decimal.Decimal('0.01'))),
+                    'tip': f'本次提现手续费率{current_rate * 100}%，手续费{shouxufei}元，实际到账{shijidaozhang}元'
+                }
+            })
+
+        except Exception as e:
+            traceback.print_exc()
+            return Response({'code': 99, 'msg': f'系统错误: {str(e)}'},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    # ==================== 校验函数 ====================
+
+    def _check_dashou_commission_withdraw(self, user_main, jine):
+        """打手佣金提现校验"""
+        try:
+            dashou = UserDashou.objects.get(user=user_main)
+        except ObjectDoesNotExist:
+            return {'code': 10, 'msg': '您不是打手身份，无法提现佣金'}
+
+        if dashou.zhanghaozhuangtai != 1:
+            return {'code': 11, 'msg': '打手账号已被封禁，无法提现'}
+        if dashou.zhuangtai != 1:
+            return {'code': 12, 'msg': '您有订单进行中，请完成后提现'}
+        if dashou.jifen != 10:
+            return {'code': 15, 'msg': '积分不足10分，请补充积分后提现'}
+        if dashou.yue < jine:
+            return {'code': 13, 'msg': f'余额不足，当前余额: {dashou.yue}'}
+
+        return {'code': 0, 'msg': 'ok', 'data': {'nicheng': dashou.nicheng or ''}}
+
+    def _check_guanshi_dividend_withdraw(self, user_main, jine):
+        """管事分红提现校验"""
+        try:
+            guanshi = UserGuanshi.objects.get(user=user_main)
+        except ObjectDoesNotExist:
+            return {'code': 20, 'msg': '您不是管事身份，无法提现分红'}
+        if guanshi.zhuangtai != 1:
+            return {'code': 21, 'msg': '管事账号已被封禁，无法提现'}
+        if guanshi.yue < jine:
+            return {'code': 22, 'msg': f'余额不足，当前余额: {guanshi.yue}'}
+        return {'code': 0, 'msg': 'ok', 'data': {}}
+
+    def _check_zuzhang_withdraw(self, user_main, jine):
+        """组长分红提现校验"""
+        try:
+            zuzhang = UserZuzhang.objects.get(user=user_main)
+        except ObjectDoesNotExist:
+            return {'code': 30, 'msg': '您不是组长身份，无法提现组长分红'}
+        if zuzhang.zhuangtai != 1:
+            return {'code': 31, 'msg': '组长账号已被封禁，无法提现'}
+        if zuzhang.ketixian_jine < jine:
+            return {'code': 32, 'msg': f'可提现金额不足，当前可提: {zuzhang.ketixian_jine}'}
+        return {'code': 0, 'msg': 'ok', 'data': {}}
+
+    from django.db.models import Q
+
+    def _check_shangjia_withdraw(self, user_main, jine):
+        """
+        商家余额提现校验（退出平台）
+        包含：订单、自身罚单、申请的罚单检查
+        """
+        try:
+            shangjia = UserShangjia.objects.get(user=user_main)
+        except ObjectDoesNotExist:
+            return {'code': 60, 'msg': '您不是商家身份，无法提现商家余额'}
+
+        if shangjia.zhuangtai != 1:
+            return {'code': 61, 'msg': '商家账号已被禁用，无法提现'}
+        if shangjia.yue < jine:
+            return {'code': 62, 'msg': f'商家余额不足，当前余额: {shangjia.yue}'}
+
+        # 订单检查（使用 Q 取反）
+        unfinished_orders = DingdanShangjia.objects.filter(
+            shangjia_id=user_main.yonghuid,
+        ).exclude(
+            dingdan__zhuangtai__in=[ORDER_STATUS_COMPLETED, ORDER_STATUS_REFUNDED]
+        ).exists()
+        if unfinished_orders:
+            return {'code': 63, 'msg': '您还有未完成或未退款的订单，请先处理完毕再提现余额'}
+
+        # 自身被处罚的罚单检查（状态不是已缴纳(2)和已驳回(4)）
+        self_fadan = Fadan.objects.filter(
+            beichufa_id=user_main.yonghuid,
+        ).exclude(
+            zhuangtai__in=[2, 4]
+        ).exists()
+        if self_fadan:
+            return {'code': 64, 'msg': '您有未处理完毕的自身罚单（待缴纳/申诉中），请先处理'}
+
+        # 申请的对他人处罚罚单检查（状态不是已缴纳(2)和已驳回(4)）
+        applied_fadan = Fadan.objects.filter(
+            shenqing_chufa=user_main.yonghuid,
+        ).exclude(
+            zhuangtai__in=[2, 4]
+        ).exists()
+        if applied_fadan:
+            return {'code': 65, 'msg': '您发起的对其他用户的处罚尚未处理完毕（待缴纳/申诉中），请等待完结'}
+
+        return {'code': 0, 'msg': 'ok', 'data': {'nicheng': shangjia.nicheng or ''}}
+
+    def _check_dashou_yajin_withdraw(self, user_main, jine):
+        """
+        打手押金提现校验（退出平台）
+        要求：无进行中的订单，无未结算订单，自身罚单需已处理
+        """
+        try:
+            dashou = UserDashou.objects.get(user=user_main)
+        except ObjectDoesNotExist:
+            return {'code': 50, 'msg': '您不是打手身份，无法提取押金'}
+
+        if dashou.zhanghaozhuangtai != 1:
+            return {'code': 51, 'msg': '打手账号已禁用，无法提取押金'}
+        if dashou.zhuangtai != 1:
+            return {'code': 52, 'msg': '您有订单进行中，请完成后提取押金'}
+        if dashou.yajin < jine:
+            return {'code': 53, 'msg': f'押金余额不足，当前押金: {dashou.yajin}'}
+
+        # 订单检查（使用 exclude + __in）
+        unfinished_orders = Dingdan.objects.filter(
+            jiedan_dashou_id=user_main.yonghuid,
+        ).exclude(
+            zhuangtai__in=[ORDER_STATUS_COMPLETED, ORDER_STATUS_REFUNDED]
+        ).exists()
+        if unfinished_orders:
+            return {'code': 54, 'msg': '您还有未完成或未退款的订单，请先处理完毕再提取押金'}
+
+        # 自身罚单检查
+        self_fadan = Fadan.objects.filter(
+            beichufa_id=user_main.yonghuid,
+        ).exclude(
+            zhuangtai__in=[2, 4]
+        ).exists()
+        if self_fadan:
+            return {'code': 55, 'msg': '您有未处理完毕的自身罚单（待缴纳/申诉中），请先处理'}
+
+        return {'code': 0, 'msg': 'ok', 'data': {'nicheng': dashou.nicheng or ''}}
+
+'''class TixianShenqingView(APIView):
+    """
+    用户提现申请接口（修复版）
+    支持打手佣金提现、管事分红提现、组长分红提现
+    严格校验所有业务条件，修复400错误问题
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        """
+        处理提现申请的POST请求
+        加强参数验证和错误处理
+        """
+        try:
+            # 获取当前用户
+            user_main = request.user
+            yonghuid = user_main.yonghuid
+
+            # 1. 获取并严格验证前端参数
+            leixing = request.data.get('leixing')  # 提现类型：1-佣金 2-分红 3-组长分红
+            jine = request.data.get('jine')
+            fangshi = request.data.get('fangshi')
+            txskfs = request.data.get('txskfs', 0)
+
+            # ==================== 【新增】罚单检查 ====================
+            from utils.fadan_utils import check_fadan_qiangdan_eligible
+            fadan_ok, fadan_msg = check_fadan_qiangdan_eligible(request.user.yonghuid, 2)
+            if not fadan_ok:
+                return Response({'code': 400, 'msg': fadan_msg})
+            # =========================================================
+
+            # 验证必需参数是否存在
+            missing_params = []
+            if leixing is None:
+                missing_params.append('leixing')
+            if jine is None:
+                missing_params.append('jine')
+            if fangshi is None:
+                missing_params.append('fangshi')
+
+            if missing_params:
+                return Response({
+                    'code': 1,
+                    'msg': f'缺少必需参数: {", ".join(missing_params)}',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 验证参数类型和格式
+            try:
+                leixing = int(leixing)
+                if isinstance(jine, str):
+                    jine = decimal.Decimal(jine)
+                else:
+                    jine = decimal.Decimal(str(jine))
+                fangshi = int(fangshi)
+                txskfs = int(txskfs)
+            except (ValueError, TypeError, decimal.InvalidOperation) as e:
+                return Response({
+                    'code': 2,
+                    'msg': f'参数格式错误: {str(e)}',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 验证提现金额必须大于0
+            if jine <= decimal.Decimal('0'):
+                return Response({
+                    'code': 3,
+                    'msg': '提现金额必须大于0',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 验证提现类型有效性（新增类型3）
+            if leixing not in [1, 2, 3,4]:
+                return Response({
+                    'code': 4,
+                    'msg': '无效的提现类型，只能是1(佣金)、2(分红)或3(组长分红)',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 验证收款方式有效性
+            if fangshi not in [1, 2]:
+                return Response({
+                    'code': 5,
+                    'msg': '无效的收款方式，只能是1(微信)或2(支付宝)',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 🔥【组长支持】获取对应费率（增加组长）
+            current_rate = decimal.Decimal('0.00')
+            if leixing == 1:
+                dashou_rate_obj = Lilubiao.objects.filter(fadanpingtai='5').first()
+                if dashou_rate_obj:
+                    current_rate = decimal.Decimal(str(dashou_rate_obj.lilu))
+            elif leixing == 2:
+                guanshi_rate_obj = Lilubiao.objects.filter(fadanpingtai='6').first()
+                if guanshi_rate_obj:
+                    current_rate = decimal.Decimal(str(guanshi_rate_obj.lilu))
+            elif leixing == 3:
+                # 组长提现费率 (fadanpingtai='8')
+                zuzhang_rate_obj = Lilubiao.objects.filter(fadanpingtai='8').first()
+                if zuzhang_rate_obj:
+                    current_rate = decimal.Decimal(str(zuzhang_rate_obj.lilu))
+                else:
+                    return Response({
+                        'code': 31,
+                        'msg': '组长费率未配置，无法提现',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+
+            elif leixing == 4:
+                # 审核官提现费率 (fadanpingtai='9'，数字可自定义)
+                kaoheguan_rate_obj = Lilubiao.objects.filter(fadanpingtai='9').first()
+                if kaoheguan_rate_obj:
+                    current_rate = decimal.Decimal(str(kaoheguan_rate_obj.lilu))
+                else:
+                    return Response({
+                        'code': 41,
+                        'msg': '审核官费率未配置，无法提现',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+
+
+            # 计算手续费和实际到账金额
+            shouxufei = jine * current_rate
+            shijidaozhang = jine - shouxufei
+
+            # 验证手续费和实际到账金额的有效性
+            if shijidaozhang <= decimal.Decimal('0'):
+                return Response({
+                    'code': 6,
+                    'msg': '提现金额过低，扣除手续费后无实际到账',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 根据提现类型进行不同的校验
+            if leixing == 1:
+                # 佣金提现 - 打手
+                result = self.yanzheng_dashou_tixian(user_main, jine)
+                if result['code'] != 0:
+                    return Response(result, status=status.HTTP_400_BAD_REQUEST)
+
+                dashou_info = result['data']
+                nicheng = dashou_info.get('nicheng', '')
+
+                # 使用事务更新打手余额
+                try:
+                    with transaction.atomic():
+                        dashou_profile = UserDashou.objects.select_for_update().get(user=user_main)
+                        if dashou_profile.yue < jine:
+                            return Response({
+                                'code': 13,
+                                'msg': '余额不足，无法提现',
+                                'data': None
+                            }, status=status.HTTP_400_BAD_REQUEST)
+                        dashou_profile.yue = F('yue') - jine
+                        dashou_profile.save()
+                        dashou_profile.refresh_from_db()
+                except Exception as e:
+                    return Response({
+                        'code': 99,
+                        'msg': f'更新余额失败: {str(e)}',
+                        'data': None
+                    }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            elif leixing == 2:
+                # 分红提现 - 管事
+                result = self.yanzheng_guanshi_tixian(user_main, jine)
+                if result['code'] != 0:
+                    return Response(result, status=status.HTTP_400_BAD_REQUEST)
+
+                nicheng = "管事用户"
+
+                try:
+                    with transaction.atomic():
+                        guanshi_profile = UserGuanshi.objects.select_for_update().get(user=user_main)
+                        if guanshi_profile.yue < jine:
+                            return Response({
+                                'code': 22,
+                                'msg': '余额不足，无法提现',
+                                'data': None
+                            }, status=status.HTTP_400_BAD_REQUEST)
+                        guanshi_profile.yue = F('yue') - jine
+                        guanshi_profile.save()
+                        guanshi_profile.refresh_from_db()
+                except Exception as e:
+                    return Response({
+                        'code': 99,
+                        'msg': f'更新余额失败: {str(e)}',
+                        'data': None
+                    }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            # 🔥【组长支持】新增组长提现分支
+            elif leixing == 3:
+                # 组长分红提现
+                result = self.yanzheng_zuzhang_tixian(user_main, jine)
+                if result['code'] != 0:
+                    return Response(result, status=status.HTTP_400_BAD_REQUEST)
+
+                zuzhang_info = result['data']
+                nicheng = zuzhang_info.get('nicheng', '')
+
+                try:
+                    with transaction.atomic():
+                        zuzhang_profile = UserZuzhang.objects.select_for_update().get(user=user_main)
+                        if zuzhang_profile.ketixian_jine < jine:
+                            return Response({
+                                'code': 32,
+                                'msg': '组长可提现金额不足',
+                                'data': None
+                            }, status=status.HTTP_400_BAD_REQUEST)
+                        # 扣除申请金额
+                        zuzhang_profile.ketixian_jine = F('ketixian_jine') - jine
+                        zuzhang_profile.save()
+                        zuzhang_profile.refresh_from_db()
+                except Exception as e:
+                    return Response({
+                        'code': 99,
+                        'msg': f'更新组长余额失败: {str(e)}',
+                        'data': None
+                    }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+            # 🔥【审核官支持】新增审核官提现分支
+            elif leixing == 4:
+                # 审核官分佣提现
+                result = self.yanzheng_kaoheguan_tixian(user_main, jine)
+                if result['code'] != 0:
+                    return Response(result, status=status.HTTP_400_BAD_REQUEST)
+
+                kaoheguan_info = result['data']
+                nicheng = kaoheguan_info.get('nicheng', '')
+
+                try:
+                    with transaction.atomic():
+                        kaoheguan_profile = UserShenheguan.objects.select_for_update().get(user=user_main)
+                        if kaoheguan_profile.yue < jine:
+                            return Response({
+                                'code': 42,
+                                'msg': '审核官可提现金额不足',
+                                'data': None
+                            }, status=status.HTTP_400_BAD_REQUEST)
+                        # 扣除申请金额
+                        kaoheguan_profile.yue = F('yue') - jine
+                        kaoheguan_profile.save()
+                        kaoheguan_profile.refresh_from_db()
+                except Exception as e:
+                    return Response({
+                        'code': 99,
+                        'msg': f'更新审核官余额失败: {str(e)}',
+                        'data': None
+                    }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            # 3. 创建提现记录
+            try:
+                avatar = user_main.avatar if user_main.avatar else ''
+                phone = user_main.phone if user_main.phone else ''
+                zhifu = user_main.zhifu if user_main.zhifu else ''
+                skzhanghao = user_main.skzhanghao if user_main.skzhanghao else ''
+
+                # 对于打手或组长，从扩展表获取昵称
+                if leixing == 1:
+                    try:
+                        dashou_profile = UserDashou.objects.get(user=user_main)
+                        nicheng = dashou_profile.nicheng if dashou_profile.nicheng else ''
+                    except UserDashou.DoesNotExist:
+                        nicheng = ''
+                elif leixing == 3:
+                    # 组长昵称从组长扩展表获取（如果需要）
+                    try:
+                        zuzhang_profile = UserZuzhang.objects.get(user=user_main)
+                        # 组长扩展表可能没有昵称字段，可以从UserMain获取
+                        nicheng = user_main.nicheng if hasattr(user_main, 'nicheng') else ''
+                    except UserZuzhang.DoesNotExist:
+                        nicheng = ''
+
+                # 4. 在创建提现记录时（约第 180 行），对审核官类型的昵称处理（可选）：
+                # 在 elif leixing == 3: 的组长昵称获取之后，追加：
+                elif leixing == 4:
+                #审核官昵称可从扩展表或UserMain获取（如果扩展表没有昵称字段）
+                    try:
+                        kaoheguan_profile = UserShenheguan.objects.get(user=user_main)
+                        # 审核官扩展表通常没有昵称，可用 '审核官' 或从 UserMain 取
+                        nicheng = '审核官'  # 或者 user_main.nicheng if hasattr(user_main, 'nicheng') else '审核官'
+                    except UserShenheguan.DoesNotExist:
+                        nicheng = ''
+
+                tixian_jilu = Tixianjilu.objects.create(
+                    yonghuid=yonghuid,
+                    avatar=avatar,
+                    phone=phone,
+                    nicheng=nicheng,
+                    leixing=leixing,
+                    zhifu=zhifu,
+                    skzhanghao=skzhanghao,
+                    jine=shijidaozhang,      # 记录实际到账金额
+                    zhuangtai=1,
+                    fangshi=fangshi,
+                    shenheid=None,
+                    bhliyou='',
+                )
+
+                # 4. 返回成功响应
+                return Response({
+                    'code': 0,
+                    'msg': '提现申请提交成功',
+                    'data': {
+                        'tixian_id': tixian_jilu.id,
+                        'leixing': leixing,
+                        'jine': str(jine.quantize(decimal.Decimal('0.01'))),
+                        'fangshi': fangshi,
+                        'zhuangtai': 1,
+                        'create_time': tixian_jilu.create_time.strftime('%Y-%m-%d %H:%M:%S'),
+                        'current_rate': str(current_rate.quantize(decimal.Decimal('0.0000'))),
+                        'shouxufei': str(shouxufei.quantize(decimal.Decimal('0.01'))),
+                        'shijidaozhang': str(shijidaozhang.quantize(decimal.Decimal('0.01'))),
+                        'tip': f'本次提现手续费率{current_rate * 100}%，手续费{shouxufei}元，实际到账{shijidaozhang}元'
+                    }
+                })
+
+            except Exception as e:
+                traceback.print_exc()
+                return Response({
+                    'code': 99,
+                    'msg': f'创建提现记录失败: {str(e)}',
+                    'data': None
+                }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        except Exception as e:
+            traceback.print_exc()
+            return Response({
+                'code': 99,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    # 原有校验函数不变
+
+    def yanzheng_kaoheguan_tixian(self, user_main, jine):
+        """
+        校验审核官分佣提现条件
+        """
+        try:
+            # 查询审核官扩展表
+            try:
+                kaoheguan_profile = UserShenheguan.objects.get(user=user_main)
+            except UserShenheguan.DoesNotExist:
+                return {
+                    'code': 40,
+                    'msg': '您不是审核官身份，无法提现分佣',
+                    'data': None
+                }
+
+            # 校验1: 审核官账号状态 (zhuangtai != 1)
+            if kaoheguan_profile.zhuangtai != 1:
+                return {
+                    'code': 41,
+                    'msg': '审核官账号已被封禁，无法提现',
+                    'data': None
+                }
+
+            # 校验2: 可提现金额是否足够 (yue < jine)
+            if kaoheguan_profile.yue < jine:
+                return {
+                    'code': 42,
+                    'msg': f'审核官可提现金额不足，当前可提: {kaoheguan_profile.yue}，申请金额: {jine}',
+                    'data': None
+                }
+
+            # 所有校验通过
+            return {
+                'code': 0,
+                'msg': '校验通过',
+                'data': {
+                    'nicheng': '审核官',  # 可根据需要调整
+                    'yue': kaoheguan_profile.yue
+                }
+            }
+
+        except Exception as e:
+            return {
+                'code': 99,
+                'msg': f'审核官提现校验过程出错: {str(e)}',
+                'data': None
+            }
+
+    def yanzheng_dashou_tixian(self, user_main, jine):
+        """
+        校验打手佣金提现条件（修复版）
+        修正了状态判断逻辑
+        """
+        try:
+            # print(f"开始校验打手提现 - 用户: {user_main.yonghuid}, 金额: {jine}")
+
+            # 查询打手扩展表
+            try:
+                dashou_profile = UserDashou.objects.get(user=user_main)
+                # print(
+                #     f"打手信息 - 状态: {dashou_profile.zhuangtai}, 账号状态: {dashou_profile.zhanghaozhuangtai}, 积分: {dashou_profile.jifen}, 余额: {dashou_profile.yue}")
+            except UserDashou.DoesNotExist:
+                # print("打手扩展表记录不存在")
+                return {
+                    'code': 10,
+                    'msg': '您不是打手身份，无法提现佣金',
+                    'data': None
+                }
+
+            # 校验1: 打手账号状态 (zhanghaozhuangtai != 1 则封禁)
+            if dashou_profile.zhanghaozhuangtai != 1:
+                return {
+                    'code': 11,
+                    'msg': '打手账号已被封禁，无法提现',
+                    'data': None
+                }
+
+            # 校验2: 打手接单状态 (zhuangtai != 1 则有订单进行中) - 修复这里
+            if dashou_profile.zhuangtai != 1:
+                return {
+                    'code': 12,
+                    'msg': '您有订单进行中，请完成后提现',
+                    'data': None
+                }
+
+            # 校验3: 积分检查 (jifen != 10 则不足) - 新增
+            if dashou_profile.jifen != 10:
+                return {
+                    'code': 15,  # 使用新的错误码
+                    'msg': '积分不足10分，请补充积分后提现',
+                    'data': None
+                }
+
+            # 校验4: 余额是否足够 (yue < jine)
+            if dashou_profile.yue < jine:
+                return {
+                    'code': 13,
+                    'msg': f'余额不足，当前余额: {dashou_profile.yue}，提现金额: {jine}',
+                    'data': None
+                }
+
+            # print("打手提现校验通过")
+
+            # 所有校验通过
+            return {
+                'code': 0,
+                'msg': '校验通过',
+                'data': {
+                    'nicheng': dashou_profile.nicheng if dashou_profile.nicheng else '',
+                    'yue': dashou_profile.yue,
+                    'jifen': dashou_profile.jifen
+                }
+            }
+
+        except Exception as e:
+            # print(f"打手提现校验异常: {e}")
+            return {
+                'code': 99,
+                'msg': f'校验过程出错: {str(e)}',
+                'data': None
+            }
+
+    def yanzheng_guanshi_tixian(self, user_main, jine):
+        """
+        校验管事分红提现条件
+        """
+        try:
+            # print(f"开始校验管事提现 - 用户: {user_main.yonghuid}, 金额: {jine}")
+
+            # 查询管事扩展表
+            try:
+                guanshi_profile = UserGuanshi.objects.get(user=user_main)
+                # print(f"管事信息 - 状态: {guanshi_profile.zhuangtai}, 余额: {guanshi_profile.yue}")
+            except UserGuanshi.DoesNotExist:
+                # print("管事扩展表记录不存在")
+                return {
+                    'code': 20,
+                    'msg': '您不是管事身份，无法提现分红',
+                    'data': None
+                }
+
+            # 校验1: 管事账号状态 (zhuangtai != 1)
+            if guanshi_profile.zhuangtai != 1:
+                return {
+                    'code': 21,
+                    'msg': '管事账号已被封禁，无法提现',
+                    'data': None
+                }
+
+            # 校验2: 余额是否足够 (yue < jine)
+            if guanshi_profile.yue < jine:
+                return {
+                    'code': 22,
+                    'msg': f'余额不足，当前余额: {guanshi_profile.yue}，提现金额: {jine}',
+                    'data': None
+                }
+
+            # print("管事提现校验通过")
+
+            # 所有校验通过
+            return {
+                'code': 0,
+                'msg': '校验通过',
+                'data': {
+                    'yue': guanshi_profile.yue
+                }
+            }
+
+        except Exception as e:
+            # print(f"管事提现校验异常: {e}")
+            return {
+                'code': 99,
+                'msg': f'校验过程出错: {str(e)}',
+                'data': None
+            }
+
+
+    # 🔥【组长支持】新增组长校验函数
+    def yanzheng_zuzhang_tixian(self, user_main, jine):
+        """
+        校验组长分红提现条件
+        """
+        try:
+            # 查询组长扩展表
+            try:
+                zuzhang_profile = UserZuzhang.objects.get(user=user_main)
+            except UserZuzhang.DoesNotExist:
+                return {
+                    'code': 30,
+                    'msg': '您不是组长身份，无法提现组长分红',
+                    'data': None
+                }
+
+            # 校验1: 组长账号状态 (zhuangtai != 1)
+            if zuzhang_profile.zhuangtai != 1:
+                return {
+                    'code': 31,
+                    'msg': '组长账号已被封禁，无法提现',
+                    'data': None
+                }
+
+            # 校验2: 可提现金额是否足够
+            if zuzhang_profile.ketixian_jine < jine:
+                return {
+                    'code': 32,
+                    'msg': f'组长可提现金额不足，当前可提: {zuzhang_profile.ketixian_jine}，申请金额: {jine}',
+                    'data': None
+                }
+
+            # 所有校验通过
+            return {
+                'code': 0,
+                'msg': '校验通过',
+                'data': {
+                    'nicheng': user_main.nicheng if hasattr(user_main, 'nicheng') else '',
+                    'ketixian_jine': zuzhang_profile.ketixian_jine
+                }
+            }
+
+        except Exception as e:
+            return {
+                'code': 99,
+                'msg': f'组长提现校验过程出错: {str(e)}',
+                'data': None
+            }'''
+
+
+
+
+
+
+
+class TixianJiluHuoquViewV2(APIView):
+    """
+    提现记录获取接口
+    mode=1：手动提现记录（默认，兼容旧版）
+    mode=2：自动提现审核记录（含 shenhe_jilu_id / shenhe_danhao，支持 zhuangtai 筛选）
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        try:
+            from .models import TixianAutoRecord, TixianShenheJilu
+
+            user_main = request.user
+            yonghuid = user_main.yonghuid
+            page = request.data.get('page', 1)
+            limit = request.data.get('limit', 50)
+            mode = int(request.data.get('mode', 1) or 1)
+            zhuangtai_filter = int(request.data.get('zhuangtai', 0) or 0)
+
+            try:
+                page = int(page)
+                limit = int(limit)
+                if page < 1 or limit < 1:
+                    return Response({'code': 1, 'msg': '参数错误', 'data': None},
+                                    status=status.HTTP_400_BAD_REQUEST)
+            except (TypeError, ValueError):
+                return Response({'code': 1, 'msg': '参数格式错误', 'data': None},
+                                status=status.HTTP_400_BAD_REQUEST)
+
+            if limit > 100:
+                limit = 100
+            offset = (page - 1) * limit
+
+            qs = Tixianjilu.objects.filter(yonghuid=yonghuid)
+            if mode == 2:
+                # 自动提现：含新审核关联记录；zhuangtai>0 时按状态筛选
+                if zhuangtai_filter > 0:
+                    qs = qs.filter(zhuangtai=zhuangtai_filter)
+            qs = qs.order_by('-create_time')
+
+            records_queryset = qs.values(
+                'id', 'leixing', 'jine', 'zhuangtai', 'create_time', 'fangshi',
+                'phone', 'skzhanghao', 'zhifu', 'bhliyou',
+                'shenhe_jilu_id', 'shenhe_danhao',
+            )[offset:offset + limit + 1]
+
+            records_list = list(records_queryset)
+            has_more = len(records_list) > limit
+            records_to_return = records_list[:limit] if has_more else records_list
+
+            # 批量取审核表 fail_reason
+            audit_ids = [r['shenhe_jilu_id'] for r in records_to_return if r.get('shenhe_jilu_id')]
+            audit_map = {}
+            if audit_ids:
+                for a in TixianShenheJilu.objects.filter(id__in=audit_ids).values(
+                    'id', 'fail_reason', 'shenqing_jine', 'shenhe_danhao'
+                ):
+                    audit_map[a['id']] = a
+
+            # 批量取自动打款失败原因
+            danhao_list = [r['shenhe_danhao'] for r in records_to_return if r.get('shenhe_danhao')]
+            auto_fail_map = {}
+            if danhao_list:
+                for ar in TixianAutoRecord.objects.filter(
+                    shenhe_danhao__in=danhao_list, zhuangtai=2
+                ).order_by('-create_time').values('shenhe_danhao', 'fail_reason'):
+                    if ar['shenhe_danhao'] not in auto_fail_map:
+                        auto_fail_map[ar['shenhe_danhao']] = ar['fail_reason']
+
+            formatted_records = []
+            for record in records_to_return:
+                audit = audit_map.get(record.get('shenhe_jilu_id')) if record.get('shenhe_jilu_id') else None
+                fail_reason = ''
+                if audit and audit.get('fail_reason'):
+                    fail_reason = audit['fail_reason']
+                elif record.get('shenhe_danhao'):
+                    fail_reason = auto_fail_map.get(record['shenhe_danhao'], '') or ''
+
+                jine_val = float(record['jine']) if record['jine'] else 0.00
+                if mode == 2 and audit and audit.get('shenqing_jine') is not None:
+                    jine_val = float(audit['shenqing_jine'])
+
+                shenhe_danhao_val = record.get('shenhe_danhao') or (audit.get('shenhe_danhao') if audit else '')
+                formatted_records.append({
+                    'id': record['id'],
+                    'tixianjilu_id': record['id'],
+                    'tixian_id': record['id'],
+                    'leixing': record['leixing'],
+                    'jine': jine_val,
+                    'zhuangtai': record['zhuangtai'],
+                    'create': record['create_time'].strftime('%Y-%m-%d %H:%M:%S'),
+                    'fangshi': record['fangshi'],
+                    'txdianhua': record['phone'] or '',
+                    'txzh': record['skzhanghao'] or '',
+                    'txtupian': record['zhifu'] or '',
+                    'shibaiyuanyin': record['bhliyou'] or '',
+                    'bhliyou': record['bhliyou'] or '',
+                    'fail_reason': fail_reason,
+                    'shenhe_jilu_id': record.get('shenhe_jilu_id'),
+                    'shenhe_danhao': shenhe_danhao_val,
+                })
+
+            return Response({
+                'code': 0,
+                'msg': '获取成功',
+                'data': {
+                    'list': formatted_records,
+                    'has_more': has_more,
+                    'page': page,
+                    'limit': limit,
+                    'current_count': len(formatted_records),
+                },
+            })
+
+        except Exception as e:
+            return Response({
+                'code': 99,
+                'msg': f'系统错误: {str(e)}',
+                'data': None,
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+'''class TixianJiluHuoquViewV2(APIView):
+    """
+    提现记录获取接口（优化版）
+    使用更高效的查询方式，减少数据库压力
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 获取当前用户
+            user_main = request.user
+            yonghuid = user_main.yonghuid
+
+            # 获取分页参数
+            page = request.data.get('page', 1)
+            limit = request.data.get('limit', 50)
+
+            # 参数验证
+            try:
+                page = int(page)
+                limit = int(limit)
+                if page < 1 or limit < 1:
+                    return Response({
+                        'code': 1,
+                        'msg': '参数错误',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+            except:
+                return Response({
+                    'code': 1,
+                    'msg': '参数格式错误',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 限制最大查询数量
+            if limit > 100:
+                limit = 100
+
+            # 计算偏移量
+            offset = (page - 1) * limit
+
+            # 高效查询：只查询需要的字段，使用切片限制数量
+            # 这里查询limit+1条，用于判断是否还有更多数据
+            query_limit = limit + 1
+            records_queryset = Tixianjilu.objects.filter(
+                yonghuid=yonghuid
+            ).order_by('-create_time').values(
+                'leixing', 'jine', 'zhuangtai', 'create_time', 'fangshi'
+            )[offset:offset + query_limit]
+
+            # 转换为列表
+            records_list = list(records_queryset)
+            records_count = len(records_list)
+
+            # 判断是否有更多数据
+            has_more = records_count > limit
+
+            # 如果查询到的数量大于limit，只返回limit条
+            if has_more:
+                records_to_return = records_list[:limit]
+            else:
+                records_to_return = records_list
+
+            # 格式化数据
+            formatted_records = []
+            for record in records_to_return:
+                formatted_records.append({
+                    'leixing': record['leixing'],
+                    'jine': float(record['jine']) if record['jine'] else 0.00,
+                    'zhuangtai': record['zhuangtai'],
+                    'create': record['create_time'].strftime('%Y-%m-%d %H:%M:%S'),
+                    'fangshi': record['fangshi']
+                })
+
+            # 构建响应
+            response_data = {
+                'list': formatted_records,
+                'has_more': has_more,
+                'page': page,
+                'limit': limit,
+                'current_count': len(formatted_records)
+            }
+
+            return Response({
+                'code': 0,
+                'msg': '获取成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            return Response({
+                'code': 99,
+                'msg': f'系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)'''
+
+
+# yonghu/views.py
+import jwt
+import datetime
+
+
+
+class AdminLoginView(APIView):
+    """
+    管理员登录接口
+    路径：/yonghu/adlog/
+    方法：POST
+    字段：zhanghao（账号）, mima（密码）, ip（二次验证码）
+    """
+
+    # 限制匿名用户访问频率，防止暴力破解
+    throttle_classes = [AnonRateThrottle]
+    # 允许任何人访问（登录接口不需要认证）
+    permission_classes = [AllowAny]
+
+    def post(self, request):
+        """
+        处理管理员登录请求
+        安全策略：任何错误都返回401，不透露具体信息
+        """
+        try:
+            # 1. 获取客户端真实IP和用户代理信息
+            kehuduan_ip = huoquKehuduanIP(request)
+            yonghu_daili = huoquYonghuDaili(request)
+
+            # 2. 获取前端传递的数据
+            data = request.data
+
+            # 检查必需字段是否存在
+            bixu_ziduan = ['zhanghao', 'mima', 'ip']
+            for ziduan in bixu_ziduan:
+                if ziduan not in data:
+                    # 字段缺失，返回401
+                    return Response(
+                        {'code': 401, 'msg': '登录失败', 'data': None},
+                        status=status.HTTP_401_UNAUTHORIZED
+                    )
+
+            # 提取并清理数据
+            zhanghao = data.get('zhanghao', '').strip()
+            mima = data.get('mima', '').strip()
+            erci_yanzhengma = data.get('ip', '').strip()  # 二次验证码（前端叫ip）
+
+            # 简单验证字段非空
+            if not zhanghao or not mima or not erci_yanzhengma:
+                return Response(
+                    {'code': 401, 'msg': '登录失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 3. 使用事务确保数据一致性
+            with transaction.atomic():
+                # 【优化点1】使用select_related一次性获取管理员扩展表
+                # 只查询管理员类型的用户
+                user = UserMain.objects.filter(
+                    phone=zhanghao,  # 手机号作为账号
+                    password=mima,  # 密码
+                    user_type='admin'  # 必须是管理员类型
+                ).select_related('admin_profile').first()
+
+                # 如果用户不存在或不是管理员，返回401
+                if not user:
+                    return Response(
+                        {'code': 401, 'msg': '登录失败', 'data': None},
+                        status=status.HTTP_401_UNAUTHORIZED
+                    )
+
+                # 【优化点2】检查管理员扩展表是否存在
+                if not hasattr(user, 'admin_profile'):
+                    return Response(
+                        {'code': 401, 'msg': '登录失败', 'data': None},
+                        status=status.HTTP_401_UNAUTHORIZED
+                    )
+
+                # 【优化点3】验证二次密码（管理员扩展表中的password字段）
+                admin_profile = user.admin_profile
+                if admin_profile.password != erci_yanzhengma:
+                    return Response(
+                        {'code': 401, 'msg': '登录失败', 'data': None},
+                        status=status.HTTP_401_UNAUTHORIZED
+                    )
+
+                # 4. 更新用户登录信息
+                # 获取当前时间
+                now_time = timezone.now()
+
+                # 处理IP地址长度问题
+                # 如果原ip字段长度不够，截取前11个字符（保持兼容性）
+                if len(kehuduan_ip) > 11:
+                    # 如果ip字段长度限制是11，我们截取前11个字符
+                    # 建议在数据库中修改ip字段为50长度
+                    cunchu_ip = kehuduan_ip[:11]
+                else:
+                    cunchu_ip = kehuduan_ip
+
+                # 更新用户信息
+                user.ip = cunchu_ip  # 存储客户端IP
+                user.last_login_time = now_time  # 更新最后登录时间
+                user.save()
+
+                # 【优化点4】生成JWT token（使用和微信登录相同的方式）
+                # 使用djangorestframework-simplejwt生成token
+                refresh = RefreshToken.for_user(user)
+                token = str(refresh.access_token)
+
+                # 5. 准备返回数据
+                # 返回用户基本信息（可根据需要调整）
+                response_data = {
+                    'token': token,
+                    'yonghuid': user.yonghuid,
+                    'phone': user.phone or '',
+                    'user_type': user.user_type,
+                    'last_login_time': now_time.strftime('%Y-%m-%d %H:%M:%S') if now_time else '',
+                }
+
+                # 可以添加管理员特定信息
+                if hasattr(user, 'admin_profile'):
+                    response_data['wechat'] = user.admin_profile.wechat or ''
+
+                return Response({
+                    'code': 0,
+                    'msg': '登录成功',
+                    'data': response_data
+                })
+
+        except Exception as e:
+            # 【安全点】任何异常都返回401，不暴露具体错误信息
+            # 记录日志用于排查问题，但前端只收到通用错误信息
+            # 这里可以添加日志记录，比如：
+            # import logging
+            # logging.error(f'管理员登录异常: {str(e)}', exc_info=True)
+
+            return Response(
+                {'code': 401, 'msg': '登录失败', 'data': None},
+                status=status.HTTP_401_UNAUTHORIZED
+            )
+
+
+# yonghu/views.py
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from django.db import transaction
+from django.core.exceptions import ObjectDoesNotExist
+import json
+
+# 导入模型
+from yonghu.models import UserMain, AdminProfile
+from peizhi.models import Szjilu
+
+
+class AdminFinancialDataView(APIView):
+    """
+    管理员财务数据接口
+    路径：/yonghu/adhq/
+    方法：POST
+    认证：JWT Token
+    权限：仅管理员
+    返回：收支记录数据
+    """
+
+    # 使用JWT认证
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        """
+        处理管理员财务数据请求
+        安全策略：任何错误都返回401，不透露具体信息
+        """
+        try:
+            # 1. 获取前端传递的数据
+            data = request.data
+
+            # 检查必需字段
+            if 'zhanghao' not in data:
+                return Response(
+                    {'code': 401, 'msg': '请求参数错误', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            qianzhanghao = data.get('zhanghao', '').strip()
+
+            # 简单验证字段非空
+            if not qianzhanghao:
+                return Response(
+                    {'code': 401, 'msg': '请求参数错误', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 2. 获取当前登录用户（JWT认证后，request.user就是UserMain实例）
+            dangqianyonghu = request.user
+
+            # 3. 验证用户类型是否为admin
+            if not hasattr(dangqianyonghu, 'user_type') or dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'msg': '权限不足', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 4. 验证前端传递的账号与当前用户的phone字段是否一致
+            if not dangqianyonghu.phone or dangqianyonghu.phone != qianzhanghao:
+                return Response(
+                    {'code': 401, 'msg': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 5. 验证管理员扩展表是否存在（反向查询）
+            # 使用高效的ORM查询，避免额外的数据库查询
+            try:
+                # 使用select_related一次性获取管理员扩展表
+                # 注意：这里假设user_type='admin'的用户都有admin_profile
+                yonghu_xiangxi = UserMain.objects.select_related('admin_profile').get(
+                    pk=dangqianyonghu.pk,
+                    user_type='admin'
+                )
+
+                # 检查管理员扩展表是否存在
+                if not hasattr(yonghu_xiangxi, 'admin_profile'):
+                    return Response(
+                        {'code': 401, 'msg': '身份验证失败', 'data': None},
+                        status=status.HTTP_401_UNAUTHORIZED
+                    )
+
+            except UserMain.DoesNotExist:
+                return Response(
+                    {'code': 401, 'msg': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 6. 查询收支记录表（Szjilu）
+            # 使用高效的ORM查询，获取最新的一条记录
+            # 注意：根据你的业务需求，这里获取最新的一条记录
+            # 如果需要汇总多条记录，可以使用aggregate进行聚合查询
+
+            # 方法1：获取最新的一条记录（假设表中只有一条汇总记录）
+            shouzhijilu = Szjilu.objects.order_by('-create_time').first()
+
+            # 方法2：如果表中可能有多条记录，需要汇总，可以使用以下方式：
+            # from django.db.models import Sum
+            # zonghe = Szjilu.objects.aggregate(
+            #     zongliushui=Sum('zongls'),
+            #     zongshouyi=Sum('zongsy'),
+            #     zongzhichu=Sum('zongzc'),
+            #     jrls=Sum('jrls'),
+            #     jrzc=Sum('jrzc')
+            # )
+
+            # 准备返回数据
+            if shouzhijilu:
+                # 有记录的情况
+                huizongshuju = {
+                    'zongliushui': float(shouzhijilu.zongls or 0),
+                    'zongshouyi': float(shouzhijilu.zongsy or 0),
+                    'zongzhichu': float(shouzhijilu.zongzc or 0),
+                    'jrls': float(shouzhijilu.jrls or 0),
+                    'jrzc': float(shouzhijilu.jrzc or 0)
+                }
+            else:
+                # 没有记录的情况，返回默认值
+                huizongshuju = {
+                    'zongliushui': 0.00,
+                    'zongshouyi': 0.00,
+                    'zongzhichu': 0.00,
+                    'jrls': 0.00,
+                    'jrzc': 0.00
+                }
+
+            # 7. 返回成功响应
+            return Response({
+                'code': 0,
+                'msg': '获取成功',
+                'data': huizongshuju
+            })
+
+        except Exception as e:
+            # 【安全策略】任何异常都返回401，不暴露具体错误信息
+            # 这里可以记录日志，但不返回给前端
+            # import logging
+            # logging.error(f'管理员财务数据接口异常: {str(e)}', exc_info=True)
+
+            return Response(
+                {'code': 401, 'msg': '获取失败', 'data': None},
+                status=status.HTTP_401_UNAUTHORIZED
+            )
+
+
+
+
+
+
+# shangpin/views.py
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class AdGetOrderTypes(APIView):
+    """
+    后台获取订单类型列表接口
+    前端调用地址: /shangpin/getOrderTypes
+    前端需要字段: id, biaoti, tupian_url
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        try:
+            # 1. 获取参数
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+
+            if not qianzhanghao:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2. 身份验证（按你说的方式）
+            dangqianyonghu = request.user
+
+            # 验证手机号
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 验证管理员身份
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 3. 验证管理员扩展表
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AttributeError:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 4. 查询订单类型（商品类型）表
+            # 注意：这里需要根据你实际的模型名调整
+            # 如果模型名不是ShangpinType，请告诉我正确的模型名
+
+            # 假设模型名是ShangpinLeixing（因为我之前看到你有商品类型表）
+            # 你需要告诉我确切的模型名
+            try:
+                # 请替换为你的实际模型名
+                from shangpin.models import ShangpinLeixing  # 或者 ShangpinType
+                # 只查询前端需要的三个字段
+                shangpin_types = ShangpinLeixing.objects.all().only('id', 'jieshao', 'tupian_url')
+
+                # 构建响应数据
+                type_list = [
+                    {
+                        'id': item.id,
+                        'biaoti': item.jieshao or '',
+                        'tupian_url': item.tupian_url or ''
+                    }
+                    for item in shangpin_types
+                ]
+
+
+                return Response({
+                    'code': 0,
+                    'message': '获取成功',
+                    'data': type_list
+                })
+
+            except Exception as e:
+                logger.error(f"查询商品类型表失败: {str(e)}")
+                # 如果表不存在，返回空数组
+                return Response({
+                    'code': 0,
+                    'message': '获取成功',
+                    'data': []
+                })
+
+        except Exception as e:
+            logger.error(f"获取订单类型异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+
+
+
+
+# yonghu/views.py 或 dingdan/views.py
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+import logging
+from django.db.models import Q, Count
+import time
+
+logger = logging.getLogger(__name__)
+
+
+class AdGetDingdanList(APIView):
+    """
+    后台订单列表获取接口
+    前端调用地址: /yonghu/adddhq
+    前端需要字段: dingdan_id, jieshao, zhuangtai, leixing, fadanpingtai, jiage, tupian_url, fadanshijian
+    统计字段: stats.platform.total, stats.platform.completed, stats.merchant.total, stats.merchant.completed
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        try:
+            # 1. 获取参数（严格按前端传的字段名）
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('pageSize', 30))
+
+            # 搜索相关参数
+            dingdan_id = request.data.get('dingdan_id', '').strip()
+
+            # 筛选相关参数（严格按前端字段名）
+            fadanpingtai = request.data.get('fadanpingtai')  # 前端叫 fadanpingtai
+            leixing = request.data.get('leixing')  # 前端叫 leixing
+            zhuangtai = request.data.get('zhuangtai', '')  # 前端叫 zhuangtai
+
+            if not qianzhanghao:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2. 身份验证（与你说的完全一样）
+            dangqianyonghu = request.user
+
+            # 验证手机号
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 验证管理员身份
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 3. 验证管理员扩展表
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AttributeError:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 4. 导入订单模型
+            from dingdan.models import Dingdan  # 你的订单主表模型
+
+            # 5. 构建查询条件（严格按前端字段名映射到数据库字段）
+            query_conditions = Q()
+
+            # 判断是否为搜索模式
+            is_search_mode = bool(dingdan_id)
+
+            if is_search_mode:
+                # 搜索模式：只按订单ID查询
+                query_conditions &= Q(dingdan_id=dingdan_id)
+            else:
+                # 筛选模式
+
+                # 发单平台筛选（前端: fadanpingtai -> 数据库: fadan_pingtai）
+                if fadanpingtai is not None:
+                    try:
+                        fadanpingtai_int = int(fadanpingtai)
+                        if fadanpingtai_int in [1, 2]:
+                            query_conditions &= Q(fadan_pingtai=fadanpingtai_int)
+                    except (ValueError, TypeError):
+                        pass
+
+                # 订单类型筛选（前端: leixing -> 数据库: leixing_id）
+                if leixing is not None:
+                    try:
+                        leixing_int = int(leixing)
+                        query_conditions &= Q(leixing_id=leixing_int)
+                    except (ValueError, TypeError):
+                        pass
+
+                # 订单状态筛选（前端: zhuangtai -> 数据库: zhuangtai）
+                if zhuangtai and zhuangtai != 'all':
+                    try:
+                        # 处理多个状态，如 "1,7"
+                        status_list = [int(s.strip()) for s in zhuangtai.split(',') if s.strip()]
+                        if status_list:
+                            query_conditions &= Q(zhuangtai__in=status_list)
+                    except (ValueError, TypeError):
+                        pass
+
+            # 6. 获取统计数据（平台订单和商家订单）
+            # 注意：这里统计所有订单，不考虑筛选条件
+            try:
+                # 平台订单统计 (fadan_pingtai=1)
+                platform_total = Dingdan.objects.filter(fadan_pingtai=1).count()
+                platform_completed = Dingdan.objects.filter(fadan_pingtai=1, zhuangtai=3).count()
+
+                # 商家订单统计 (fadan_pingtai=2)
+                merchant_total = Dingdan.objects.filter(fadan_pingtai=2).count()
+                merchant_completed = Dingdan.objects.filter(fadan_pingtai=2, zhuangtai=3).count()
+
+                platform_stats = {
+                    'total': platform_total,
+                    'completed': platform_completed
+                }
+                merchant_stats = {
+                    'total': merchant_total,
+                    'completed': merchant_completed
+                }
+            except Exception as e:
+                logger.warning(f"统计数据查询失败: {str(e)}")
+                platform_stats = {'total': 0, 'completed': 0}
+                merchant_stats = {'total': 0, 'completed': 0}
+
+            # 7. 执行分页查询（只查询主表，不查扩展表）
+            start_time = time.time()
+
+            # 计算分页
+            offset = (page - 1) * page_size
+
+            # 查询符合条件的订单总数
+            total_count = Dingdan.objects.filter(query_conditions).count()
+
+            # 查询当前页的数据（只查询主表，只查询前端需要的字段）
+            dingdan_list = Dingdan.objects.filter(query_conditions).only(
+                'dingdan_id', 'jieshao', 'zhuangtai', 'leixing_id',
+                'fadan_pingtai', 'jine', 'tupian', 'create_time'
+            ).order_by('-create_time')[offset:offset + page_size]
+
+            query_time = time.time() - start_time
+            logger.info(f"订单查询完成，耗时: {query_time:.3f}s，查询条数: {len(dingdan_list)}")
+
+            # 8. 构建响应数据（严格按前端需要的字段）
+            result_list = []
+
+            for dingdan in dingdan_list:
+                # 注意：这里字段名必须与前端完全一致
+                order_data = {
+                    'dingdan_id': dingdan.dingdan_id or '',
+                    'jieshao': dingdan.jieshao or '',
+                    'zhuangtai': dingdan.zhuangtai or 1,
+                    'leixing': dingdan.leixing_id or 0,  # 前端需要 leixing
+                    'fadanpingtai': dingdan.fadan_pingtai or 1,  # 前端需要 fadanpingtai
+                    'jiage': float(dingdan.jine) if dingdan.jine else 0.00,  # 价格对应 jine 字段
+                    'tupian_url': dingdan.tupian or '',  # 图片对应 tupian 字段
+                    'fadanshijian': dingdan.create_time.strftime('%Y-%m-%d %H:%M:%S') if dingdan.create_time else ''
+                }
+                result_list.append(order_data)
+
+            # 9. 判断是否有更多数据
+            current_loaded_count = offset + len(result_list)
+            has_more = len(result_list) >= page_size and current_loaded_count < total_count
+
+            # 10. 构建完整响应（严格按前端需要的结构）
+            response_data = {
+                'stats': {
+                    'platform': platform_stats,
+                    'merchant': merchant_stats
+                },
+                'list': result_list,
+                'hasMore': has_more,
+                'total': total_count,
+                'currentPage': page,
+                'pageSize': page_size
+            }
+
+            return Response({
+                'code': 0,
+                'message': '获取成功',
+                'data': response_data
+            })
+
+        except Exception as e:
+            logger.error(f"获取订单列表异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+
+
+
+
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+from rest_framework import status
+from django.db import transaction
+import logging
+
+# 获取日志器
+logger = logging.getLogger(__name__)
+
+
+class AdYaoQingDaShou(APIView):
+    """
+    后台获取邀请码接口（用于邀请打手）
+    权限: JWT Token认证 + 管理员身份验证
+    前端调用: POST /yonghu/adyqds
+    参数: {
+        "zhanghao": "管理员账号"
+    }
+    返回: {
+        "code": 0,
+        "message": "成功",
+        "data": {
+            "yaoqingma": "邀请码"
+        }
+    }
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        try:
+            # 1. 获取前端参数
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+
+            if not qianzhanghao:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2. JWT Token身份验证
+            dangqianyonghu = request.user
+
+            # 3. 验证手机号是否匹配
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 4. 验证用户类型是否为管理员
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 5. 验证管理员扩展表是否存在
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AttributeError:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 6. 获取用户ID（yonghuid），如果获取不到就用'123456'
+            yonghuid_str = getattr(dangqianyonghu, 'yonghuid', '123456')
+
+            # 7. 尝试获取或创建管事扩展表
+            try:
+                # 尝试获取现有的管事扩展表
+                guanshi_profile = dangqianyonghu.guanshi_profile
+            except AttributeError:
+                # 管事扩展表不存在，创建一个
+                try:
+                    from yonghu.models import UserGuanshi
+
+                    # 创建默认的管事扩展表
+                    guanshi_profile = UserGuanshi.objects.create(
+                        user=dangqianyonghu,
+                        yaoqingma='',  # 暂时为空，后面生成
+                        dianhua='',  # 默认空
+                        wechat='',  # 默认空
+                        yaogingshuliang=0,  # 邀请数量为0
+                        zhuangtai=1,  # 正常状态
+                        jinrichongzhi=0,  # 今日充值0
+                        jinyuechongzhi=0,  # 今月充值0
+                        chongzhifenrun=0,  # 充值分佣0
+                        yue=0  # 余额0
+                    )
+                    #logger.info(f"为管理员{dangqianyonghu.yonghuid}创建了管事扩展表")
+                except Exception as e:
+                    logger.error(f"创建管事扩展表失败: {str(e)}")
+                    return Response(
+                        {'code': 500, 'message': '创建用户信息失败', 'data': None},
+                        status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                    )
+
+            # 8. 检查是否已有邀请码
+            existing_yaoqingma = guanshi_profile.yaoqingma
+
+            if existing_yaoqingma and existing_yaoqingma.strip():
+                # 已有邀请码，直接返回
+                return Response({
+                    'code': 0,
+                    'message': '成功获取邀请码',
+                    'data': {
+                        'yaoqingma': existing_yaoqingma
+                    }
+                })
+
+            # 9. 生成新的邀请码
+            try:
+                # 导入邀请码生成工具
+                from utils.yaoqingma_generator import chuangjianYaoqingma
+
+                # 生成邀请码
+                new_yaoqingma = chuangjianYaoqingma(str(yonghuid_str))
+
+                # 验证邀请码格式
+                from utils.yaoqingma_generator import yanzhengYaoqingmaWeiyixing
+                if not yanzhengYaoqingmaWeiyixing(new_yaoqingma):
+                    raise Exception('邀请码格式验证失败')
+
+            except ImportError:
+                # 如果导入失败，使用简单方法生成邀请码
+                import time
+                import random
+                import string
+
+                timestamp = str(int(time.time()))
+                random_str = ''.join(random.choices(string.ascii_uppercase + string.digits, k=8))
+                new_yaoqingma = f"GL{timestamp[-6:]}{random_str}"
+
+                logger.warning(f"使用简单方法生成邀请码: {new_yaoqingma}")
+            except Exception as e:
+                logger.error(f"生成邀请码失败: {str(e)}")
+                return Response(
+                    {'code': 500, 'message': '生成邀请码失败', 'data': None},
+                    status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                )
+
+            # 10. 保存邀请码到数据库
+            try:
+                with transaction.atomic():
+                    guanshi_profile.yaoqingma = new_yaoqingma
+                    guanshi_profile.save()
+
+                    logger.info(f"管理员{dangqianyonghu.yonghuid}生成邀请码: {new_yaoqingma}")
+            except Exception as e:
+                logger.error(f"保存邀请码失败: {str(e)}")
+                return Response(
+                    {'code': 500, 'message': '保存邀请码失败', 'data': None},
+                    status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                )
+
+            # 11. 返回成功响应
+            return Response({
+                'code': 0,
+                'message': '成功生成邀请码',
+                'data': {
+                    'yaoqingma': new_yaoqingma
+                }
+            })
+
+        except Exception as e:
+            logger.error(f"获取邀请码接口异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+
+
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+from rest_framework import status
+from django.db.models import Q
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class AdGuanLiYongHu(APIView):
+    """
+    后台用户管理列表接口
+    权限: JWT Token认证 + 管理员身份验证
+    前端调用: POST /yonghu/adgl
+    参数: {
+        "zhanghao": "管理员账号",
+        "user_type": "用户类型(1-4)",
+        "keyword": "搜索关键词(可选)",
+        "page": "页码(从1开始)",
+        "page_size": "每页数量"
+    }
+    返回: {
+        "code": 0,
+        "message": "成功",
+        "data": {
+            "list": [用户列表],
+            "stats": {"1": 总数, "2": 总数, "3": 总数, "4": 总数},
+            "has_more": true/false
+        }
+    }
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        try:
+            # 1. 获取前端参数
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            user_type = request.data.get('user_type')
+            keyword = request.data.get('keyword', '').strip()
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('page_size', 30))
+
+            # 验证参数
+            if not qianzhanghao or not user_type:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2. JWT Token身份验证
+            dangqianyonghu = request.user
+
+            # 3. 验证手机号是否匹配
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 4. 验证用户类型是否为管理员
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 5. 验证管理员扩展表是否存在
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AttributeError:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 6. 根据用户类型选择查询的模型
+            user_type_int = int(user_type)
+
+            if user_type_int not in [1, 2, 3, 4]:
+                return Response(
+                    {'code': 400, 'message': '用户类型错误', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 7. 统计四种用户类型的总数
+            stats = self._get_user_stats()
+
+            # 8. 根据用户类型查询用户列表
+            user_list, has_more = self._query_users_by_type(
+                user_type_int, keyword, page, page_size
+            )
+
+            # 9. 构建返回数据
+            return Response({
+                'code': 0,
+                'message': '成功',
+                'data': {
+                    'list': user_list,
+                    'stats': stats,
+                    'has_more': has_more
+                }
+            })
+
+        except ValueError:
+            logger.error("参数类型错误")
+            return Response(
+                {'code': 400, 'message': '参数类型错误', 'data': None},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        except Exception as e:
+            logger.error(f"用户管理列表接口异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+    def _get_user_stats(self):
+        """
+        获取四种用户类型的统计数量
+        """
+        try:
+            from yonghu.models import UserBoss, UserDashou, UserGuanshi, UserShangjia
+
+            stats = {
+                '1': UserBoss.objects.count(),
+                '2': UserDashou.objects.count(),
+                '3': UserGuanshi.objects.count(),
+                '4': UserShangjia.objects.count()
+            }
+
+            return stats
+
+        except Exception as e:
+            logger.error(f"获取用户统计失败: {str(e)}")
+            return {'1': 0, '2': 0, '3': 0, '4': 0}
+
+    def _query_users_by_type(self, user_type_int, keyword, page, page_size):
+        """
+        根据用户类型查询用户列表
+        返回: (用户列表, 是否还有更多数据)
+        """
+        try:
+            # 计算偏移量
+            offset = (page - 1) * page_size
+
+            if user_type_int == 1:
+                return self._query_boss_users(keyword, offset, page_size)
+            elif user_type_int == 2:
+                return self._query_dashou_users(keyword, offset, page_size)
+            elif user_type_int == 3:
+                return self._query_guanshi_users(keyword, offset, page_size)
+            elif user_type_int == 4:
+                return self._query_shangjia_users(keyword, offset, page_size)
+            else:
+                return [], False
+
+        except Exception as e:
+            logger.error(f"查询用户列表失败: {str(e)}")
+            return [], False
+
+    def _query_boss_users(self, keyword, offset, limit):
+        """查询普通用户（老板）"""
+        try:
+            from yonghu.models import UserBoss
+
+            queryset = UserBoss.objects.select_related('user')
+
+            if keyword:
+                queryset = queryset.filter(
+                    Q(user__yonghuid__icontains=keyword) |
+                    Q(nickname__icontains=keyword)
+                )
+
+            # 获取总数
+            total_count = queryset.count()
+
+            # 获取当前页的数据
+            users = list(queryset.order_by('-create_time')[offset:offset + limit])
+
+            # 计算是否有更多数据
+            current_count = len(users)
+            has_more = (offset + current_count) < total_count
+
+
+
+            # 构建返回数据
+            user_list = []
+            for boss in users:
+                user_main = boss.user
+
+                user_data = {
+                    'yonghuid': user_main.yonghuid,
+                    'avatar': user_main.avatar or '',
+                    'nicheng': boss.nickname or '',
+                }
+
+                user_list.append(user_data)
+
+            return user_list, has_more
+
+        except Exception as e:
+            logger.error(f"查询老板用户失败: {str(e)}")
+            return [], False
+
+    def _query_dashou_users(self, keyword, offset, limit):
+        """查询打手用户"""
+        try:
+            from yonghu.models import UserDashou
+
+            queryset = UserDashou.objects.select_related('user')
+
+            if keyword:
+                queryset = queryset.filter(
+                    Q(user__yonghuid__icontains=keyword) |
+                    Q(nicheng__icontains=keyword) |
+                    Q(chenghao__icontains=keyword)
+                )
+
+            # 获取总数
+            total_count = queryset.count()
+
+            # 获取当前页的数据
+            dashou_list = list(queryset.order_by('-create_time')[offset:offset + limit])
+
+            # 计算是否有更多数据
+            current_count = len(dashou_list)
+            has_more = (offset + current_count) < total_count
+
+
+
+            # 构建返回数据
+            user_list = []
+            for dashou in dashou_list:
+                user_main = dashou.user
+
+                user_data = {
+                    'yonghuid': user_main.yonghuid,
+                    'avatar': user_main.avatar or '',
+                    'zaixianzhuangtai': dashou.zaixianzhuangtai,
+                    'zhanghaozhuangtai': dashou.zhanghaozhuangtai,
+                    'nicheng': dashou.nicheng or '',
+                    'zhuangtai': dashou.zhuangtai,
+                }
+
+                user_list.append(user_data)
+
+            return user_list, has_more
+
+        except Exception as e:
+            logger.error(f"查询打手用户失败: {str(e)}")
+            return [], False
+
+    def _query_guanshi_users(self, keyword, offset, limit):
+        """查询管事用户"""
+        try:
+            from yonghu.models import UserGuanshi
+
+            queryset = UserGuanshi.objects.select_related('user')
+
+            if keyword:
+                queryset = queryset.filter(
+                    Q(user__yonghuid__icontains=keyword)
+                )
+
+            # 获取总数
+            total_count = queryset.count()
+
+            # 获取当前页的数据
+            guanshi_list = list(queryset.order_by('-create_time')[offset:offset + limit])
+
+            # 计算是否有更多数据
+            current_count = len(guanshi_list)
+            has_more = (offset + current_count) < total_count
+
+
+
+            # 构建返回数据
+            user_list = []
+            for guanshi in guanshi_list:
+                user_main = guanshi.user
+
+                user_data = {
+                    'yonghuid': user_main.yonghuid,
+                    'avatar': user_main.avatar or '',
+                    'zhanghaozhuangtai': guanshi.zhuangtai,
+                    'nicheng': f'管事{user_main.yonghuid}',
+                }
+
+                user_list.append(user_data)
+
+            return user_list, has_more
+
+        except Exception as e:
+            logger.error(f"查询管事用户失败: {str(e)}")
+            return [], False
+
+    def _query_shangjia_users(self, keyword, offset, limit):
+        """查询商家用户"""
+        try:
+            from yonghu.models import UserShangjia
+
+            queryset = UserShangjia.objects.select_related('user')
+
+            if keyword:
+                queryset = queryset.filter(
+                    Q(user__yonghuid__icontains=keyword) |
+                    Q(nicheng__icontains=keyword)
+                )
+
+            # 获取总数
+            total_count = queryset.count()
+
+            # 获取当前页的数据
+            shangjia_list = list(queryset.order_by('-create_time')[offset:offset + limit])
+
+            # 计算是否有更多数据
+            current_count = len(shangjia_list)
+            has_more = (offset + current_count) < total_count
+
+
+
+            # 构建返回数据
+            user_list = []
+            for shangjia in shangjia_list:
+                user_main = shangjia.user
+
+                user_data = {
+                    'yonghuid': user_main.yonghuid,
+                    'avatar': user_main.avatar or '',
+                    'zhanghaozhuangtai': shangjia.zhuangtai,
+                    'nicheng': shangjia.nicheng or '',
+                }
+
+                user_list.append(user_data)
+
+            return user_list, has_more
+
+        except Exception as e:
+            logger.error(f"查询商家用户失败: {str(e)}")
+            return [], False
+
+
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+from rest_framework import status
+from django.db.models import Q
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class CfGuanLi(APIView):
+    """
+    后台处罚管理列表接口
+    权限: JWT Token认证 + 管理员身份验证
+    前端调用: POST /yonghu/cfgl
+    参数: {
+        "zhanghao": "管理员账号",
+        "qingqiu_tongji": true/false,  # 是否只请求统计信息
+        "sqzhuangtai": 0 或 [1,2],     # 处罚申请状态筛选（可选）
+        "page": "页码(从1开始)",       # 分页参数
+        "page_size": "每页数量"        # 分页参数
+    }
+    返回: {
+        "code": 0,
+        "message": "成功",
+        "data": {
+            "list": [处罚记录列表],
+            "zongshu": 总数,
+            "daichuli": 待处理数量,
+            "yichuli": 已处理数量,
+            "haiyougengduo": true/false
+        }
+    }
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        try:
+            # 1. 获取前端参数
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            qingqiu_tongji = request.data.get('qingqiu_tongji', False)
+            sqzhuangtai = request.data.get('sqzhuangtai')
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('page_size', 30))
+
+            # 验证参数
+            if not qianzhanghao:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2. JWT Token身份验证
+            dangqianyonghu = request.user
+
+            # 3. 验证手机号是否匹配
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 4. 验证用户类型是否为管理员
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 5. 验证管理员扩展表是否存在
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AttributeError:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 6. 导入模型
+            from dingdan.models import Chufajilu
+
+            # 7. 获取统计信息（总是需要统计）
+            zongshu = Chufajilu.objects.count()
+            daichuli = Chufajilu.objects.filter(sqzhuangtai__in=[0, 3]).count()
+            yichuli = Chufajilu.objects.filter(sqzhuangtai__in=[1, 2]).count()
+
+            # 8. 如果只请求统计信息，直接返回
+            if qingqiu_tongji:
+                return Response({
+                    'code': 0,
+                    'message': '成功',
+                    'data': {
+                        'zongshu': zongshu,
+                        'daichuli': daichuli,
+                        'yichuli': yichuli
+                    }
+                })
+
+            # 9. 构建查询集
+            queryset = Chufajilu.objects.all()
+
+            # 10. 根据状态筛选
+            if sqzhuangtai is not None:
+                if isinstance(sqzhuangtai, list):
+                    # 如果是数组，表示多个状态
+                    queryset = queryset.filter(sqzhuangtai__in=sqzhuangtai)
+                else:
+                    # 单个状态
+                    queryset = queryset.filter(sqzhuangtai=sqzhuangtai)
+
+            # 11. 获取总数（用于分页计算）
+            total_count = queryset.count()
+
+            # 12. 计算分页偏移量
+            offset = (page - 1) * page_size
+
+            # 13. 分页查询
+            chufa_list = list(queryset.order_by('-create_time')[offset:offset + page_size])
+
+            # 🔴【新增】高效获取图片信息
+            if chufa_list:
+                # 收集所有需要查询的组合
+                dingdan_ids = []
+                yonghu_combinations = []  # 保存 (dingdan_id, yonghuid) 组合
+
+                for chufa in chufa_list:
+                    if chufa.dingdan_id:
+                        dingdan_ids.append(chufa.dingdan_id)
+                        # 商家图片组合
+                        if chufa.qingqiuid:
+                            yonghu_combinations.append((chufa.dingdan_id, chufa.qingqiuid))
+                        # 打手图片组合
+                        if chufa.dashouid:
+                            yonghu_combinations.append((chufa.dingdan_id, chufa.dashouid))
+
+                # 去重
+                dingdan_ids = list(set(dingdan_ids))
+                yonghu_combinations = list(set(yonghu_combinations))
+
+                # 🔴【新增】批量查询图片表（高效查询，避免循环）
+                tupian_mapping = {}
+                if yonghu_combinations:
+                    # 导入图片模型
+                    from dingdan.models import Chufatupian
+
+                    # 构建查询条件
+                    from django.db.models import Q
+                    query_conditions = Q()
+                    for dingdan_id, yonghuid in yonghu_combinations:
+                        query_conditions |= Q(dingdan_id=dingdan_id, yonghuid=yonghuid)
+
+                    # 批量查询
+                    tupian_queryset = Chufatupian.objects.filter(query_conditions).values(
+                        'dingdan_id', 'yonghuid', 'tupian'
+                    )
+
+                    # 构建映射：key为"dingdan_id_yonghuid"，value为图片URL列表
+                    for item in tupian_queryset:
+                        key = f"{item['dingdan_id']}_{item['yonghuid']}"
+                        if key not in tupian_mapping:
+                            tupian_mapping[key] = []
+                        if item['tupian']:
+                            tupian_mapping[key].append(item['tupian'])
+            else:
+                tupian_mapping = {}
+
+            # 🔴【修改】14. 构建返回数据 - 添加图片和申诉理由字段
+            chufa_data = []
+            for chufa in chufa_list:
+                # 🔴【新增】获取商家证据图片
+                zhengju_tupian = []
+                if chufa.dingdan_id and chufa.qingqiuid:
+                    key = f"{chufa.dingdan_id}_{chufa.qingqiuid}"
+                    zhengju_tupian = tupian_mapping.get(key, [])
+
+                # 🔴【新增】获取打手申诉图片
+                shensu_tupian = []
+                if chufa.dingdan_id and chufa.dashouid:
+                    key = f"{chufa.dingdan_id}_{chufa.dashouid}"
+                    shensu_tupian = tupian_mapping.get(key, [])
+
+                chufa_data.append({
+                    'dashouid': chufa.dashouid,
+                    'qingqiuid': chufa.qingqiuid,
+                    'chuliid': chufa.chuliid,
+                    'cfliyou': chufa.cfliyou,
+                    'sqzhuangtai': chufa.sqzhuangtai,
+                    'bhliyou': chufa.bhliyou,
+                    'jifen': chufa.jifen,
+                    'dingdan_id': chufa.dingdan_id,
+                    'create_time': chufa.create_time,
+                    'update_time': chufa.update_time,
+                    # 🔴【新增】申诉理由字段
+                    'ssliyou': chufa.ssliyou or '',
+                    # 🔴【新增】商家证据图片
+                    'zhengju_tupian': zhengju_tupian,
+                    # 🔴【新增】打手申诉图片
+                    'shensu_tupian': shensu_tupian,
+                })
+
+            # 15. 计算是否还有更多数据
+            current_count = len(chufa_list)
+            haiyougengduo = (offset + current_count) < total_count
+
+            return Response({
+                'code': 0,
+                'message': '成功',
+                'data': {
+                    'list': chufa_data,
+                    'zongshu': zongshu,
+                    'daichuli': daichuli,
+                    'yichuli': yichuli,
+                    'haiyougengduo': haiyougengduo
+                }
+            })
+
+        except ValueError:
+            return Response(
+                {'code': 400, 'message': '参数类型错误', 'data': None},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        except Exception as e:
+            logger.error(f"处罚管理列表接口异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+
+
+'''class CfGuanLi(APIView):
+    """
+    后台处罚管理列表接口
+    权限: JWT Token认证 + 管理员身份验证
+    前端调用: POST /yonghu/cfgl
+    参数: {
+        "zhanghao": "管理员账号",
+        "qingqiu_tongji": true/false,  # 是否只请求统计信息
+        "sqzhuangtai": 0 或 [1,2],     # 处罚申请状态筛选（可选）
+        "page": "页码(从1开始)",       # 分页参数
+        "page_size": "每页数量"        # 分页参数
+    }
+    返回: {
+        "code": 0,
+        "message": "成功",
+        "data": {
+            "list": [处罚记录列表],
+            "zongshu": 总数,
+            "daichuli": 待处理数量,
+            "yichuli": 已处理数量,
+            "haiyougengduo": true/false
+        }
+    }
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        try:
+            # 1. 获取前端参数
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            qingqiu_tongji = request.data.get('qingqiu_tongji', False)
+            sqzhuangtai = request.data.get('sqzhuangtai')
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('page_size', 30))
+
+            # 验证参数
+            if not qianzhanghao:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2. JWT Token身份验证
+            dangqianyonghu = request.user
+
+            # 3. 验证手机号是否匹配
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 4. 验证用户类型是否为管理员
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 5. 验证管理员扩展表是否存在
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AttributeError:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 6. 导入模型
+            from dingdan.models import Chufajilu
+
+            # 7. 获取统计信息（总是需要统计）
+            zongshu = Chufajilu.objects.count()
+            daichuli = Chufajilu.objects.filter(sqzhuangtai=0).count()
+            yichuli = Chufajilu.objects.filter(sqzhuangtai__in=[1, 2]).count()
+
+            # 8. 如果只请求统计信息，直接返回
+            if qingqiu_tongji:
+                return Response({
+                    'code': 0,
+                    'message': '成功',
+                    'data': {
+                        'zongshu': zongshu,
+                        'daichuli': daichuli,
+                        'yichuli': yichuli
+                    }
+                })
+
+            # 9. 构建查询集
+            queryset = Chufajilu.objects.all()
+
+            # 10. 根据状态筛选
+            if sqzhuangtai is not None:
+                if isinstance(sqzhuangtai, list):
+                    # 如果是数组，表示多个状态
+                    queryset = queryset.filter(sqzhuangtai__in=sqzhuangtai)
+                else:
+                    # 单个状态
+                    queryset = queryset.filter(sqzhuangtai=sqzhuangtai)
+
+            # 11. 获取总数（用于分页计算）
+            total_count = queryset.count()
+
+            # 12. 计算分页偏移量
+            offset = (page - 1) * page_size
+
+            # 13. 分页查询
+            chufa_list = list(queryset.order_by('-create_time')[offset:offset + page_size])
+
+            # 14. 构建返回数据
+            chufa_data = []
+            for chufa in chufa_list:
+                chufa_data.append({
+                    'dashouid': chufa.dashouid,
+                    'qingqiuid': chufa.qingqiuid,
+                    'chuliid': chufa.chuliid,
+                    'cfliyou': chufa.cfliyou,
+                    'sqzhuangtai': chufa.sqzhuangtai,
+                    'bhliyou': chufa.bhliyou,
+                    'jifen': chufa.jifen,
+                    'dingdan_id': chufa.dingdan_id,
+                    'create_time': chufa.create_time,
+                    'update_time': chufa.update_time
+                })
+
+            # 15. 计算是否还有更多数据
+            current_count = len(chufa_list)
+            haiyougengduo = (offset + current_count) < total_count
+
+            return Response({
+                'code': 0,
+                'message': '成功',
+                'data': {
+                    'list': chufa_data,
+                    'zongshu': zongshu,
+                    'daichuli': daichuli,
+                    'yichuli': yichuli,
+                    'haiyougengduo': haiyougengduo
+                }
+            })
+
+        except ValueError:
+            return Response(
+                {'code': 400, 'message': '参数类型错误', 'data': None},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        except Exception as e:
+            logger.error(f"处罚管理列表接口异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )'''
+
+
+
+
+logger = logging.getLogger(__name__)
+
+
+class AdTongYiChuFa(APIView):
+    """
+    后台同意/驳回处罚接口（已修复重复记录问题）
+    权限: JWT Token认证 + 管理员身份验证
+    前端调用: POST /yonghu/adtycf
+    参数: {
+        "zhanghao": "管理员账号",
+        "dingdan_id": "订单ID",
+        "caozuo": 1或2,  # 1=同意处罚，2=拒绝处罚
+        "bohui_liyou": "拒绝理由"  # 拒绝处罚时必填
+    }
+    返回: {
+        "code": 0,
+        "message": "成功",
+        "data": null
+    }
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        try:
+            # 1. 获取前端参数
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            dingdan_id = request.data.get('dingdan_id', '').strip()
+            caozuo = request.data.get('caozuo')  # 1=同意，2=拒绝
+            bohui_liyou = request.data.get('bohui_liyou', '').strip()
+
+            # 验证参数
+            if not qianzhanghao or not dingdan_id or caozuo is None:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 验证操作类型
+            if caozuo not in [1, 2]:
+                return Response(
+                    {'code': 400, 'message': '操作类型错误', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 如果是拒绝处罚，需要拒绝理由
+            if caozuo == 2 and not bohui_liyou:
+                return Response(
+                    {'code': 400, 'message': '拒绝处罚需要填写理由', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2. JWT Token身份验证
+            dangqianyonghu = request.user
+
+            # 3. 验证手机号是否匹配
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 4. 验证用户类型是否为管理员
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 5. 验证管理员扩展表是否存在
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AttributeError:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 6. 使用事务保证数据一致性
+            with transaction.atomic():
+                # 7. 导入模型
+                from dingdan.models import Chufajilu, Dingdan, DingdanShangjia
+                from yonghu.models import UserDashou
+
+                # 8. 🔴 修复：查询处罚记录（处理重复记录问题）
+                # 使用 filter().first() 而不是 get()，以防出现多条记录
+                chufajilu = Chufajilu.objects.filter(
+                    dingdan_id=dingdan_id,
+                    sqzhuangtai__in=[0, 3]  # 🔴【修改】包括待处理和申诉中状态
+                ).order_by('-create_time').first()  # 取最新的一条
+
+                if not chufajilu:
+                    # 如果没有待处理的处罚记录，检查是否有已处理的
+                    exists_processed = Chufajilu.objects.filter(dingdan_id=dingdan_id).exists()
+                    if exists_processed:
+                        return Response(
+                            {'code': 400, 'message': '该处罚记录已处理', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+                    else:
+                        return Response(
+                            {'code': 404, 'message': '处罚记录不存在', 'data': None},
+                            status=status.HTTP_404_NOT_FOUND
+                        )
+
+                # 9. 验证处罚记录状态（必须是待处理或申诉中状态才能处理）
+                if chufajilu.sqzhuangtai not in [0, 3]:  # 🔴【修改】包括待处理(0)和申诉中(3)
+                    return Response(
+                        {'code': 400, 'message': '该处罚记录已处理', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 10. 🔴 修复：检查是否有重复的待处理/申诉中记录，并记录警告
+                duplicate_count = Chufajilu.objects.filter(
+                    dingdan_id=dingdan_id,
+                    sqzhuangtai__in=[0, 3]  # 🔴【修改】包括待处理和申诉中
+                ).count()
+
+                if duplicate_count > 1:
+                    # 记录警告日志
+                    logger.warning(f"订单ID {dingdan_id} 存在 {duplicate_count} 条待处理/申诉中处罚记录，处理最新的一条")
+
+                    # 🔴 可选：将其他重复的待处理/申诉中记录标记为已拒绝
+                    # 防止用户重复提交相同订单的处罚申请
+                    duplicate_records = Chufajilu.objects.filter(
+                        dingdan_id=dingdan_id,
+                        sqzhuangtai__in=[0, 3]  # 🔴【修改】包括待处理和申诉中
+                    ).exclude(id=chufajilu.id)
+
+                    for dup in duplicate_records:
+                        dup.sqzhuangtai = 2  # 已拒绝
+                        dup.chuliid = qianzhanghao
+                        dup.bhliyou = "系统自动拒绝：存在重复处罚记录"
+                        dup.save()
+
+                # 11. 根据操作类型处理
+                if caozuo == 1:
+                    # 同意处罚 - 不扣分，只改状态
+                    # 11.1 检查打手是否存在
+                    if not chufajilu.dashouid:
+                        return Response(
+                            {'code': 400, 'message': '被处罚打手ID不存在', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+
+                    # 11.2 查询打手扩展表（只是验证存在性）
+                    try:
+                        dashou = UserDashou.objects.get(user__yonghuid=chufajilu.dashouid)
+                    except UserDashou.DoesNotExist:
+                        return Response(
+                            {'code': 404, 'message': '被处罚打手不存在', 'data': None},
+                            status=status.HTTP_404_NOT_FOUND
+                        )
+
+                    # 🔴【修改】11.3 同意处罚时不扣分（因为申请时已经扣了），只更新状态
+                    chufajilu.sqzhuangtai = 1  # 已处罚
+                    chufajilu.chuliid = qianzhanghao  # 处理人ID为管理员账号
+                    chufajilu.save()
+
+                    # 11.4 更新商家订单扩展表
+                    try:
+                        dingdan = Dingdan.objects.get(dingdan_id=dingdan_id)
+                        if hasattr(dingdan, 'shangjia_kuozhan'):
+                            shangjia_kuozhan = dingdan.shangjia_kuozhan
+                            shangjia_kuozhan.sqzhuangtai = 1  # 已处罚
+                            shangjia_kuozhan.save()
+                    except (Dingdan.DoesNotExist, AttributeError):
+                        # 如果订单或扩展表不存在，继续执行，不中断
+                        pass
+
+                    logger.info(f"同意处罚成功：订单ID={dingdan_id}，打手ID={chufajilu.dashouid}")
+
+                elif caozuo == 2:
+                    # 拒绝处罚 - 需要返还积分（加分）
+                    # 🔴【新增】11.5 返还打手积分（加5分）
+                    if chufajilu.jifen > 0:
+                        try:
+                            dashou = UserDashou.objects.get(user__yonghuid=chufajilu.dashouid)
+
+                            # 🔴【新增】安全验证：必须积分小于等于5分才允许加分
+                            if dashou.jifen <= 5:  # 判断积分是否小于等于5分
+                                dashou.jifen += chufajilu.jifen  # 加5分
+                                dashou.save()
+                                logger.info(
+                                    f"拒绝处罚，给打手{dashou.user.yonghuid}返还积分{chufajilu.jifen}分，当前积分{dashou.jifen}")
+                            else:
+                                # 积分已超过5分，可能是异常情况，记录警告但不中断处理
+                                logger.warning(
+                                    f"拒绝处罚时打手积分异常：打手ID={chufajilu.dashouid}，当前积分{dashou.jifen}已超过5分，不再加分")
+                        except UserDashou.DoesNotExist:
+                            # 打手不存在，记录错误，但继续处理状态
+                            logger.error(f"拒绝处罚时打手不存在：打手ID={chufajilu.dashouid}")
+
+                    # 11.6 更新处罚记录
+                    chufajilu.sqzhuangtai = 2  # 已拒绝
+                    chufajilu.chuliid = qianzhanghao  # 处理人ID为管理员账号
+                    chufajilu.bhliyou = bohui_liyou  # 拒绝理由
+                    chufajilu.save()
+
+                    # 11.7 更新商家订单扩展表
+                    try:
+                        dingdan = Dingdan.objects.get(dingdan_id=dingdan_id)
+                        if hasattr(dingdan, 'shangjia_kuozhan'):
+                            shangjia_kuozhan = dingdan.shangjia_kuozhan
+                            shangjia_kuozhan.sqzhuangtai = 2  # 已拒绝
+                            shangjia_kuozhan.bhliyou = bohui_liyou  # 拒绝理由
+                            shangjia_kuozhan.save()
+                    except (Dingdan.DoesNotExist, AttributeError):
+                        # 如果订单或扩展表不存在，继续执行，不中断
+                        pass
+
+                    logger.info(f"拒绝处罚成功：订单ID={dingdan_id}，拒绝理由={bohui_liyou}")
+
+                # 12. 返回成功响应
+                return Response({
+                    'code': 0,
+                    'message': '处理成功',
+                    'data': None
+                })
+
+        except ValueError:
+            return Response(
+                {'code': 400, 'message': '参数类型错误', 'data': None},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        except Exception as e:
+            logger.error(f"处理处罚接口异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+
+
+'''class AdTongYiChuFa(APIView):
+    """
+    后台同意/驳回处罚接口（已修复重复记录问题）
+    权限: JWT Token认证 + 管理员身份验证
+    前端调用: POST /yonghu/adtycf
+    参数: {
+        "zhanghao": "管理员账号",
+        "dingdan_id": "订单ID",
+        "caozuo": 1或2,  # 1=同意处罚，2=驳回处罚
+        "bohui_liyou": "驳回理由"  # 驳回处罚时必填
+    }
+    返回: {
+        "code": 0,
+        "message": "成功",
+        "data": null
+    }
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        try:
+            # 1. 获取前端参数
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            dingdan_id = request.data.get('dingdan_id', '').strip()
+            caozuo = request.data.get('caozuo')  # 1=同意，2=驳回
+            bohui_liyou = request.data.get('bohui_liyou', '').strip()
+
+            # 验证参数
+            if not qianzhanghao or not dingdan_id or caozuo is None:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 验证操作类型
+            if caozuo not in [1, 2]:
+                return Response(
+                    {'code': 400, 'message': '操作类型错误', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 如果是驳回处罚，需要驳回理由
+            if caozuo == 2 and not bohui_liyou:
+                return Response(
+                    {'code': 400, 'message': '驳回处罚需要填写理由', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2. JWT Token身份验证
+            dangqianyonghu = request.user
+
+            # 3. 验证手机号是否匹配
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 4. 验证用户类型是否为管理员
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 5. 验证管理员扩展表是否存在
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AttributeError:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 6. 使用事务保证数据一致性
+            with transaction.atomic():
+                # 7. 导入模型
+                from dingdan.models import Chufajilu, Dingdan, DingdanShangjia
+                from yonghu.models import UserDashou
+
+                # 8. 🔴 修复：查询处罚记录（处理重复记录问题）
+                # 使用 filter().first() 而不是 get()，以防出现多条记录
+                chufajilu = Chufajilu.objects.filter(
+                    dingdan_id=dingdan_id,
+                    sqzhuangtai=0  # 只查询待处理状态的记录
+                ).order_by('-create_time').first()  # 取最新的一条
+
+                if not chufajilu:
+                    # 如果没有待处理的处罚记录，检查是否有已处理的
+                    exists_processed = Chufajilu.objects.filter(dingdan_id=dingdan_id).exists()
+                    if exists_processed:
+                        return Response(
+                            {'code': 400, 'message': '该处罚记录已处理', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+                    else:
+                        return Response(
+                            {'code': 404, 'message': '处罚记录不存在', 'data': None},
+                            status=status.HTTP_404_NOT_FOUND
+                        )
+
+                # 9. 验证处罚记录状态（必须是待处理状态才能处理）
+                if chufajilu.sqzhuangtai != 0:
+                    return Response(
+                        {'code': 400, 'message': '该处罚记录已处理', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 10. 🔴 修复：检查是否有重复的待处理记录，并记录警告
+                duplicate_count = Chufajilu.objects.filter(
+                    dingdan_id=dingdan_id,
+                    sqzhuangtai=0
+                ).count()
+
+                if duplicate_count > 1:
+                    # 记录警告日志
+                    logger.warning(f"订单ID {dingdan_id} 存在 {duplicate_count} 条待处理处罚记录，处理最新的一条")
+
+                    # 🔴 可选：将其他重复的待处理记录标记为已驳回
+                    # 防止用户重复提交相同订单的处罚申请
+                    duplicate_records = Chufajilu.objects.filter(
+                        dingdan_id=dingdan_id,
+                        sqzhuangtai=0
+                    ).exclude(id=chufajilu.id)
+
+                    for dup in duplicate_records:
+                        dup.sqzhuangtai = 2  # 已驳回
+                        dup.chuliid = qianzhanghao
+                        dup.bhliyou = "系统自动驳回：存在重复处罚记录"
+                        dup.save()
+
+                # 11. 根据操作类型处理
+                if caozuo == 1:
+                    # 同意处罚
+                    # 11.1 检查打手是否存在
+                    if not chufajilu.dashouid:
+                        return Response(
+                            {'code': 400, 'message': '被处罚打手ID不存在', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+
+                    # 11.2 查询打手扩展表
+                    try:
+                        dashou = UserDashou.objects.get(user__yonghuid=chufajilu.dashouid)
+                    except UserDashou.DoesNotExist:
+                        return Response(
+                            {'code': 404, 'message': '被处罚打手不存在', 'data': None},
+                            status=status.HTTP_404_NOT_FOUND
+                        )
+
+                    # 11.3 扣除打手积分（确保积分不为负数）
+                    jifen_kouchu = chufajilu.jifen
+                    if jifen_kouchu > 0:
+                        # 检查积分是否足够
+                        if dashou.jifen < jifen_kouchu:
+                            # 如果积分不足，设置为0
+                            dashou.jifen = 0
+                        else:
+                            dashou.jifen -= jifen_kouchu
+                        dashou.save()
+
+                    # 11.4 更新处罚记录
+                    chufajilu.sqzhuangtai = 1  # 已处罚
+                    chufajilu.chuliid = qianzhanghao  # 处理人ID为管理员账号
+                    chufajilu.save()
+
+                    # 11.5 更新商家订单扩展表
+                    try:
+                        dingdan = Dingdan.objects.get(dingdan_id=dingdan_id)
+                        if hasattr(dingdan, 'shangjia_kuozhan'):
+                            shangjia_kuozhan = dingdan.shangjia_kuozhan
+                            shangjia_kuozhan.sqzhuangtai = 1  # 已处罚
+                            shangjia_kuozhan.save()
+                    except (Dingdan.DoesNotExist, AttributeError):
+                        # 如果订单或扩展表不存在，继续执行，不中断
+                        pass
+
+                    #logger.info(f"同意处罚成功：订单ID={dingdan_id}，打手ID={chufajilu.dashouid}，扣除积分={jifen_kouchu}")
+
+                elif caozuo == 2:
+                    # 驳回处罚
+                    # 11.6 更新处罚记录
+                    chufajilu.sqzhuangtai = 2  # 已驳回
+                    chufajilu.chuliid = qianzhanghao  # 处理人ID为管理员账号
+                    chufajilu.bhliyou = bohui_liyou  # 驳回理由
+                    chufajilu.save()
+
+                    # 11.7 更新商家订单扩展表
+                    try:
+                        dingdan = Dingdan.objects.get(dingdan_id=dingdan_id)
+                        if hasattr(dingdan, 'shangjia_kuozhan'):
+                            shangjia_kuozhan = dingdan.shangjia_kuozhan
+                            shangjia_kuozhan.sqzhuangtai = 2  # 已驳回
+                            shangjia_kuozhan.bhliyou = bohui_liyou  # 驳回理由
+                            shangjia_kuozhan.save()
+                    except (Dingdan.DoesNotExist, AttributeError):
+                        # 如果订单或扩展表不存在，继续执行，不中断
+                        pass
+
+                    #logger.info(f"驳回处罚成功：订单ID={dingdan_id}，驳回理由={bohui_liyou}")
+
+                # 12. 返回成功响应
+                return Response({
+                    'code': 0,
+                    'message': '处理成功',
+                    'data': None
+                })
+
+        except ValueError:
+            return Response(
+                {'code': 400, 'message': '参数类型错误', 'data': None},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        except Exception as e:
+            logger.error(f"处理处罚接口异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )'''
+
+
+'''class AdTongYiChuFa(APIView):
+    """
+    后台同意/驳回处罚接口
+    权限: JWT Token认证 + 管理员身份验证
+    前端调用: POST /yonghu/adtycf
+    参数: {
+        "zhanghao": "管理员账号",
+        "dingdan_id": "订单ID",
+        "caozuo": 1或2,  # 1=同意处罚，2=驳回处罚
+        "bohui_liyou": "驳回理由"  # 驳回处罚时必填
+    }
+    返回: {
+        "code": 0,
+        "message": "成功",
+        "data": null
+    }
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        try:
+            # 1. 获取前端参数
+            qianzhanghao = request.data.get('zhanghao', '').strip()
+            dingdan_id = request.data.get('dingdan_id', '').strip()
+            caozuo = request.data.get('caozuo')  # 1=同意，2=驳回
+            bohui_liyou = request.data.get('bohui_liyou', '').strip()
+
+            # 验证参数
+            if not qianzhanghao or not dingdan_id or caozuo is None:
+                return Response(
+                    {'code': 400, 'message': '参数不完整', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 验证操作类型
+            if caozuo not in [1, 2]:
+                return Response(
+                    {'code': 400, 'message': '操作类型错误', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 如果是驳回处罚，需要驳回理由
+            if caozuo == 2 and not bohui_liyou:
+                return Response(
+                    {'code': 400, 'message': '驳回处罚需要填写理由', 'data': None},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+
+            # 2. JWT Token身份验证
+            dangqianyonghu = request.user
+
+            # 3. 验证手机号是否匹配
+            if not hasattr(dangqianyonghu, 'phone') or str(dangqianyonghu.phone) != qianzhanghao:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 4. 验证用户类型是否为管理员
+            if dangqianyonghu.user_type != 'admin':
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 5. 验证管理员扩展表是否存在
+            try:
+                guanliyuan = dangqianyonghu.admin_profile
+            except AttributeError:
+                return Response(
+                    {'code': 401, 'message': '身份验证失败', 'data': None},
+                    status=status.HTTP_401_UNAUTHORIZED
+                )
+
+            # 6. 使用事务保证数据一致性
+            with transaction.atomic():
+                # 7. 导入模型
+                from dingdan.models import Chufajilu, Dingdan, DingdanShangjia
+                from yonghu.models import UserDashou
+
+                # 8. 查询处罚记录
+                try:
+                    chufajilu = Chufajilu.objects.get(dingdan_id=dingdan_id)
+                except Chufajilu.DoesNotExist:
+                    return Response(
+                        {'code': 404, 'message': '处罚记录不存在', 'data': None},
+                        status=status.HTTP_404_NOT_FOUND
+                    )
+
+                # 9. 验证处罚记录状态（必须是待处理状态才能处理）
+                if chufajilu.sqzhuangtai != 0:
+                    return Response(
+                        {'code': 400, 'message': '该处罚记录已处理', 'data': None},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
+                # 10. 根据操作类型处理
+                if caozuo == 1:
+                    # 同意处罚
+                    # 10.1 检查打手是否存在
+                    if not chufajilu.dashouid:
+                        return Response(
+                            {'code': 400, 'message': '被处罚打手ID不存在', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+
+                    # 10.2 查询打手扩展表
+                    try:
+                        dashou = UserDashou.objects.get(user__yonghuid=chufajilu.dashouid)
+                    except UserDashou.DoesNotExist:
+                        return Response(
+                            {'code': 404, 'message': '被处罚打手不存在', 'data': None},
+                            status=status.HTTP_404_NOT_FOUND
+                        )
+
+                    # 10.3 扣除打手积分（确保积分不为负数）
+                    jifen_kouchu = chufajilu.jifen
+                    if jifen_kouchu > 0:
+                        # 检查积分是否足够
+                        if dashou.jifen < jifen_kouchu:
+                            # 如果积分不足，设置为0
+                            dashou.jifen = 0
+                        else:
+                            dashou.jifen -= jifen_kouchu
+                        dashou.save()
+
+                    # 10.4 更新处罚记录
+                    chufajilu.sqzhuangtai = 1  # 已处罚
+                    chufajilu.chuliid = qianzhanghao  # 处理人ID为管理员账号
+                    chufajilu.save()
+
+                    # 10.5 更新商家订单扩展表
+                    try:
+                        dingdan = Dingdan.objects.get(dingdan_id=dingdan_id)
+                        shangjia_kuozhan = dingdan.shangjia_kuozhan
+                        shangjia_kuozhan.sqzhuangtai = 1  # 已处罚
+                        shangjia_kuozhan.save()
+                    except (Dingdan.DoesNotExist, AttributeError):
+                        # 如果订单或扩展表不存在，继续执行，不中断
+                        pass
+
+                    #logger.info(f"同意处罚成功：订单ID={dingdan_id}，打手ID={chufajilu.dashouid}，扣除积分={jifen_kouchu}")
+
+                elif caozuo == 2:
+                    # 驳回处罚
+                    # 10.6 更新处罚记录
+                    chufajilu.sqzhuangtai = 2  # 已驳回
+                    chufajilu.chuliid = qianzhanghao  # 处理人ID为管理员账号
+                    chufajilu.bhliyou = bohui_liyou  # 驳回理由
+                    chufajilu.save()
+
+                    # 10.7 更新商家订单扩展表
+                    try:
+                        dingdan = Dingdan.objects.get(dingdan_id=dingdan_id)
+                        shangjia_kuozhan = dingdan.shangjia_kuozhan
+                        shangjia_kuozhan.sqzhuangtai = 2  # 已驳回
+                        shangjia_kuozhan.bhliyou = bohui_liyou  # 驳回理由
+                        shangjia_kuozhan.save()
+                    except (Dingdan.DoesNotExist, AttributeError):
+                        # 如果订单或扩展表不存在，继续执行，不中断
+                        pass
+
+                    #logger.info(f"驳回处罚成功：订单ID={dingdan_id}，驳回理由={bohui_liyou}")
+
+                # 11. 返回成功响应
+                return Response({
+                    'code': 0,
+                    'message': '处理成功',
+                    'data': None
+                })
+
+        except ValueError:
+            return Response(
+                {'code': 400, 'message': '参数类型错误', 'data': None},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        except Exception as e:
+            logger.error(f"处理处罚接口异常: {str(e)}", exc_info=True)
+            return Response(
+                {'code': 500, 'message': '服务器内部错误', 'data': None},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )'''
+
+
+
+
+
+# yonghu/views.py
+from django.utils import timezone
+from datetime import timedelta
+from decimal import Decimal
+from django.db import transaction
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from rest_framework import status
+from .models import (
+    UserMain, UserBoss, UserDashou, UserShangjia, UserGuanshi,
+    AdminProfile, Xiugaijilu
+)
+from shangpin.models import Huiyuan, Huiyuangoumai
+
+
+class AdckyhxqView(APIView):
+    """
+    获取用户详情接口
+    前端需要传递: zhanghao, uid, user_type
+    返回用户信息和会员列表
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # ==================== 管理员身份验证 ====================
+            # 1. 验证JWT Token
+            if not request.user.is_authenticated:
+                return Response({
+                    'code': 401,
+                    'message': '未认证',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            # 2. 验证用户类型为管理员
+            if request.user.user_type != 'admin':
+                return Response({
+                    'code': 403,
+                    'message': '权限不足',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+
+            # 3. 验证管理员扩展表存在
+            admin_profile = getattr(request.user, 'admin_profile', None)
+            if not admin_profile:
+                return Response({
+                    'code': 403,
+                    'message': '管理员信息不完整',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+
+            # 4. 验证管理员账号（phone）与前端传递的zhanghao一致
+            zhanghao = request.data.get('zhanghao')
+            if not zhanghao or request.user.phone != zhanghao:
+                return Response({
+                    'code': 401,
+                    'message': '账号验证失败',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+            # ==================== 身份验证结束 ====================
+
+            # 获取业务参数
+            uid = request.data.get('uid')  # 用户ID (yonghuid)
+            user_type = request.data.get('user_type')  # 用户类型 (1,2,3,4)
+
+            if not uid or not user_type:
+                return Response({
+                    'code': 400,
+                    'message': '参数缺失',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 验证用户类型
+            try:
+                user_type = int(user_type)
+                if user_type not in [1, 2, 3, 4]:
+                    raise ValueError
+            except ValueError:
+                return Response({
+                    'code': 400,
+                    'message': '用户类型无效',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 查询用户主表 - 使用select_related优化查询
+            user_main = UserMain.objects.filter(yonghuid=uid).first()
+            if not user_main:
+                return Response({
+                    'code': 404,
+                    'message': '用户不存在',
+                    'data': None
+                }, status=status.HTTP_404_NOT_FOUND)
+
+            # 构建响应数据
+            response_data = {
+                'user_info': {},
+                'member_list': [],
+                'all_member_list': []
+            }
+
+            # 通用字段（所有用户都有）
+            user_info = {
+                'yonghuid': user_main.yonghuid,
+                'avatar': user_main.avatar,
+                'phone': user_main.phone,
+                'ip': user_main.ip,
+                'create_time': user_main.create_time,
+                'update_time': user_main.update_time,
+                'user_type': user_type
+            }
+
+            # 根据用户类型查询扩展信息
+            if user_type == 1:  # 老板
+                # 使用select_related预取boss_profile
+                user_main = UserMain.objects.filter(yonghuid=uid).select_related('boss_profile').first()
+                if user_main.boss_profile:
+                    boss_profile = user_main.boss_profile
+                    user_info.update({
+                        'nickname': boss_profile.nickname,
+                        'zonge': boss_profile.zonge,
+                        'alldingdan': boss_profile.alldingdan,
+                        'alltui': boss_profile.alltui,
+                        'create_time_boss': boss_profile.create_time
+                    })
+
+            elif user_type == 2:  # 打手
+                # 使用select_related预取dashou_profile
+                user_main = UserMain.objects.filter(yonghuid=uid).select_related('dashou_profile').first()
+                if user_main.dashou_profile:
+                    dashou_profile = user_main.dashou_profile
+
+                    # 构建打手信息
+                    user_info.update({
+                        'nicheng': dashou_profile.nicheng,
+                        'chenghao': dashou_profile.chenghao,
+                        'zhuangtai': dashou_profile.zhuangtai,
+                        'zaixianzhuangtai': dashou_profile.zaixianzhuangtai,
+                        'zhanghaozhuangtai': dashou_profile.zhanghaozhuangtai,
+                        'jieshao': dashou_profile.jieshao,
+                        'jiedanzongliang': dashou_profile.jiedanzongliang,
+                        'chengjiaozongliang': dashou_profile.chengjiaozongliang,
+                        'tuikuanliang': dashou_profile.tuikuanliang,
+                        'yue': dashou_profile.yue,  # 打手可提现余额
+                        'zonge': dashou_profile.zonge,  # 打手赚取总额
+                        'dianhua': dashou_profile.dianhua,
+                        'wechat': dashou_profile.wechat,
+                        'yaoqingren': dashou_profile.yaoqingren,
+                        'jinrijiedan': dashou_profile.jinrijiedan,
+                        'jinrishouyi': dashou_profile.jinrishouyi,
+                        'jinyuejiedan': dashou_profile.jinyuejiedan,
+                        'jinyueshouyi': dashou_profile.jinyueshouyi,
+                        'jifen': dashou_profile.jifen,
+                        'yajin': dashou_profile.yajin,
+                        'create_time_dashou': dashou_profile.create_time
+                    })
+
+                    # 查询打手的会员信息（只返回未过期的）
+                    # 使用select_related预取huiyuan信息（如果有关联的话）
+                    member_records = Huiyuangoumai.objects.filter(
+                        yonghu_id=uid
+                    ).order_by('-create_time')
+
+                    member_list = []
+                    for record in member_records:
+                        # 调用方法检查是否过期，并更新状态
+                        is_expired = record.jiance_shifou_daoqi()
+
+                        if not is_expired:  # 只返回未过期的
+                            # 查询会员详情
+                            huiyuan = Huiyuan.objects.filter(
+                                huiyuan_id=record.huiyuan_id
+                            ).first()
+
+                            if huiyuan:
+                                member_list.append({
+                                    'huiyuan_id': record.huiyuan_id,
+                                    'huiyuan_name': huiyuan.jieshao,
+                                    'daoqi_time': record.daoqi_time,
+                                    'is_active': record.huiyuan_zhuangtai == 1,
+                                    'create_time': record.create_time
+                                })
+
+                    response_data['member_list'] = member_list
+
+            elif user_type == 3:  # 管事
+                # 使用select_related预取guanshi_profile
+                user_main = UserMain.objects.filter(yonghuid=uid).select_related('guanshi_profile').first()
+                if user_main.guanshi_profile:
+                    guanshi_profile = user_main.guanshi_profile
+                    user_info.update({
+                        'nicheng': user_main.phone,  # 管事昵称用手机号
+                        'yaoqingma': guanshi_profile.yaoqingma,
+                        'dianhua': guanshi_profile.dianhua,
+                        'wechat': guanshi_profile.wechat,
+                        'yaogingshuliang': guanshi_profile.yaogingshuliang,
+                        'zhuangtai': guanshi_profile.zhuangtai,
+                        'jinrichongzhi': guanshi_profile.jinrichongzhi,
+                        'jinyuechongzhi': guanshi_profile.jinyuechongzhi,
+                        'chongzhifenrun': guanshi_profile.chongzhifenrun,
+                        'yue': guanshi_profile.yue,  # 管事可提现余额
+                        'create_time_guanshi': guanshi_profile.create_time
+                    })
+
+            elif user_type == 4:  # 商家
+                # 使用select_related预取shop_profile
+                user_main = UserMain.objects.filter(yonghuid=uid).select_related('shop_profile').first()
+                if user_main.shop_profile:
+                    shop_profile = user_main.shop_profile
+                    user_info.update({
+                        'nicheng': shop_profile.nicheng,
+                        'zhuangtai': shop_profile.zhuangtai,
+                        'dianhua': shop_profile.dianhua,
+                        'wechat': shop_profile.wechat,
+                        'fabu': shop_profile.fabu,
+                        'tuikuan': shop_profile.tuikuan,
+                        'yue': shop_profile.yue,  # 商家余额
+                        'chengjiao': shop_profile.chengjiao,
+                        'jinridingdan': shop_profile.jinridingdan,
+                        'jinriliushui': shop_profile.jinriliushui,
+                        'jinyuedingdan': shop_profile.jinyuedingdan,
+                        'jinyueliushui': shop_profile.jinyueliushui,
+                        'create_time_shop': shop_profile.create_time
+                    })
+
+            # 获取所有会员列表（用于前端下拉选择）
+            all_huiyuan = Huiyuan.objects.all().order_by('jiage')
+            all_member_list = [
+                {
+                    'id': huiyuan.huiyuan_id,
+                    'nicheng': huiyuan.jieshao,
+                    'jiage': huiyuan.jiage,
+                    'jieshao': huiyuan.jtjieshao
+                }
+                for huiyuan in all_huiyuan
+            ]
+
+            response_data['user_info'] = user_info
+            response_data['all_member_list'] = all_member_list
+
+            return Response({
+                'code': 0,
+                'message': '获取成功',
+                'data': response_data
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            return Response({
+                'code': 500,
+                'message': f'获取用户详情失败: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+class AdcjxgView(APIView):
+    """
+    修改用户信息接口
+    前端需要传递: zhanghao, uid, user_type, 以及其他修改的字段
+    支持打手会员添加功能
+    敏感字段修改会记录到修改记录表
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # ==================== 管理员身份验证 ====================
+            if not request.user.is_authenticated:
+                return Response({
+                    'code': 401,
+                    'message': '未认证',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            if request.user.user_type != 'admin':
+                return Response({
+                    'code': 403,
+                    'message': '权限不足',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+
+            admin_profile = getattr(request.user, 'admin_profile', None)
+            if not admin_profile:
+                return Response({
+                    'code': 403,
+                    'message': '管理员信息不完整',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+
+            zhanghao = request.data.get('zhanghao')
+            if not zhanghao or request.user.phone != zhanghao:
+                return Response({
+                    'code': 401,
+                    'message': '账号验证失败',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+            # ==================== 身份验证结束 ====================
+
+            # 获取业务参数
+            uid = request.data.get('uid')
+            user_type = request.data.get('user_type')
+
+            if not uid or not user_type:
+                return Response({
+                    'code': 400,
+                    'message': '参数缺失',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            try:
+                user_type = int(user_type)
+                if user_type not in [1, 2, 3, 4]:
+                    raise ValueError
+            except ValueError:
+                return Response({
+                    'code': 400,
+                    'message': '用户类型无效',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 查询用户主表
+            user_main = UserMain.objects.filter(yonghuid=uid).first()
+            if not user_main:
+                return Response({
+                    'code': 404,
+                    'message': '用户不存在',
+                    'data': None
+                }, status=status.HTTP_404_NOT_FOUND)
+
+            # 使用事务确保数据一致性
+            with transaction.atomic():
+                # 存储修改记录的数据
+                modify_record_data = {
+                    'yonghuid': uid,
+                    'xiugaiid': zhanghao,
+                    'leixing': user_type,
+                    'qitashuoming': '',
+                    'create_time': timezone.now()
+                }
+
+                # 标记是否有敏感字段被修改
+                has_sensitive_change = False
+
+                if user_type == 1:  # 老板 - 不允许修改
+                    return Response({
+                        'code': 403,
+                        'message': '老板信息不允许修改',
+                        'data': None
+                    }, status=status.HTTP_403_FORBIDDEN)
+
+                elif user_type == 2:  # 打手
+                    # 获取或创建打手扩展记录
+                    dashou_profile, created = UserDashou.objects.get_or_create(
+                        user=user_main,
+                        defaults={'nicheng': user_main.phone or f'打手{uid}'}
+                    )
+
+                    # 记录敏感字段的旧值
+                    old_yue = dashou_profile.yue  # 打手可提现余额
+                    old_zonge = dashou_profile.zonge  # 打手提现金额
+                    old_jifen = dashou_profile.jifen  # 打手积分
+                    old_yajin = dashou_profile.yajin  # 打手押金
+
+                    # 需要更新的字段列表
+                    update_fields = [
+                        'chenghao', 'dianhua', 'yue', 'zonge', 'jifen',
+                        'yajin', 'yaoqingren', 'jieshao', 'zhuangtai',
+                        'zaixianzhuangtai', 'zhanghaozhuangtai'
+                    ]
+
+                    # 记录被修改的字段
+                    modified_fields = []
+
+                    for field in update_fields:
+                        if field in request.data:
+                            new_value = request.data.get(field)
+                            old_value = getattr(dashou_profile, field)
+
+                            # 检查值是否改变
+                            if str(new_value) != str(old_value):
+                                # 处理特殊字段类型
+                                if field in ['yue', 'zonge', 'yajin']:
+                                    new_value = Decimal(str(new_value))
+                                    setattr(dashou_profile, field, new_value)
+                                elif field in ['jifen']:
+                                    new_value = int(new_value)
+                                    setattr(dashou_profile, field, new_value)
+                                elif field in ['zhuangtai', 'zaixianzhuangtai', 'zhanghaozhuangtai']:
+                                    new_value = int(new_value)
+                                    setattr(dashou_profile, field, new_value)
+                                else:
+                                    setattr(dashou_profile, field, new_value)
+
+                                modified_fields.append(field)
+
+                                # 记录敏感字段修改
+                                if field == 'yue':
+                                    has_sensitive_change = True
+                                    modify_record_data['xiugaitijiao'] = new_value  # 使用xiugaitijiao字段记录打手余额修改
+                                    modify_record_data['xiugaitijiaoq'] = old_yue
+                                elif field == 'zonge':
+                                    has_sensitive_change = True
+                                    # zonge字段在修改记录表中可能没有直接对应，可以记录在备注中
+                                    modify_record_data['qitashuoming'] += f' 打手总额从{old_zonge}修改为{new_value}'
+                                elif field == 'jifen':
+                                    has_sensitive_change = True
+                                    modify_record_data['jifen'] = new_value
+                                    modify_record_data['yjifen'] = old_jifen
+                                elif field == 'yajin':
+                                    has_sensitive_change = True
+                                    modify_record_data['yajin'] = new_value
+                                    modify_record_data['yyajin'] = old_yajin
+
+                    # 保存打手信息
+                    dashou_profile.save()
+
+                    # 记录被修改的非敏感字段
+                    non_sensitive_fields = [f for f in modified_fields if f not in ['yue', 'zonge', 'jifen', 'yajin']]
+                    if non_sensitive_fields:
+                        modify_record_data['qitashuoming'] += f' 修改了字段: {",".join(non_sensitive_fields)}'
+
+                elif user_type == 3:  # 管事
+                    # 获取或创建管事扩展记录
+                    guanshi_profile, created = UserGuanshi.objects.get_or_create(
+                        user=user_main,
+                        defaults={'yaoqingma': f'GS{uid[-4:]}'}
+                    )
+
+                    # 记录敏感字段的旧值
+                    old_yue = guanshi_profile.yue  # 管事可提现余额
+
+                    update_fields = [
+                        'yaogingshuliang', 'chongzhifenrun', 'yue',
+                        'zhuangtai', 'dianhua', 'wechat'
+                    ]
+
+                    modified_fields = []
+
+                    for field in update_fields:
+                        if field in request.data:
+                            new_value = request.data.get(field)
+                            old_value = getattr(guanshi_profile, field)
+
+                            if str(new_value) != str(old_value):
+                                if field in ['chongzhifenrun', 'yue']:
+                                    new_value = Decimal(str(new_value))
+                                    setattr(guanshi_profile, field, new_value)
+                                elif field in ['yaogingshuliang']:
+                                    new_value = int(new_value)
+                                    setattr(guanshi_profile, field, new_value)
+                                elif field in ['zhuangtai']:
+                                    new_value = int(new_value)
+                                    setattr(guanshi_profile, field, new_value)
+                                else:
+                                    setattr(guanshi_profile, field, new_value)
+
+                                modified_fields.append(field)
+
+                                # 记录敏感字段修改
+                                if field == 'yue':
+                                    has_sensitive_change = True
+                                    modify_record_data['guanshiyue'] = new_value
+                                    modify_record_data['guanshiyueq'] = old_yue
+                                elif field == 'chongzhifenrun':
+                                    has_sensitive_change = True
+                                    modify_record_data['qitashuoming'] += f' 管事分佣从{old_value}修改为{new_value}'
+
+                    guanshi_profile.save()
+
+                    # 记录非敏感字段
+                    non_sensitive_fields = [f for f in modified_fields if f not in ['yue', 'chongzhifenrun']]
+                    if non_sensitive_fields:
+                        modify_record_data['qitashuoming'] += f' 修改了字段: {",".join(non_sensitive_fields)}'
+
+                elif user_type == 4:  # 商家
+                    # 获取或创建商家扩展记录
+                    shop_profile, created = UserShangjia.objects.get_or_create(
+                        user=user_main,
+                        defaults={'nicheng': user_main.phone or f'商家{uid}'}
+                    )
+
+                    # 记录敏感字段的旧值
+                    old_yue = shop_profile.yue  # 商家余额
+
+                    update_fields = ['yue', 'zhuangtai', 'dianhua', 'wechat']
+
+                    modified_fields = []
+
+                    for field in update_fields:
+                        if field in request.data:
+                            new_value = request.data.get(field)
+                            old_value = getattr(shop_profile, field)
+
+                            if str(new_value) != str(old_value):
+                                if field == 'yue':
+                                    new_value = Decimal(str(new_value))
+                                    setattr(shop_profile, field, new_value)
+                                elif field == 'zhuangtai':
+                                    new_value = int(new_value)
+                                    setattr(shop_profile, field, new_value)
+                                else:
+                                    setattr(shop_profile, field, new_value)
+
+                                modified_fields.append(field)
+
+                                # 记录敏感字段修改
+                                if field == 'yue':
+                                    has_sensitive_change = True
+                                    modify_record_data['shangjiayue'] = new_value
+                                    modify_record_data['shangjiayueq'] = old_yue
+
+                    shop_profile.save()
+
+                    # 记录非敏感字段
+                    non_sensitive_fields = [f for f in modified_fields if f != 'yue']
+                    if non_sensitive_fields:
+                        modify_record_data['qitashuoming'] += f' 修改了字段: {",".join(non_sensitive_fields)}'
+
+
+
+
+                # 处理打手会员添加（只有打手可以添加会员）
+                '''if user_type == 2 and 'huiyuan_id' in request.data and 'days' in request.data:
+                    huiyuan_id = request.data.get('huiyuan_id')
+                    days = int(request.data.get('days', 0))
+
+                    if huiyuan_id and days > 0:
+                        if days < 1 or days > 10000:
+                            return Response({
+                                'code': 400,
+                                'message': '会员天数必须在1-10000之间',
+                                'data': None
+                            }, status=status.HTTP_400_BAD_REQUEST)
+
+                        # 检查会员是否存在
+                        huiyuan = Huiyuan.objects.filter(huiyuan_id=huiyuan_id).first()
+                        if not huiyuan:
+                            return Response({
+                                'code': 404,
+                                'message': '会员不存在',
+                                'data': None
+                            }, status=status.HTTP_404_NOT_FOUND)
+
+                        # 检查是否已购买该会员
+                        existing_record = Huiyuangoumai.objects.filter(
+                            yonghu_id=uid,
+                            huiyuan_id=huiyuan_id
+                        ).first()
+
+                        if existing_record:
+                            # 续费：延长到期时间
+                            if existing_record.daoqi_time < timezone.now():
+                                # 已过期，从当前时间开始算
+                                new_daoqi_time = timezone.now() + timedelta(days=days)
+                            else:
+                                # 未过期，从原到期时间开始算
+                                new_daoqi_time = existing_record.daoqi_time + timedelta(days=days)
+
+                            existing_record.daoqi_time = new_daoqi_time
+                            existing_record.save()
+
+                            # 记录会员续费
+                            has_sensitive_change = True
+                            modify_record_data['huiyuants'] = days
+                            modify_record_data['huiyuan_id'] = huiyuan_id
+                            modify_record_data['qitashuoming'] += f' 续费会员 {huiyuan.jieshao} {days}天'
+                        else:
+                            # 新购买
+                            daoqi_time = timezone.now() + timedelta(days=days)
+                            new_record = Huiyuangoumai.objects.create(
+                                huiyuan_id=huiyuan_id,
+                                yonghu_id=uid,
+                                jieshao=huiyuan.jieshao,
+                                daoqi_time=daoqi_time
+                            )
+
+                            # 记录会员购买
+                            has_sensitive_change = True
+                            modify_record_data['huiyuants'] = days
+                            modify_record_data['huiyuan_id'] = huiyuan_id
+                            modify_record_data['qitashuoming'] += f' 购买会员 {huiyuan.jieshao} {days}天'
+
+                        # 更新会员购买次数
+                        huiyuan.goumai_cishu += 1
+                        huiyuan.save()'''
+
+                # 🔥🔥🔥 后端修改：支持正负数会员天数
+                # 修改会员处理逻辑部分
+
+                if user_type == 2 and 'huiyuan_id' in request.data and 'days' in request.data:
+                    huiyuan_id = request.data.get('huiyuan_id')
+                    days = int(request.data.get('days', 0))
+
+                    # 🔥 修改：允许正负数，但不能为0
+                    if huiyuan_id and days != 0:
+                        # 🔥 修改：检查绝对值范围
+                        if abs(days) < 1 or abs(days) > 10000:
+                            return Response({
+                                'code': 400,
+                                'message': '会员天数必须在1-10000之间（正数增加，负数减少）',
+                                'data': None
+                            }, status=status.HTTP_400_BAD_REQUEST)
+
+                        # 检查会员是否存在
+                        huiyuan = Huiyuan.objects.filter(huiyuan_id=huiyuan_id).first()
+                        if not huiyuan:
+                            return Response({
+                                'code': 404,
+                                'message': '会员不存在',
+                                'data': None
+                            }, status=status.HTTP_404_NOT_FOUND)
+
+                        # 检查是否已购买该会员
+                        existing_record = Huiyuangoumai.objects.filter(
+                            yonghu_id=uid,
+                            huiyuan_id=huiyuan_id
+                        ).first()
+
+                        if existing_record:
+                            # 🔥🔥🔥 重要修改：支持减少天数
+                            # 计算新的到期时间
+                            new_daoqi_time = existing_record.daoqi_time + timedelta(days=days)
+
+                            # 🔥 安全验证：减少天数后不能小于当前时间前90天（防止过度减少）
+                            # 这个限制可以根据业务调整
+                            min_allowed_time = timezone.now() - timedelta(days=90)
+                            if new_daoqi_time < min_allowed_time:
+                                return Response({
+                                    'code': 400,
+                                    'message': f'减少天数过多，调整后到期时间不能早于 {(min_allowed_time + timedelta(days=90)).strftime("%Y-%m-%d")}',
+                                    'data': None
+                                }, status=status.HTTP_400_BAD_REQUEST)
+
+                            existing_record.daoqi_time = new_daoqi_time
+                            existing_record.save()
+
+                            # 记录会员操作
+                            has_sensitive_change = True
+                            modify_record_data['huiyuants'] = days
+                            modify_record_data['huiyuan_id'] = huiyuan_id
+
+                            if days > 0:
+                                modify_record_data['qitashuoming'] += f' 续费会员 {huiyuan.jieshao} {days}天'
+                                # 只有增加天数时才增加购买次数
+                                huiyuan.goumai_cishu += 1
+                                huiyuan.save()
+                            else:
+                                modify_record_data[
+                                    'qitashuoming'] += f' 减少会员 {huiyuan.jieshao} {abs(days)}天'
+                                # 减少天数时不增加购买次数
+
+                        else:
+                            # 🔥 修改：新购买时只能增加天数
+                            if days > 0:
+                                daoqi_time = timezone.now() + timedelta(days=days)
+                                new_record = Huiyuangoumai.objects.create(
+                                    huiyuan_id=huiyuan_id,
+                                    yonghu_id=uid,
+                                    jieshao=huiyuan.jieshao,
+                                    daoqi_time=daoqi_time
+                                )
+
+                                # 记录会员购买
+                                has_sensitive_change = True
+                                modify_record_data['huiyuants'] = days
+                                modify_record_data['huiyuan_id'] = huiyuan_id
+                                modify_record_data['qitashuoming'] += f' 购买会员 {huiyuan.jieshao} {days}天'
+
+                                # 更新会员购买次数
+                                huiyuan.goumai_cishu += 1
+                                huiyuan.save()
+                            else:
+                                # 🔥 不能为不存在的会员减少天数
+                                return Response({
+                                    'code': 400,
+                                    'message': '用户未购买该会员，无法减少天数',
+                                    'data': None
+                                }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 如果有敏感字段被修改或会员操作，创建修改记录
+                if has_sensitive_change or 'huiyuan_id' in request.data:
+                    # 创建修改记录
+                    Xiugaijilu.objects.create(**modify_record_data)
+                elif modify_record_data.get('qitashuoming', '').strip():
+                    # 只有非敏感字段修改，也记录但qitashuoming不同
+                    Xiugaijilu.objects.create(**modify_record_data)
+
+                return Response({
+                    'code': 0,
+                    'message': '修改成功',
+                    'data': None
+                }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            return Response({
+                'code': 500,
+                'message': f'修改失败: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+# yonghu/views.py
+from django.utils import timezone
+from django.db.models import Q
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from rest_framework import status
+from .models import UserMain, AdminProfile, Tixianjilu
+
+
+# 管理员认证装饰器
+def admin_required(view_func):
+    """管理员权限验证装饰器"""
+
+    def wrapped_view(self, request, *args, **kwargs):
+        try:
+            # 1. 验证JWT Token
+            if not request.user.is_authenticated:
+                return Response({
+                    'code': 401,
+                    'message': '未认证',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            # 2. 验证用户类型为管理员
+            if request.user.user_type != 'admin':
+                return Response({
+                    'code': 403,
+                    'message': '权限不足',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+
+            # 3. 验证管理员扩展表存在
+            admin_profile = getattr(request.user, 'admin_profile', None)
+            if not admin_profile:
+                return Response({
+                    'code': 403,
+                    'message': '管理员信息不完整',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+
+            # 4. 验证管理员账号（phone）与前端传递的zhanghao一致
+            zhanghao = request.data.get('zhanghao')
+            if not zhanghao or request.user.phone != zhanghao:
+                return Response({
+                    'code': 401,
+                    'message': '账号验证失败',
+                    'data': None
+                }, status=status.HTTP_401_UNAUTHORIZED)
+
+            return view_func(self, request, *args, **kwargs)
+        except Exception as e:
+            return Response({
+                'code': 500,
+                'message': f'权限验证异常: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    return wrapped_view
+
+
+from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+from django.utils import timezone
+from django.db.models import Q
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+from rest_framework import status
+from yonghu.models import Tixianjilu
+
+
+class AddtxshView(APIView):
+    """
+    获取提现审核列表接口
+    与用户管理页面保持一致的分页逻辑
+    支持按用户ID搜索，排序改为按申请时间升序（最早申请排最前）
+    """
+    permission_classes = [IsAuthenticated]
+
+    @admin_required
+    def post(self, request):
+        try:
+            # 获取参数
+            zhanghao = request.data.get('zhanghao')
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('page_size', 5))
+            zhuangtai = int(request.data.get('zhuangtai', 1))
+            leixing = int(request.data.get('leixing', 1))
+            fangshi = request.data.get('fangshi')
+
+            # 🔴【新增】获取搜索参数（用户ID）
+            search_uid = request.data.get('search_uid', '').strip()
+
+            if page < 1:
+                page = 1
+
+            # 计算偏移量（与用户管理页面完全一致）
+            offset = (page - 1) * page_size
+
+            # 构建查询条件
+            query = Q()
+
+            # 状态筛选
+            if zhuangtai == 1:
+                query &= Q(zhuangtai=1)
+            elif zhuangtai == 2:
+                query &= Q(zhuangtai__in=[2, 3])
+
+            # 类型筛选
+            query &= Q(leixing=leixing)
+
+            # 收款方式筛选（可选）
+            if fangshi:
+                query &= Q(fangshi=int(fangshi))
+
+            # 🔴【新增】如果搜索了用户ID，添加条件
+            if search_uid:
+                query &= Q(yonghuid=search_uid)
+
+            # 🔴【修改】排序改为按申请时间升序（最早申请排最前）
+            queryset = Tixianjilu.objects.filter(query).order_by('create_time')
+
+            # 🔴【修改】分页逻辑：如果是搜索模式，不分页，返回所有匹配记录
+            if search_uid:
+                records = list(queryset)
+                total_count = len(records)
+                has_more = False  # 搜索模式没有更多数据
+            else:
+                total_count = queryset.count()
+                records = list(queryset[offset:offset + page_size])
+                current_count = len(records)
+                has_more = (offset + current_count) < total_count
+
+            # 获取状态统计（统计与搜索无关，依然按筛选条件统计）
+            status_counts = {
+                'awaiting': Tixianjilu.objects.filter(
+                    zhuangtai=1,
+                    leixing=leixing
+                ).count(),
+                'processed': Tixianjilu.objects.filter(
+                    zhuangtai__in=[2, 3],
+                    leixing=leixing
+                ).count()
+            }
+
+            # 构建响应数据
+            withdrawal_list = []
+            for record in records:
+                withdrawal_list.append({
+                    'id': record.id,
+                    'yonghuid': record.yonghuid,
+                    'avatar': record.avatar,
+                    'phone': record.phone,
+                    'nicheng': record.nicheng,
+                    'leixing': record.leixing,
+                    'zhifu': record.zhifu,
+                    'skzhanghao': record.skzhanghao,
+                    'jine': str(record.jine) if record.jine else '0.00',
+                    'zhuangtai': record.zhuangtai,
+                    'fangshi': record.fangshi,
+                    'shenheid': record.shenheid,
+                    'bhliyou': record.bhliyou,
+                    'create_time': record.create_time,
+                    'update_time': record.update_time
+                })
+
+            return Response({
+                'code': 0,
+                'message': '获取成功',
+                'data': {
+                    'list': withdrawal_list,
+                    'total_count': total_count,
+                    'status_counts': status_counts,
+                    'has_more': has_more
+                }
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            return Response({
+                'code': 500,
+                'message': f'获取提现列表失败: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+
+
+
+
+'''class AddtxshView(APIView):
+    """
+    获取提现审核列表接口
+    与用户管理页面保持一致的分页逻辑
+    """
+    permission_classes = [IsAuthenticated]
+
+    @admin_required
+    def post(self, request):
+        try:
+            # 获取参数
+            zhanghao = request.data.get('zhanghao')
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('page_size', 5))
+            zhuangtai = int(request.data.get('zhuangtai', 1))
+            leixing = int(request.data.get('leixing', 1))
+            fangshi = request.data.get('fangshi')
+
+            if page < 1:
+                page = 1
+
+            # 计算偏移量（与用户管理页面完全一致）
+            offset = (page - 1) * page_size
+
+            # 构建查询条件
+            query = Q()
+
+            # 状态筛选
+            if zhuangtai == 1:
+                query &= Q(zhuangtai=1)
+            elif zhuangtai == 2:
+                query &= Q(zhuangtai__in=[2, 3])
+
+            # 类型筛选
+            query &= Q(leixing=leixing)
+
+            # 收款方式筛选（可选）
+            if fangshi:
+                query &= Q(fangshi=int(fangshi))
+
+            # 获取查询集（与用户管理页面一致）
+            queryset = Tixianjilu.objects.filter(query).order_by('-update_time', '-create_time')
+
+            # 获取总数
+            total_count = queryset.count()
+
+            # 分页数据（与用户管理页面完全一致）
+            records = list(queryset[offset:offset + page_size])
+
+            # ✅ 计算是否有更多数据（与用户管理页面完全一致）
+            current_count = len(records)
+            has_more = (offset + current_count) < total_count
+
+            # 获取状态统计
+            status_counts = {
+                'awaiting': Tixianjilu.objects.filter(
+                    zhuangtai=1,
+                    leixing=leixing
+                ).count(),
+                'processed': Tixianjilu.objects.filter(
+                    zhuangtai__in=[2, 3],
+                    leixing=leixing
+                ).count()
+            }
+
+            # 构建响应数据
+            withdrawal_list = []
+            for record in records:
+                withdrawal_list.append({
+                    'id': record.id,
+                    'yonghuid': record.yonghuid,
+                    'avatar': record.avatar,
+                    'phone': record.phone,
+                    'nicheng': record.nicheng,
+                    'leixing': record.leixing,
+                    'zhifu': record.zhifu,
+                    'skzhanghao': record.skzhanghao,
+                    'jine': str(record.jine) if record.jine else '0.00',
+                    'zhuangtai': record.zhuangtai,
+                    'fangshi': record.fangshi,
+                    'shenheid': record.shenheid,
+                    'bhliyou': record.bhliyou,
+                    'create_time': record.create_time,
+                    'update_time': record.update_time
+                })
+
+            return Response({
+                'code': 0,
+                'message': '获取成功',
+                'data': {
+                    'list': withdrawal_list,
+                    'total_count': total_count,
+                    'status_counts': status_counts,
+                    'has_more': has_more
+                }
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            return Response({
+                'code': 500,
+                'message': f'获取提现列表失败: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)'''
+
+
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from django.db import transaction
+from django.utils import timezone
+from peizhi.models import Szjilu  # 添加收支记录表导入
+
+
+# 假设你的提现记录模型导入
+# from your_app.models import Tixianjilu
+
+class AdtixianqkView(APIView):
+    """
+    处理提现申请接口（已更新：添加收支记录表更新）
+    """
+    permission_classes = [IsAuthenticated]
+
+    @admin_required  # 假设你有这个装饰器
+    def post(self, request):
+        try:
+            zhanghao = request.data.get('zhanghao')
+            tixian_id = request.data.get('tixian_id')
+            result = int(request.data.get('result', 0))
+            reason = request.data.get('reason', '')
+
+            if not tixian_id:
+                return Response({
+                    'code': 400,
+                    'message': '提现记录ID不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            if result not in [2, 3]:
+                return Response({
+                    'code': 400,
+                    'message': '操作结果无效',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 如果是拒绝，需要理由
+            if result == 3 and not reason:
+                return Response({
+                    'code': 400,
+                    'message': '拒绝提现需要提供理由',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 获取提现记录
+            try:
+                withdrawal = Tixianjilu.objects.get(id=tixian_id)
+            except Tixianjilu.DoesNotExist:
+                return Response({
+                    'code': 404,
+                    'message': '提现记录不存在',
+                    'data': None
+                }, status=status.HTTP_404_NOT_FOUND)
+
+            # 检查状态，只有待审核的可以处理
+            if withdrawal.zhuangtai != 1:
+                return Response({
+                    'code': 400,
+                    'message': '该提现申请已被处理',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # ---------- 自动提现审核新流程（有关联 shenhe_jilu_id） ----------
+            if withdrawal.shenhe_jilu_id:
+                from .models import TixianShenheJilu
+                from .tixian_shenhe_services import refund_balance, sync_audit_and_jilu_status
+                with transaction.atomic():
+                    try:
+                        audit = TixianShenheJilu.objects.select_for_update().get(
+                            id=withdrawal.shenhe_jilu_id
+                        )
+                    except TixianShenheJilu.DoesNotExist:
+                        return Response({'code': 404, 'message': '审核记录不存在', 'data': None},
+                                        status=status.HTTP_404_NOT_FOUND)
+                    if audit.zhuangtai != 1:
+                        return Response({'code': 400, 'message': '该审核申请已被处理', 'data': None},
+                                        status=status.HTTP_400_BAD_REQUEST)
+                    user_main = UserMain.objects.get(yonghuid=withdrawal.yonghuid)
+                    if result == 2:
+                        # 审核通过 → 待收款(6)，等用户在前端点击「收款」
+                        sync_audit_and_jilu_status(
+                            audit, 6,
+                            shenhe_ren_id=request.user.yonghuid,
+                        )
+                        withdrawal.shenheid = request.user.yonghuid
+                        withdrawal.save(update_fields=['shenheid', 'update_time'])
+                    elif result == 3:
+                        sync_audit_and_jilu_status(
+                            audit, 5,
+                            bhliyou=reason,
+                            bo_hui_ren_id=request.user.yonghuid,
+                        )
+                        refund_balance(user_main, audit.leixing, audit.shijidaozhang)
+                        withdrawal.shenheid = request.user.yonghuid
+                        withdrawal.bhliyou = reason
+                        withdrawal.save(update_fields=['shenheid', 'bhliyou', 'update_time'])
+                return Response({
+                    'code': 0,
+                    'message': '处理成功',
+                    'data': {
+                        'id': withdrawal.id,
+                        'zhuangtai': 6 if result == 2 else 5,
+                        'shenhe_danhao': audit.shenhe_danhao,
+                    },
+                }, status=status.HTTP_200_OK)
+
+            # 使用事务确保数据一致性（手动提现旧流程）
+            with transaction.atomic():
+                # 更新提现记录
+                withdrawal.zhuangtai = result
+                withdrawal.shenheid = request.user.yonghuid
+
+                if result == 3:  # 拒绝
+                    from .tixian_shenhe_services import refund_balance
+                    user_main = UserMain.objects.get(yonghuid=withdrawal.yonghuid)
+                    # 手动提现记录 jine=到账金额(已扣手续费)，按类型退回对应账户
+                    refund_balance(user_main, withdrawal.leixing, withdrawal.jine)
+                    withdrawal.bhliyou = reason
+
+                withdrawal.update_time = timezone.now()
+                withdrawal.save()
+
+                # 🟢 新增：如果同意提现（result=2），更新收支记录表
+                if result == 2:
+                    try:
+                        # 查询收支记录表，id=1的记录
+                        szjilu_record = Szjilu.objects.get(id=1)
+
+                        # 获取提现金额
+                        tixian_jine = withdrawal.jine  # 假设提现记录模型中有jine字段
+
+                        from dingdan.utils import update_daily_payout
+                        update_daily_payout(tixian_jine)
+
+                        # 更新收支记录
+                        szjilu_record.zongsy -= tixian_jine  # 总收益减去提现金额
+                        szjilu_record.zongzc += tixian_jine  # 总支出加上提现金额
+                        szjilu_record.jrzc += tixian_jine  # 今日支出加上提现金额
+                        szjilu_record.update_time = timezone.now()
+                        szjilu_record.save()
+
+                    except Szjilu.DoesNotExist:
+                        # 如果收支记录表不存在id=1的记录，创建一个
+                        szjilu_record = Szjilu.objects.create(
+                            id=1,
+                            zongsy=-tixian_jine if result == 2 else 0,
+                            zongzc=tixian_jine if result == 2 else 0,
+                            jrzc=tixian_jine if result == 2 else 0
+                        )
+                    except Exception as e:
+                        # 如果更新收支记录失败，抛出异常，事务会回滚
+                        raise Exception(f"更新收支记录失败: {str(e)}")
+
+            return Response({
+                'code': 0,
+                'message': '处理成功',
+                'data': {
+                    'id': withdrawal.id,
+                    'zhuangtai': withdrawal.zhuangtai,
+                    'shenheid': withdrawal.shenheid,
+                    'update_time': withdrawal.update_time
+                }
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            return Response({
+                'code': 500,
+                'message': f'处理提现失败: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+'''class AdtixianqkView(APIView):
+    """
+    处理提现申请接口（保持不变）
+    """
+    permission_classes = [IsAuthenticated]
+
+    @admin_required
+    def post(self, request):
+        try:
+            zhanghao = request.data.get('zhanghao')
+            tixian_id = request.data.get('tixian_id')
+            result = int(request.data.get('result', 0))
+            reason = request.data.get('reason', '')
+
+            if not tixian_id:
+                return Response({
+                    'code': 400,
+                    'message': '提现记录ID不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            if result not in [2, 3]:
+                return Response({
+                    'code': 400,
+                    'message': '操作结果无效',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 如果是拒绝，需要理由
+            if result == 3 and not reason:
+                return Response({
+                    'code': 400,
+                    'message': '拒绝提现需要提供理由',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 获取提现记录
+            try:
+                withdrawal = Tixianjilu.objects.get(id=tixian_id)
+            except Tixianjilu.DoesNotExist:
+                return Response({
+                    'code': 404,
+                    'message': '提现记录不存在',
+                    'data': None
+                }, status=status.HTTP_404_NOT_FOUND)
+
+            # 检查状态，只有待审核的可以处理
+            if withdrawal.zhuangtai != 1:
+                return Response({
+                    'code': 400,
+                    'message': '该提现申请已被处理',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 更新提现记录
+            withdrawal.zhuangtai = result
+            withdrawal.shenheid = request.user.yonghuid
+
+            if result == 3:  # 拒绝
+                withdrawal.bhliyou = reason
+
+            withdrawal.update_time = timezone.now()
+            withdrawal.save()
+
+            return Response({
+                'code': 0,
+                'message': '处理成功',
+                'data': {
+                    'id': withdrawal.id,
+                    'zhuangtai': withdrawal.zhuangtai,
+                    'shenheid': withdrawal.shenheid,
+                    'update_time': withdrawal.update_time
+                }
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            return Response({
+                'code': 500,
+                'message': f'处理提现失败: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)'''
+
+# views.py (yonghu应用)
+from rest_framework.views import APIView
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework import status
+from .models import UserMain, UserDashou
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class DashouZiliaoHuoquView(APIView):
+    """
+    打手资料获取接口
+    URL: /yonghu/dszjxxhq
+    方法: POST
+    认证: JWT Token
+    返回: 打手扩展表信息
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 使用select_related高效查询，避免N+1问题
+            dashou = UserDashou.objects.select_related('user').get(user=request.user)
+
+            # 构建返回数据
+            data = {
+                'nicheng': dashou.nicheng if dashou.nicheng else '',
+                'jieshao': dashou.jieshao if dashou.jieshao else '',
+                'dianhua': dashou.dianhua if dashou.dianhua else '',
+                'wechat': dashou.wechat if dashou.wechat else '',
+                'uid': request.user.yonghuid,  # 从主表获取UID
+                'avatar': request.user.avatar if request.user.avatar else '',  # 头像相对URL
+            }
+
+            return Response({
+                'code': 200,
+                'msg': 'success',
+                'data': data
+            }, status=status.HTTP_200_OK)
+
+        except UserDashou.DoesNotExist:
+            logger.warning(f'打手扩展表不存在: user_id={request.user.id}')
+            return Response({
+                'code': 404,
+                'msg': '打手信息不存在'
+            }, status=status.HTTP_404_NOT_FOUND)
+
+        except Exception as e:
+            logger.error(f'获取打手资料异常: {str(e)}', exc_info=True)
+            return Response({
+                'code': 500,
+                'msg': '服务器内部错误'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+# views.py (yonghu应用)
+from rest_framework.views import APIView
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework import status
+from .models import UserDashou
+import re
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class DashouGengxinView(APIView):
+    """
+    打手信息更新接口
+    URL: /yonghu/dsgxxx
+    方法: POST
+    认证: JWT Token
+    参数: nicheng(昵称), dianhua(电话), wechat(微信), jieshao(介绍)
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 获取请求数据
+            nicheng = request.data.get('nicheng', '').strip()
+            dianhua = request.data.get('dianhua', '').strip()
+            wechat = request.data.get('wechat', '').strip()
+            jieshao = request.data.get('jieshao', '').strip()
+
+            # 数据验证
+            validation_errors = self.validate_data(nicheng, dianhua, wechat, jieshao)
+            if validation_errors:
+                return Response({
+                    'code': 400,
+                    'msg': validation_errors
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 获取打手扩展表
+            try:
+                dashou = UserDashou.objects.get(user=request.user)
+            except UserDashou.DoesNotExist:
+                return Response({
+                    'code': 404,
+                    'msg': '打手信息不存在'
+                }, status=status.HTTP_404_NOT_FOUND)
+
+            # 更新数据
+            update_fields = []
+
+            if nicheng is not None:
+                dashou.nicheng = nicheng if nicheng != '' else None
+                update_fields.append('nicheng')
+
+            if dianhua is not None:
+                dashou.dianhua = dianhua if dianhua != '' else None
+                update_fields.append('dianhua')
+
+            if wechat is not None:
+                dashou.wechat = wechat if wechat != '' else None
+                update_fields.append('wechat')
+
+            if jieshao is not None:
+                dashou.jieshao = jieshao if jieshao != '' else None
+                update_fields.append('jieshao')
+
+            # 保存更新（只更新修改的字段）
+            if update_fields:
+                dashou.save(update_fields=update_fields)
+
+            return Response({
+                'code': 200,
+                'msg': '更新成功',
+                'data': {
+                    'nicheng': dashou.nicheng or '',
+                    'dianhua': dashou.dianhua or '',
+                    'wechat': dashou.wechat or '',
+                    'jieshao': dashou.jieshao or ''
+                }
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            logger.error(f'更新打手信息异常: {str(e)}', exc_info=True)
+            return Response({
+                'code': 500,
+                'msg': '服务器内部错误'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def validate_data(self, nicheng, dianhua, wechat, jieshao):
+        """数据验证方法"""
+        errors = []
+
+        # 1. 昵称验证（必填）
+        if not nicheng:
+            errors.append('昵称不能为空')
+        elif len(nicheng) > 20:
+            errors.append('昵称不能超过20个字符')
+
+        # 2. 手机号验证（非必填，但填写时必须正确）
+        if dianhua:
+            # 手机号正则：1开头，11位数字
+            phone_pattern = r'^1[3-9]\d{9}$'
+            if not re.match(phone_pattern, dianhua):
+                errors.append('手机号格式不正确')
+
+        # 3. 微信号验证（非必填）
+        if wechat and len(wechat) > 30:
+            errors.append('微信号不能超过30个字符')
+
+        # 4. 个人介绍验证
+        if jieshao and len(jieshao) > 200:
+            errors.append('个人介绍不能超过200个字符')
+
+        return '; '.join(errors) if errors else None
+
+
+class ShangjiaZhuceView(APIView):
+    """
+    商家注册接口 (通过管理员邀请码)
+    访问路径: /api/yonghu/shangjiahuce/
+    请求方法: POST
+    权限要求: JWT Token认证通过的用户
+    请求体: { "inviteCode": "管理员邀请码" }
+
+    返回字段说明：
+    - code: 状态码（200成功，其他失败）
+    - message: 提示信息
+    - data: 商家信息数据，包含以下字段（与前端商家页面完全一致）：
+        - nicheng: 商家昵称
+        - sjyue: 商家余额（字符串，保留两位小数）
+        - fabu: 发布订单总数
+        - chengjiao: 成交订单总数
+        - tuikuan: 退款订单总数
+        - jinridingdan: 今日订单
+        - jinriliushui: 今日流水（字符串）
+        - jinyuedingdan: 今月订单
+        - jinyueliushui: 今月流水（字符串）
+        - zhuangtai: 商家状态（1正常）
+        - dianhua: 商家电话
+        - wechat: 商家微信
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 1. 获取并验证邀请码参数
+        yaoqingma = request.data.get('inviteCode')
+        if not yaoqingma:
+            return Response({
+                'code': 400,
+                'message': '邀请码不能为空',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        yaoqingma = yaoqingma.strip()
+        if len(yaoqingma) > 100:
+            return Response({
+                'code': 400,
+                'message': '邀请码长度超过限制',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        current_user = request.user
+
+        # 2. 检查用户是否已是商家
+        try:
+            shangjia_profile = current_user.shop_profile
+            # 用户已是商家，直接返回现有信息
+            return self.fanhuiXianyouShangjiaXinxi(shangjia_profile, current_user)
+        except UserShangjia.DoesNotExist:
+            # 用户不是商家，继续注册流程
+            pass
+
+        # 3. 根据邀请码查找对应的管理员
+        try:
+            # 从管理员表查找邀请码
+            admin_profile = AdminProfile.objects.select_related('user').get(yaoqingma=yaoqingma)
+        except AdminProfile.DoesNotExist:
+            return Response({
+                'code': 404,
+                'message': '管理员邀请码无效或不存在',
+                'data': None
+            }, status=status.HTTP_404_NOT_FOUND)
+
+        # 4. 核心：在数据库事务中创建商家身份
+        try:
+            with transaction.atomic():
+                # 4.1 查询老板扩展表获取老板昵称
+                boss_nickname = '普通商家'
+                try:
+                    boss_profile = current_user.boss_profile
+                    if boss_profile.nickname and boss_profile.nickname.strip():
+                        boss_nickname = boss_profile.nickname.strip()
+                except UserBoss.DoesNotExist:
+                    # 老板扩展表不存在，使用默认值
+                    pass
+
+                # 4.2 创建商家扩展表
+                # 使用老板昵称作为商家昵称的基础
+                shangjia_nicheng = boss_nickname
+
+                # 检查昵称是否已存在（安全考虑）
+                if UserShangjia.objects.filter(nicheng=shangjia_nicheng).exists():
+                    # 如果存在，添加随机数确保唯一
+                    import random
+                    shangjia_nicheng = f"{boss_nickname}{random.randint(1000, 9999)}"
+
+                # 4.3 创建商家记录
+                shop_profile = UserShangjia.objects.create(
+                    user=current_user,
+                    nicheng=shangjia_nicheng,
+                    zhuangtai=1,  # 正常状态
+                    yue=0.00,  # 商家余额
+                    fabu=0,  # 发布订单总数
+                    tuikuan=0,  # 退款订单总数
+                    chengjiao=0,  # 成交订单总数
+                    jinridingdan=0,  # 今日订单
+                    jinriliushui=0.00,  # 今日流水
+                    jinyuedingdan=0,  # 今月订单
+                    jinyueliushui=0.00,  # 今月流水
+                    dianhua='',  # 电话
+                    wechat='',  # 微信
+                )
+
+        except Exception as e:
+            # 事务会自动回滚
+            import traceback
+            error_detail = traceback.format_exc()
+            #print(f"商家注册错误详情: {error_detail}")
+
+            return Response({
+                'code': 500,
+                'message': f'商家注册过程中发生系统错误: {str(e)}',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 5. 注册成功，返回商家信息
+        fanhui_data = self.zhuangbeiFanhuiShuju(shop_profile, current_user)
+        return Response({
+            'code': 200,
+            'message': '商家注册成功！',
+            'data': fanhui_data
+        })
+
+    def fanhuiXianyouShangjiaXinxi(self, shangjia_profile, current_user):
+        """处理已是商家的用户，返回其现有信息"""
+        fanhui_data = self.zhuangbeiFanhuiShuju(shangjia_profile, current_user)
+        return Response({
+            'code': 200,
+            'message': '您已是商家，返回当前信息。',
+            'data': fanhui_data
+        })
+
+    def zhuangbeiFanhuiShuju(self, shangjia_profile, current_user):
+        """
+        准备返回给前端的商家数据
+        字段名必须与前端商家页面完全一致
+        """
+        data = {
+            # 🟢 商家基本信息
+            'nicheng': shangjia_profile.nicheng,  # 商家昵称
+            'sjyue': format(shangjia_profile.yue, '.2f'),  # 商家余额，保留两位小数
+            'fabu': shangjia_profile.fabu,  # 发布订单总数
+            'chengjiao': shangjia_profile.chengjiao,  # 成交订单总数
+            'tuikuan': shangjia_profile.tuikuan,  # 退款订单总数
+            'jinridingdan': shangjia_profile.jinridingdan,  # 今日订单
+            'jinriliushui': format(shangjia_profile.jinriliushui, '.2f'),  # 今日流水
+            'jinyuedingdan': shangjia_profile.jinyuedingdan,  # 今月订单
+            'jinyueliushui': format(shangjia_profile.jinyueliushui, '.2f'),  # 今月流水
+            'zhuangtai': shangjia_profile.zhuangtai,  # 商家状态
+            'dianhua': shangjia_profile.dianhua or '',  # 电话
+            'wechat': shangjia_profile.wechat or '',  # 微信
+
+            # 🟢 可能需要的主表信息
+            'uid': current_user.yonghuid,  # 用户ID
+        }
+        return data
+
+
+
+
+
+class WechatLoginAndDashouRegisterView(APIView):
+    """
+    微信登录并注册打手一体化接口
+    访问路径: /api/yonghu/wdlyhdl
+    请求方法: POST
+    权限要求: 无需登录
+    请求体: { "code": "微信登录code", "inviteCode": "邀请码" }
+
+    功能: 用户扫码进入但未登录时，一次性完成微信登录和打手注册
+    """
+
+    throttle_classes = [AnonRateThrottle]
+    permission_classes = [AllowAny]
+
+    def post(self, request):
+        """
+        处理微信登录并注册打手请求
+        """
+        try:
+            # 1. 获取并验证参数
+            code = request.data.get('code', '').strip()
+            yaoqingma = request.data.get('inviteCode', '').strip()
+
+            if not code:
+                return Response({
+                    'code': 1,
+                    'msg': '微信授权码不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            if not yaoqingma:
+                return Response({
+                    'code': 2,
+                    'msg': '邀请码不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            if len(yaoqingma) > 100:
+                return Response({
+                    'code': 3,
+                    'msg': '邀请码长度超过限制',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 2. 获取微信openid
+            wechat_data = self.get_wechat_openid(code)
+            if not wechat_data or 'openid' not in wechat_data:
+                error_msg = wechat_data.get('errmsg', '微信授权失败')
+                return Response({
+                    'code': 4,
+                    'msg': f'微信登录失败: {error_msg}',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            openid = wechat_data['openid']
+
+            # 3. 获取客户端真实IP
+            kehuduan_ip = self.huoquKehuduanIP(request)
+
+            # 4. 开始数据库事务（确保登录和注册的原子性）
+            with transaction.atomic():
+                # 4.1 创建或获取用户（登录逻辑）
+                user_main, created = UserMain.objects.select_for_update().get_or_create(
+                    openid=openid,
+                    defaults={
+                        'yonghuid': self.shengchengYonghuID(),
+                        'user_type': 'normal',
+                    }
+                )
+
+                # 更新用户IP和最后登录时间
+                cunchu_ip = kehuduan_ip
+                user_main.ip = cunchu_ip
+                user_main.last_login_time = timezone.now()
+                user_main.save()
+
+                if created:
+                    # 新用户：创建老板扩展表
+                    UserBoss.objects.create(user=user_main, nickname='微信用户')
+
+                # 4.2 验证邀请码对应的管事（注册逻辑）
+                try:
+                    # 使用select_related获取管事及其关联的主表用户信息
+                    guanshi_profile = UserGuanshi.objects.select_related('user').get(yaoqingma=yaoqingma)
+                except UserGuanshi.DoesNotExist:
+                    # 邀请码无效，但用户已登录，可以返回登录成功但注册失败
+                    # 这里我们继续执行，但只返回登录信息
+                    return self.fanhuiZhihouDengluXinxi(user_main, yaoqingma_wuxiao=True)
+
+                # 验证管事状态
+                if guanshi_profile.zhuangtai != 1:
+                    # 管事账号已被禁用
+                    return self.fanhuiZhihouDengluXinxi(user_main, guanshi_jinyong=True)
+
+                # 4.3 检查用户是否已是打手
+                dashou_exists = UserDashou.objects.filter(user=user_main).exists()
+                if dashou_exists:
+                    # 用户已是打手，直接返回信息
+                    dashou_profile = UserDashou.objects.get(user=user_main)
+                    return self.fanhuiDengluZhuceshuju(user_main, dashou_profile)
+
+                # 4.4 核心：为用户创建所有身份（打手、商家、管事）
+                guanshi_yonghuid = guanshi_profile.user.yonghuid
+
+                # 创建打手扩展表
+                dashou_profile = UserDashou.objects.create(
+                    user=user_main,
+                    nicheng='大手子',
+                    chenghao='普通大手',
+                    yaoqingren=guanshi_yonghuid,
+                    # 其他字段使用模型默认值
+                )
+
+                # 创建商家扩展表
+                # 商家昵称需要唯一，这里用 用户ID + "的店铺" 来确保唯一性
+                '''shangjia_nicheng = f"{user_main.yonghuid}的店铺"
+                UserShangjia.objects.create(
+                    user=user_main,
+                    nicheng=shangjia_nicheng,
+                    # 其他字段使用默认值
+                )'''
+
+                # 创建管事扩展表
+                '''guanshi_yaoqingma = chuangjianYaoqingma(str(user_main.yonghuid))
+                new_guanshi_profile = UserGuanshi.objects.create(
+                    user=user_main,
+                    yaoqingma=guanshi_yaoqingma,
+                    # 其他字段使用默认值
+                )'''
+
+                # 更新原管事的邀请数量
+                locked_guanshi = UserGuanshi.objects.select_for_update().get(pk=guanshi_profile.pk)
+                locked_guanshi.yaogingshuliang += 1
+                locked_guanshi.save()
+
+                # ========== 新增：管事每日统计（邀请打手） ==========
+
+                try:
+                    import logging
+
+                    logger = logging.getLogger(__name__)
+                    from houtai.utils import update_guanshi_daily_by_action
+                    update_guanshi_daily_by_action(
+                        yonghuid=guanshi_yonghuid,
+                        action=1,  # 1 = 邀请打手
+                        amount=Decimal('0.00')
+                    )
+                    logger.info(f"管事每日统计更新成功（邀请打手）：管事{guanshi_yonghuid}")
+                except Exception as e:
+                    logger.error(f"管事每日统计更新失败（邀请打手）：{str(e)}")
+
+                # 5. 生成JWT token
+                refresh = RefreshToken.for_user(user_main)
+                token = str(refresh.access_token)
+
+                # 6. 准备返回数据
+                response_data = self.zhuangbeiFanhuiShuju(user_main, dashou_profile, token)
+
+                return Response({
+                    'code': 0,
+                    'msg': '登录并注册成功！已开通打手、管事等身份。',
+                    'data': response_data
+                })
+
+        except Exception as e:
+            # 记录错误日志
+            import logging
+            logger = logging.getLogger(__name__)
+            error_openid = locals().get('openid', 'N/A')
+            logger.error(
+                f"微信登录注册一体化接口异常 - openid: {error_openid}, "
+                f"错误类型: {type(e).__name__}, 错误详情: {str(e)}",
+                exc_info=True
+            )
+
+            # 返回友好错误信息
+            return Response({
+                'code': 99,
+                'msg': '系统繁忙，请稍后重试',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def get_wechat_openid(self, code):
+        """
+        调用微信接口获取openid
+        """
+        try:
+            appid = getattr(settings, 'WEIXIN_APPID', '')
+            secret = getattr(settings, 'WEIXIN_SECRET', '')
+
+            if not appid or not secret:
+                raise ValueError('微信配置未设置')
+
+            url = 'https://api.weixin.qq.com/sns/jscode2session'
+            params = {
+                'appid': appid,
+                'secret': secret,
+                'js_code': code,
+                'grant_type': 'authorization_code'
+            }
+
+            response = requests.get(url, params=params, timeout=10)
+            result = response.json()
+
+            if 'openid' in result:
+                return result
+            else:
+                errcode = result.get('errcode', 'unknown')
+                errmsg = result.get('errmsg', '未知错误')
+                return {'errmsg': f'[{errcode}]{errmsg}'}
+
+        except requests.exceptions.Timeout:
+            return {'errmsg': '请求微信接口超时'}
+        except Exception as e:
+            return {'errmsg': f'请求微信接口异常: {str(e)}'}
+
+    def shengchengYonghuID(self):
+        """
+        生成7位数字用户ID
+        """
+        for _ in range(10):
+            timestamp_part = str(int(time.time()))[-5:].zfill(5)
+            random_part = str(random.randint(0, 99)).zfill(2)
+            user_id = timestamp_part + random_part
+
+            if len(user_id) == 7 and user_id.isdigit():
+                if not UserMain.objects.filter(yonghuid=user_id).exists():
+                    return user_id
+
+        raise Exception('生成用户ID失败')
+
+    def huoquKehuduanIP(self, request):
+        """
+        获取客户端真实IP地址
+        """
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0].strip()
+            if ip:
+                return ip
+
+        ip = request.META.get('REMOTE_ADDR', '')
+        return ip if ip else '0.0.0.0'
+
+    def huoquQunPeizhi(self):
+        """
+        获取群配置信息
+        """
+        try:
+            qun_configs = Qunpeizhi.objects.filter(id__in=[1, 2])
+
+            result = {
+                'dashouqun': '',
+                'dashouqunid': '',
+                'guanshiqun': '',
+                'guanshiqunid': ''
+            }
+
+            for config in qun_configs:
+                if config.id == 1:
+                    result['dashouqun'] = config.neirong or ''
+                    result['dashouqunid'] = config.qunid or ''
+                elif config.id == 2:
+                    result['guanshiqun'] = config.neirong or ''
+                    result['guanshiqunid'] = config.qunid or ''
+
+            return result
+
+        except Exception:
+            return {
+                'dashouqun': '',
+                'dashouqunid': '',
+                'guanshiqun': '',
+                'guanshiqunid': ''
+            }
+
+    def fanhuiZhihouDengluXinxi(self, user_main, yaoqingma_wuxiao=False, guanshi_jinyong=False):
+        """
+        返回只登录成功的信息（当邀请码无效或管事禁用时）
+        """
+        # 获取老板昵称
+        boss_nickname = '微信用户'
+        try:
+            boss_profile = UserBoss.objects.get(user=user_main)
+            if boss_profile.nickname:
+                boss_nickname = boss_profile.nickname
+        except UserBoss.DoesNotExist:
+            pass
+
+        # 检查各身份状态
+        dashou_status = 1 if UserDashou.objects.filter(user=user_main).exists() else 0
+        shangjia_status = 1 if UserShangjia.objects.filter(user=user_main).exists() else 0
+        guanshi_status = 1 if UserGuanshi.objects.filter(user=user_main).exists() else 0
+
+        # 生成token
+        refresh = RefreshToken.for_user(user_main)
+        token = str(refresh.access_token)
+
+        # 获取群配置
+        group_info = self.huoquQunPeizhi()
+
+        # 构建返回数据
+        response_data = {
+            'token': token,
+            'nicheng': boss_nickname,
+            'uid': user_main.yonghuid,
+            'touxiang': user_main.avatar or '',
+            'shangjiastatus': shangjia_status,
+            'dashoustatus': dashou_status,
+            'guanshistatus': guanshi_status,
+            # 🟢 注意：这里没有返回dingdantiaoshu（订单数量），与前端需求一致
+            'dashouqun': group_info.get('dashouqun', ''),
+            'dashouqunid': group_info.get('dashouqunid', ''),
+            'guanshiqun': group_info.get('guanshiqun', ''),
+            'guanshiqunid': group_info.get('guanshiqunid', '')
+        }
+
+        # 根据情况设置返回消息
+        if yaoqingma_wuxiao:
+            msg = '登录成功，但邀请码无效'
+        elif guanshi_jinyong:
+            msg = '登录成功，但邀请码对应的管事账号已被禁用'
+        else:
+            msg = '登录成功'
+
+        return Response({
+            'code': 0,
+            'msg': msg,
+            'data': response_data
+        })
+
+    def fanhuiDengluZhuceshuju(self, user_main, dashou_profile):
+        """
+        返回登录并注册的数据（用户已是打手的情况）
+        """
+        # 获取老板昵称
+        boss_nickname = '微信用户'
+        try:
+            boss_profile = UserBoss.objects.get(user=user_main)
+            if boss_profile.nickname:
+                boss_nickname = boss_profile.nickname
+        except UserBoss.DoesNotExist:
+            pass
+
+        # 检查各身份状态（这里用户已是打手，所以都是1）
+        dashou_status = 1
+        shangjia_status = 1 if UserShangjia.objects.filter(user=user_main).exists() else 1  # 确保是1
+        guanshi_status = 1 if UserGuanshi.objects.filter(user=user_main).exists() else 1  # 确保是1
+
+        # 生成token
+        refresh = RefreshToken.for_user(user_main)
+        token = str(refresh.access_token)
+
+        # 获取群配置
+        group_info = self.huoquQunPeizhi()
+
+        # 准备打手信息
+        dashou_data = self.zhuangbeiDashouFanhuiShuju(dashou_profile)
+
+        # 合并所有数据
+        response_data = {
+            'token': token,
+            'nicheng': boss_nickname,
+            'uid': user_main.yonghuid,
+            'touxiang': user_main.avatar or '',
+            'shangjiastatus': shangjia_status,
+            'dashoustatus': dashou_status,
+            'guanshistatus': guanshi_status,
+            'dashouqun': group_info.get('dashouqun', ''),
+            'dashouqunid': group_info.get('dashouqunid', ''),
+            'guanshiqun': group_info.get('guanshiqun', ''),
+            'guanshiqunid': group_info.get('guanshiqunid', ''),
+            # 合并打手信息
+            **dashou_data
+        }
+
+        return Response({
+            'code': 0,
+            'msg': '您已是打手，登录成功',
+            'data': response_data
+        })
+
+    def zhuangbeiFanhuiShuju(self, user_main, dashou_profile, token):
+        """
+        准备完整的返回数据（登录+注册成功的情况）
+        """
+        # 获取老板昵称
+        boss_nickname = '微信用户'
+        try:
+            boss_profile = UserBoss.objects.get(user=user_main)
+            if boss_profile.nickname:
+                boss_nickname = boss_profile.nickname
+        except UserBoss.DoesNotExist:
+            pass
+
+        # 身份状态（刚注册成功，应该都是1）
+        dashou_status = 1
+        shangjia_status = 1
+        guanshi_status = 1
+
+        # 获取群配置
+        group_info = self.huoquQunPeizhi()
+
+        # 准备打手信息
+        dashou_data = self.zhuangbeiDashouFanhuiShuju(dashou_profile)
+
+        # 合并所有数据
+        response_data = {
+            'token': token,
+            'nicheng': boss_nickname,
+            'uid': user_main.yonghuid,
+            'touxiang': user_main.avatar or '',
+            'shangjiastatus': shangjia_status,
+            'dashoustatus': dashou_status,
+            'guanshistatus': guanshi_status,
+            'dashouqun': group_info.get('dashouqun', ''),
+            'dashouqunid': group_info.get('dashouqunid', ''),
+            'guanshiqun': group_info.get('guanshiqun', ''),
+            'guanshiqunid': group_info.get('guanshiqunid', ''),
+            # 合并打手信息
+            **dashou_data
+        }
+
+        return response_data
+
+    def zhuangbeiDashouFanhuiShuju(self, dashou_profile):
+        """
+        准备打手返回数据（字段名严格匹配前端）
+        """
+        # 构建基础信息
+        data = {
+            'dashounicheng': dashou_profile.nicheng,
+            'zhanghaostatus': dashou_profile.zhanghaozhuangtai,
+            'yongjin': str(dashou_profile.yue),  # Decimal转字符串
+            'zonge': str(dashou_profile.zonge),
+            'yajin': str(dashou_profile.yajin),
+            'chenghao': dashou_profile.chenghao,
+            'jinfen': dashou_profile.jifen,
+            'chengjiaoliang': dashou_profile.chengjiaozongliang,
+            'zaixianzhuangtai': dashou_profile.zaixianzhuangtai,
+            'dashouzhuangtai': dashou_profile.zhuangtai,
+        }
+
+        # 查询并处理会员列表 (clumber)
+        # 使用当前用户的yonghuid进行查询
+        huiyuan_goumai_list = []
+        goumai_records = Huiyuangoumai.objects.filter(yonghu_id=dashou_profile.user.yonghuid)
+        for record in goumai_records:
+            # 调用方法检查是否到期，此方法内部会更新状态
+            shifou_daoqi = record.jiance_shifou_daoqi()
+            huiyuan_goumai_list.append({
+                'huiyuan_id': record.huiyuan_id,
+                'huiyuan_zhuangtai': record.huiyuan_zhuangtai,
+                'daoqi_time': record.daoqi_time.isoformat() if record.daoqi_time else None,
+                'shifou_daoqi': shifou_daoqi,
+                'jieshao': record.jieshao
+            })
+
+        data['clumber'] = huiyuan_goumai_list
+        return data
+
+from datetime import datetime  # 🔴【关键修改】
+class YonghuTixianShenheXiugaiView(APIView):
+    """
+    用户修改审核中提现申请接口
+    访问路径: /api/yonghu/yonghutxshxg
+    请求方法: POST
+    权限要求: JWT Token认证通过的用户
+    请求体: multipart/form-data 格式
+    支持字段: tixian_id, fangshi, txdianhua, txzh, file (图片文件)
+
+    功能: 允许用户修改审核中提现申请的收款方式、电话、账号、收款码等
+    """
+
+    permission_classes = [IsAuthenticated]
+    parser_classes = (MultiPartParser, FormParser, JSONParser)
+
+    def post(self, request):
+        """
+        处理用户修改审核中提现申请的POST请求
+        """
+        try:
+            # 1. 获取当前用户
+            user_main = request.user
+            current_yonghuid = user_main.yonghuid
+
+            # 2. 验证必填字段：提现记录ID
+            tixian_id = request.data.get('tixian_id')
+            if not tixian_id:
+                return Response({
+                    'code': 1,
+                    'msg': '提现记录ID不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 3. 查询提现记录（使用select_for_update确保事务安全）
+            with transaction.atomic():
+                try:
+                    tixian_record = Tixianjilu.objects.select_for_update().get(
+                        id=tixian_id,
+                        yonghuid=current_yonghuid  # 确保只能修改自己的记录
+                    )
+                except Tixianjilu.DoesNotExist:
+                    return Response({
+                        'code': 2,
+                        'msg': '提现记录不存在或无权修改',
+                        'data': None
+                    }, status=status.HTTP_404_NOT_FOUND)
+
+                # 4. 验证提现记录状态（必须是审核中）
+                if tixian_record.zhuangtai != 1:
+                    return Response({
+                        'code': 3,
+                        'msg': '只有审核中的提现申请可以修改',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 5. 获取并验证提现方式
+                fangshi = request.data.get('fangshi')
+                if fangshi:
+                    fangshi = int(fangshi)
+                    if fangshi not in [1, 2]:
+                        return Response({
+                            'code': 4,
+                            'msg': '提现方式无效，请选择1(微信)或2(支付宝)',
+                            'data': None
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                    # 检查提现类型与方式的匹配（如果前端提供了leixing）
+                    leixing = request.data.get('leixing')
+                    if leixing:
+                        leixing = int(leixing)
+                        # 这里可以根据业务逻辑添加类型与方式的验证
+                        # 例如：某些类型只能使用某些方式
+
+                # 6. 验证手机号（必填）
+                txdianhua = request.data.get('txdianhua', '').strip()
+                if not txdianhua:
+                    return Response({
+                        'code': 5,
+                        'msg': '收款人电话不能为空',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 验证手机号格式
+                if not txdianhua.isdigit() or len(txdianhua) != 11:
+                    return Response({
+                        'code': 6,
+                        'msg': '请输入11位有效的手机号码',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 7. 获取收款账号（可选）
+                txzh = request.data.get('txzh', '').strip()
+
+                # 8. 处理收款码图片上传（如果有）
+                txtupian_file = request.FILES.get('file')
+                new_zhifu_url = None
+                old_zhifu_url = tixian_record.zhifu
+
+                if txtupian_file:
+                    # 验证图片
+                    is_valid, error_msg = validate_image(txtupian_file)
+                    if not is_valid:
+                        return Response({
+                            'code': 7,
+                            'msg': f'图片验证失败: {error_msg}',
+                            'data': None
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                    # 上传收款码图片
+                    new_zhifu_url = self.handle_shoukuanma_upload(
+                        user_main,
+                        txtupian_file,
+                        old_zhifu_url,
+                        tixian_record.leixing
+                    )
+
+                    if not new_zhifu_url:
+                        return Response({
+                            'code': 8,
+                            'msg': '收款码上传失败',
+                            'data': None
+                        }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+                # 9. 验证收款信息（账号和图片至少有一个）
+                if not txzh and not (new_zhifu_url or old_zhifu_url):
+                    return Response({
+                        'code': 9,
+                        'msg': '请填写收款账号或上传收款码',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 10. 更新提现记录
+                update_fields = []
+
+                # 更新提现方式（如果有）
+                if fangshi:
+                    tixian_record.fangshi = fangshi
+                    update_fields.append('fangshi')
+
+                # 更新手机号（必填）
+                tixian_record.phone = txdianhua
+                update_fields.append('phone')
+
+                # 更新收款账号（如果有）
+                if txzh is not None:  # 注意：空字符串也要更新
+                    tixian_record.skzhanghao = txzh
+                    update_fields.append('skzhanghao')
+
+                # 更新收款码图片（如果有新图片）
+                if new_zhifu_url:
+                    tixian_record.zhifu = new_zhifu_url
+                    update_fields.append('zhifu')
+
+                # 保存更新
+                if update_fields:
+                    tixian_record.save(update_fields=update_fields)
+
+                # 11. 构建返回数据
+                response_data = {
+                    'tixian_id': tixian_record.id,
+                    'fangshi': tixian_record.fangshi,
+                    'txdianhua': tixian_record.phone,
+                    'txzh': tixian_record.skzhanghao or '',
+                    'txtupian': tixian_record.zhifu or ''  # 返回相对URL
+                }
+
+                # 12. 返回成功响应
+                return Response({
+                    'code': 0,
+                    'msg': '提现申请修改成功',
+                    'data': response_data
+                })
+
+        except Exception as e:
+            # 记录详细错误日志
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.error(
+                f"修改提现申请异常 - 用户ID: {getattr(user_main, 'yonghuid', 'N/A')}, "
+                f"提现ID: {tixian_id}, "
+                f"错误类型: {type(e).__name__}, "
+                f"错误详情: {str(e)}",
+                exc_info=True
+            )
+
+            # 返回友好错误信息
+            return Response({
+                'code': 99,
+                'msg': '系统繁忙，请稍后重试',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def handle_shoukuanma_upload(self, user_main, image_file, old_zhifu_url, leixing=None):
+        """
+        处理收款码图片上传到腾讯云COS
+        存储路径: tixian/{yonghuid}/{timestamp_uuid}.扩展名
+
+        参数:
+        - user_main: 当前用户对象
+        - image_file: 图片文件对象
+        - old_zhifu_url: 旧收款码URL（用于删除）
+        - leixing: 提现类型（可选，用于文件夹分类）
+
+        返回: 新的图片相对路径
+        """
+        try:
+            yonghuid = user_main.yonghuid
+            if not yonghuid:
+                return None
+
+            # 删除旧收款码（如果存在且不是空字符串）
+            if old_zhifu_url and old_zhifu_url.strip():
+                delete_from_oss(old_zhifu_url)
+
+            # 获取文件扩展名
+            file_name = image_file.name
+            file_extension = os.path.splitext(file_name)[1].lower()
+            if not file_extension:
+                file_extension = '.jpg'
+
+            # 生成唯一文件名（使用时间戳+UUID确保不重复）
+            timestamp = datetime.now().strftime('%Y%m%d%H%M%S')
+            unique_id = str(uuid.uuid4())[:8]  # 取UUID前8位
+            unique_file_name = f"{timestamp}_{unique_id}{file_extension}"
+
+            # 根据提现类型构建文件夹路径（如果提供了leixing）
+            if leixing:
+                # leixing=1:打手佣金, leixing=2:管事分红
+                type_folder = 'dashou' if leixing == 1 else 'guanshi'
+                oss_file_path = f"tixian/{type_folder}/{yonghuid}/{unique_file_name}"
+            else:
+                # 默认路径
+                oss_file_path = f"tixian/{yonghuid}/{unique_file_name}"
+
+            # 上传新收款码到OSS
+            new_shoukuanma_url = upload_to_oss(image_file, oss_file_path)
+
+            if new_shoukuanma_url:
+                # 返回相对路径（从tixian文件夹开始）
+                return oss_file_path
+            else:
+                return None
+
+        except Exception as e:
+            print(f"处理收款码上传失败: {e}")
+            return None
+
+
+# views.py
+from django.db.models import Q, Prefetch
+from django.db import connection
+from django.core.paginator import Paginator
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from dingdan.models import Chufajilu, Chufatupian
+from yonghu.models import UserDashou
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class DashouPermission:
+    """
+    打手权限验证类
+    确保用户是打手且账号状态正常
+    """
+
+    def has_permission(self, request, view):
+        user = request.user
+
+        # 检查用户是否已认证
+        if not user.is_authenticated:
+            return False
+
+        try:
+            # 通过反向关系获取打手扩展信息
+            dashou_profile = user.dashou_profile
+
+            # 检查账号状态是否为1（正常）
+            if dashou_profile.zhanghaozhuangtai != 1:
+                return False
+
+            return True
+        except UserDashou.DoesNotExist:
+            return False
+        except Exception as e:
+            logger.error(f"打手权限验证异常: {e}")
+            return False
+
+
+from django.db.models import Q, Count, Case, When, IntegerField
+
+
+
+logger = logging.getLogger(__name__)
+
+
+class ChufaJiluHuoquView(APIView):
+    """
+    打手获取处罚记录接口
+    路径: /yonghu/dshqcfjl
+    方法: POST
+    权限: JWT Token + 打手权限验证
+    """
+    permission_classes = [IsAuthenticated, DashouPermission]
+
+    def post(self, request):
+        try:
+            # 获取当前用户信息
+            user_main = request.user
+            yonghuid = user_main.yonghuid
+
+            # 通过反向关系获取打手扩展信息
+            try:
+                dashou_profile = user_main.dashou_profile
+                # 再次确认账号状态
+                if dashou_profile.zhanghaozhuangtai != 1:
+                    return Response({
+                        'code': 3,
+                        'msg': '账号已被封禁，无法查看处罚记录',
+                        'data': None
+                    }, status=status.HTTP_403_FORBIDDEN)
+            except UserDashou.DoesNotExist:
+                return Response({
+                    'code': 2,
+                    'msg': '用户不是打手身份',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+
+            # 判断请求类型：统计信息 or 记录列表
+            qingqiu_tongji = request.data.get('qingqiu_tongji', False)
+
+            if qingqiu_tongji:
+                # 返回统计信息
+                return self.get_tongji_info(yonghuid)
+            else:
+                # 返回处罚记录列表
+                return self.get_chufa_list(yonghuid, request.data)
+
+        except Exception as e:
+            logger.error(f"获取处罚记录异常 - 用户ID: {yonghuid}, 错误: {str(e)}", exc_info=True)
+            return Response({
+                'code': 99,
+                'msg': '系统繁忙，请稍后重试',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def get_tongji_info(self, yonghuid):
+        """
+        获取统计信息（总记录、待处理、已处理）
+        """
+        try:
+            # 使用单个查询获取所有统计信息
+            stats = Chufajilu.objects.filter(dashouid=yonghuid).aggregate(
+                # 总记录数
+                zongshu=Count('id'),
+
+                # 待处理数：状态为0（待处罚）和3（申诉中）
+                daichuli=Count(
+                    Case(
+                        When(Q(sqzhuangtai=0) | Q(sqzhuangtai=3), then=1),
+                        output_field=IntegerField()
+                    )
+                ),
+
+                # 已处理数：状态为1（已处罚）和2（已驳回）
+                yichuli=Count(
+                    Case(
+                        When(Q(sqzhuangtai=1) | Q(sqzhuangtai=2), then=1),
+                        output_field=IntegerField()
+                    )
+                )
+            )
+
+            # 如果查询结果为None，则设置为0
+            tongji_data = {
+                'zongshu': stats.get('zongshu', 0) or 0,
+                'daichuli': stats.get('daichuli', 0) or 0,
+                'yichuli': stats.get('yichuli', 0) or 0
+            }
+
+            return Response({
+                'code': 0,
+                'msg': '获取统计信息成功',
+                'data': tongji_data
+            })
+
+        except Exception as e:
+            logger.error(f"获取统计信息异常 - 用户ID: {yonghuid}, 错误: {str(e)}")
+            return Response({
+                'code': 1,
+                'msg': '获取统计信息失败',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def get_chufa_list(self, yonghuid, request_data):
+        """
+        获取处罚记录列表（高性能批量查询）
+        🔴 只修改图片查询逻辑，字段保持原样
+        """
+        try:
+            # 获取分页参数
+            page = int(request_data.get('page', 1))
+            page_size = int(request_data.get('page_size', 10))
+
+            # 限制最大每页数量，防止恶意请求
+            if page_size > 50:
+                page_size = 50
+            if page_size < 1:
+                page_size = 10
+
+            # 获取状态筛选参数
+            zhuangtai = request_data.get('zhuangtai', 0)
+
+            # 🔴 构建查询条件 - 打手端根据dashouid查询
+            queryset = Chufajilu.objects.filter(dashouid=yonghuid)
+
+            if zhuangtai == 0:
+                # 待处理：状态为0（待处罚）和3（申诉中）
+                queryset = queryset.filter(Q(sqzhuangtai=0) | Q(sqzhuangtai=3))
+            elif zhuangtai == 1:
+                # 已处理：状态为1（已处罚）和2（已驳回）
+                queryset = queryset.filter(Q(sqzhuangtai=1) | Q(sqzhuangtai=2))
+            else:
+                # 默认返回所有状态
+                pass
+
+            # 按创建时间倒序排列（最新在前）
+            queryset = queryset.order_by('-create_time')
+
+            # 使用游标分页，避免传统分页的性能问题
+            paginator = Paginator(queryset, page_size)
+
+            try:
+                page_obj = paginator.page(page)
+            except:
+                # 页码超出范围，返回空列表
+                return Response({
+                    'code': 0,
+                    'msg': '获取成功',
+                    'data': {
+                        'list': [],
+                        'has_more': False,
+                        'page': page,
+                        'page_size': page_size,
+                        'current_count': 0
+                    }
+                })
+
+            # 获取当前页的记录
+            chufa_records = list(page_obj)
+
+            if not chufa_records:
+                # 没有数据直接返回
+                return Response({
+                    'code': 0,
+                    'msg': '获取成功',
+                    'data': {
+                        'list': [],
+                        'has_more': False,
+                        'page': page,
+                        'page_size': page_size,
+                        'current_count': 0
+                    }
+                })
+
+            # 🔴【核心修复】收集所有需要查询图片的组合
+            dingdan_ids = []
+            shangjia_ids = []
+
+            for record in chufa_records:
+                if record.dingdan_id:
+                    dingdan_ids.append(record.dingdan_id)
+                if record.qingqiuid:  # 商家ID
+                    shangjia_ids.append(record.qingqiuid)
+
+            # 去重
+            dingdan_ids = list(set(dingdan_ids))
+            shangjia_ids = list(set(shangjia_ids))
+
+            # 🔴【核心修复】分别查询两种图片（避免if-elif逻辑错误）
+            # 1. 查询证据图片（商家上传的）
+            zhengju_mapping = {}
+            if dingdan_ids and shangjia_ids:
+                # 构建Q对象：dingdan_id在列表中 AND yonghuid在商家ID列表中
+                zhengju_q = Q(dingdan_id__in=dingdan_ids, yonghuid__in=shangjia_ids)
+                zhengju_queryset = Chufatupian.objects.filter(zhengju_q).values('dingdan_id', 'yonghuid', 'tupian')
+
+                for item in zhengju_queryset:
+                    key = f"{item['dingdan_id']}_{item['yonghuid']}"
+                    if key not in zhengju_mapping:
+                        zhengju_mapping[key] = []
+                    if item['tupian']:
+                        zhengju_mapping[key].append(item['tupian'])
+
+            # 2. 查询申诉图片（打手上传的）
+            shensu_mapping = {}
+            if dingdan_ids:
+                # 构建Q对象：dingdan_id在列表中 AND yonghuid=当前打手ID
+                shensu_q = Q(dingdan_id__in=dingdan_ids, yonghuid=yonghuid)
+                shensu_queryset = Chufatupian.objects.filter(shensu_q).values('dingdan_id', 'yonghuid', 'tupian')
+
+                for item in shensu_queryset:
+                    key = f"{item['dingdan_id']}_{item['yonghuid']}"
+                    if key not in shensu_mapping:
+                        shensu_mapping[key] = []
+                    if item['tupian']:
+                        shensu_mapping[key].append(item['tupian'])
+
+            # 🔴【核心修复】组装返回数据 - 字段保持原样！
+            chufa_list = []
+            for record in chufa_records:
+                dingdan_id = record.dingdan_id
+                shangjia_id = record.qingqiuid
+
+                # 获取证据图片（商家上传的）
+                zhengju_tupian = []
+                if dingdan_id and shangjia_id:
+                    key = f"{dingdan_id}_{shangjia_id}"
+                    zhengju_tupian = zhengju_mapping.get(key, [])
+
+                # 获取申诉图片（打手上传的）
+                shensu_tupian = []
+                if dingdan_id:
+                    key = f"{dingdan_id}_{yonghuid}"
+                    shensu_tupian = shensu_mapping.get(key, [])
+
+                # 🔴【字段保持原样！】与前端完全对应！
+                chufa_data = {
+                    'id': record.id,
+                    'dingdan_id': record.dingdan_id or '',
+                    'qingqiuid': record.qingqiuid or '',  # 商家ID
+                    'cfliyou': record.cfliyou or '',
+                    'sqzhuangtai': record.sqzhuangtai or 0,
+                    'ssliyou': record.ssliyou or '',
+                    'jifen': record.jifen or 0,
+                    'create_time': record.create_time.strftime('%Y-%m-%d %H:%M:%S') if record.create_time else '',
+                    'update_time': record.update_time.strftime('%Y-%m-%d %H:%M:%S') if record.update_time else '',
+                    'zhengju_tupian': zhengju_tupian,  # 商家上传的证据图片
+                    'shensu_tupian': shensu_tupian,  # 打手上传的申诉图片
+                }
+                chufa_list.append(chufa_data)
+
+            # 判断是否还有更多数据
+            has_more = page_obj.has_next()
+
+            # 构建响应数据
+            response_data = {
+                'list': chufa_list,
+                'has_more': has_more,
+                'page': page,
+                'page_size': page_size,
+                'current_count': len(chufa_list)
+            }
+
+            return Response({
+                'code': 0,
+                'msg': '获取成功',
+                'data': response_data
+            })
+
+        except ValueError as e:
+            logger.error(f"参数错误 - 用户ID: {yonghuid}, 错误: {str(e)}")
+            return Response({
+                'code': 4,
+                'msg': '参数格式错误',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+        except Exception as e:
+            logger.error(f"获取处罚记录列表异常 - 用户ID: {yonghuid}, 错误: {str(e)}", exc_info=True)
+            return Response({
+                'code': 5,
+                'msg': '获取记录列表失败',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+
+
+'''class ChufaJiluHuoquView(APIView):
+    """
+    打手获取处罚记录接口
+    路径: /yonghu/dshqcfjl
+    方法: POST
+    权限: JWT Token + 打手权限验证
+    """
+    permission_classes = [IsAuthenticated, DashouPermission]
+
+    def post(self, request):
+        try:
+            # 获取当前用户信息
+            user_main = request.user
+            yonghuid = user_main.yonghuid
+
+            # 🔴🆕【关键】通过反向关系获取打手扩展信息
+            try:
+                dashou_profile = user_main.dashou_profile
+                # 再次确认账号状态
+                if dashou_profile.zhanghaozhuangtai != 1:
+                    return Response({
+                        'code': 3,
+                        'msg': '账号已被封禁，无法查看处罚记录',
+                        'data': None
+                    }, status=status.HTTP_403_FORBIDDEN)
+            except UserDashou.DoesNotExist:
+                return Response({
+                    'code': 2,
+                    'msg': '用户不是打手身份',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+
+            # 判断请求类型：统计信息 or 记录列表
+            qingqiu_tongji = request.data.get('qingqiu_tongji', False)
+
+            if qingqiu_tongji:
+                # 🔴🆕【关键】返回统计信息（高效查询）
+                return self.get_tongji_info(yonghuid)
+            else:
+                # 🔴🆕【关键】返回处罚记录列表（高性能游标分页）
+                return self.get_chufa_list(yonghuid, request.data)
+
+        except Exception as e:
+            logger.error(f"获取处罚记录异常 - 用户ID: {yonghuid}, 错误: {str(e)}", exc_info=True)
+            return Response({
+                'code': 99,
+                'msg': '系统繁忙，请稍后重试',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def get_tongji_info(self, yonghuid):
+        """
+        获取统计信息（总记录、待处理、已处理）
+        使用高效的单次查询，避免多次count查询
+        """
+        try:
+            # 🔴🆕【关键】使用单个查询获取所有统计信息，减少数据库查询次数
+            # 使用条件聚合查询
+            from django.db.models import Count, Case, When, IntegerField
+
+            stats = Chufajilu.objects.filter(dashouid=yonghuid).aggregate(
+                # 总记录数
+                zongshu=Count('id'),
+
+                # 待处理数：状态为0（待处罚）和3（申诉中）
+                daichuli=Count(
+                    Case(
+                        When(Q(sqzhuangtai=0) | Q(sqzhuangtai=3), then=1),
+                        output_field=IntegerField()
+                    )
+                ),
+
+                # 已处理数：状态为1（已处罚）和2（已驳回）
+                yichuli=Count(
+                    Case(
+                        When(Q(sqzhuangtai=1) | Q(sqzhuangtai=2), then=1),
+                        output_field=IntegerField()
+                    )
+                )
+            )
+
+            # 如果查询结果为None，则设置为0
+            tongji_data = {
+                'zongshu': stats.get('zongshu', 0) or 0,
+                'daichuli': stats.get('daichuli', 0) or 0,
+                'yichuli': stats.get('yichuli', 0) or 0
+            }
+
+            return Response({
+                'code': 0,
+                'msg': '获取统计信息成功',
+                'data': tongji_data
+            })
+
+        except Exception as e:
+            logger.error(f"获取统计信息异常 - 用户ID: {yonghuid}, 错误: {str(e)}")
+            return Response({
+                'code': 1,
+                'msg': '获取统计信息失败',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def get_chufa_list(self, yonghuid, request_data):
+        """
+        获取处罚记录列表（高性能游标分页）
+        关键优化：使用JOIN减少查询次数，批量获取图片数据
+        """
+        try:
+            # 🔴🆕【关键】获取分页参数
+            page = int(request_data.get('page', 1))
+            page_size = int(request_data.get('page_size', 10))
+
+            # 限制最大每页数量，防止恶意请求
+            if page_size > 50:
+                page_size = 50
+            if page_size < 1:
+                page_size = 10
+
+            # 🔴🆕【关键】获取状态筛选参数
+            zhuangtai = request_data.get('zhuangtai', 0)
+
+            # 构建查询条件
+            queryset = Chufajilu.objects.filter(dashouid=yonghuid)
+
+            if zhuangtai == 0:
+                # 待处理：状态为0（待处罚）和3（申诉中）
+                queryset = queryset.filter(Q(sqzhuangtai=0) | Q(sqzhuangtai=3))
+            elif zhuangtai == 1:
+                # 已处理：状态为1（已处罚）和2（已驳回）
+                queryset = queryset.filter(Q(sqzhuangtai=1) | Q(sqzhuangtai=2))
+            else:
+                # 默认返回所有状态
+                pass
+
+            # 🔴🆕【关键】按创建时间倒序排列（最新在前）
+            queryset = queryset.order_by('-create_time')
+
+            # 🔴🆕【关键】使用游标分页，避免传统分页的性能问题
+            paginator = Paginator(queryset, page_size)
+
+            try:
+                page_obj = paginator.page(page)
+            except:
+                # 页码超出范围，返回空列表
+                return Response({
+                    'code': 0,
+                    'msg': '获取成功',
+                    'data': {
+                        'list': [],
+                        'has_more': False,
+                        'page': page,
+                        'page_size': page_size,
+                        'current_count': 0
+                    }
+                })
+
+            # 获取当前页的记录
+            chufa_records = list(page_obj)
+
+            if not chufa_records:
+                # 没有数据直接返回
+                return Response({
+                    'code': 0,
+                    'msg': '获取成功',
+                    'data': {
+                        'list': [],
+                        'has_more': False,
+                        'page': page,
+                        'page_size': page_size,
+                        'current_count': 0
+                    }
+                })
+
+            # 🔴🆕【关键】批量获取所有相关的图片数据（性能优化核心）
+            # 提取所有dingdan_id
+            dingdan_ids = [record.dingdan_id for record in chufa_records if record.dingdan_id]
+
+            # 提取所有qingqiuid（申请人ID）
+            qingqiuids = [record.qingqiuid for record in chufa_records if record.qingqiuid]
+
+            # 🔴🆕【关键】批量查询证据图片（申请人上传的图片）
+            # 使用单个查询获取所有相关图片，避免N+1查询
+            zhengju_tupian_queryset = Chufatupian.objects.filter(
+                dingdan_id__in=dingdan_ids,
+                yonghuid__in=qingqiuids
+            ).values('dingdan_id', 'yonghuid', 'tupian')
+
+            # 将证据图片按(dingdan_id, yonghuid)分组
+            zhengju_tupian_dict = {}
+            for item in zhengju_tupian_queryset:
+                key = f"{item['dingdan_id']}_{item['yonghuid']}"
+                if key not in zhengju_tupian_dict:
+                    zhengju_tupian_dict[key] = []
+                if item['tupian']:
+                    zhengju_tupian_dict[key].append(item['tupian'])
+
+            # 🔴🆕【关键】批量查询申诉图片（打手上传的图片）
+            shensu_tupian_queryset = Chufatupian.objects.filter(
+                dingdan_id__in=dingdan_ids,
+                yonghuid=yonghuid  # 打手自己上传的图片
+            ).values('dingdan_id', 'yonghuid', 'tupian')
+
+            # 将申诉图片按dingdan_id分组
+            shensu_tupian_dict = {}
+            for item in shensu_tupian_queryset:
+                dingdan_id = item['dingdan_id']
+                if dingdan_id not in shensu_tupian_dict:
+                    shensu_tupian_dict[dingdan_id] = []
+                if item['tupian']:
+                    shensu_tupian_dict[dingdan_id].append(item['tupian'])
+
+            # 🔴🆕【关键】组装返回数据
+            chufa_list = []
+            for record in chufa_records:
+                # 获取证据图片
+                zhengju_tupian = []
+                if record.dingdan_id and record.qingqiuid:
+                    key = f"{record.dingdan_id}_{record.qingqiuid}"
+                    zhengju_tupian = zhengju_tupian_dict.get(key, [])
+
+                # 获取申诉图片
+                shensu_tupian = []
+                if record.dingdan_id:
+                    shensu_tupian = shensu_tupian_dict.get(record.dingdan_id, [])
+
+                # 构建返回数据格式（与前端对应）
+                chufa_data = {
+                    'id': record.id,  # 处罚记录ID
+                    'dingdan_id': record.dingdan_id or '',
+                    'qingqiuid': record.qingqiuid or '',  # 申请人ID
+                    'cfliyou': record.cfliyou or '',
+                    'sqzhuangtai': record.sqzhuangtai or 0,
+                    'ssliyou': record.ssliyou or '',  # 申诉理由
+                    'jifen': record.jifen or 0,
+                    'create_time': record.create_time.strftime('%Y-%m-%d %H:%M:%S') if record.create_time else '',
+                    'update_time': record.update_time.strftime('%Y-%m-%d %H:%M:%S') if record.update_time else '',
+                    # 图片数据
+                    'zhengju_tupian': zhengju_tupian,  # 证据图片数组
+                    'shensu_tupian': shensu_tupian,  # 申诉图片数组
+                }
+                chufa_list.append(chufa_data)
+
+            # 判断是否还有更多数据
+            has_more = page_obj.has_next()
+
+            # 构建响应数据
+            response_data = {
+                'list': chufa_list,
+                'has_more': has_more,
+                'page': page,
+                'page_size': page_size,
+                'current_count': len(chufa_list)
+            }
+
+            return Response({
+                'code': 0,
+                'msg': '获取成功',
+                'data': response_data
+            })
+
+        except ValueError as e:
+            logger.error(f"参数错误 - 用户ID: {yonghuid}, 错误: {str(e)}")
+            return Response({
+                'code': 4,
+                'msg': '参数格式错误',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+        except Exception as e:
+            logger.error(f"获取处罚记录列表异常 - 用户ID: {yonghuid}, 错误: {str(e)}", exc_info=True)
+            return Response({
+                'code': 5,
+                'msg': '获取记录列表失败',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)'''
+
+
+class DashouShensuView(APIView):
+    """
+    打手申诉接口
+    路径: /yonghu/dscfss
+    方法: POST
+    权限: JWT Token + 打手权限验证
+    功能: 打手对处罚进行申诉
+    """
+    permission_classes = [IsAuthenticated, DashouPermission]
+
+    def post(self, request):
+        try:
+            # 获取当前用户信息
+            user_main = request.user
+            yonghuid = user_main.yonghuid
+
+            # 🔴🆕【关键】验证打手账号状态
+            try:
+                dashou_profile = user_main.dashou_profile
+                if dashou_profile.zhanghaozhuangtai != 1:
+                    return Response({
+                        'code': 3,
+                        'msg': '账号已被封禁，无法申诉',
+                        'data': None
+                    }, status=status.HTTP_403_FORBIDDEN)
+            except UserDashou.DoesNotExist:
+                return Response({
+                    'code': 2,
+                    'msg': '用户不是打手身份',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+
+            # 🔴🆕【关键】获取请求参数
+            chufa_id = request.data.get('chufa_id')  # 处罚记录ID
+            shensu_liyou = request.data.get('shensu_liyou', '').strip()  # 申诉理由
+            shensu_tupian_urls = request.data.get('shensu_tupian_urls', [])  # 申诉图片URL数组
+
+            # 验证必填字段
+            if not chufa_id:
+                return Response({
+                    'code': 6,
+                    'msg': '处罚记录ID不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            if not shensu_liyou:
+                return Response({
+                    'code': 7,
+                    'msg': '申诉理由不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 验证申诉理由长度
+            if len(shensu_liyou) > 500:
+                return Response({
+                    'code': 8,
+                    'msg': '申诉理由不能超过500字',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 验证图片数量
+            if len(shensu_tupian_urls) > 9:
+                return Response({
+                    'code': 9,
+                    'msg': '最多只能上传9张图片',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # 🔴🆕【关键】使用事务确保数据一致性
+            from django.db import transaction
+
+            with transaction.atomic():
+                # 1. 查询处罚记录
+                try:
+                    chufa_record = Chufajilu.objects.select_for_update().get(
+                        id=chufa_id,
+                        dashouid=yonghuid  # 确保只能申诉自己的处罚记录
+                    )
+                except Chufajilu.DoesNotExist:
+                    return Response({
+                        'code': 10,
+                        'msg': '处罚记录不存在或无权申诉',
+                        'data': None
+                    }, status=status.HTTP_404_NOT_FOUND)
+
+                # 2. 验证处罚记录状态（必须是待处理状态0）
+                if chufa_record.sqzhuangtai != 0:
+                    return Response({
+                        'code': 11,
+                        'msg': '该处罚记录已处理，无法申诉',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 3. 验证订单是否存在（可选，根据需求决定）
+                # 这里可以根据dingdan_id去查询订单表，但根据需求描述，我们已经有了处罚记录
+                # 处罚记录中包含了dingdan_id，如果dingdan_id不存在，说明订单可能被删除
+                # 但根据业务逻辑，有处罚记录就应该有订单，所以这里可以跳过这个检查
+
+                # 4. 检查是否已有申诉记录（防止重复申诉）
+                if chufa_record.ssliyou or chufa_record.sqzhuangtai == 3:
+                    # 检查是否已经有申诉图片
+                    existing_shensu_tupian = Chufatupian.objects.filter(
+                        dingdan_id=chufa_record.dingdan_id,
+                        yonghuid=yonghuid
+                    ).exists()
+
+                    if existing_shensu_tupian:
+                        return Response({
+                            'code': 12,
+                            'msg': '您已经提交过申诉，请等待处理结果',
+                            'data': None
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                # 5. 更新处罚记录
+                chufa_record.ssliyou = shensu_liyou
+                chufa_record.sqzhuangtai = 3  # 状态改为申诉中
+                chufa_record.save()
+
+                # 6. 保存申诉图片（如果有）
+                saved_tupian_urls = []
+                if shensu_tupian_urls:
+                    for tupian_url in shensu_tupian_urls:
+                        if tupian_url:  # 确保URL不为空
+                            chufa_tupian = Chufatupian.objects.create(
+                                dingdan_id=chufa_record.dingdan_id,
+                                yonghuid=yonghuid,
+                                tupian=tupian_url
+                            )
+                            saved_tupian_urls.append(tupian_url)
+
+                # 7. 构建返回数据
+                response_data = {
+                    'chufa_id': chufa_record.id,
+                    'dingdan_id': chufa_record.dingdan_id or '',
+                    'shensu_liyou': shensu_liyou,
+                    'shensu_tupian_urls': saved_tupian_urls,
+                    'sqzhuangtai': chufa_record.sqzhuangtai,
+                    'update_time': chufa_record.update_time.strftime(
+                        '%Y-%m-%d %H:%M:%S') if chufa_record.update_time else ''
+                }
+
+                # 记录操作日志
+                logger.info(f"打手申诉成功 - 用户ID: {yonghuid}, 处罚ID: {chufa_id}, 订单ID: {chufa_record.dingdan_id}")
+
+                return Response({
+                    'code': 0,
+                    'msg': '申诉提交成功',
+                    'data': response_data
+                })
+
+        except Exception as e:
+            logger.error(f"打手申诉异常 - 用户ID: {yonghuid}, 错误: {str(e)}", exc_info=True)
+            return Response({
+                'code': 99,
+                'msg': '系统繁忙，请稍后重试',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+
+
+
+class ShangjiaChufaJiluHuoquView(APIView):
+    """
+    商家获取处罚记录接口
+    路径: /yonghu/sjcfjlhq
+    方法: POST
+    权限: JWT Token + 商家权限验证
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # 获取当前用户信息
+            user_main = request.user
+            yonghuid = user_main.yonghuid
+
+            # 通过反向关系获取商家扩展信息
+            try:
+                shangjia_profile = user_main.shop_profile
+                # 再次确认账号状态
+                if shangjia_profile.zhuangtai != 1:
+                    return Response({
+                        'code': 3,
+                        'msg': '商家账号状态异常，无法查看处罚记录',
+                        'data': None
+                    }, status=status.HTTP_403_FORBIDDEN)
+            except UserShangjia.DoesNotExist:
+                return Response({
+                    'code': 2,
+                    'msg': '用户不是商家身份',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+
+            # 判断请求类型
+            qingqiu_tongji = request.data.get('qingqiu_tongji', False)
+
+            if qingqiu_tongji:
+                return self.get_tongji_info(yonghuid)
+            else:
+                return self.get_chufa_list(yonghuid, request.data)
+
+        except Exception as e:
+            logger.error(f"商家获取处罚记录异常 - 用户ID: {yonghuid}, 错误: {str(e)}", exc_info=True)
+            return Response({
+                'code': 99,
+                'msg': '系统繁忙，请稍后重试',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def get_tongji_info(self, yonghuid):
+        """
+        获取统计信息
+        """
+        try:
+            # 🔴 查询条件：qingqiuid = 当前商家ID
+            stats = Chufajilu.objects.filter(qingqiuid=yonghuid).aggregate(
+                zongshu=Count('id'),
+                daichuli=Count(
+                    Case(
+                        When(Q(sqzhuangtai=0) | Q(sqzhuangtai=3), then=1),
+                        output_field=IntegerField()
+                    )
+                ),
+                yichuli=Count(
+                    Case(
+                        When(Q(sqzhuangtai=1) | Q(sqzhuangtai=2), then=1),
+                        output_field=IntegerField()
+                    )
+                )
+            )
+
+            tongji_data = {
+                'zongshu': stats.get('zongshu', 0) or 0,
+                'daichuli': stats.get('daichuli', 0) or 0,
+                'yichuli': stats.get('yichuli', 0) or 0
+            }
+
+            return Response({
+                'code': 0,
+                'msg': '获取统计信息成功',
+                'data': tongji_data
+            })
+
+        except Exception as e:
+            logger.error(f"商家获取统计信息异常 - 用户ID: {yonghuid}, 错误: {str(e)}")
+            return Response({
+                'code': 1,
+                'msg': '获取统计信息失败',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def get_chufa_list(self, yonghuid, request_data):
+        """
+        获取处罚记录列表（商家端）
+        🔴 只修改图片查询逻辑，字段保持原样
+        """
+        try:
+            # 获取分页参数
+            page = int(request_data.get('page', 1))
+            page_size = int(request_data.get('page_size', 10))
+
+            if page_size > 50:
+                page_size = 50
+            if page_size < 1:
+                page_size = 10
+
+            # 获取状态筛选参数
+            zhuangtai = request_data.get('zhuangtai', 0)
+
+            # 🔴 查询条件：qingqiuid = 当前商家ID
+            queryset = Chufajilu.objects.filter(qingqiuid=yonghuid)
+
+            if zhuangtai == 0:
+                queryset = queryset.filter(Q(sqzhuangtai=0) | Q(sqzhuangtai=3))
+            elif zhuangtai == 1:
+                queryset = queryset.filter(Q(sqzhuangtai=1) | Q(sqzhuangtai=2))
+            else:
+                pass
+
+            # 按创建时间倒序排列
+            queryset = queryset.order_by('-create_time')
+
+            # 分页逻辑
+            paginator = Paginator(queryset, page_size)
+
+            try:
+                page_obj = paginator.page(page)
+            except:
+                return Response({
+                    'code': 0,
+                    'msg': '获取成功',
+                    'data': {
+                        'list': [],
+                        'has_more': False,
+                        'page': page,
+                        'page_size': page_size,
+                        'current_count': 0
+                    }
+                })
+
+            chufa_records = list(page_obj)
+
+            if not chufa_records:
+                return Response({
+                    'code': 0,
+                    'msg': '获取成功',
+                    'data': {
+                        'list': [],
+                        'has_more': False,
+                        'page': page,
+                        'page_size': page_size,
+                        'current_count': 0
+                    }
+                })
+
+            # 🔴【核心修复】收集所有需要查询图片的组合
+            dingdan_ids = []
+            dashou_ids = []
+
+            for record in chufa_records:
+                if record.dingdan_id:
+                    dingdan_ids.append(record.dingdan_id)
+                if record.dashouid:  # 打手ID
+                    dashou_ids.append(record.dashouid)
+
+            # 去重
+            dingdan_ids = list(set(dingdan_ids))
+            dashou_ids = list(set(dashou_ids))
+
+            # 🔴【核心修复】分别查询两种图片（避免if-elif逻辑错误）
+            # 1. 查询证据图片（商家自己上传的）
+            zhengju_mapping = {}
+            if dingdan_ids:
+                # 构建Q对象：dingdan_id在列表中 AND yonghuid=当前商家ID
+                zhengju_q = Q(dingdan_id__in=dingdan_ids, yonghuid=yonghuid)
+                zhengju_queryset = Chufatupian.objects.filter(zhengju_q).values('dingdan_id', 'yonghuid', 'tupian')
+
+                for item in zhengju_queryset:
+                    key = f"{item['dingdan_id']}_{item['yonghuid']}"
+                    if key not in zhengju_mapping:
+                        zhengju_mapping[key] = []
+                    if item['tupian']:
+                        zhengju_mapping[key].append(item['tupian'])
+
+            # 2. 查询申诉图片（打手上传的）
+            shensu_mapping = {}
+            if dingdan_ids and dashou_ids:
+                # 构建Q对象：dingdan_id在列表中 AND yonghuid在打手ID列表中
+                shensu_q = Q(dingdan_id__in=dingdan_ids, yonghuid__in=dashou_ids)
+                shensu_queryset = Chufatupian.objects.filter(shensu_q).values('dingdan_id', 'yonghuid', 'tupian')
+
+                for item in shensu_queryset:
+                    key = f"{item['dingdan_id']}_{item['yonghuid']}"
+                    if key not in shensu_mapping:
+                        shensu_mapping[key] = []
+                    if item['tupian']:
+                        shensu_mapping[key].append(item['tupian'])
+
+            # 🔴【核心修复】组装返回数据 - 字段保持原样！
+            chufa_list = []
+            for record in chufa_records:
+                dingdan_id = record.dingdan_id
+                dashou_id = record.dashouid
+
+                # 获取证据图片（商家自己上传的）
+                zhengju_tupian = []
+                if dingdan_id:
+                    key = f"{dingdan_id}_{yonghuid}"
+                    zhengju_tupian = zhengju_mapping.get(key, [])
+
+                # 获取申诉图片（打手上传的）
+                shensu_tupian = []
+                if dingdan_id and dashou_id:
+                    key = f"{dingdan_id}_{dashou_id}"
+                    shensu_tupian = shensu_mapping.get(key, [])
+
+                # 🔴【字段保持原样！】与前端完全对应！
+                chufa_data = {
+                    'id': record.id,
+                    'dingdan_id': record.dingdan_id or '',
+                    'qingqiuid': record.dashouid or '',  # 打手ID
+                    'cfliyou': record.cfliyou or '',
+                    'sqzhuangtai': record.sqzhuangtai or 0,
+                    'ssliyou': record.ssliyou or '',
+                    'jifen': record.jifen or 0,
+                    'create_time': record.create_time.strftime('%Y-%m-%d %H:%M:%S') if record.create_time else '',
+                    'update_time': record.update_time.strftime('%Y-%m-%d %H:%M:%S') if record.update_time else '',
+                    'zhengju_tupian': zhengju_tupian,  # 商家自己上传的证据图片
+                    'shensu_tupian': shensu_tupian,  # 打手上传的申诉图片
+                }
+                chufa_list.append(chufa_data)
+
+            # 判断是否还有更多数据
+            has_more = page_obj.has_next()
+
+            response_data = {
+                'list': chufa_list,
+                'has_more': has_more,
+                'page': page,
+                'page_size': page_size,
+                'current_count': len(chufa_list)
+            }
+
+            return Response({
+                'code': 0,
+                'msg': '获取成功',
+                'data': response_data
+            })
+
+        except ValueError as e:
+            logger.error(f"商家端参数错误 - 用户ID: {yonghuid}, 错误: {str(e)}")
+            return Response({
+                'code': 4,
+                'msg': '参数格式错误',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+        except Exception as e:
+            logger.error(f"商家获取处罚记录列表异常 - 用户ID: {yonghuid}, 错误: {str(e)}", exc_info=True)
+            return Response({
+                'code': 5,
+                'msg': '获取记录列表失败',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+logger = logging.getLogger(__name__)
+
+class KefuLoginView(APIView):
+    """
+    客服登录接口（支持手机号重复）
+    请求：POST /yonghu/kefujinru
+    请求体：{"phone": "13800138000", "password": "xxx", "erjimima": "yyy"}
+    返回：
+        code=0 成功，data包含token,nicheng,yonghuid
+        code=4 账号被封禁（提示“账号已被封禁”）
+        其他错误统一 code=1 msg="登录失败"
+    """
+    throttle_classes = [AnonRateThrottle]          # 限制匿名请求频率
+    permission_classes = [AllowAny]                # 任何人都可访问
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        password = request.data.get('password', '')
+        erjimima = request.data.get('erjimima', '')
+
+        if not phone or not password or not erjimima:
+            return Response({
+                'code': 1,
+                'msg': '登录失败',          # 统一提示，不暴露具体原因
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 2. 获取客户端真实IP
+        client_ip = self.get_client_ip(request)
+
+        # 3. 查询所有手机号匹配且类型为客服的用户
+        #    注意：UserMain 中需要有 user_type 字段，且值为 'kefu' 代表客服
+        user_mains = UserMain.objects.filter(
+            phone=phone,
+            user_type='kefu'               # 只查找客服账号
+        ).select_related('kefu_profile')    # 预加载客服扩展表
+
+        if not user_mains.exists():
+            logger.warning(f"登录失败，手机号不存在或非客服: {phone}, IP: {client_ip}")
+            return Response({
+                'code': 1,
+                'msg': '登录失败',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 4. 遍历所有匹配的用户，验证密码和二级密码
+        target_user = None
+        target_kefu = None
+
+        for user in user_mains:
+            # 验证主密码（明文比较，按您的要求）
+            if user.password != password:
+                continue
+
+            # 检查是否存在客服扩展表
+            try:
+                kefu = user.kefu_profile
+            except UserKefu.DoesNotExist:
+                continue
+
+            # 验证二级密码（明文比较）
+            if kefu.erjimima != erjimima:
+                continue
+
+            # 如果账号被禁用，记录但继续查找（可能还有其他正常账号？）
+            if kefu.zhuangtai != 1:
+                # 如果找到被禁用的，记录下来，但继续查找是否有正常账号
+                if target_user is None:
+                    # 暂时记录这个禁用账号，但继续遍历
+                    target_user = user
+                    target_kefu = kefu
+                continue
+
+            # 找到完全匹配且状态正常的账号，立即使用
+            target_user = user
+            target_kefu = kefu
+            break
+        else:
+            # 循环结束未找到正常账号，但可能找到了禁用账号
+            if target_user and target_kefu:
+                # 只有被禁用的账号匹配，返回封禁提示
+                logger.warning(f"登录失败，客服账号已禁用: {phone}, IP: {client_ip}")
+                return Response({
+                    'code': 4,
+                    'msg': '账号已被封禁',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+            else:
+                # 没有任何账号匹配（密码/二级密码错误）
+                logger.warning(f"登录失败，密码或二级密码错误: {phone}, IP: {client_ip}")
+                return Response({
+                    'code': 1,
+                    'msg': '登录失败',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+        # 5. 更新IP和最后登录时间
+        target_user.ip = client_ip
+        target_user.last_login_time = timezone.now()
+        target_user.save(update_fields=['ip', 'last_login_time'])
+
+        # 6. 生成JWT token
+        refresh = RefreshToken.for_user(target_user)
+        token = str(refresh.access_token)
+
+        # 7. 返回成功数据
+        return Response({
+            'code': 0,
+            'msg': '登录成功',
+            'data': {
+                'token': token,
+                'nicheng': target_kefu.nicheng,
+                'yonghuid': target_user.yonghuid,
+            }
+        })
+
+    def get_client_ip(self, request):
+        """
+        获取客户端真实IP
+        """
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0].strip()
+            if ip:
+                return ip
+        return request.META.get('REMOTE_ADDR', '0.0.0.0')
+
+
+
+
+
+
+logger = logging.getLogger(__name__)
+
+class KefuStatsView(APIView):
+    """
+    客服统计数据接口
+    请求：POST /yonghu/kfjrhqzl
+    请求体：{"phone": "13800138000"}
+    认证：必须携带有效的 JWT token（放在 Authorization 头）
+    返回：
+        code=0 成功，data 包含 jinrichuli, jinyuechuli, zongchuli
+        验证失败统一返回 401，不透露具体原因
+    """
+
+    permission_classes = [IsAuthenticated]        # 必须登录
+
+
+    def post(self, request):
+        # 1. 获取请求中的 phone
+        phone = request.data.get('phone', '').strip()
+        if not phone:
+            # 缺少参数，但按约定返回 401（可以改为 400，但为了统一，用401）
+            logger.warning(f"统计接口缺少 phone 参数，用户: {request.user.yonghuid}")
+            return Response({'detail': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 获取当前登录用户（从 JWT 中解析）
+        current_user = request.user
+
+        # 3. 验证前端传来的 phone 是否与当前用户的 phone 一致
+        if current_user.phone != phone:
+            # 不一致，可能 token 被冒用或参数错误
+            logger.warning(f"统计接口 phone 不匹配: 请求phone={phone}, 用户phone={current_user.phone}")
+            return Response({'detail': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 4. 验证用户类型是否为客服
+        if current_user.user_type != 'kefu':
+            logger.warning(f"统计接口用户类型非客服: {current_user.yonghuid}")
+            return Response({'detail': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 5. 尝试获取客服扩展表数据
+        try:
+            kefu_profile = current_user.kefu_profile  # OneToOneField 反向关系
+        except UserKefu.DoesNotExist:
+            logger.warning(f"统计接口客服扩展表不存在: {current_user.yonghuid}")
+            return Response({'detail': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 6. 返回统计数据（字段名与前端约定一致）
+        return Response({
+            'code': 0,
+            'data': {
+                'jinrichuli': kefu_profile.jinrichuli,
+                'jinyuechuli': kefu_profile.jinyuechuli,
+                'zongchuli': kefu_profile.zongchuli,
+            }
+        }, status=status.HTTP_200_OK)
+
+
+
+
+
+
+from rest_framework.views import APIView
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+import logging
+from shangpin.models import ShangpinLeixing  # 假设商品类型表名，请根据实际调整
+
+logger = logging.getLogger(__name__)
+
+class KefuGetOrderTypesView(APIView):
+    """
+    客服获取订单类型列表接口（平台订单用）
+    请求：POST /yonghu/kfhqptddlx
+    参数：{"phone": "13800138000"}
+    认证：JWT
+    返回：code=0 + 类型列表
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        if not phone:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        current_user = request.user
+
+        # 2. 验证手机号一致性
+        if getattr(current_user, 'phone', '') != phone:
+            logger.warning(f"手机号不匹配: 请求phone={phone}, 用户phone={current_user.phone}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 验证用户类型及客服状态
+        if current_user.user_type != 'kefu':
+            logger.warning(f"用户类型非客服: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu_profile = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            logger.warning(f"客服扩展表不存在: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu_profile.zhuangtai != 1:
+            logger.warning(f"客服账号已被禁用: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 4. 查询订单类型（商品类型）
+        try:
+            # 只查询需要的字段，减少数据传输
+            types_qs = ShangpinLeixing.objects.all().only('id', 'jieshao', 'tupian_url')
+            type_list = [
+                {
+                    'id': t.id,
+                    'biaoti': t.jieshao or '',          # 假设商品类型的标题字段为 jieshao
+                    'tupian_url': t.tupian_url or ''
+                }
+                for t in types_qs
+            ]
+            return Response({'code': 0, 'data': type_list})
+        except Exception as e:
+            logger.error(f"查询商品类型表失败: {str(e)}")
+            # 表不存在或查询失败，返回空列表
+            return Response({'code': 0, 'data': []})
+
+
+
+
+
+
+
+import time
+import logging
+from django.db.models import Q, Count
+from django.core.exceptions import ObjectDoesNotExist
+from rest_framework.views import APIView
+
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+
+
+logger = logging.getLogger(__name__)
+
+'''class KefuGetOrderListView(APIView):
+    """
+    客服获取平台订单列表接口（发单平台=1）
+    请求参数：
+        phone: 客服账号
+        page: 页码
+        pageSize: 每页条数
+        dingdan_id: 订单ID（精确搜索）
+        laoban_id: 老板ID（搜索平台扩展表中的老板）
+        dashou_id: 打手ID（搜索主表中的接单打手）
+        leixing: 商品类型ID
+        zhuangtai: 状态（多个用逗号分隔，如 "1,7"）
+        date: 日期（YYYY-MM-DD），筛选订单创建时间
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        start_total = time.time()
+
+        phone = request.data.get('phone', '').strip()
+        page = int(request.data.get('page', 1))
+        page_size = int(request.data.get('pageSize', 20))
+
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        laoban_id = request.data.get('laoban_id', '').strip()
+        dashou_id = request.data.get('dashou_id', '').strip()
+        leixing = request.data.get('leixing')
+        zhuangtai = request.data.get('zhuangtai', '')
+        date = request.data.get('date', '').strip()  # 日期筛选
+
+        if not phone:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # ---------- 查询条件 ----------
+        base_q = Q(fadan_pingtai=1)  # 平台订单
+
+        if dingdan_id:
+            q_conditions = base_q & Q(dingdan_id=dingdan_id)
+        else:
+            q_conditions = base_q
+            if leixing is not None:
+                try:
+                    leixing_int = int(leixing)
+                    q_conditions &= Q(leixing_id=leixing_int)
+                except (ValueError, TypeError):
+                    pass
+            if zhuangtai and zhuangtai != 'all':
+                try:
+                    status_list = [int(s.strip()) for s in zhuangtai.split(',') if s.strip()]
+                    if status_list:
+                        q_conditions &= Q(zhuangtai__in=status_list)
+                except (ValueError, TypeError):
+                    pass
+            if dashou_id:
+                q_conditions &= Q(jiedan_dashou_id=dashou_id)
+            if laoban_id:
+                q_conditions &= Q(pingtai_kuozhan__laoban_id=laoban_id)
+            if date:
+                q_conditions &= Q(create_time__date=date)  # 按日期筛选
+
+        # ---------- 统计（仅按发单平台） ----------
+        stats = Dingdan.objects.filter(fadan_pingtai=1).aggregate(
+            total_orders=Count('id'),
+            completed_orders=Count('id', filter=Q(zhuangtai=3)),
+            refund_orders=Count('id', filter=Q(zhuangtai=5)),
+            pending_orders=Count('id', filter=Q(zhuangtai__in=[4,8]))
+        )
+
+        # ---------- 状态计数（所有状态都返回） ----------
+        status_counts = {
+            'all': Dingdan.objects.filter(fadan_pingtai=1).count(),
+            '1,7': Dingdan.objects.filter(fadan_pingtai=1, zhuangtai__in=[1,7]).count(),
+            '2': Dingdan.objects.filter(fadan_pingtai=1, zhuangtai=2).count(),
+            '8': Dingdan.objects.filter(fadan_pingtai=1, zhuangtai=8).count(),
+            '3': Dingdan.objects.filter(fadan_pingtai=1, zhuangtai=3).count(),
+            '4': Dingdan.objects.filter(fadan_pingtai=1, zhuangtai=4).count(),
+            '5': Dingdan.objects.filter(fadan_pingtai=1, zhuangtai=5).count(),
+            '6': Dingdan.objects.filter(fadan_pingtai=1, zhuangtai=6).count(),
+        }
+
+        # ---------- 分页查询 ----------
+        total_count = Dingdan.objects.filter(q_conditions).count()
+
+        orders_qs = Dingdan.objects.filter(q_conditions).select_related(
+            'pingtai_kuozhan'  # 预加载平台扩展表
+        ).only(
+            'dingdan_id', 'jieshao', 'zhuangtai', 'leixing_id', 'fadan_pingtai',
+            'jine', 'tupian', 'create_time', 'nicheng', 'jiedan_dashou_id',
+            'pingtai_kuozhan__laoban_id'
+        ).order_by('-create_time')[(page-1)*page_size : page*page_size]
+
+        # ---------- 获取老板昵称 ----------
+        laoban_ids = [o.pingtai_kuozhan.laoban_id for o in orders_qs if hasattr(o, 'pingtai_kuozhan') and o.pingtai_kuozhan.laoban_id]
+        nickname_map = {}
+        if laoban_ids:
+            users = UserMain.objects.filter(yonghuid__in=laoban_ids).select_related('boss_profile').only(
+                'yonghuid', 'boss_profile__nickname'
+            )
+            for user in users:
+                nickname_map[user.yonghuid] = user.boss_profile.nickname or '' if hasattr(user, 'boss_profile') else ''
+
+        result_list = []
+        for order in orders_qs:
+            ext = getattr(order, 'pingtai_kuozhan', None)
+            laoban_id = ext.laoban_id if ext else ''
+            youxi_nicheng = nickname_map.get(laoban_id, order.nicheng or '')
+            result_list.append({
+                'dingdan_id': order.dingdan_id or '',
+                'jieshao': order.jieshao or '',
+                'zhuangtai': order.zhuangtai,
+                'leixing': order.leixing_id,
+                'fadanpingtai': order.fadan_pingtai,
+                'jiage': float(order.jine) if order.jine else 0.00,
+                'tupian_url': order.tupian or '',
+                'fadanshijian': order.create_time.strftime('%Y-%m-%d %H:%M:%S') if order.create_time else '',
+                'youxi_nicheng': youxi_nicheng
+            })
+
+        response_data = {
+            'stats': {
+                'totalOrders': stats['total_orders'] or 0,
+                'completedOrders': stats['completed_orders'] or 0,
+                'refundOrders': stats['refund_orders'] or 0,
+                'pendingOrders': stats['pending_orders'] or 0
+            },
+            'statusCounts': status_counts,
+            'list': result_list,
+            'total': total_count,
+            'page': page,
+            'pageSize': page_size
+        }
+
+        logger.info(f"平台订单接口总耗时: {time.time()-start_total:.3f}s")
+        return Response({'code': 0, 'data': response_data})
+
+
+
+
+
+
+
+logger = logging.getLogger(__name__)
+
+class KefuGetShangjiaOrderListView(APIView):
+    """
+    客服获取商家订单列表接口（发单平台=2）
+    请求参数：
+        phone: 客服账号
+        page: 页码
+        pageSize: 每页条数
+        dingdan_id: 订单ID（精确搜索）
+        shangjia_id: 商家ID（搜索商家扩展表中的商家ID）
+        dashou_id: 打手ID（搜索主表中的接单打手）
+        leixing: 商品类型ID
+        zhuangtai: 状态（多个用逗号分隔，如 "1,7"）
+        date: 日期（YYYY-MM-DD），筛选订单创建时间
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        start_total = time.time()
+
+        phone = request.data.get('phone', '').strip()
+        page = int(request.data.get('page', 1))
+        page_size = int(request.data.get('pageSize', 20))
+
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        shangjia_id = request.data.get('shangjia_id', '').strip()
+        dashou_id = request.data.get('dashou_id', '').strip()
+        leixing = request.data.get('leixing')
+        zhuangtai = request.data.get('zhuangtai', '')
+        date = request.data.get('date', '').strip()  # 格式 YYYY-MM-DD
+
+        if not phone:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # ---------- 查询条件 ----------
+        base_q = Q(fadan_pingtai=2)  # 商家订单
+
+        if dingdan_id:
+            q_conditions = base_q & Q(dingdan_id=dingdan_id)
+        else:
+            q_conditions = base_q
+            if leixing is not None:
+                try:
+                    leixing_int = int(leixing)
+                    q_conditions &= Q(leixing_id=leixing_int)
+                except (ValueError, TypeError):
+                    pass
+            if zhuangtai and zhuangtai != 'all':
+                try:
+                    status_list = [int(s.strip()) for s in zhuangtai.split(',') if s.strip()]
+                    if status_list:
+                        q_conditions &= Q(zhuangtai__in=status_list)
+                except (ValueError, TypeError):
+                    pass
+            if dashou_id:
+                q_conditions &= Q(jiedan_dashou_id=dashou_id)
+            if shangjia_id:
+                q_conditions &= Q(shangjia_kuozhan__shangjia_id=shangjia_id)  # 关联商家扩展表
+            if date:
+                q_conditions &= Q(create_time__date=date)  # 按日期筛选
+
+        # ---------- 统计（仅按发单平台） ----------
+        stats = Dingdan.objects.filter(fadan_pingtai=2).aggregate(
+            total_orders=Count('id'),
+            completed_orders=Count('id', filter=Q(zhuangtai=3)),
+            refund_orders=Count('id', filter=Q(zhuangtai=5)),
+            pending_orders=Count('id', filter=Q(zhuangtai__in=[4,8]))
+        )
+
+        # ---------- 状态计数（所有状态都返回） ----------
+        status_counts = {
+            'all': Dingdan.objects.filter(fadan_pingtai=2).count(),
+            '1,7': Dingdan.objects.filter(fadan_pingtai=2, zhuangtai__in=[1,7]).count(),
+            '2': Dingdan.objects.filter(fadan_pingtai=2, zhuangtai=2).count(),
+            '8': Dingdan.objects.filter(fadan_pingtai=2, zhuangtai=8).count(),
+            '3': Dingdan.objects.filter(fadan_pingtai=2, zhuangtai=3).count(),
+            '4': Dingdan.objects.filter(fadan_pingtai=2, zhuangtai=4).count(),
+            '5': Dingdan.objects.filter(fadan_pingtai=2, zhuangtai=5).count(),
+            '6': Dingdan.objects.filter(fadan_pingtai=2, zhuangtai=6).count(),
+        }
+
+        # ---------- 分页查询 ----------
+        total_count = Dingdan.objects.filter(q_conditions).count()
+
+        orders_qs = Dingdan.objects.filter(q_conditions).select_related(
+            'shangjia_kuozhan'  # 预加载商家扩展表
+        ).only(
+            'dingdan_id', 'jieshao', 'zhuangtai', 'leixing_id', 'fadan_pingtai',
+            'jine', 'tupian', 'create_time', 'nicheng', 'jiedan_dashou_id',
+            'shangjia_kuozhan__shangjia_id'  # 商家ID
+        ).order_by('-create_time')[(page-1)*page_size : page*page_size]
+
+        # ---------- 获取商家昵称（如果有） ----------
+        # 假设商家昵称在 UserShangjia 扩展表中，通过 shangjia_id 关联 UserMain，再关联 UserShangjia
+        # 此处简化，实际可根据需要查询
+        shangjia_ids = [o.shangjia_kuozhan.shangjia_id for o in orders_qs if hasattr(o, 'shangjia_kuozhan') and o.shangjia_kuozhan.shangjia_id]
+        nickname_map = {}
+        if shangjia_ids:
+            users = UserMain.objects.filter(yonghuid__in=shangjia_ids).select_related('shop_profile').only(
+                'yonghuid', 'shop_profile__nicheng'
+            )
+            for user in users:
+                nickname_map[user.yonghuid] = user.shop_profile.nicheng or '' if hasattr(user, 'shop_profile') else ''
+
+        result_list = []
+        for order in orders_qs:
+            ext = getattr(order, 'shangjia_kuozhan', None)
+            shangjia_id = ext.shangjia_id if ext else ''
+            # 游戏昵称从订单主表的 nicheng 取，或从老板昵称取（商家订单可能没有老板昵称，保持简单）
+            youxi_nicheng = order.nicheng or ''
+            result_list.append({
+                'dingdan_id': order.dingdan_id or '',
+                'jieshao': order.jieshao or '',
+                'zhuangtai': order.zhuangtai,
+                'leixing': order.leixing_id,
+                'fadanpingtai': order.fadan_pingtai,
+                'jiage': float(order.jine) if order.jine else 0.00,
+                'tupian_url': order.tupian or '',
+                'fadanshijian': order.create_time.strftime('%Y-%m-%d %H:%M:%S') if order.create_time else '',
+                'youxi_nicheng': youxi_nicheng
+            })
+
+        response_data = {
+            'stats': {
+                'totalOrders': stats['total_orders'] or 0,
+                'completedOrders': stats['completed_orders'] or 0,
+                'refundOrders': stats['refund_orders'] or 0,
+                'pendingOrders': stats['pending_orders'] or 0
+            },
+            'statusCounts': status_counts,
+            'list': result_list,
+            'total': total_count,
+            'page': page,
+            'pageSize': page_size
+        }
+
+        logger.info(f"商家订单接口总耗时: {time.time()-start_total:.3f}s")
+        return Response({'code': 0, 'data': response_data})'''
+
+
+from rest_framework.views import APIView
+
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+from django.db.models import Q, Count
+from django.core.paginator import Paginator
+
+class KefuGetOrderListView(APIView):
+    """
+    客服获取平台订单列表接口（发单平台=1，非跨平台）
+    需要权限：002ab（平台订单管理）
+    请求参数：
+        username: 客服账号（用于权限校验）
+        page: 页码
+        pageSize: 每页条数
+        dingdan_id: 订单ID（精确搜索）
+        laoban_id: 老板ID（搜索平台扩展表中的老板）
+        dashou_id: 打手ID（搜索主表中的接单打手）
+        leixing: 商品类型ID
+        zhuangtai: 状态（多个用逗号分隔，如 "1,7"）
+        date: 日期（YYYY-MM-DD），筛选订单创建时间
+        nicheng: 游戏昵称（订单主表的 nicheng 字段）
+        jieshao: 订单介绍（订单主表的 jieshao 字段）
+        clkf: 处理客服（订单主表的 clkf 字段）
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        start_total = time.time()
+
+        # 1. 获取前端参数
+        username = request.data.get('phone', '').strip()
+        if not username:
+            return Response({'code': 400, 'msg': '缺少username'})
+
+        # 2. 公共权限校验
+        kefu, permissions = verify_kefu_permission(request, username)
+        if kefu is None:
+            return permissions
+
+        # 3. 检查平台订单管理权限（002ab）
+        if '002ab' not in permissions:
+            return Response({'code': 403, 'msg': '您无权查看平台订单列表'})
+
+        # 4. 获取分页和筛选参数
+        page = int(request.data.get('page', 1))
+        page_size = int(request.data.get('pageSize', 20))
+
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        laoban_id = request.data.get('laoban_id', '').strip()
+        dashou_id = request.data.get('dashou_id', '').strip()
+        leixing = request.data.get('leixing')
+        zhuangtai = request.data.get('zhuangtai', '')
+        date = request.data.get('date', '').strip()
+        # 新增筛选条件
+        nicheng = request.data.get('nicheng', '').strip()
+        jieshao = request.data.get('jieshao', '').strip()
+        clkf = request.data.get('clkf', '').strip()
+
+        # ---------- 查询条件 ----------
+        # 基础条件：平台发单 + 非跨平台
+        base_q = Q(fadan_pingtai=1) & Q(is_cross=0)
+
+        if dingdan_id:
+            q_conditions = base_q & Q(dingdan_id=dingdan_id)
+        else:
+            q_conditions = base_q
+            if leixing is not None:
+                try:
+                    leixing_int = int(leixing)
+                    q_conditions &= Q(leixing_id=leixing_int)
+                except (ValueError, TypeError):
+                    pass
+            if zhuangtai and zhuangtai != 'all':
+                try:
+                    status_list = [int(s.strip()) for s in zhuangtai.split(',') if s.strip()]
+                    if status_list:
+                        q_conditions &= Q(zhuangtai__in=status_list)
+                except (ValueError, TypeError):
+                    pass
+            if dashou_id:
+                q_conditions &= Q(jiedan_dashou_id=dashou_id)
+            if laoban_id:
+                q_conditions &= Q(pingtai_kuozhan__laoban_id=laoban_id)
+            if date:
+                q_conditions &= Q(create_time__date=date)
+            # 新增筛选条件
+            if nicheng:
+                q_conditions &= Q(nicheng__icontains=nicheng)
+            if jieshao:
+                q_conditions &= Q(jieshao__icontains=jieshao)
+            if clkf:
+                q_conditions &= Q(clkf__icontains=clkf)
+
+        # ---------- 统计（仅按发单平台，非跨平台） ----------
+        stats = Dingdan.objects.filter(fadan_pingtai=1, is_cross=0).aggregate(
+            total_orders=Count('id'),
+            completed_orders=Count('id', filter=Q(zhuangtai=3)),
+            refund_orders=Count('id', filter=Q(zhuangtai=5)),
+            pending_orders=Count('id', filter=Q(zhuangtai__in=[4,8]))
+        )
+
+        # ---------- 状态计数（所有状态都返回，非跨平台） ----------
+        status_counts = {
+            'all': Dingdan.objects.filter(fadan_pingtai=1, is_cross=0).count(),
+            '1,7': Dingdan.objects.filter(fadan_pingtai=1, is_cross=0, zhuangtai__in=[1,7]).count(),
+            '2': Dingdan.objects.filter(fadan_pingtai=1, is_cross=0, zhuangtai=2).count(),
+            '8': Dingdan.objects.filter(fadan_pingtai=1, is_cross=0, zhuangtai=8).count(),
+            '3': Dingdan.objects.filter(fadan_pingtai=1, is_cross=0, zhuangtai=3).count(),
+            '4': Dingdan.objects.filter(fadan_pingtai=1, is_cross=0, zhuangtai=4).count(),
+            '5': Dingdan.objects.filter(fadan_pingtai=1, is_cross=0, zhuangtai=5).count(),
+            '6': Dingdan.objects.filter(fadan_pingtai=1, is_cross=0, zhuangtai=6).count(),
+        }
+
+        # ---------- 分页查询 ----------
+        total_count = Dingdan.objects.filter(q_conditions).count()
+
+        orders_qs = Dingdan.objects.filter(q_conditions).select_related(
+            'pingtai_kuozhan'
+        ).only(
+            'dingdan_id', 'jieshao', 'zhuangtai', 'leixing_id', 'fadan_pingtai',
+            'jine', 'tupian', 'create_time', 'nicheng', 'jiedan_dashou_id',
+            'pingtai_kuozhan__laoban_id'
+        ).order_by('-create_time')[(page-1)*page_size : page*page_size]
+
+        # ---------- 获取老板昵称 ----------
+        laoban_ids = [o.pingtai_kuozhan.laoban_id for o in orders_qs if hasattr(o, 'pingtai_kuozhan') and o.pingtai_kuozhan.laoban_id]
+        nickname_map = {}
+        if laoban_ids:
+            users = UserMain.objects.filter(yonghuid__in=laoban_ids).select_related('boss_profile').only(
+                'yonghuid', 'boss_profile__nickname'
+            )
+            for user in users:
+                nickname_map[user.yonghuid] = user.boss_profile.nickname or '' if hasattr(user, 'boss_profile') else ''
+
+        result_list = []
+        for order in orders_qs:
+            ext = getattr(order, 'pingtai_kuozhan', None)
+            laoban_id = ext.laoban_id if ext else ''
+            youxi_nicheng = nickname_map.get(laoban_id, order.nicheng or '')
+            result_list.append({
+                'dingdan_id': order.dingdan_id or '',
+                'jieshao': order.jieshao or '',
+                'zhuangtai': order.zhuangtai,
+                'leixing': order.leixing_id,
+                'fadanpingtai': order.fadan_pingtai,
+                'jiage': float(order.jine) if order.jine else 0.00,
+                'tupian_url': order.tupian or '',
+                'fadanshijian': order.create_time.strftime('%Y-%m-%d %H:%M:%S') if order.create_time else '',
+                'youxi_nicheng': youxi_nicheng
+            })
+
+        response_data = {
+            'stats': {
+                'totalOrders': stats['total_orders'] or 0,
+                'completedOrders': stats['completed_orders'] or 0,
+                'refundOrders': stats['refund_orders'] or 0,
+                'pendingOrders': stats['pending_orders'] or 0
+            },
+            'statusCounts': status_counts,
+            'list': result_list,
+            'total': total_count,
+            'page': page,
+            'pageSize': page_size
+        }
+
+        logger.info(f"平台订单接口总耗时: {time.time()-start_total:.3f}s")
+        return Response({'code': 0, 'data': response_data})
+
+class KefuGetShangjiaOrderListView(APIView):
+    """
+    客服获取商家订单列表接口（发单平台=2，非跨平台）
+    需要权限：002ac（商家订单管理）—— 如不区分可使用 002ab
+    请求参数：
+        username: 客服账号（用于权限校验）
+        page: 页码
+        pageSize: 每页条数
+        dingdan_id: 订单ID（精确搜索）
+        shangjia_id: 商家ID（搜索商家扩展表中的商家ID）
+        dashou_id: 打手ID（搜索主表中的接单打手）
+        leixing: 商品类型ID
+        zhuangtai: 状态（多个用逗号分隔，如 "1,7"）
+        date: 日期（YYYY-MM-DD），筛选订单创建时间
+        nicheng: 游戏昵称（订单主表的 nicheng 字段）
+        jieshao: 订单介绍（订单主表的 jieshao 字段）
+        clkf: 处理客服（订单主表的 clkf 字段）
+        shangjia_nicheng: 商家昵称（商家扩展表中的昵称）
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        start_total = time.time()
+
+        # 1. 获取前端参数
+        username = request.data.get('phone', '').strip()
+        if not username:
+            return Response({'code': 400, 'msg': '缺少username'})
+
+        # 2. 公共权限校验
+        kefu, permissions = verify_kefu_permission(request, username)
+        if kefu is None:
+            return permissions
+
+        # 3. 检查商家订单管理权限（使用 002ac，如果没有可改用 002ab）
+        if '002ac' not in permissions:
+            return Response({'code': 403, 'msg': '您无权查看商家订单列表'})
+
+        # 4. 获取分页和筛选参数
+        page = int(request.data.get('page', 1))
+        page_size = int(request.data.get('pageSize', 20))
+
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        shangjia_id = request.data.get('shangjia_id', '').strip()
+        dashou_id = request.data.get('dashou_id', '').strip()
+        leixing = request.data.get('leixing')
+        zhuangtai = request.data.get('zhuangtai', '')
+        date = request.data.get('date', '').strip()
+        # 新增筛选条件
+        nicheng = request.data.get('nicheng', '').strip()
+        jieshao = request.data.get('jieshao', '').strip()
+        clkf = request.data.get('clkf', '').strip()
+        shangjia_nicheng = request.data.get('shangjia_nicheng', '').strip()
+
+        # ---------- 查询条件 ----------
+        # 基础条件：商家发单 + 非跨平台
+        base_q = Q(fadan_pingtai=2) & Q(is_cross=0)
+
+        if dingdan_id:
+            q_conditions = base_q & Q(dingdan_id=dingdan_id)
+        else:
+            q_conditions = base_q
+            if leixing is not None:
+                try:
+                    leixing_int = int(leixing)
+                    q_conditions &= Q(leixing_id=leixing_int)
+                except (ValueError, TypeError):
+                    pass
+            if zhuangtai and zhuangtai != 'all':
+                try:
+                    status_list = [int(s.strip()) for s in zhuangtai.split(',') if s.strip()]
+                    if status_list:
+                        q_conditions &= Q(zhuangtai__in=status_list)
+                except (ValueError, TypeError):
+                    pass
+            if dashou_id:
+                q_conditions &= Q(jiedan_dashou_id=dashou_id)
+            if shangjia_id:
+                q_conditions &= Q(shangjia_kuozhan__shangjia_id=shangjia_id)
+            if date:
+                q_conditions &= Q(create_time__date=date)
+            if nicheng:
+                q_conditions &= Q(nicheng__icontains=nicheng)
+            if jieshao:
+                q_conditions &= Q(jieshao__icontains=jieshao)
+            if clkf:
+                q_conditions &= Q(clkf__icontains=clkf)
+            if shangjia_nicheng:
+                # 通过商家扩展表关联 UserShangjia 的昵称
+                q_conditions &= Q(shangjia_kuozhan__shangjia_id__in=UserMain.objects.filter(
+                    shop_profile__nicheng__icontains=shangjia_nicheng
+                ).values_list('yonghuid', flat=True))
+
+        # ---------- 统计（仅按发单平台，非跨平台） ----------
+        stats = Dingdan.objects.filter(fadan_pingtai=2, is_cross=0).aggregate(
+            total_orders=Count('id'),
+            completed_orders=Count('id', filter=Q(zhuangtai=3)),
+            refund_orders=Count('id', filter=Q(zhuangtai=5)),
+            pending_orders=Count('id', filter=Q(zhuangtai__in=[4,8]))
+        )
+
+        # ---------- 状态计数（所有状态都返回，非跨平台） ----------
+        status_counts = {
+            'all': Dingdan.objects.filter(fadan_pingtai=2, is_cross=0).count(),
+            '1,7': Dingdan.objects.filter(fadan_pingtai=2, is_cross=0, zhuangtai__in=[1,7]).count(),
+            '2': Dingdan.objects.filter(fadan_pingtai=2, is_cross=0, zhuangtai=2).count(),
+            '8': Dingdan.objects.filter(fadan_pingtai=2, is_cross=0, zhuangtai=8).count(),
+            '3': Dingdan.objects.filter(fadan_pingtai=2, is_cross=0, zhuangtai=3).count(),
+            '4': Dingdan.objects.filter(fadan_pingtai=2, is_cross=0, zhuangtai=4).count(),
+            '5': Dingdan.objects.filter(fadan_pingtai=2, is_cross=0, zhuangtai=5).count(),
+            '6': Dingdan.objects.filter(fadan_pingtai=2, is_cross=0, zhuangtai=6).count(),
+        }
+
+        # ---------- 分页查询 ----------
+        total_count = Dingdan.objects.filter(q_conditions).count()
+
+        orders_qs = Dingdan.objects.filter(q_conditions).select_related(
+            'shangjia_kuozhan'
+        ).only(
+            'dingdan_id', 'jieshao', 'zhuangtai', 'leixing_id', 'fadan_pingtai',
+            'jine', 'tupian', 'create_time', 'nicheng', 'jiedan_dashou_id',
+            'shangjia_kuozhan__shangjia_id'
+        ).order_by('-create_time')[(page-1)*page_size : page*page_size]
+
+        # ---------- 获取商家昵称 ----------
+        shangjia_ids = [o.shangjia_kuozhan.shangjia_id for o in orders_qs if hasattr(o, 'shangjia_kuozhan') and o.shangjia_kuozhan.shangjia_id]
+        nickname_map = {}
+        if shangjia_ids:
+            users = UserMain.objects.filter(yonghuid__in=shangjia_ids).select_related('shop_profile').only(
+                'yonghuid', 'shop_profile__nicheng'
+            )
+            for user in users:
+                nickname_map[user.yonghuid] = user.shop_profile.nicheng or '' if hasattr(user, 'shop_profile') else ''
+
+        result_list = []
+        for order in orders_qs:
+            ext = getattr(order, 'shangjia_kuozhan', None)
+            shangjia_id = ext.shangjia_id if ext else ''
+            youxi_nicheng = order.nicheng or ''  # 商家订单的玩家昵称
+            result_list.append({
+                'dingdan_id': order.dingdan_id or '',
+                'jieshao': order.jieshao or '',
+                'zhuangtai': order.zhuangtai,
+                'leixing': order.leixing_id,
+                'fadanpingtai': order.fadan_pingtai,
+                'jiage': float(order.jine) if order.jine else 0.00,
+                'tupian_url': order.tupian or '',
+                'fadanshijian': order.create_time.strftime('%Y-%m-%d %H:%M:%S') if order.create_time else '',
+                'youxi_nicheng': youxi_nicheng
+            })
+
+        response_data = {
+            'stats': {
+                'totalOrders': stats['total_orders'] or 0,
+                'completedOrders': stats['completed_orders'] or 0,
+                'refundOrders': stats['refund_orders'] or 0,
+                'pendingOrders': stats['pending_orders'] or 0
+            },
+            'statusCounts': status_counts,
+            'list': result_list,
+            'total': total_count,
+            'page': page,
+            'pageSize': page_size
+        }
+
+        logger.info(f"商家订单接口总耗时: {time.time()-start_total:.3f}s")
+        return Response({'code': 0, 'data': response_data})
+
+
+import time
+import logging
+
+from rest_framework.views import APIView
+
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+
+
+from dingdan.models import Dingdan, DingdanPingtai, DingdanShangjia, Dashoutupian, Tuikuanjilu
+
+logger = logging.getLogger(__name__)
+
+class KefuGetOrderDetailView(APIView):
+    """
+    客服获取订单详情接口
+    请求：POST /yonghu/kefuhqddxq
+    参数：{"phone": "客服手机号", "dingdan_id": "订单ID"}
+    认证：JWT
+    返回：code=0 + 订单详情数据
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        start_time = time.time()
+
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+
+        if not phone or not dingdan_id:
+            return Response(
+                {'code': 401, 'msg': '认证失败'},
+                status=status.HTTP_401_UNAUTHORIZED
+            )
+
+        # 2. 身份验证
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            logger.warning(f"手机号不匹配: {phone}")
+            return Response(
+                {'code': 401, 'msg': '认证失败'},
+                status=status.HTTP_401_UNAUTHORIZED
+            )
+
+        if current_user.user_type != 'kefu':
+            logger.warning(f"用户类型非客服: {current_user.yonghuid}")
+            return Response(
+                {'code': 401, 'msg': '认证失败'},
+                status=status.HTTP_401_UNAUTHORIZED
+            )
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            logger.warning(f"客服扩展表不存在: {current_user.yonghuid}")
+            return Response(
+                {'code': 401, 'msg': '认证失败'},
+                status=status.HTTP_401_UNAUTHORIZED
+            )
+
+        if kefu.zhuangtai != 1:
+            logger.warning(f"客服账号已禁用: {current_user.yonghuid}")
+            return Response(
+                {'code': 401, 'msg': '认证失败'},
+                status=status.HTTP_401_UNAUTHORIZED
+            )
+
+        # 3. 查询订单
+        try:
+            # 使用 select_related 预加载扩展表，避免后续 N+1 查询
+            dingdan_obj = Dingdan.objects.select_related(
+                'pingtai_kuozhan',
+                'shangjia_kuozhan'
+            ).only(
+                'dingdan_id', 'zhuangtai', 'fadan_pingtai', 'jine', 'dashou_fencheng',
+                'jiedan_dashou_id', 'dashou_liuyan', 'zhiding_id', 'shangpin_id',
+                'leixing_id', 'tupian', 'jieshao', 'beizhu', 'tkly', 'nicheng',
+                'clkf', 'create_time', 'update_time'
+            ).get(dingdan_id=dingdan_id)
+
+        except Dingdan.DoesNotExist:
+            logger.warning(f"订单不存在: {dingdan_id}")
+            return Response(
+                {'code': 404, 'msg': '订单不存在', 'data': None},
+                status=status.HTTP_404_NOT_FOUND
+            )
+
+        # 4. 构建基础响应数据（主表字段）
+        response_data = {
+            'dingdan_id': dingdan_obj.dingdan_id or '',
+            'zhuangtai': dingdan_obj.zhuangtai or 0,
+            'fadanpingtai': dingdan_obj.fadan_pingtai or 0,
+            'jiage': float(dingdan_obj.jine) if dingdan_obj.jine else 0.00,
+            'dashou_fencheng': float(dingdan_obj.dashou_fencheng) if dingdan_obj.dashou_fencheng else 0.00,
+            'jiedan_dashou_id': dingdan_obj.jiedan_dashou_id or '',
+            'dashou_liuyan': dingdan_obj.dashou_liuyan or '',
+            'zhiding_id': dingdan_obj.zhiding_id or '',
+            'shangpin_id': dingdan_obj.shangpin_id or '',
+            'leixing': dingdan_obj.leixing_id or 0,
+            'tupian_url': dingdan_obj.tupian or '',
+            'jieshao': dingdan_obj.jieshao or '',
+            'beizhu': dingdan_obj.beizhu or '',
+            'tkly': dingdan_obj.tkly or '',
+            'nicheng': dingdan_obj.nicheng or '',
+            'clkf': dingdan_obj.clkf or '',
+            'chuangjianshijian': dingdan_obj.create_time.strftime('%Y-%m-%d %H:%M:%S') if dingdan_obj.create_time else '',
+            'genggaishijian': dingdan_obj.update_time.strftime('%Y-%m-%d %H:%M:%S') if dingdan_obj.update_time else '',
+        }
+
+        # 5. 根据发单平台添加扩展表数据
+        fadan_pingtai = dingdan_obj.fadan_pingtai
+
+        if fadan_pingtai == 1:
+            # 平台订单扩展
+            if hasattr(dingdan_obj, 'pingtai_kuozhan') and dingdan_obj.pingtai_kuozhan:
+                pingtai = dingdan_obj.pingtai_kuozhan
+                response_data['pingtai_kuozhan'] = {
+                    'laoban_id': pingtai.laoban_id or '',
+                    'laoban_pingjia': pingtai.laoban_pingjia or '',
+                }
+            else:
+                response_data['pingtai_kuozhan'] = {
+                    'laoban_id': '',
+                    'laoban_pingjia': '',
+                }
+
+        elif fadan_pingtai == 2:
+            # 商家订单扩展
+            if hasattr(dingdan_obj, 'shangjia_kuozhan') and dingdan_obj.shangjia_kuozhan:
+                shangjia = dingdan_obj.shangjia_kuozhan
+                response_data['shangjia_kuozhan'] = {
+                    'shangjia_id': shangjia.shangjia_id or '',
+                    'sjnicheng': shangjia.sjnicheng or '',
+                    'shangjia_pingjia': shangjia.shangjia_pingjia or '',
+                    'cfliyou': shangjia.cfliyou or '',
+                    'sqzhuangtai': shangjia.sqzhuangtai if shangjia.sqzhuangtai is not None else 0,
+                    'bhliyou': shangjia.bhliyou or '',
+                }
+            else:
+                response_data['shangjia_kuozhan'] = {
+                    'shangjia_id': '',
+                    'sjnicheng': '',
+                    'shangjia_pingjia': '',
+                    'cfliyou': '',
+                    'sqzhuangtai': 0,
+                    'bhliyou': '',
+                }
+
+        # 6. 查询打手提交的图片
+        try:
+            dashou_images = Dashoutupian.objects.filter(
+                dingdan_id=dingdan_id
+            ).values_list('tupian', flat=True)
+            response_data['dashou_images'] = [img for img in dashou_images if img]
+        except Exception as e:
+            logger.warning(f"查询打手图片失败: {str(e)}")
+            response_data['dashou_images'] = []
+
+        # 7. 查询退款理由（从退款记录表取最新一条）
+        try:
+            tuikuan_record = Tuikuanjilu.objects.filter(
+                dingdan_id=dingdan_id
+            ).order_by('-create_time').first()
+            if tuikuan_record and tuikuan_record.liyou:
+                response_data['tuikuan_liyou'] = tuikuan_record.liyou
+            else:
+                response_data['tuikuan_liyou'] = ''
+        except Exception as e:
+            logger.warning(f"查询退款记录失败: {str(e)}")
+            response_data['tuikuan_liyou'] = ''
+
+        logger.info(f"订单详情接口耗时: {time.time()-start_time:.3f}s")
+        return Response({'code': 0, 'data': response_data})
+
+
+
+
+import logging
+from django.db import transaction
+from django.core.exceptions import ObjectDoesNotExist
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+
+
+from shangpin.models import Huiyuangoumai  # 假设会员购买模型存在
+
+logger = logging.getLogger(__name__)
+
+class KefuChangeDashouView(APIView):
+    """
+    客服更换打手接口
+    请求：POST /yonghu/kefughds
+    参数：{
+        "phone": "客服手机号",
+        "dingdan_id": "订单ID",
+        "new_dashou_id": "新打手ID"
+    }
+    认证：JWT
+    返回：code=0 成功
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        new_dashou_id = request.data.get('new_dashou_id', '').strip()
+
+        if not phone or not dingdan_id or not new_dashou_id:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 客服身份验证
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            logger.warning(f"手机号不匹配: {phone}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            logger.warning(f"用户类型非客服: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            logger.warning(f"客服扩展表不存在: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            logger.warning(f"客服账号已禁用: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 查询订单
+        try:
+            order = Dingdan.objects.get(dingdan_id=dingdan_id)
+        except Dingdan.DoesNotExist:
+            return Response({'code': 404, 'msg': '订单不存在'}, status=status.HTTP_404_NOT_FOUND)
+
+        # 4. 验证订单状态是否允许更换打手（进行中2 或 结算中8）
+        if order.zhuangtai not in [2, 8]:
+            return Response({'code': 400, 'msg': '订单状态不允许更换打手'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 5. 查询新打手
+        try:
+            new_dashou_user = UserMain.objects.get(yonghuid=new_dashou_id)
+        except UserMain.DoesNotExist:
+            return Response({'code': 404, 'msg': '打手不存在'}, status=status.HTTP_404_NOT_FOUND)
+
+        # 6. 验证打手扩展表
+        try:
+            new_dashou_profile = new_dashou_user.dashou_profile
+        except ObjectDoesNotExist:
+            return Response({'code': 404, 'msg': '打手信息不完整'}, status=status.HTTP_404_NOT_FOUND)
+
+        # 7. 验证打手状态（打手状态和账号状态必须为1）
+        if new_dashou_profile.zhuangtai != 1 or new_dashou_profile.zhanghaozhuangtai != 1:
+            return Response({'code': 400, 'msg': '打手状态不允许接单'}, status=status.HTTP_400_BAD_REQUEST)
+        # 8. 验证打手积分是否足够（至少5分）
+        if new_dashou_profile.jifen < 5:
+            return Response({'code': 400, 'msg': '打手积分不足，无法接单'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 8. 根据订单的抢单要求类型进行额外验证
+        yaoqiuleixing = order.yaoqiuleixing
+
+        if yaoqiuleixing == 1:  # 会员抢单
+            huiyuan_id = order.huiyuan_id
+            if not huiyuan_id:
+                return Response({'code': 400, 'msg': '订单会员ID为空'}, status=status.HTTP_400_BAD_REQUEST)
+
+            try:
+                # 查询打手的会员购买记录
+                huiyuan_goumai = Huiyuangoumai.objects.get(
+                    huiyuan_id=huiyuan_id,
+                    yonghu_id=new_dashou_id  # 假设 yonghu_id 字段存储用户ID
+                )
+            except Huiyuangoumai.DoesNotExist:
+                return Response({'code': 400, 'msg': '打手未购买该订单要求的会员'}, status=status.HTTP_400_BAD_REQUEST)
+
+            # 检查会员是否过期（调用模型方法）
+            is_expired = huiyuan_goumai.jiance_shifou_daoqi()
+            if is_expired or huiyuan_goumai.huiyuan_zhuangtai != 1:
+                return Response({'code': 400, 'msg': '打手的会员已过期'}, status=status.HTTP_400_BAD_REQUEST)
+
+        elif yaoqiuleixing == 2:  # 押金抢单
+            order_yajin = order.yongjin  # 假设订单的 yongjin 字段存储押金要求
+            if order_yajin is None:
+                return Response({'code': 400, 'msg': '订单押金为空'}, status=status.HTTP_400_BAD_REQUEST)
+
+            if new_dashou_profile.yajin < order_yajin:
+                return Response({'code': 400, 'msg': '打手押金不足'}, status=status.HTTP_400_BAD_REQUEST)
+        else:
+            return Response({'code': 400, 'msg': '订单抢单要求类型错误'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 9. 所有验证通过，开始更换打手（使用事务）
+        with transaction.atomic():
+            # 9.1 更新新打手扩展表
+            new_dashou_profile.zhuangtai = 0  # 设为接单中
+            new_dashou_profile.jiedanzongliang += 1
+            new_dashou_profile.jinrijiedan += 1
+            new_dashou_profile.jinyuejiedan += 1
+            new_dashou_profile.save()
+
+            # 9.2 处理原打手（如果存在）
+            old_dashou_id = order.jiedan_dashou_id
+            if old_dashou_id:
+                try:
+                    old_dashou_user = UserMain.objects.get(yonghuid=old_dashou_id)
+                    old_dashou_profile = old_dashou_user.dashou_profile
+                    old_dashou_profile.zhuangtai = 1  # 恢复空闲
+                    old_dashou_profile.tuikuanliang += 1  # 原打手退款总量+1（业务逻辑）
+                    old_dashou_profile.save()
+                    logger.info(f"原打手 {old_dashou_id} 状态已更新")
+                except (UserMain.DoesNotExist, ObjectDoesNotExist):
+                    logger.warning(f"原打手 {old_dashou_id} 不存在或信息不完整，跳过更新")
+                except Exception as e:
+                    logger.error(f"更新原打手时异常: {str(e)}", exc_info=True)
+
+            # 9.3 更新订单
+            order.jiedan_dashou_id = new_dashou_id
+            order.zhuangtai = 2  # 进行中
+            order.clkf = current_user.yonghuid  # 记录处理客服ID
+            order.save()
+
+        return Response({'code': 0, 'msg': '更换打手成功'})
+
+
+
+
+
+class KefuRecoverOrderView(APIView):
+    """
+    客服恢复订单接口（仅状态9可恢复）
+    请求：POST /yonghu/kefuhf
+    参数：{
+        "phone": "客服手机号",
+        "dingdan_id": "订单ID"
+    }
+    认证：JWT
+    返回：code=0 成功
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+
+        if not phone or not dingdan_id:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 客服身份验证
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 查询订单
+        try:
+            order = Dingdan.objects.get(dingdan_id=dingdan_id)
+        except Dingdan.DoesNotExist:
+            return Response({'code': 404, 'msg': '订单不存在'}, status=status.HTTP_404_NOT_FOUND)
+
+        # 4. 验证订单状态是否为9（未付款）
+        if order.zhuangtai != 9:
+            return Response({'code': 400, 'msg': '订单状态不允许恢复'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 5. 根据是否有指定ID决定新状态
+        if order.zhiding_id:
+            new_status = 7  # 指定中
+        else:
+            new_status = 1  # 下单中
+
+        # 6. 更新订单
+        order.zhuangtai = new_status
+        order.clkf = current_user.yonghuid
+        order.save()
+
+        return Response({'code': 0, 'msg': '恢复成功', 'data': {'new_status': new_status}})
+
+
+
+
+
+
+
+# dingdan/views.py
+import logging
+import random
+import hashlib
+import requests
+import xmltodict
+
+from rest_framework.views import APIView
+
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+
+from dingdan.models import Dingdan, DingdanPingtai # 注意：Tuikuanjilu 模型未在本次提供，但假设存在
+
+logger = logging.getLogger(__name__)
+
+
+'''class KefuPlatformRefundView(APIView):
+    """
+    客服平台订单退款接口（调用微信支付）
+    请求：POST /yonghu/kefupttk
+    参数：{
+        "phone": "客服手机号",
+        "dingdan_id": "订单ID",
+        "tuikuan_liyou": "退款理由（可选）"
+    }
+    认证：JWT
+    返回：code=0 成功，code=其他 失败
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        tuikuan_liyou = request.data.get('tuikuan_liyou', '').strip()
+
+        if not phone or not dingdan_id:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 客服身份验证
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            logger.warning(f"手机号不匹配: {phone}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            logger.warning(f"用户类型非客服: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            logger.warning(f"客服扩展表不存在: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            logger.warning(f"客服账号已禁用: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 查询订单并加锁
+        try:
+            with transaction.atomic():
+                order = Dingdan.objects.select_related('pingtai_kuozhan').select_for_update().get(dingdan_id=dingdan_id)
+
+                # 4. 验证平台订单
+                if order.fadan_pingtai != 1:
+                    return Response({'code': 400, 'msg': '该订单不是平台订单'}, status=status.HTTP_400_BAD_REQUEST)
+
+                # 5. 验证状态允许退款（根据模型，状态值：1下单中，2进行中，3已完成，4退款审核，5已退款，6退款失败，7指定中，8结算中）
+                allowed_statuses = [1, 2, 4, 7, 8]  # 允许退款的已支付或处理中状态
+                if order.zhuangtai not in allowed_statuses:
+                    return Response({'code': 400, 'msg': '订单状态不允许退款'}, status=status.HTTP_400_BAD_REQUEST)
+
+                # 6. 获取微信交易号（如果存在）
+                wechat_transaction_id = getattr(order, 'wechat_transaction_id', None)
+
+                # 7. 调用微信退款接口
+                refund_result = self.call_wechat_refund(
+                    dingdan_id=order.dingdan_id,
+                    jine=order.jine,
+                    transaction_id=wechat_transaction_id
+                )
+
+                if refund_result['code'] != 0:
+                    # 微信退款失败，直接返回错误，数据库不更新
+                    logger.error(f"微信退款失败，订单 {dingdan_id}，原因：{refund_result['msg']}")
+                    return Response({'code': 400, 'msg': refund_result['msg']}, status=status.HTTP_400_BAD_REQUEST)
+
+                # 8. 更新订单状态为5（已退款）
+                order.zhuangtai = 5
+                order.clkf = current_user.phone  # 记录处理客服手机号
+                if tuikuan_liyou:
+                    order.tkly = tuikuan_liyou
+                order.save()
+
+                # 9. 更新打手数据
+                jiedan_dashou_id = order.jiedan_dashou_id
+                if jiedan_dashou_id:
+                    try:
+                        dashou_user = UserMain.objects.get(yonghuid=jiedan_dashou_id)
+                        dashou_profile = dashou_user.dashou_profile
+                        dashou_profile.tuikuanliang += 1
+                        dashou_profile.zhuangtai = 1  # 打手状态设为空闲
+                        dashou_profile.save()
+                        logger.info(f"平台退款：打手 {jiedan_dashou_id} 退款订单+1")
+                    except (UserMain.DoesNotExist, ObjectDoesNotExist):
+                        logger.warning(f"平台退款：打手 {jiedan_dashou_id} 不存在或扩展表缺失，跳过更新")
+
+                # 10. 更新退款记录表（假设存在 Tuikuanjilu 模型，字段需根据实际调整）
+                try:
+                    from dingdan.models import Tuikuanjilu  # 确保模型已导入
+                    refund_record, created = Tuikuanjilu.objects.get_or_create(
+                        dingdan_id=dingdan_id,
+                        defaults={
+                            'dashouid': jiedan_dashou_id or '',
+                            'qingqiuid': '',
+                            'chuliid': phone,
+                            'liyou': tuikuan_liyou or '客服退款',
+                            'sqzhuangtai': 1,  # 成功
+                            'jine': order.jine,
+                            'dashou_fencheng': order.dashou_fencheng or 0,
+                            'jieshao': order.jieshao or '',
+                            'beizhu': '客服平台退款',
+                            'nicheng': order.nicheng or '',
+                        }
+                    )
+                    if not created:
+                        refund_record.sqzhuangtai = 1
+                        refund_record.chuliid = phone
+                        if tuikuan_liyou:
+                            refund_record.liyou = tuikuan_liyou
+                        refund_record.save()
+                except Exception as e:
+                    logger.error(f"平台退款更新退款记录异常: {str(e)}", exc_info=True)
+
+                # ========== 新增：商品和店铺每日统计 ==========
+                try:
+                    # 商品每日统计（只要有商品ID就执行）
+                    if order.shangpin_id:
+                        # 从扩展表获取已计算好的收益值（下单时已存储）
+                        pingtai_shouyi = Decimal('0.00')
+                        dianpu_shouyi = Decimal('0.00')
+                        if hasattr(order, 'pingtai_kuozhan'):
+                            pingtai_shouyi = order.pingtai_kuozhan.pingtai_shouyi or Decimal('0.00')
+                            dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00')
+
+                        update_shangpin_daily_stat(
+                            shangpin_id=order.shangpin_id,
+                            caozuo_leixing=3,  # 3 = 退款
+                            dingdan_jiage=order.jine,
+                            pingtai_shouyi=pingtai_shouyi,
+                            dianpu_zongshouyi=dianpu_shouyi
+                        )
+                        logger.info(f"商品统计更新完成，商品ID: {order.shangpin_id}")
+
+                    # 店铺每日统计（仅当存在店铺ID时执行）
+                    dianpu_id = None
+                    if hasattr(order, 'pingtai_kuozhan'):
+                        dianpu_id = order.pingtai_kuozhan.dianpu_id
+                    if dianpu_id:
+                        dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00')
+                        update_dianpu_daily_stat(
+                            dianpu_id=dianpu_id,
+                            caozuo_leixing=3,  # 3 = 退款
+                            dingdan_jiage=order.jine,
+                            dianpu_shouyi=dianpu_shouyi
+                        )
+                        logger.info(f"店铺统计更新完成，店铺ID: {dianpu_id}")
+                except Exception as e:
+                    logger.error(f"商品/店铺统计更新失败: {e}")
+                    logger.error(traceback.format_exc())
+                    # 统计失败不影响主流程
+                # =============================================
+
+                # 11. 更新客服统计数据
+                kefu.jinrichuli += 1
+                kefu.jinyuechuli += 1
+                kefu.zongchuli += 1
+                kefu.save()
+
+                #12.更新退款统计
+                from dingdan.utils import update_daily_payout
+                update_daily_payout(order.jine)
+
+                # 🔥 新增：调用打手每日统计（成交）
+                try:
+                    update_dashou_daily_by_action(
+                        yonghuid=order.jiedan_dashou_id,
+                        amount=order.dashou_fencheng,
+                        action=3  # 3 表示退款（退款）
+                    )
+                    logger.info(f"打手 {order.jiedan_dashou_id} 每日统计更新成功")
+                except Exception as e:
+                    logger.error(f"打手每日统计更新失败: {e}")
+                    # 不影响主流程
+
+            logger.info(f"平台退款成功，订单 {dingdan_id}，退款单号 {refund_result.get('refund_id')}")
+            return Response({'code': 0, 'msg': '退款成功'})
+
+        except Dingdan.DoesNotExist:
+            return Response({'code': 404, 'msg': '订单不存在'}, status=status.HTTP_404_NOT_FOUND)
+        except Exception as e:
+            logger.error(f"平台退款接口异常: {str(e)}", exc_info=True)
+            return Response({'code': 500, 'msg': '服务器内部错误'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def call_wechat_refund(self, dingdan_id, jine, transaction_id=None):
+        """
+        调用微信支付退款接口
+        :param dingdan_id: 商户订单号（我们的订单ID）
+        :param jine: 退款金额
+        :param transaction_id: 微信支付订单号（优先使用）
+        :return: {'code': 0, 'msg': '成功', 'refund_id': 'xxx'} 或 {'code': 非0, 'msg': '错误信息'}
+        """
+        # 获取配置
+        appid = getattr(settings, 'WEIXIN_APPID', '')
+        mch_id = getattr(settings, 'WEIXIN_MCHID', '')
+        key = getattr(settings, 'WEIXIN_SHANGHUMIYAO', '')
+        cert_path = getattr(settings, 'WEIXIN_CERT_PATH', '')
+        key_path = getattr(settings, 'WEIXIN_KEY_PATH', '')
+
+        if not all([appid, mch_id, key, cert_path, key_path]):
+            missing = [k for k, v in {'appid': appid, 'mch_id': mch_id, 'key': key, 'cert_path': cert_path, 'key_path': key_path}.items() if not v]
+            logger.error(f"微信支付配置缺失: {missing}")
+            return {'code': 500, 'msg': f'系统支付配置缺失: {missing}'}
+
+        # 生成退款单号
+        out_refund_no = self.generate_refund_no(dingdan_id)
+        total_fee = int(float(jine) * 100)
+        refund_fee = total_fee
+        refund_desc = '客服退款'
+
+        # 构造请求参数
+        params = {
+            'appid': appid,
+            'mch_id': mch_id,
+            'nonce_str': self.generate_nonce_str(),
+            'out_refund_no': out_refund_no,
+            'total_fee': total_fee,
+            'refund_fee': refund_fee,
+            'refund_desc': refund_desc,
+        }
+        if transaction_id:
+            params['transaction_id'] = transaction_id
+        else:
+            params['out_trade_no'] = dingdan_id  # 使用订单ID作为商户订单号
+
+        # 生成签名
+        sorted_keys = sorted(params.keys())
+        stringA = '&'.join([f"{k}={params[k]}" for k in sorted_keys])
+        stringSignTemp = f"{stringA}&key={key}"
+        sign = hashlib.md5(stringSignTemp.encode('utf-8')).hexdigest().upper()
+        params['sign'] = sign
+
+        xml_data = self.dict_to_xml(params)
+        url = 'https://api.mch.weixin.qq.com/secapi/pay/refund'
+
+        try:
+            response = requests.post(
+                url,
+                data=xml_data,
+                cert=(cert_path, key_path),
+                timeout=10
+            )
+            result = xmltodict.parse(response.content)['xml']
+            logger.info(f"微信退款响应: {result}")
+        except Exception as e:
+            logger.error(f"微信退款请求异常: {str(e)}", exc_info=True)
+            return {'code': 500, 'msg': '微信退款请求异常'}
+
+        if result.get('return_code') == 'SUCCESS' and result.get('result_code') == 'SUCCESS':
+            return {'code': 0, 'msg': 'success', 'refund_id': out_refund_no}
+        else:
+            err_msg = result.get('err_code_des', result.get('return_msg', '未知错误'))
+            logger.warning(f"微信退款失败: {err_msg}")
+            return {'code': 400, 'msg': err_msg}
+
+    def generate_nonce_str(self):
+        import string
+        return ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+
+    def generate_refund_no(self, dingdan_id):
+        timestamp = str(int(time.time()))
+        rand = ''.join(random.choices('0123456789', k=4))
+        return f"{dingdan_id}REF{timestamp}{rand}"
+
+    def dict_to_xml(self, data):
+        xml = ['<xml>']
+        for k, v in data.items():
+            xml.append(f'<{k}>{v}</{k}>')
+        xml.append('</xml>')
+        return ''.join(xml)'''
+
+from dingdan.utils import (
+    update_daily_income,
+    sync_order_to_partners,
+    update_daily_payout,)
+
+
+
+
+import hmac
+class KefuPlatformRefundView(APIView):
+    """
+    虚拟支付退款接口（代币订单，使用 refund_order 接口）
+    业务逻辑与原 KefuPlatformRefundView 完全一致
+    微信 API：POST /xpay/refund_order
+    文档：https://developers.weixin.qq.com/minigame/dev/api-backend/open-api/virtual-payment/refund_order.html
+    """
+    permission_classes = [permissions.IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        tuikuan_liyou = request.data.get('tuikuan_liyou', '').strip()
+
+        if not phone or not dingdan_id:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 客服身份验证（与原逻辑完全一致）
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            logger.warning(f"手机号不匹配: {phone}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            logger.warning(f"用户类型非客服: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            logger.warning(f"客服扩展表不存在: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            logger.warning(f"客服账号已禁用: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 查询订单并加锁
+        try:
+            with transaction.atomic():
+                order = Dingdan.objects.select_related('pingtai_kuozhan').select_for_update().get(dingdan_id=dingdan_id)
+
+                # 4. 验证平台订单
+                if order.fadan_pingtai != 1:
+                    return Response({'code': 400, 'msg': '该订单不是平台订单'}, status=status.HTTP_400_BAD_REQUEST)
+
+                # 5. 验证状态允许退款（沿用原有白名单）
+                allowed_statuses = [1, 2, 4, 7, 8]
+                if order.zhuangtai not in allowed_statuses:
+                    return Response({'code': 400, 'msg': '订单状态不允许退款'}, status=status.HTTP_400_BAD_REQUEST)
+
+                # 6. 获取退款所需关键信息
+                jiedan_dashou_id = order.jiedan_dashou_id
+                # 从订单扩展表获取老板 openid（退款API需要）
+                laoban_openid = None
+                laoban_id = order.pingtai_kuozhan.laoban_id if hasattr(order, 'pingtai_kuozhan') else None
+                if laoban_id:
+                    laoban_user = UserMain.objects.filter(yonghuid=laoban_id).first()
+                    if laoban_user:
+                        laoban_openid = getattr(laoban_user, 'openid', None)
+
+                if not laoban_openid:
+                    return Response({'code': 400, 'msg': '未找到用户openid，无法退款'}, status=status.HTTP_400_BAD_REQUEST)
+
+                # 7. 调用虚拟支付退款接口（refund_order）
+                refund_result = self.call_virtual_refund(
+                    dingdan_id=order.dingdan_id,
+                    jine=order.jine,
+                    openid=laoban_openid,
+                    wechat_transaction_id=getattr(order, 'wechat_transaction_id', None)
+                )
+
+                if refund_result['code'] != 0:
+                    logger.error(f"虚拟支付退款失败，订单 {dingdan_id}，原因：{refund_result['msg']}")
+                    return Response({'code': 400, 'msg': refund_result['msg']}, status=status.HTTP_400_BAD_REQUEST)
+
+                # ========== 以下数据库操作与原逻辑完全一致（全部保留） ==========
+                # 8. 更新订单状态为5（已退款）
+                order.zhuangtai = 5
+                order.clkf = current_user.phone
+                if tuikuan_liyou:
+                    order.tkly = tuikuan_liyou
+                order.save()
+
+                # 9. 更新打手数据
+                if jiedan_dashou_id:
+                    try:
+                        dashou_user = UserMain.objects.get(yonghuid=jiedan_dashou_id)
+                        dashou_profile = dashou_user.dashou_profile
+                        dashou_profile.tuikuanliang += 1
+                        dashou_profile.zhuangtai = 1
+                        dashou_profile.save()
+                        logger.info(f"平台退款：打手 {jiedan_dashou_id} 退款订单+1")
+                    except (UserMain.DoesNotExist, ObjectDoesNotExist):
+                        logger.warning(f"平台退款：打手 {jiedan_dashou_id} 不存在或扩展表缺失")
+
+                # 10. 更新退款记录表
+                try:
+                    refund_record, created = Tuikuanjilu.objects.get_or_create(
+                        dingdan_id=dingdan_id,
+                        defaults={
+                            'dashouid': jiedan_dashou_id or '',
+                            'qingqiuid': '',
+                            'chuliid': phone,
+                            'liyou': tuikuan_liyou or '客服退款',
+                            'sqzhuangtai': 1,
+                            'jine': order.jine,
+                            'dashou_fencheng': order.dashou_fencheng or 0,
+                            'jieshao': order.jieshao or '',
+                            'beizhu': '客服平台退款（虚拟支付）',
+                            'nicheng': order.nicheng or '',
+                        }
+                    )
+                    if not created:
+                        refund_record.sqzhuangtai = 1
+                        refund_record.chuliid = phone
+                        if tuikuan_liyou:
+                            refund_record.liyou = tuikuan_liyou
+                        refund_record.save()
+                except Exception as e:
+                    logger.error(f"平台退款更新退款记录异常: {str(e)}", exc_info=True)
+
+                # 11. 商品和店铺每日统计
+                try:
+                    if order.shangpin_id:
+                        pingtai_shouyi = Decimal('0.00')
+                        dianpu_shouyi = Decimal('0.00')
+                        if hasattr(order, 'pingtai_kuozhan'):
+                            pingtai_shouyi = order.pingtai_kuozhan.pingtai_shouyi or Decimal('0.00')
+                            dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00')
+
+                        update_shangpin_daily_stat(
+                            shangpin_id=order.shangpin_id,
+                            caozuo_leixing=3,
+                            dingdan_jiage=order.jine,
+                            pingtai_shouyi=pingtai_shouyi,
+                            dianpu_zongshouyi=dianpu_shouyi
+                        )
+                        logger.info(f"商品统计更新完成，商品ID: {order.shangpin_id}")
+
+                    dianpu_id = None
+                    if hasattr(order, 'pingtai_kuozhan'):
+                        dianpu_id = order.pingtai_kuozhan.dianpu_id
+                    if dianpu_id:
+                        dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00')
+                        update_dianpu_daily_stat(
+                            dianpu_id=dianpu_id,
+                            caozuo_leixing=3,
+                            dingdan_jiage=order.jine,
+                            dianpu_shouyi=dianpu_shouyi
+                        )
+                        logger.info(f"店铺统计更新完成，店铺ID: {dianpu_id}")
+                except Exception as e:
+                    logger.error(f"商品/店铺统计更新失败: {e}")
+                    logger.error(traceback.format_exc())
+
+                # 12. 更新客服统计数据
+                kefu.jinrichuli += 1
+                kefu.jinyuechuli += 1
+                kefu.zongchuli += 1
+                kefu.save()
+
+                # 13. 更新退款统计
+                update_daily_payout(order.jine)
+
+                # 14. 打手每日统计（退款）
+                try:
+                    update_dashou_daily_by_action(
+                        yonghuid=order.jiedan_dashou_id,
+                        amount=order.dashou_fencheng,
+                        action=3
+                    )
+                    logger.info(f"打手 {order.jiedan_dashou_id} 每日统计更新成功")
+                except Exception as e:
+                    logger.error(f"打手每日统计更新失败: {e}")
+
+            logger.info(f"虚拟支付退款成功，订单 {dingdan_id}，退款单号 {refund_result.get('refund_id')}")
+            return Response({'code': 0, 'msg': '退款成功'})
+
+        except Dingdan.DoesNotExist:
+            return Response({'code': 404, 'msg': '订单不存在'}, status=status.HTTP_404_NOT_FOUND)
+        except Exception as e:
+            logger.error(f"虚拟支付退款接口异常: {str(e)}", exc_info=True)
+            return Response({'code': 500, 'msg': '服务器内部错误'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    # ==================== 核心退款方法 ====================
+    def call_virtual_refund(self, dingdan_id, jine, openid, wechat_transaction_id=None):
+        """
+        调用虚拟支付退款接口 /xpay/refund_order
+        :param dingdan_id: 商户订单号（order_id）
+        :param jine: 退款金额（元）
+        :param openid: 支付用户的 openid
+        :param wechat_transaction_id: 微信支付交易单号（wx_order_id），若有则优先使用
+        :return: {'code': 0, 'msg': '成功', 'refund_id': 'xxx'} 或 {'code': 非0, 'msg': '错误信息'}
+        """
+        uri = "/xpay/refund_order"
+        base_url = "https://api.weixin.qq.com"
+        appkey = settings.VP_APPKEY_SANDBOX if settings.VP_ENV == 1 else settings.VP_APPKEY
+        offer_id = settings.VP_OFFER_ID
+
+        # 金额：元 -> 分
+        refund_fee = int(float(jine) * 100)
+
+        # 退款单号：R + 时间戳 + 6位随机数，保证唯一且长度合适
+        refund_order_id = f"R{int(time.time())}{random.randint(100000, 999999)}"
+
+        # 用户 IP
+        x_forwarded_for = self.request.META.get('HTTP_X_FORWARDED_FOR')
+        user_ip = x_forwarded_for.split(',')[0].strip() if x_forwarded_for else self.request.META.get('REMOTE_ADDR', '127.0.0.1')
+
+        # 请求体构造（优先使用 wx_order_id，若有的话）
+        body_data = {
+            "openid": openid,
+            "env": settings.VP_ENV,
+            "order_id": dingdan_id,                    # 商户订单号
+            "refund_order_id": refund_order_id,        # 本次退款单号
+            "left_fee": refund_fee,                    # 订单剩余可退金额（全退时等于订单金额）
+            "refund_fee": refund_fee,                  # 本次退款金额
+            "biz_meta": "客服退款",                    # 业务备注
+            "refund_reason": 5,                        # 退款原因：5 其他
+            "req_from": 1                              # 退款来源：1 人工客服
+        }
+        # 如果有微信支付交易单号，优先传入（可选）
+        if wechat_transaction_id:
+            body_data["wx_order_id"] = wechat_transaction_id
+
+        body = json.dumps(body_data, separators=(",", ":"))
+
+        # 签名：pay_sig
+        msg = uri + "&" + body
+        pay_sig = hmac.new(appkey.encode("utf-8"), msg.encode("utf-8"), hashlib.sha256).hexdigest()
+
+        # 获取 access_token
+        access_token = self._get_access_token()
+
+        # 构建 URL
+        url = f"{base_url}{uri}?access_token={access_token}&pay_sig={pay_sig}"
+
+        # ========== 调试日志（保留，方便排查） ==========
+        logger.info("================== 退款调试信息 ==================")
+        logger.info(f"[退款] 订单号 (dingdan_id): {dingdan_id}")
+        logger.info(f"[退款] 微信交易号 (wx_order_id): {wechat_transaction_id}")
+        logger.info(f"[退款] 退款金额 (分): {refund_fee}")
+        logger.info(f"[退款] 退款单号: {refund_order_id}")
+        logger.info(f"[退款] 请求 URL: {url}")
+        logger.info(f"[退款] 请求 Body: {body}")
+        logger.info("==================================================")
+
+        headers = {"Content-Type": "application/json"}
+        try:
+            response = requests.post(url, data=body, headers=headers, timeout=10)
+            result = response.json()
+            logger.info(f"[退款] 微信返回结果: {result}")
+
+            if result.get("errcode") == 0:
+                return {'code': 0, 'msg': '退款成功', 'refund_id': refund_order_id}
+            else:
+                errcode = result.get('errcode')
+                errmsg = result.get('errmsg', '未知错误')
+                # 常见错误码提示
+                if errcode == 268490002:
+                    errmsg = "参数错误，请检查订单号是否正确、金额是否匹配、openid是否正确"
+                elif errcode == 268490003:
+                    errmsg = "签名错误，请检查 appkey 是否正确"
+                elif errcode == 268490004:
+                    errmsg = "订单不存在或已退款"
+                logger.error(f"[退款] 退款失败: errcode={errcode}, errmsg={errmsg}")
+                return {'code': 400, 'msg': f"退款失败: {errmsg}"}
+
+        except requests.exceptions.RequestException as e:
+            logger.error(f"[退款] 网络请求异常: {e}")
+            return {'code': 500, 'msg': '微信退款请求网络异常'}
+
+    def _get_access_token(self):
+        """获取 access_token，带缓存"""
+        cache_key = "virtual_payment_access_token"
+        access_token = cache.get(cache_key)
+        if not access_token:
+            logger.info("[退款] 缓存无 access_token，重新获取")
+            resp = requests.get(
+                "https://api.weixin.qq.com/cgi-bin/token",
+                params={
+                    "grant_type": "client_credential",
+                    "appid": settings.WEIXIN_APPID,
+                    "secret": settings.WEIXIN_SECRET,
+                },
+                timeout=10,
+            )
+            data = resp.json()
+            if "access_token" in data:
+                access_token = data["access_token"]
+                cache.set(cache_key, access_token, data.get("expires_in", 7200) - 300)
+                logger.info(f"[退款] access_token 已更新")
+            else:
+                raise Exception(f"获取 access_token 失败: {data}")
+        return access_token
+
+
+
+
+
+# dingdan/views.py
+import logging
+
+from rest_framework.views import APIView
+
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+
+from yonghu.models import  UserShangjia
+from dingdan.models import Dingdan, DingdanShangjia, Tuikuanjilu
+
+logger = logging.getLogger(__name__)
+from houtai.utils import update_dashou_daily_by_action
+
+class KefuRejectRefundView(APIView):
+    """
+    客服拒绝退款接口
+    请求：POST /yonghu/kefujjtk
+    参数：{
+        "phone": "客服手机号",
+        "dingdan_id": "订单ID",
+        "jujue_liyou": "拒绝理由（可选）"
+    }
+    认证：JWT
+    返回：code=0 成功
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        jujue_liyou = request.data.get('jujue_liyou', '').strip()
+
+        if not phone or not dingdan_id:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 客服身份验证
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 查询订单并加锁
+        try:
+            with transaction.atomic():
+                order = Dingdan.objects.select_for_update().get(dingdan_id=dingdan_id)
+
+                # 4. 验证订单状态为退款审核中（4）
+                if order.zhuangtai != 4:
+                    return Response({'code': 400, 'msg': '订单状态不是退款审核中'}, status=status.HTTP_400_BAD_REQUEST)
+
+                # 获取必要字段
+                jiedan_dashou_id = order.jiedan_dashou_id
+                dashou_fencheng = order.dashou_fencheng
+                fadan_pingtai = order.fadan_pingtai
+
+                # 5. 验证打手分成金额是否存在
+                if dashou_fencheng is None:
+                    return Response({'code': 400, 'msg': '订单缺少打手分成金额'}, status=status.HTTP_400_BAD_REQUEST)
+
+                # 6. 更新订单状态为退款失败（6）
+                order.zhuangtai = 6
+                order.clkf = current_user.phone  # 记录处理客服手机号
+                if jujue_liyou:
+                    order.tkly = jujue_liyou
+                order.save()
+
+                # 7. 给打手结算（返还分成）
+                if jiedan_dashou_id:
+                    try:
+                        dashou_user = UserMain.objects.get(yonghuid=jiedan_dashou_id)
+                        dashou_profile = dashou_user.dashou_profile
+                        # 增加打手相关统计数据
+                        dashou_profile.chengjiaozongliang += 1
+                        dashou_profile.yue += dashou_fencheng
+                        dashou_profile.zonge += dashou_fencheng
+                        dashou_profile.jinrishouyi += dashou_fencheng
+                        dashou_profile.jinyueshouyi += dashou_fencheng
+                        dashou_profile.save()
+                        logger.info(f"拒绝退款：打手 {jiedan_dashou_id} 获得分成 {dashou_fencheng}")
+                    except (UserMain.DoesNotExist, AttributeError):
+                        logger.warning(f"拒绝退款：打手 {jiedan_dashou_id} 不存在或扩展表缺失，跳过结算")
+
+                # 8. 如果是商家发单，更新商家成交订单数量
+                if fadan_pingtai == 2:
+                    try:
+                        # 获取商家订单扩展表
+                        shangjia_kuozhan = order.shangjia_kuozhan
+                        shangjia_id = shangjia_kuozhan.shangjia_id
+                        if shangjia_id:
+                            shangjia_user = UserMain.objects.get(yonghuid=shangjia_id)
+                            shangjia_profile = shangjia_user.shop_profile
+                            shangjia_profile.chengjiao += 1
+                            shangjia_profile.save()
+                            logger.info(f"拒绝退款：商家 {shangjia_id} 成交订单+1")
+                            # ✅ 新方法（行为驱动，更安全）
+                            from houtai.utils import update_shangjia_daily
+                            update_shangjia_daily(
+                                yonghuid=shangjia_id,
+                                amount=Decimal(str(order.jine)),
+                                action=2  # 2 = 结算
+                            )
+                    except (ObjectDoesNotExist, UserMain.DoesNotExist, AttributeError):
+                        logger.warning(f"拒绝退款：商家信息不存在，跳过商家更新")
+
+                # 9. 更新退款记录表
+                try:
+                    refund_record = Tuikuanjilu.objects.get(dingdan_id=dingdan_id)
+                    refund_record.sqzhuangtai = 2          # 2表示拒绝
+                    refund_record.chuliid = phone
+                    refund_record.bhliyou = jujue_liyou    # 记录驳回理由（假设模型有此字段）
+                    refund_record.save()
+                    logger.info(f"拒绝退款：更新退款记录表，订单 {dingdan_id}")
+                except Tuikuanjilu.DoesNotExist:
+                    # 如果退款记录不存在，可以创建一条记录（可选）
+                    Tuikuanjilu.objects.create(
+                        dingdan_id=dingdan_id,
+                        dashouid=jiedan_dashou_id or '',
+                        qingqiuid='',
+                        chuliid=phone,
+                        liyou=jujue_liyou or '客服拒绝退款',
+                        sqzhuangtai=2,
+                        jine=order.jine,
+                        dashou_fencheng=dashou_fencheng or 0,
+                        jieshao=order.jieshao or '',
+                        beizhu='客服拒绝退款',
+                        nicheng=order.nicheng or '',
+                        bhliyou=jujue_liyou or '',  # 假设模型有 bhliyou 字段
+                    )
+                except Exception as e:
+                    logger.error(f"拒绝退款更新退款记录异常: {str(e)}", exc_info=True)
+
+                # 🔥 新增：调用打手每日统计（成交）
+                try:
+                    update_dashou_daily_by_action(
+                        yonghuid=jiedan_dashou_id,
+                        amount=dashou_fencheng,
+                        action=2  # 2 表示成交（结算）
+                    )
+                    logger.info(f"打手 {jiedan_dashou_id} 每日统计更新成功")
+                except Exception as e:
+                    logger.error(f"打手每日统计更新失败: {e}")
+                    # 不影响主流程
+
+                # 10. 更新客服统计数据
+                kefu.jinrichuli += 1
+                kefu.jinyuechuli += 1
+                kefu.zongchuli += 1
+                kefu.save()
+
+            return Response({'code': 0, 'msg': '拒绝退款成功'})
+
+        except Dingdan.DoesNotExist:
+            return Response({'code': 404, 'msg': '订单不存在'}, status=status.HTTP_404_NOT_FOUND)
+        except Exception as e:
+            logger.error(f"拒绝退款接口异常: {str(e)}", exc_info=True)
+            return Response({'code': 500, 'msg': '服务器内部错误'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+
+
+
+class KefuMerchantRefundView(APIView):
+    """
+    客服商家订单退款接口（发单平台=2）
+    请求：POST /yonghu/kefusjtk
+    参数：{
+        "phone": "客服手机号",
+        "dingdan_id": "订单ID",
+        "tuikuan_liyou": "退款理由（可选）"
+    }
+    认证：JWT
+    返回：code=0 成功
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        phone = request.data.get('phone', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        tuikuan_liyou = request.data.get('tuikuan_liyou', '').strip()
+
+
+        # 客服身份验证（同前，省略以节省篇幅，但实际必须完整）
+
+        # ... 验证
+        if not phone or not dingdan_id:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 客服身份验证
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 查询订单，预加载商家扩展表
+        try:
+            order = Dingdan.objects.select_related('shangjia_kuozhan').get(dingdan_id=dingdan_id)
+        except Dingdan.DoesNotExist:
+            return Response({'code': 404, 'msg': '订单不存在'}, status=status.HTTP_404_NOT_FOUND)
+
+        # 验证商家订单
+        if order.fadan_pingtai != 2:
+            return Response({'code': 400, 'msg': '该订单不是商家订单'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 验证状态允许退款
+        allowed_statuses = [1, 7, 2, 8, 4]
+        if order.zhuangtai not in allowed_statuses:
+            return Response({'code': 400, 'msg': '订单状态不允许退款'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 获取必要数据
+        jiedan_dashou_id = order.jiedan_dashou_id
+        jine = order.jine
+        if jine is None:
+            return Response({'code': 400, 'msg': '订单金额缺失'}, status=status.HTTP_400_BAD_REQUEST)
+
+        try:
+            shangjia_kuozhan = order.shangjia_kuozhan
+            shangjia_id = shangjia_kuozhan.shangjia_id
+        except ObjectDoesNotExist:
+            return Response({'code': 400, 'msg': '订单商家信息不存在'}, status=status.HTTP_400_BAD_REQUEST)
+
+        with transaction.atomic():
+            # 更新订单
+            order.zhuangtai = 5
+            order.clkf = current_user.phone
+            if tuikuan_liyou:
+                order.tkly = tuikuan_liyou
+            order.save()
+
+            # 更新打手
+            if jiedan_dashou_id:
+                try:
+                    dashou_user = UserMain.objects.get(yonghuid=jiedan_dashou_id)
+                    dashou_profile = dashou_user.dashou_profile
+                    dashou_profile.tuikuanliang += 1
+                    dashou_profile.zhuangtai = 1
+                    dashou_profile.save()
+                except (UserMain.DoesNotExist, ObjectDoesNotExist):
+                    logger.warning(f"商家退款：打手 {jiedan_dashou_id} 不存在，跳过更新")
+
+            # 更新商家
+            try:
+                shangjia_user = UserMain.objects.get(yonghuid=shangjia_id)
+                shangjia_profile = shangjia_user.shop_profile
+                shangjia_profile.tuikuan += 1
+                shangjia_profile.yue += jine
+                shangjia_profile.save()
+            except (UserMain.DoesNotExist, ObjectDoesNotExist):
+                logger.warning(f"商家退款：商家 {shangjia_id} 不存在，跳过更新")
+
+            # 更新退款记录表
+            try:
+                refund_record = Tuikuanjilu.objects.get(dingdan_id=dingdan_id)
+                refund_record.sqzhuangtai = 1
+                refund_record.chuliid = phone
+                refund_record.save()
+            except Tuikuanjilu.DoesNotExist:
+                pass
+
+            # ✅ 新方法（行为驱动，更安全）
+            from houtai.utils import update_shangjia_daily
+            update_shangjia_daily(
+                yonghuid=shangjia_id,
+                amount=Decimal(str(order.jine)),
+                action=3  # 3 = 退款
+            )
+
+            # 🔥 新增：调用打手每日统计（成交）
+            try:
+                update_dashou_daily_by_action(
+                    yonghuid=order.jiedan_dashou_id,
+                    amount=order.dashou_fencheng,
+                    action=3  # 3 表示退款（退款）
+                )
+                logger.info(f"打手 {order.jiedan_dashou_id} 每日统计更新成功")
+            except Exception as e:
+                logger.error(f"打手每日统计更新失败: {e}")
+                # 不影响主流程
+
+            # 更新客服统计
+            kefu = current_user.kefu_profile
+            kefu.jinrichuli += 1
+            kefu.jinyuechuli += 1
+            kefu.zongchuli += 1
+            kefu.save()
+
+        return Response({'code': 0, 'msg': '退款成功'})
+
+
+
+
+logger = logging.getLogger(__name__)
+
+class KefuRejectSettlementView(APIView):
+    """
+    客服拒绝结算接口（仅平台订单，状态2/8）
+    请求：POST /yonghu/kefujjjs
+    参数：{
+        "phone": "客服手机号",
+        "dingdan_id": "订单ID",
+        "tkly": "拒绝结算理由（必填）"
+    }
+    认证：JWT
+    返回：code=0 成功，其他失败
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        tkly = request.data.get('tkly', '').strip()
+
+        if not phone or not dingdan_id or not tkly:
+            return Response({'code': 401, 'msg': '参数不完整'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 客服身份验证
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            logger.warning(f"手机号不匹配: {phone}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            logger.warning(f"用户类型非客服: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            logger.warning(f"客服扩展表不存在: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            logger.warning(f"客服账号已禁用: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 查询订单，预加载平台扩展表
+        try:
+            order = Dingdan.objects.select_related('pingtai_kuozhan').get(dingdan_id=dingdan_id)
+        except Dingdan.DoesNotExist:
+            return Response({'code': 404, 'msg': '订单不存在'}, status=status.HTTP_404_NOT_FOUND)
+
+        # 4. 校验订单条件：平台发单（1）且状态为2或8
+        if order.fadan_pingtai != 1 or order.zhuangtai not in [2, 8]:
+            return Response({'code': 400, 'msg': '仅平台发单且状态为进行中(2)或结算中(8)的订单可拒绝结算'}, status=status.HTTP_400_BAD_REQUEST)
+
+        jiedan_dashou_id = order.jiedan_dashou_id
+        if not jiedan_dashou_id:
+            return Response({'code': 400, 'msg': '订单暂无接单打手'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 5. 使用事务更新
+        with transaction.atomic():
+            # 5.1 更新订单主表
+            order.zhuangtai = 5                     # 已退款
+            order.tkly = tkly                        # 拒绝理由
+            order.clkf = phone                        # 记录客服手机号
+            order.save()
+
+            # 5.2 更新平台订单扩展表：标记为拒绝结算（假设字段 jjjs_biaoshi）
+            # 注意：需要确保 DingdanPingtai 模型中已添加 jjjs_biaoshi 字段，IntegerField，默认0
+            if hasattr(order, 'pingtai_kuozhan') and order.pingtai_kuozhan:
+                pingtai_ext = order.pingtai_kuozhan
+                pingtai_ext.jjjs_biaoshi = 1          # 1表示拒绝结算
+                pingtai_ext.save()
+            else:
+                # 理论上应该存在，但若不存在则记录日志
+                logger.warning(f"订单 {dingdan_id} 缺少平台扩展表，无法标记拒绝结算")
+
+            # 5.3 更新打手扩展表
+            try:
+                dashou_user = UserMain.objects.get(yonghuid=jiedan_dashou_id)
+                dashou_profile = dashou_user.dashou_profile
+                dashou_profile.zhuangtai = 1          # 打手状态设为空闲
+                dashou_profile.tuikuanliang += 1      # 退款订单总量+1
+                dashou_profile.save()
+                logger.info(f"拒绝结算：打手 {jiedan_dashou_id} 退款订单+1，状态空闲")
+            except (UserMain.DoesNotExist, ObjectDoesNotExist):
+                logger.warning(f"拒绝结算：打手 {jiedan_dashou_id} 不存在或扩展表缺失，跳过更新")
+            except Exception as e:
+                logger.error(f"拒绝结算更新打手异常: {str(e)}", exc_info=True)
+
+            # 🔥 新增：调用打手每日统计（成交）
+            try:
+                update_dashou_daily_by_action(
+                    yonghuid=order.jiedan_dashou_id,
+                    amount=order.dashou_fencheng,
+                    action=3  # 3 表示退款（退款）
+                )
+                logger.info(f"打手 {order.jiedan_dashou_id} 每日统计更新成功")
+            except Exception as e:
+                logger.error(f"打手每日统计更新失败: {e}")
+                # 不影响主流程
+
+            # 5.4 更新客服扩展表统计数据
+            kefu.jinrichuli += 1
+            kefu.jinyuechuli += 1
+            kefu.zongchuli += 1
+            kefu.save()
+
+        return Response({'code': 0, 'msg': '拒绝结算成功'})
+
+
+
+class KefuTransferHallView(APIView):
+    """
+    客服恢复大厅（转移大厅）接口
+    请求：POST /yonghu/kefuzydt
+    参数：{
+        "phone": "客服手机号",
+        "dingdan_id": "订单ID"
+    }
+    认证：JWT
+    返回：code=0 成功
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+
+        if not phone or not dingdan_id:
+            return Response({'code': 401, 'msg': '参数不完整'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 客服身份验证（同前，略，但必须完整实现）
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+        if current_user.user_type != 'kefu':
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+        try:
+            kefu = current_user.kefu_profile
+            if kefu.zhuangtai != 1:
+                return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+        except ObjectDoesNotExist:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 查询订单
+        try:
+            order = Dingdan.objects.get(dingdan_id=dingdan_id)
+        except Dingdan.DoesNotExist:
+            return Response({'code': 404, 'msg': '订单不存在'}, status=status.HTTP_404_NOT_FOUND)
+
+        # 4. 校验订单状态（允许状态：2,8,4）
+        if order.zhuangtai not in [2, 8, 4]:
+            return Response({'code': 400, 'msg': '订单状态不允许转移大厅'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 5. 根据是否有指定ID决定新状态
+
+        if order.jiedan_dashou_id:
+            UserDashou.objects.filter(user__yonghuid=order.jiedan_dashou_id).update(zhuangtai=1)
+        else:
+            pass
+
+        if order.zhiding_id:
+            new_status = 7   # 指定中
+        else:
+            new_status = 1   # 下单中
+
+        # 6. 使用事务更新
+        with transaction.atomic():
+            # 清空接单打手ID，更新状态，记录客服
+            order.jiedan_dashou_id = None
+            order.zhuangtai = new_status
+            order.clkf = phone
+            order.save()
+
+        return Response({'code': 0, 'msg': '转移大厅成功'})
+
+
+
+
+
+
+
+from dingdan.utils import update_daily_dispatch_stat
+from dingdan.models import PreSettlement
+
+logger = logging.getLogger(__name__)
+from shangpin.utils import update_shangpin_daily_stat
+from shangdian.utils import update_dianpu_daily_stat   # 注意：您之前写的店铺统计方法名是 update_dianpu_daily_stat
+
+
+
+class KefuForceCompleteView(APIView):
+    """
+    客服强制结单接口（仅本地订单）
+    请求：POST /yonghu/kefuqiangzhijiedan
+    参数：{"phone": "客服手机号", "dingdan_id": "订单ID"}
+    认证：JWT，仅限状态正常的客服
+    逻辑：
+        1. 验证客服身份及状态
+        2. 查询订单并加锁（事务内）
+        3. 校验订单状态是否为8（结算中）
+        4. 校验订单必须有接单打手且打手分成金额有效
+        5. 给打手增加余额、成交统计、今日/本月收益
+        6. 如果是商家发单，更新商家成交订单数量
+        7. 更新订单状态为3（已完成）
+        8. 更新客服处理统计
+        9. 返回成功
+    """
+    permission_classes = [permissions.IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        phone = request.data.get('phone', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+
+        if not phone or not dingdan_id:
+            return Response({'code': 401, 'msg': '参数缺失'})
+
+        # 1. 客服身份验证
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            return Response({'code': 401, 'msg': '认证失败'})
+
+        if current_user.user_type != 'kefu':
+            return Response({'code': 401, 'msg': '认证失败'})
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            return Response({'code': 401, 'msg': '认证失败'})
+
+        if kefu.zhuangtai != 1:
+            return Response({'code': 401, 'msg': '客服状态异常'})
+
+        # 2. 订单处理（事务内）
+        try:
+            with transaction.atomic():
+                order = Dingdan.objects.select_for_update().get(dingdan_id=dingdan_id)
+
+                # 3. 校验订单状态
+                if order.zhuangtai != 8:
+                    return Response({'code': 400, 'msg': f'订单状态不是结算中，当前状态: {order.zhuangtai}'})
+
+                # 4. 校验必要字段
+                dashou_id = order.jiedan_dashou_id
+                dashou_fencheng = order.dashou_fencheng
+                if not dashou_id:
+                    return Response({'code': 400, 'msg': '订单无接单打手'})
+                if not dashou_fencheng or dashou_fencheng <= 0:
+                    return Response({'code': 400, 'msg': '打手分成金额无效'})
+
+                # 5. 给打手结算
+                try:
+                    dashou_user = UserMain.objects.get(yonghuid=dashou_id)
+                    dashou_profile = dashou_user.dashou_profile
+                    # 原子更新（避免并发重复加）
+                    dashou_profile.chengjiaozongliang = F('chengjiaozongliang') + 1
+                    dashou_profile.yue = F('yue') + dashou_fencheng
+                    dashou_profile.zonge = F('zonge') + dashou_fencheng
+                    dashou_profile.jinrishouyi = F('jinrishouyi') + dashou_fencheng
+                    dashou_profile.jinyueshouyi = F('jinyueshouyi') + dashou_fencheng
+                    dashou_profile.save(update_fields=[
+                        'chengjiaozongliang', 'yue', 'zonge',
+                        'jinrishouyi', 'jinyueshouyi'
+                    ])
+                except (UserMain.DoesNotExist, AttributeError):
+                    return Response({'code': 400, 'msg': '打手不存在或扩展表缺失'})
+
+                # 6. 如果是商家发单，更新商家成交订单数量
+                if order.fadan_pingtai == 2:
+                    try:
+                        # 通过 DingdanShangjia 获取商家ID
+                        shangjia_ext = order.shangjia_kuozhan  # 假设 related_name='shangjia_kuozhan'
+                        if shangjia_ext and shangjia_ext.shangjia_id:
+                            shangjia_user = UserMain.objects.get(yonghuid=shangjia_ext.shangjia_id)
+                            shangjia_profile = shangjia_user.shop_profile
+                            shangjia_profile.chengjiao = F('chengjiao') + 1
+                            shangjia_profile.save(update_fields=['chengjiao'])
+
+                            # ✅ 新方法（行为驱动，更安全）
+                            from houtai.utils import update_shangjia_daily
+                            update_shangjia_daily(
+                                yonghuid=shangjia_ext.shangjia_id,
+                                amount=Decimal(str(order.jine)),
+                                action=2  # 2 = 结算
+                            )
+
+                    except ObjectDoesNotExist:
+                        # 没有商家扩展记录则忽略
+                        pass
+
+                # 7. 更新订单状态
+                order.zhuangtai = 3
+                order.clkf = phone
+                order.save(update_fields=['zhuangtai', 'clkf'])
+
+
+                if order.fadan_pingtai == 1:
+
+                    # ========== 新增：商品和店铺每日统计 ==========
+                    try:
+                        # 商品每日统计（只要有商品ID就执行）
+                        if order.shangpin_id:
+                            # 从扩展表获取已计算好的收益值（下单时已存储）
+                            pingtai_shouyi = Decimal('0.00')
+                            dianpu_shouyi = Decimal('0.00')
+                            if hasattr(order, 'pingtai_kuozhan'):
+                                pingtai_shouyi = order.pingtai_kuozhan.pingtai_shouyi or Decimal('0.00')
+                                dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00')
+
+                            update_shangpin_daily_stat(
+                                shangpin_id=order.shangpin_id,
+                                caozuo_leixing=2,  # 2 = 结单
+                                dingdan_jiage=order.jine,
+                                pingtai_shouyi=pingtai_shouyi,
+                                dianpu_zongshouyi=dianpu_shouyi
+                            )
+                            logger.info(f"商品统计更新完成，商品ID: {order.shangpin_id}")
+
+                        # 店铺每日统计（仅当存在店铺ID时执行）
+                        dianpu_id = None
+                        if hasattr(order, 'pingtai_kuozhan'):
+                            dianpu_id = order.pingtai_kuozhan.dianpu_id
+                        if dianpu_id:
+                            dianpu_shouyi = order.pingtai_kuozhan.dianpu_shouyi or Decimal('0.00')
+                            update_dianpu_daily_stat(
+                                dianpu_id=dianpu_id,
+                                caozuo_leixing=2,  # 2 = 结单
+                                dingdan_jiage=order.jine,
+                                dianpu_shouyi=dianpu_shouyi
+                            )
+                            logger.info(f"店铺统计更新完成，店铺ID: {dianpu_id}")
+                    except Exception as e:
+                        logger.error(f"商品/店铺统计更新失败: {e}")
+                        logger.error(traceback.format_exc())
+                        # 统计失败不影响主流程
+                    # =============================================
+
+                # 🔥 新增：调用打手每日统计（成交）
+                try:
+                    update_dashou_daily_by_action(
+                        yonghuid=order.jiedan_dashou_id,
+                        amount=dashou_fencheng,
+                        action=2  # 2 表示成交（结算）
+                    )
+                    logger.info(f"打手 {order.jiedan_dashou_id} 每日统计更新成功")
+                except Exception as e:
+                    logger.error(f"打手每日统计更新失败: {e}")
+                    # 不影响主流程
+
+                # 商家订单管事分红
+                if order.fadan_pingtai == 2:
+                    from dingdan.utils import settle_shangjia_order_guanshi_fenhong
+                    settle_shangjia_order_guanshi_fenhong(order, dashou_id)
+
+                # 8. 更新客服统计
+                kefu.jinrichuli = F('jinrichuli') + 1
+                kefu.jinyuechuli = F('jinyuechuli') + 1
+                kefu.zongchuli = F('zongchuli') + 1
+                kefu.save(update_fields=['jinrichuli', 'jinyuechuli', 'zongchuli'])
+
+            return Response({'code': 0, 'msg': '强制结单成功'})
+
+        except Dingdan.DoesNotExist:
+            return Response({'code': 404, 'msg': '订单不存在'})
+        except Exception as e:
+            logger.error(f"强制结单异常: {str(e)}", exc_info=True)
+            return Response({'code': 500, 'msg': '服务器内部错误'})
+
+
+
+
+
+
+
+
+
+class KefuCancelDesignationView(APIView):
+    """
+    客服取消指定接口（仅状态7）
+    请求：POST /yonghu/kefuqxzd
+    参数：{
+        "phone": "客服手机号",
+        "dingdan_id": "订单ID"
+    }
+    认证：JWT
+    返回：code=0 成功
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+
+        if not phone or not dingdan_id:
+            return Response({'code': 401, 'msg': '参数不完整'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 客服身份验证（同前，略，但必须完整实现）
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+        if current_user.user_type != 'kefu':
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+        try:
+            kefu = current_user.kefu_profile
+            if kefu.zhuangtai != 1:
+                return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+        except ObjectDoesNotExist:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 查询订单
+        try:
+            order = Dingdan.objects.get(dingdan_id=dingdan_id)
+        except Dingdan.DoesNotExist:
+            return Response({'code': 404, 'msg': '订单不存在'}, status=status.HTTP_404_NOT_FOUND)
+
+        # 4. 校验订单状态为7（指定中）
+        if order.zhuangtai != 7:
+            return Response({'code': 400, 'msg': '仅状态为指定中(7)的订单可取消指定'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 5. 使用事务更新
+        with transaction.atomic():
+            # 状态改为1（下单中），清空指定ID，记录客服
+            order.zhuangtai = 1
+            order.zhiding_id = None
+            order.clkf = phone
+            order.save()
+
+        return Response({'code': 0, 'msg': '取消指定成功'})
+
+
+
+
+
+
+import logging
+from django.db.models import Q
+from django.core.exceptions import ObjectDoesNotExist
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+
+from yonghu.models import UserMain, UserKefu, UserDashou
+
+logger = logging.getLogger(__name__)
+
+class KefuGetDashouListView(APIView):
+    """
+    客服获取打手列表接口（仅打手类型）
+    请求：POST /yonghu/kefuhqdslb
+    参数：{
+        "phone": "客服手机号",
+        "keyword": "搜索关键词（可选，搜索用户ID或昵称）",
+        "page": "页码（从1开始）",
+        "page_size": "每页数量"
+    }
+    认证：JWT
+    返回：{
+        "code": 0,
+        "data": {
+            "list": [打手对象],
+            "has_more": true/false
+        }
+    }
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('zhanghao', '').strip()
+        keyword = request.data.get('keyword', '').strip()
+        try:
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('page_size', 20))
+        except ValueError:
+            return Response({'code': 400, 'msg': '分页参数错误'}, status=status.HTTP_400_BAD_REQUEST)
+
+        if not phone:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 客服身份验证
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            logger.warning(f"手机号不匹配: {phone}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            logger.warning(f"用户类型非客服: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            logger.warning(f"客服扩展表不存在: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            logger.warning(f"客服账号已禁用: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 构建查询条件（只查询打手）
+        # 通过 UserDashou 扩展表关联 UserMain
+        queryset = UserDashou.objects.select_related('user').all()
+
+        if keyword:
+            # 搜索用户ID或打手昵称
+            queryset = queryset.filter(
+                Q(user__yonghuid__icontains=keyword) |
+                Q(nicheng__icontains=keyword)
+            )
+
+        # 4. 计算总数并分页
+        total = queryset.count()
+        offset = (page - 1) * page_size
+        dashou_list = queryset.order_by('-create_time')[offset:offset + page_size]
+
+        # 5. 构建返回数据（只取需要的字段）
+        result = []
+        for dashou in dashou_list:
+            user = dashou.user
+            result.append({
+                'yonghuid': user.yonghuid,
+                'avatar': user.avatar or '',
+                'zaixianzhuangtai': dashou.zaixianzhuangtai,
+                'zhanghaozhuangtai': dashou.zhanghaozhuangtai,
+                'nicheng': dashou.nicheng or '',
+                'zhuangtai': dashou.zhuangtai,
+            })
+
+        # 6. 判断是否有更多数据
+        has_more = (offset + len(dashou_list)) < total
+
+        return Response({
+            'code': 0,
+            'data': {
+                'list': result,
+                'has_more': has_more
+            }
+        })
+
+
+
+
+
+
+
+class KefuGetDashouDetailView(APIView):
+    """
+    客服获取打手详情接口
+    请求：POST /yonghu/kefuhqdsxq
+    参数：{
+        "phone": "客服手机号",
+        "uid": "打手ID (yonghuid)"
+    }
+    认证：JWT
+    返回：code=0 + 打手信息 + 会员列表
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        uid = request.data.get('uid', '').strip()
+
+        if not phone or not uid:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 客服身份验证
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            logger.warning(f"手机号不匹配: {phone}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            logger.warning(f"用户类型非客服: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            logger.warning(f"客服扩展表不存在: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            logger.warning(f"客服账号已禁用: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 查询打手主表和扩展表
+        try:
+            # 使用 select_related 预加载 dashou_profile，减少数据库查询
+            user_main = UserMain.objects.select_related('dashou_profile').get(
+                yonghuid=uid
+            )
+        except UserMain.DoesNotExist:
+            return Response({'code': 404, 'msg': '打手不存在'}, status=status.HTTP_404_NOT_FOUND)
+
+        # 验证用户类型是否为打手（可选，但建议验证）
+        # 如果该用户没有打手扩展表，则返回空信息（但前端会显示未注册）
+        try:
+            dashou = user_main.dashou_profile
+        except ObjectDoesNotExist:
+            # 用户存在但未注册打手身份，返回基本信息
+            user_info = {
+                'yonghuid': user_main.yonghuid,
+                'avatar': user_main.avatar or '',
+                'zaixianzhuangtai': 0,
+                'zhanghaozhuangtai': 0,
+                'zhuangtai': 0,
+                'nicheng': '',
+                'chenghao': '',
+                'dianhua': '',
+                'wechat': '',
+                'phone': user_main.phone or '',
+                'create_time': user_main.create_time,
+                'ip': user_main.ip or '',
+                'jiedanzongliang': 0,
+                'chengjiaozongliang': 0,
+                'tuikuanliang': 0,
+                'jinrijiedan': 0,
+                'yue': 0.00,
+                'zonge': 0.00,
+                'jifen': 0,
+                'yajin': 0.00,
+                'jinrishouyi': 0.00,
+                'jinyueshouyi': 0.00,
+                'yaoqingren': '',
+                'jieshao': '',
+            }
+            member_list = []
+            return Response({
+                'code': 0,
+                'data': {
+                    'user_info': user_info,
+                    'member_list': member_list
+                }
+            })
+
+        # 4. 构建打手信息
+        user_info = {
+            'yonghuid': user_main.yonghuid,
+            'avatar': user_main.avatar or '',
+            'zaixianzhuangtai': dashou.zaixianzhuangtai,
+            'zhanghaozhuangtai': dashou.zhanghaozhuangtai,
+            'zhuangtai': dashou.zhuangtai,
+            'nicheng': dashou.nicheng or '',
+            'chenghao': dashou.chenghao or '',
+            'dianhua': dashou.dianhua or '',
+            'wechat': dashou.wechat or '',
+            'phone': user_main.phone or '',
+            'create_time': user_main.create_time,
+            'ip': user_main.ip or '',
+            'jiedanzongliang': dashou.jiedanzongliang,
+            'chengjiaozongliang': dashou.chengjiaozongliang,
+            'tuikuanliang': dashou.tuikuanliang,
+            'jinrijiedan': dashou.jinrijiedan,
+            'yue': float(dashou.yue) if dashou.yue else 0.00,
+            'zonge': float(dashou.zonge) if dashou.zonge else 0.00,
+            'jifen': dashou.jifen,
+            'yajin': float(dashou.yajin) if dashou.yajin else 0.00,
+            'jinrishouyi': float(dashou.jinrishouyi) if dashou.jinrishouyi else 0.00,
+            'jinyueshouyi': float(dashou.jinyueshouyi) if dashou.jinyueshouyi else 0.00,
+            'yaoqingren': dashou.yaoqingren or '',
+            'jieshao': dashou.jieshao or '',
+        }
+
+        # 5. 查询打手会员信息（仅未过期）
+        member_records = Huiyuangoumai.objects.filter(
+            yonghu_id=uid
+        ).order_by('-create_time')
+
+        member_list = []
+        for record in member_records:
+            # 调用模型方法检查是否过期
+            if hasattr(record, 'jiance_shifou_daoqi'):
+                is_expired = record.jiance_shifou_daoqi()
+            else:
+                # 如果方法不存在，简单判断
+                is_expired = record.daoqi_time < timezone.now() if record.daoqi_time else True
+
+            if not is_expired:
+                # 获取会员详情
+                try:
+                    huiyuan = Huiyuan.objects.get(huiyuan_id=record.huiyuan_id)
+                    huiyuan_name = huiyuan.jieshao
+                except Huiyuan.DoesNotExist:
+                    huiyuan_name = '未知会员'
+
+                member_list.append({
+                    'id': record.id,
+                    'huiyuan_name': huiyuan_name,
+                    'daoqi_time': record.daoqi_time,
+                    'is_active': record.huiyuan_zhuangtai == 1,
+                })
+
+        return Response({
+            'code': 0,
+            'data': {
+                'user_info': user_info,
+                'member_list': member_list
+            }
+        })
+
+
+
+from yonghu.models import Xiugaijilu  # 确保已导入
+
+
+
+
+from houtai.utils import verify_kefu_permission
+
+logger = logging.getLogger(__name__)
+
+class KefuUpdateDashouView(APIView):
+    """
+    客服修改打手信息接口
+    支持操作：
+    - jian_yue / jia_yue           : 减/加打手余额 (权限001aa/001bb)
+    - jian_yajin / jia_yajin       : 减/加打手押金 (权限001aa/001bb)
+    - jian_jifen / jia_jifen       : 减/加打手积分 (权限001cc/001dd)
+    - gai_zhanghaozhuangtai        : 修改打手账号状态（封禁/解封） (权限001ee)
+    - gai_zaixianzhuangtai         : 修改打手在线状态 (权限001ee)
+    - gai_zhuangtai                : 修改打手接单状态（空闲/忙碌） (权限001ee)
+    - jia_huiyuan / jian_huiyuan   : 加/减会员 (权限001ff/001gg)
+    """
+    def post(self, request):
+        # 1. 获取前端参数
+        username = request.data.get('username', '').strip()
+        dashou_id = request.data.get('dashou_id', '').strip()
+        caozuo = request.data.get('caozuo', '').strip()
+        value = request.data.get('value')          # 金额、积分、天数等
+        huiyuan_id = request.data.get('huiyuan_id', '').strip()   # 会员ID（加/减会员时使用）
+
+        if not username or not dashou_id or not caozuo:
+            return Response({'code': 400, 'msg': '参数不完整'})
+
+        # 2. 权限校验（统一方法）
+        kefu, permissions = verify_kefu_permission(request, username)
+        if kefu is None:
+            return permissions  # 直接返回错误响应
+
+        # 3. 查询打手是否存在
+        try:
+            dashou_user = UserMain.objects.get(yonghuid=dashou_id, user_type='dashou')
+            dashou_profile = dashou_user.dashou_profile
+        except UserMain.DoesNotExist:
+            return Response({'code': 404, 'msg': '打手不存在'})
+        except UserDashou.DoesNotExist:
+            return Response({'code': 404, 'msg': '打手扩展信息缺失'})
+
+        # 4. 根据操作类型执行（事务内）
+        with transaction.atomic():
+            try:
+                # 记录修改前的值（用于日志）
+                before = {
+                    'yue': dashou_profile.yue,
+                    'yajin': dashou_profile.yajin,
+                    'jifen': dashou_profile.jifen,
+                    'zhanghaozhuangtai': dashou_profile.zhanghaozhuangtai,
+                    'zaixianzhuangtai': dashou_profile.zaixianzhuangtai,
+                    'zhuangtai': dashou_profile.zhuangtai,
+                }
+
+                # ---------- 余额操作 ----------
+                if caozuo == 'jian_yue':
+                    if '001aa' not in permissions:
+                        return Response({'code': 403, 'msg': '无权限减打手余额'})
+                    amount = Decimal(str(value))
+                    if dashou_profile.yue < amount:
+                        return Response({'code': 400, 'msg': '余额不足'})
+                    dashou_profile.yue -= amount
+                    dashou_profile.save()
+                    after_yue = dashou_profile.yue
+                    # 记录日志
+                    Xiugaijilu.objects.create(
+                        yonghuid=dashou_id,
+                        xiugaiid=kefu.user.phone,
+                        leixing=2,  # 2=打手
+                        xiugaitijiao=after_yue,
+                        xiugaitijiaoq=before['yue'],
+                    )
+                    return Response({'code': 0, 'msg': '减余额成功', 'data': {'new_yue': str(after_yue)}})
+
+                elif caozuo == 'jia_yue':
+                    if '001bb' not in permissions:
+                        return Response({'code': 403, 'msg': '无权限加打手余额'})
+                    amount = Decimal(str(value))
+                    dashou_profile.yue += amount
+                    dashou_profile.save()
+                    after_yue = dashou_profile.yue
+                    Xiugaijilu.objects.create(
+                        yonghuid=dashou_id,
+                        xiugaiid=kefu.user.phone,
+                        leixing=2,
+                        xiugaitijiao=after_yue,
+                        xiugaitijiaoq=before['yue'],
+                    )
+                    return Response({'code': 0, 'msg': '加余额成功', 'data': {'new_yue': str(after_yue)}})
+
+                # ---------- 押金操作 ----------
+                elif caozuo == 'jian_yajin':
+                    if '001aa' not in permissions:
+                        return Response({'code': 403, 'msg': '无权限减打手押金'})
+                    amount = Decimal(str(value))
+                    if dashou_profile.yajin < amount:
+                        return Response({'code': 400, 'msg': '押金不足'})
+                    dashou_profile.yajin -= amount
+                    dashou_profile.save()
+                    after_yajin = dashou_profile.yajin
+                    Xiugaijilu.objects.create(
+                        yonghuid=dashou_id,
+                        xiugaiid=kefu.user.phone,
+                        leixing=2,
+                        yajin=after_yajin,
+                        yyajin=before['yajin'],
+                    )
+                    return Response({'code': 0, 'msg': '减押金成功', 'data': {'new_yajin': str(after_yajin)}})
+
+                elif caozuo == 'jia_yajin':
+                    if '001bb' not in permissions:
+                        return Response({'code': 403, 'msg': '无权限加打手押金'})
+                    amount = Decimal(str(value))
+                    dashou_profile.yajin += amount
+                    dashou_profile.save()
+                    after_yajin = dashou_profile.yajin
+                    Xiugaijilu.objects.create(
+                        yonghuid=dashou_id,
+                        xiugaiid=kefu.user.phone,
+                        leixing=2,
+                        yajin=after_yajin,
+                        yyajin=before['yajin'],
+                    )
+                    return Response({'code': 0, 'msg': '加押金成功', 'data': {'new_yajin': str(after_yajin)}})
+
+                # ---------- 积分操作 ----------
+                elif caozuo == 'jian_jifen':
+                    if '001cc' not in permissions:
+                        return Response({'code': 403, 'msg': '无权限减打手积分'})
+                    jifen = int(value)
+                    if dashou_profile.jifen < jifen:
+                        return Response({'code': 400, 'msg': '积分不足'})
+                    dashou_profile.jifen -= jifen
+                    dashou_profile.save()
+                    after_jifen = dashou_profile.jifen
+                    Xiugaijilu.objects.create(
+                        yonghuid=dashou_id,
+                        xiugaiid=kefu.user.phone,
+                        leixing=2,
+                        jifen=after_jifen,
+                        yjifen=before['jifen'],
+                    )
+                    return Response({'code': 0, 'msg': '减积分成功', 'data': {'new_jifen': after_jifen}})
+
+                elif caozuo == 'jia_jifen':
+                    if '001dd' not in permissions:
+                        return Response({'code': 403, 'msg': '无权限加打手积分'})
+                    jifen = int(value)
+                    dashou_profile.jifen += jifen
+                    dashou_profile.save()
+                    after_jifen = dashou_profile.jifen
+                    Xiugaijilu.objects.create(
+                        yonghuid=dashou_id,
+                        xiugaiid=kefu.user.phone,
+                        leixing=2,
+                        jifen=after_jifen,
+                        yjifen=before['jifen'],
+                    )
+                    return Response({'code': 0, 'msg': '加积分成功', 'data': {'new_jifen': after_jifen}})
+
+                # ---------- 状态修改 ----------
+                elif caozuo == 'gai_zhanghaozhuangtai':
+                    if '001ee' not in permissions:
+                        return Response({'code': 403, 'msg': '无权限修改打手账号状态'})
+                    new_status = int(value)
+                    if new_status not in [0, 1]:
+                        return Response({'code': 400, 'msg': '状态值无效（0=封禁,1=正常）'})
+                    dashou_profile.zhanghaozhuangtai = new_status
+                    dashou_profile.save()
+                    Xiugaijilu.objects.create(
+                        yonghuid=dashou_id,
+                        xiugaiid=kefu.user.phone,
+                        leixing=2,
+                        qitashuoming=f'修改账号状态为{new_status}',
+                    )
+                    return Response({'code': 0, 'msg': '修改账号状态成功', 'data': {'new_zhanghaozhuangtai': new_status}})
+
+                elif caozuo == 'gai_zaixianzhuangtai':
+                    if '001ee' not in permissions:
+                        return Response({'code': 403, 'msg': '无权限修改打手在线状态'})
+                    new_status = int(value)
+                    if new_status not in [0, 1]:
+                        return Response({'code': 400, 'msg': '状态值无效（0=离线,1=在线）'})
+                    dashou_profile.zaixianzhuangtai = new_status
+                    dashou_profile.save()
+                    Xiugaijilu.objects.create(
+                        yonghuid=dashou_id,
+                        xiugaiid=kefu.user.phone,
+                        leixing=2,
+                        qitashuoming=f'修改在线状态为{new_status}',
+                    )
+                    return Response({'code': 0, 'msg': '修改在线状态成功', 'data': {'new_zaixianzhuangtai': new_status}})
+
+                elif caozuo == 'gai_zhuangtai':
+                    if '001ee' not in permissions:
+                        return Response({'code': 403, 'msg': '无权限修改打手接单状态'})
+                    new_status = int(value)
+                    if new_status not in [0, 1]:
+                        return Response({'code': 400, 'msg': '状态值无效（0=忙碌,1=空闲）'})
+                    dashou_profile.zhuangtai = new_status
+                    dashou_profile.save()
+                    Xiugaijilu.objects.create(
+                        yonghuid=dashou_id,
+                        xiugaiid=kefu.user.phone,
+                        leixing=2,
+                        qitashuoming=f'修改接单状态为{new_status}',
+                    )
+                    return Response({'code': 0, 'msg': '修改接单状态成功', 'data': {'new_zhuangtai': new_status}})
+
+                # ---------- 会员操作 ----------
+                elif caozuo == 'jia_huiyuan':
+                    if '001ff' not in permissions:
+                        return Response({'code': 403, 'msg': '无权限给打手加会员'})
+                    if not huiyuan_id:
+                        return Response({'code': 400, 'msg': '缺少会员ID'})
+                    days = int(value) if value else 30  # 默认加30天
+                    try:
+                        huiyuan = Huiyuan.objects.get(huiyuan_id=huiyuan_id)
+                    except Huiyuan.DoesNotExist:
+                        return Response({'code': 404, 'msg': '会员类型不存在'})
+                    # 获取或创建购买记录
+                    record, created = Huiyuangoumai.objects.select_for_update().get_or_create(
+                        yonghu_id=dashou_id,
+                        huiyuan_id=huiyuan_id,
+                        defaults={
+                            'huiyuan_zhuangtai': 1,
+                            'jieshao': huiyuan.jieshao,
+                            'daoqi_time': timezone.now() + timedelta(days=days),
+                        }
+                    )
+                    if not created:
+                        # 延长有效期
+                        new_daoqi = record.daoqi_time + timedelta(days=days)
+                        record.daoqi_time = new_daoqi
+                        record.huiyuan_zhuangtai = 1
+                        record.save()
+                    # 记录修改日志
+                    Xiugaijilu.objects.create(
+                        yonghuid=dashou_id,
+                        xiugaiid=kefu.user.phone,
+                        leixing=2,
+                        huiyuants=days,
+                        huiyuan_id=huiyuan_id,
+                        qitashuoming=f'加会员 {huiyuan_id}，增加{days}天',
+                    )
+                    return Response({'code': 0, 'msg': '加会员成功', 'data': {'new_daoqi': record.daoqi_time.strftime('%Y-%m-%d %H:%M:%S')}})
+
+                elif caozuo == 'jian_huiyuan':
+                    if '001gg' not in permissions:
+                        return Response({'code': 403, 'msg': '无权限给打手减会员'})
+                    if not huiyuan_id:
+                        return Response({'code': 400, 'msg': '缺少会员ID'})
+                    try:
+                        record = Huiyuangoumai.objects.get(yonghu_id=dashou_id, huiyuan_id=huiyuan_id)
+                    except Huiyuangoumai.DoesNotExist:
+                        return Response({'code': 404, 'msg': '该打手未购买此会员'})
+                    # 删除会员记录（或设置为过期，根据业务要求）
+                    record.delete()
+                    Xiugaijilu.objects.create(
+                        yonghuid=dashou_id,
+                        xiugaiid=kefu.user.phone,
+                        leixing=2,
+                        huiyuan_id=huiyuan_id,
+                        qitashuoming=f'移除会员 {huiyuan_id}',
+                    )
+                    return Response({'code': 0, 'msg': '减会员成功'})
+
+                else:
+                    return Response({'code': 400, 'msg': '未知操作类型'})
+
+            except Exception as e:
+                logger.error(f"修改打手信息异常: {str(e)}", exc_info=True)
+                return Response({'code': 500, 'msg': '服务器内部错误'})
+
+'''class KefuUpdateDashouView(APIView):
+    """
+    客服修改打手信息接口
+    请求：POST /yonghu/kefuxgds
+    参数：{
+        "phone": "客服手机号",
+        "uid": "打手ID",
+        // 以下字段可选，只传需要修改的字段
+        "yue": 100.00,
+        "jifen": 200,
+        "yajin": 50.00,
+        "zaixianzhuangtai": 0/1,
+        "zhanghaozhuangtai": 0/1,
+        "zhuangtai": 1/2
+    }
+    认证：JWT
+    返回：code=0 成功
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        uid = request.data.get('uid', '').strip()
+
+        if not phone or not uid:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 客服身份验证
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            logger.warning(f"手机号不匹配: {phone}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            logger.warning(f"用户类型非客服: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            logger.warning(f"客服扩展表不存在: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            logger.warning(f"客服账号已禁用: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 查询打手主表和扩展表
+        try:
+            user_main = UserMain.objects.select_related('dashou_profile').get(
+                yonghuid=uid
+            )
+        except UserMain.DoesNotExist:
+            return Response({'code': 404, 'msg': '打手不存在'}, status=status.HTTP_404_NOT_FOUND)
+
+        try:
+            dashou = user_main.dashou_profile
+        except ObjectDoesNotExist:
+            return Response({'code': 400, 'msg': '该用户未注册打手身份'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 4. 收集要修改的字段
+        update_fields = {}
+        editable_fields = [
+            'yue', 'jifen', 'yajin',
+            'zaixianzhuangtai', 'zhanghaozhuangtai', 'zhuangtai'
+        ]
+
+        for field in editable_fields:
+            if field in request.data:
+                value = request.data.get(field)
+                # 类型转换
+                if field in ['yue', 'yajin']:
+                    try:
+                        value = Decimal(str(value))
+                    except:
+                        return Response({'code': 400, 'msg': f'{field} 格式错误'}, status=status.HTTP_400_BAD_REQUEST)
+                elif field in ['jifen']:
+                    try:
+                        value = int(value)
+                    except:
+                        return Response({'code': 400, 'msg': f'{field} 必须为整数'}, status=status.HTTP_400_BAD_REQUEST)
+                elif field in ['zaixianzhuangtai', 'zhanghaozhuangtai', 'zhuangtai']:
+                    try:
+                        value = int(value)
+                        if field == 'zhuangtai' and value not in [1, 2]:
+                            return Response({'code': 400, 'msg': f'{field} 值无效'}, status=status.HTTP_400_BAD_REQUEST)
+                        if field != 'zhuangtai' and value not in [0, 1]:
+                            return Response({'code': 400, 'msg': f'{field} 值无效'}, status=status.HTTP_400_BAD_REQUEST)
+                    except:
+                        return Response({'code': 400, 'msg': f'{field} 必须为数字'}, status=status.HTTP_400_BAD_REQUEST)
+                update_fields[field] = value
+
+        if not update_fields:
+            return Response({'code': 400, 'msg': '没有要修改的字段'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 5. 使用事务更新并记录修改日志
+        with transaction.atomic():
+            # 保存旧值用于记录（可选）
+            old_values = {field: getattr(dashou, field) for field in update_fields}
+
+            for field, value in update_fields.items():
+                setattr(dashou, field, value)
+            dashou.save()
+
+            # 记录修改日志
+            try:
+                # 构建修改描述
+                desc_parts = []
+                for field in update_fields:
+                    old = old_values.get(field)
+                    new = update_fields[field]
+                    desc_parts.append(f"{field}: {old} -> {new}")
+                desc = "; ".join(desc_parts)
+
+                Xiugaijilu.objects.create(
+                    yonghuid=uid,
+                    xiugaiid=phone,  # 客服手机号
+                    leixing=2,  # 打手类型
+                    qitashuoming=desc,
+                    create_time=timezone.now()
+                )
+            except Exception as e:
+                logger.error(f"记录修改日志失败: {e}")
+                # 不影响主流程，但记录错误
+
+        return Response({'code': 0, 'msg': '修改成功'})'''
+
+
+
+
+
+class KefuPunishmentListView(APIView):
+    """
+    客服获取处罚记录列表接口
+    请求：POST /yonghu/kefu_cfgl
+    参数：{
+        "phone": "客服手机号",
+        "status": [0,3] 或 [1,2],  # 状态数组
+        "dingdan_id": "订单ID（可选）",
+        "dashouid": "打手ID（可选）",
+        "page": 1,
+        "page_size": 20
+    }
+    认证：JWT
+    返回：{
+        "code": 0,
+        "data": {
+            "list": [处罚记录],
+            "total": 总数,
+            "stats": {
+                "zongshu": 总记录数,
+                "daichuli": 待处理数,
+                "yichuli": 已处理数
+            }
+        }
+    }
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        status_list = request.data.get('status')
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        dashouid = request.data.get('dashouid', '').strip()
+        try:
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('page_size', 20))
+        except ValueError:
+            return Response({'code': 400, 'msg': '分页参数错误'}, status=status.HTTP_400_BAD_REQUEST)
+
+        if not phone:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 客服身份验证
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            logger.warning(f"手机号不匹配: {phone}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            logger.warning(f"用户类型非客服: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            logger.warning(f"客服扩展表不存在: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            logger.warning(f"客服账号已禁用: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 获取统计信息（不分页）
+        stats = {
+            'zongshu': Chufajilu.objects.count(),
+            'daichuli': Chufajilu.objects.filter(sqzhuangtai__in=[0, 3]).count(),
+            'yichuli': Chufajilu.objects.filter(sqzhuangtai__in=[1, 2]).count(),
+        }
+
+        # 4. 构建查询条件
+        queryset = Chufajilu.objects.all()
+
+        if status_list and isinstance(status_list, list):
+            queryset = queryset.filter(sqzhuangtai__in=status_list)
+
+        if dingdan_id:
+            queryset = queryset.filter(dingdan_id=dingdan_id)
+
+        if dashouid:
+            queryset = queryset.filter(dashouid=dashouid)
+
+        # 5. 分页
+        total = queryset.count()
+        offset = (page - 1) * page_size
+        records = queryset.order_by('-create_time')[offset:offset + page_size]
+
+        # 6. 构建返回列表
+        list_data = []
+        for item in records:
+            list_data.append({
+                'dingdan_id': item.dingdan_id,
+                'dashouid': item.dashouid,
+                'qingqiuid': item.qingqiuid,
+                'cfliyou': item.cfliyou,
+                'sqzhuangtai': item.sqzhuangtai,
+                'create_time': item.create_time,
+                'update_time': item.update_time,
+                # 其他字段按需添加
+            })
+
+        return Response({
+            'code': 0,
+            'data': {
+                'list': list_data,
+                'total': total,
+                'stats': stats
+            }
+        })
+
+
+
+
+
+class KefuPunishmentDetailView(APIView):
+    """
+    客服获取处罚详情接口
+    请求：POST /yonghu/kefu_cf_detail
+    参数：{
+        "phone": "客服手机号",
+        "dingdan_id": "订单ID"
+    }
+    认证：JWT
+    返回：code=0 + 处罚记录详情（含图片）
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        phone = request.data.get('phone', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+
+        if not phone or not dingdan_id:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 客服身份验证
+        current_user = request.user
+        # 1. 获取前端参数
+        username = request.data.get('phone', '').strip()
+        if not username:
+            return Response({'code': 400, 'msg': '缺少username'})
+
+        # 2. 公共权限校验
+        kefu, permissions = verify_kefu_permission(request, username)
+        if kefu is None:
+            return permissions
+
+        # 3. 检查平台订单管理权限（002ab）
+        if '005aa' not in permissions:
+            return Response({'code': 403, 'msg': '您无权查看平台订单列表'})
+
+        # 查询处罚记录（按创建时间倒序取最新一条）
+        try:
+            record = Chufajilu.objects.filter(dingdan_id=dingdan_id).order_by('-create_time').first()
+            if not record:
+                return Response({'code': 404, 'msg': '处罚记录不存在'}, status=status.HTTP_404_NOT_FOUND)
+        except Exception as e:
+            logger.error(f"查询处罚记录失败: {e}")
+            return Response({'code': 500, 'msg': '服务器内部错误'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # 查询商家证据图片
+        zhengju_images = []
+        shensu_images = []
+        try:
+            # 商家证据图片：上传者为请求人 (qingqiuid)
+            zhengju_qs = Chufatupian.objects.filter(dingdan_id=dingdan_id, yonghuid=record.qingqiuid)
+            zhengju_images = [item.tupian for item in zhengju_qs if item.tupian]
+
+            # 打手申诉图片：上传者为打手 (dashouid)
+            shensu_qs = Chufatupian.objects.filter(dingdan_id=dingdan_id, yonghuid=record.dashouid)
+            shensu_images = [item.tupian for item in shensu_qs if item.tupian]
+        except Exception as e:
+            logger.error(f"查询图片失败: {e}")
+
+        # 构建返回数据
+        data = {
+            'dingdan_id': record.dingdan_id,
+            'dashouid': record.dashouid,
+            'qingqiuid': record.qingqiuid,
+            'chuliid': record.chuliid,
+            'cfliyou': record.cfliyou,
+            'sqzhuangtai': record.sqzhuangtai,
+            'bhliyou': record.bhliyou,
+            'jifen': record.jifen,
+            'ssliyou': record.ssliyou or '',
+            'zhengju_tupian': zhengju_images,
+            'shensu_tupian': shensu_images,
+            'create_time': record.create_time,
+            'update_time': record.update_time,
+        }
+
+        return Response({'code': 0, 'data': data})
+
+
+
+from django.db import transaction
+from decimal import Decimal
+
+class KefuPunishmentActionView(APIView):
+    """
+    客服同意/驳回处罚接口
+    请求：POST /yonghu/kefu_cf_action
+    参数：{
+        "phone": "客服手机号",
+        "dingdan_id": "订单ID",
+        "action": 1(同意) / 2(驳回),
+        "reject_reason": "驳回理由（驳回时必填）"
+    }
+    认证：JWT
+    返回：code=0 成功
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        phone = request.data.get('phone', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        action = request.data.get('action')
+        reject_reason = request.data.get('reject_reason', '').strip()
+
+        if not phone or not dingdan_id or action not in [1, 2]:
+            return Response({'code': 401, 'msg': '参数错误'}, status=status.HTTP_400_BAD_REQUEST)
+
+        if action == 2 and not reject_reason:
+            return Response({'code': 400, 'msg': '驳回理由不能为空'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 客服身份验证（完整验证，此处略）
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+        if current_user.user_type != 'kefu':
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+        try:
+            kefu = current_user.kefu_profile
+            if kefu.zhuangtai != 1:
+                return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+        except ObjectDoesNotExist:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 查询待处理的处罚记录（状态0或3）
+        try:
+            record = Chufajilu.objects.filter(
+                dingdan_id=dingdan_id,
+                sqzhuangtai__in=[0, 3]
+            ).order_by('-create_time').first()
+            if not record:
+                exists = Chufajilu.objects.filter(dingdan_id=dingdan_id).exists()
+                if exists:
+                    return Response({'code': 400, 'msg': '该处罚记录已处理'}, status=status.HTTP_400_BAD_REQUEST)
+                else:
+                    return Response({'code': 404, 'msg': '处罚记录不存在'}, status=status.HTTP_404_NOT_FOUND)
+        except Exception as e:
+            logger.error(f"查询处罚记录失败: {e}")
+            return Response({'code': 500, 'msg': '服务器内部错误'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        with transaction.atomic():
+            # 处理重复记录：同一订单的其他待处理/申诉中记录标记为驳回
+            duplicate_records = Chufajilu.objects.filter(
+                dingdan_id=dingdan_id,
+                sqzhuangtai__in=[0, 3]
+            ).exclude(id=record.id)
+            for dup in duplicate_records:
+                dup.sqzhuangtai = 2
+                dup.chuliid = phone
+                dup.bhliyou = "系统自动驳回：存在重复处罚记录"
+                dup.save()
+                logger.info(f"自动驳回重复处罚记录 ID={dup.id}")
+
+            if action == 1:  # 同意
+                # 可选验证打手存在
+                if record.dashouid:
+                    try:
+                        dashou = UserDashou.objects.get(user__yonghuid=record.dashouid)
+                    except UserDashou.DoesNotExist:
+                        return Response({'code': 400, 'msg': '被处罚打手不存在'}, status=status.HTTP_400_BAD_REQUEST)
+
+                record.sqzhuangtai = 1
+                record.chuliid = phone
+                record.save()
+
+                # 更新商家订单扩展表
+                try:
+                    dingdan = Dingdan.objects.get(dingdan_id=dingdan_id)
+                    if hasattr(dingdan, 'shangjia_kuozhan'):
+                        dingdan.shangjia_kuozhan.sqzhuangtai = 1
+                        dingdan.shangjia_kuozhan.save()
+                except Exception as e:
+                    logger.warning(f"更新商家扩展表失败: {e}")
+
+            elif action == 2:  # 驳回
+                # 返还积分
+                if record.jifen > 0 and record.dashouid:
+                    try:
+                        dashou = UserDashou.objects.get(user__yonghuid=record.dashouid)
+                        if dashou.jifen <= 1000:  # 安全限制
+                            dashou.jifen += record.jifen
+                            dashou.save()
+                            logger.info(f"驳回处罚，打手{record.dashouid}返还积分{record.jifen}")
+                        else:
+                            logger.warning(f"打手积分异常({dashou.jifen})，不再返还")
+                    except UserDashou.DoesNotExist:
+                        logger.warning(f"打手{record.dashouid}不存在，无法返还积分")
+
+                record.sqzhuangtai = 2
+                record.chuliid = phone
+                record.bhliyou = reject_reason
+                record.save()
+
+                try:
+                    dingdan = Dingdan.objects.get(dingdan_id=dingdan_id)
+                    if hasattr(dingdan, 'shangjia_kuozhan'):
+                        dingdan.shangjia_kuozhan.sqzhuangtai = 2
+                        dingdan.shangjia_kuozhan.bhliyou = reject_reason
+                        dingdan.shangjia_kuozhan.save()
+                except Exception as e:
+                    logger.warning(f"更新商家扩展表失败: {e}")
+
+        return Response({'code': 0, 'msg': '处理成功'})
+
+
+
+'''class KefuWithdrawListView(APIView):
+    """
+    客服获取提现审核列表接口
+    请求：POST /yonghu/kefu_txsh_list
+    参数：{
+        "phone": "客服手机号",
+        "page": 1,
+        "page_size": 20,
+        "status": 1(待审核)/2(已处理),
+        "type": 1(打手)/2(管事) 可选,
+        "payment": 1(微信)/2(支付宝) 可选,
+        "search_uid": "用户ID搜索" 可选,
+        "date": "YYYY-MM-DD" 可选 按创建日期筛选
+    }
+    认证：JWT
+    返回：{
+        "code": 0,
+        "data": {
+            "list": [提现记录],
+            "total": 总数,
+            "stats": {
+                "total": 总记录,
+                "awaiting": 待审核数,
+                "processed": 已处理数
+            }
+        }
+    }
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        phone = request.data.get('phone', '').strip()
+        try:
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('page_size', 20))
+        except ValueError:
+            return Response({'code': 400, 'msg': '分页参数错误'}, status=status.HTTP_400_BAD_REQUEST)
+
+        status_filter = request.data.get('status')  # 1待审核 2已处理
+        type_filter = request.data.get('type')
+        payment_filter = request.data.get('payment')
+        search_uid = request.data.get('search_uid', '').strip()
+        date_filter = request.data.get('date', '').strip()
+
+        if not phone:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 客服身份验证
+        current_user = request.user
+        # 1. 获取前端参数
+        username = request.data.get('phone', '').strip()
+        if not username:
+            return Response({'code': 400, 'msg': '缺少username'})
+
+        # 2. 公共权限校验
+        kefu, permissions = verify_kefu_permission(request, username)
+        if kefu is None:
+            return permissions
+
+        # 3. 检查平台订单管理权限（002ab）
+        if '005bb' not in permissions:
+            return Response({'code': 403, 'msg': '您无权查看平台订单列表'})
+
+        # 构建查询条件
+        q = Q()
+
+        if status_filter == 1:
+            q &= Q(zhuangtai=1)
+        elif status_filter == 2:
+            q &= Q(zhuangtai__in=[2, 3])
+
+        if type_filter:
+            try:
+                q &= Q(leixing=int(type_filter))
+            except ValueError:
+                pass
+
+        if payment_filter:
+            try:
+                q &= Q(fangshi=int(payment_filter))
+            except ValueError:
+                pass
+
+        if search_uid:
+            q &= Q(yonghuid=search_uid)
+
+        if date_filter:
+            q &= Q(create_time__date=date_filter)
+
+        # 统计信息（整体，不考虑分页）
+        stats = {
+            'total': Tixianjilu.objects.filter(q).count(),
+            'awaiting': Tixianjilu.objects.filter(q & Q(zhuangtai=1)).count(),
+            'processed': Tixianjilu.objects.filter(q & Q(zhuangtai__in=[2, 3])).count(),
+        }
+
+        # 分页查询
+        total = Tixianjilu.objects.filter(q).count()
+        queryset = Tixianjilu.objects.filter(q).order_by('create_time')  # 按申请时间升序
+        records = queryset[(page-1)*page_size : page*page_size]
+
+        # 构建返回列表
+        list_data = []
+        for item in records:
+            list_data.append({
+                'id': item.id,
+                'yonghuid': item.yonghuid,
+                'avatar': item.avatar or '',
+                'phone': item.phone or '',
+                'nicheng': item.nicheng or '',
+                'leixing': item.leixing,
+                'zhifu': item.zhifu or '',
+                'skzhanghao': item.skzhanghao or '',
+                'jine': str(item.jine) if item.jine else '0.00',
+                'zhuangtai': item.zhuangtai,
+                'fangshi': item.fangshi,
+                'shenheid': item.shenheid or '',
+                'bhliyou': item.bhliyou or '',
+                'create_time': item.create_time,
+                'update_time': item.update_time,
+            })
+
+        return Response({
+            'code': 0,
+            'data': {
+                'list': list_data,
+                'total': total,
+                'stats': stats
+            }
+        })'''
+
+
+# yonghu/views.py
+import logging
+import sys
+from django.db import DatabaseError
+from django.db.models import Q, Sum
+from yonghu.models import Tixianjilu, TixianShenheJilu
+
+kefu_txsh_list_logger = logging.getLogger('yonghu.kefu_txsh_list')
+if not kefu_txsh_list_logger.handlers:
+    _console_handler = logging.StreamHandler(sys.stderr)
+    _console_handler.setFormatter(logging.Formatter(
+        '[%(asctime)s] %(levelname)s %(name)s: %(message)s'
+    ))
+    kefu_txsh_list_logger.addHandler(_console_handler)
+    kefu_txsh_list_logger.setLevel(logging.DEBUG)
+    kefu_txsh_list_logger.propagate = False
+
+_TIXIAN_LIST_BASE_FIELDS = (
+    'id', 'yonghuid', 'avatar', 'phone', 'nicheng', 'leixing',
+    'zhifu', 'skzhanghao', 'jine', 'zhuangtai', 'fangshi',
+    'shenheid', 'bhliyou', 'create_time', 'update_time',
+)
+_TIXIAN_LIST_AUDIT_FIELDS = ('shenhe_jilu_id', 'shenhe_danhao')
+
+
+class KefuWithdrawListView(APIView):
+    """
+    客服获取提现审核列表接口
+    请求：POST /yonghu/kefu_txsh_list
+    参数：{
+        "phone": "客服手机号",
+        "page": 1,
+        "page_size": 20,
+        "status": 1(待审核)/2(已处理),
+        "type": 1(打手佣金)/2(管事分红)/3(组长分红)/4(审核官分佣)/5(打手押金)/6(商家余额),  可选
+        "payment": 1(微信)/2(支付宝) 可选,
+        "search_uid": "用户ID搜索" 可选,
+        "date": "YYYY-MM-DD" 可选,
+        "min_amount": 0,       # 最小提现金额（元）可选
+        "max_amount": 999999,  # 最大提现金额（元）可选
+        "dakuan_mode": 1       # 打款方式：1手动打款 2自动打款，可选
+    }
+    认证：JWT
+    返回：{
+        "code": 0,
+        "data": {
+            "list": [提现记录],
+            "total": 总数,
+            "stats": {
+                "total": 总记录数,
+                "awaiting": 待审核数,
+                "processed": 已处理数,
+                "total_amount": "总金额（元）"
+            }
+        }
+    }
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def _safe_request_params(self, request):
+        try:
+            return dict(request.data)
+        except Exception:
+            return {'raw': str(request.data)}
+
+    def _shenhe_jilu_field_available(self):
+        """探测 shenhe_jilu_id 字段是否已在数据库中就绪"""
+        try:
+            Tixianjilu.objects.values_list('shenhe_jilu_id', flat=True).first()
+            return True
+        except DatabaseError as e:
+            kefu_txsh_list_logger.error(
+                'kefu_txsh_list: shenhe_jilu_id 字段不可用，将按旧表结构查询: %s', e,
+                exc_info=True,
+            )
+            return False
+
+    def _list_queryset(self, q, shenhe_field_ok):
+        """字段未迁移时 only 旧字段，避免 SELECT 不存在的列导致 500"""
+        fields = _TIXIAN_LIST_BASE_FIELDS + (
+            _TIXIAN_LIST_AUDIT_FIELDS if shenhe_field_ok else ()
+        )
+        return Tixianjilu.objects.filter(q).only(*fields)
+
+    def _resolve_row_dakuan_mode(self, item, audit_mode_map, shenhe_field_ok):
+        """无关联审核或审核表未标记自动 → 默认手动(1)"""
+        if not shenhe_field_ok:
+            return 1
+        sid = getattr(item, 'shenhe_jilu_id', None)
+        if not sid:
+            return 1
+        if audit_mode_map.get(sid) == 2:
+            return 2
+        return 1
+
+    def post(self, request):
+        dakuan_mode_filter = request.data.get('dakuan_mode')
+        req_params = self._safe_request_params(request)
+        kefu_txsh_list_logger.info('kefu_txsh_list 请求开始 params=%s', req_params)
+
+        try:
+            try:
+                page = int(request.data.get('page', 1))
+                page_size = int(request.data.get('page_size', 20))
+            except (TypeError, ValueError):
+                return Response({'code': 400, 'msg': '分页参数错误'}, status=status.HTTP_400_BAD_REQUEST)
+
+            if page < 1:
+                page = 1
+            if page_size < 1 or page_size > 100:
+                page_size = min(max(page_size, 1), 100)
+
+            status_filter = request.data.get('status')
+            type_filter = request.data.get('type')
+            payment_filter = request.data.get('payment')
+            search_uid = (request.data.get('search_uid') or '').strip()
+            date_filter = (request.data.get('date') or '').strip()
+            min_amount = request.data.get('min_amount')
+            max_amount = request.data.get('max_amount')
+
+            phone = (request.data.get('phone') or '').strip()
+            if not phone:
+                return Response({'code': 401, 'msg': '缺少客服手机号'}, status=status.HTTP_401_UNAUTHORIZED)
+
+            kefu, permissions = verify_kefu_permission(request, phone)
+            if kefu is None:
+                return permissions
+            if '005bb' not in permissions:
+                return Response({'code': 403, 'msg': '您无权查看平台订单列表'})
+
+            q = Q()
+
+            try:
+                status_val = int(status_filter) if status_filter is not None and str(status_filter).strip() != '' else None
+            except (TypeError, ValueError):
+                status_val = None
+
+            try:
+                dakuan_mode_val = int(dakuan_mode_filter) if dakuan_mode_filter is not None and str(dakuan_mode_filter).strip() != '' else None
+            except (TypeError, ValueError):
+                dakuan_mode_val = None
+
+            # 未传打款方式参数 → 默认手动打款(1)
+            effective_dakuan = dakuan_mode_val if dakuan_mode_val in (1, 2) else 1
+
+            if status_val == 1:
+                q &= Q(zhuangtai=1)
+            elif status_val == 2:
+                if effective_dakuan == 2:
+                    q &= Q(zhuangtai__in=[2, 3, 4, 5, 6])
+                else:
+                    q &= Q(zhuangtai__in=[2, 3])
+
+            if type_filter is not None and str(type_filter).strip() != '':
+                try:
+                    type_val = int(type_filter)
+                    if type_val in [1, 2, 3, 4, 5, 6]:
+                        q &= Q(leixing=type_val)
+                except (TypeError, ValueError):
+                    pass
+
+            if payment_filter is not None and str(payment_filter).strip() != '':
+                try:
+                    payment_val = int(payment_filter)
+                    if payment_val in [1, 2]:
+                        q &= Q(fangshi=payment_val)
+                except (TypeError, ValueError):
+                    pass
+
+            if search_uid:
+                q &= Q(yonghuid=search_uid)
+
+            if date_filter:
+                q &= Q(update_time__date=date_filter)
+
+            if min_amount is not None and str(min_amount).strip() != '':
+                try:
+                    q &= Q(jine__gte=float(min_amount))
+                except (TypeError, ValueError):
+                    pass
+            if max_amount is not None and str(max_amount).strip() != '':
+                try:
+                    q &= Q(jine__lte=float(max_amount))
+                except (TypeError, ValueError):
+                    pass
+
+            shenhe_field_ok = self._shenhe_jilu_field_available()
+            if shenhe_field_ok:
+                if effective_dakuan == 2:
+                    q &= Q(shenhe_jilu_id__isnull=False)
+                else:
+                    q &= Q(shenhe_jilu_id__isnull=True)
+            elif effective_dakuan == 2:
+                kefu_txsh_list_logger.warning('kefu_txsh_list: 自动打款筛选不可用，返回空列表')
+                return Response({
+                    'code': 0,
+                    'data': {
+                        'list': [],
+                        'total': 0,
+                        'stats': {'total': 0, 'awaiting': 0, 'processed': 0, 'total_amount': '0.00'},
+                    },
+                })
+
+            processed_statuses = [2, 3, 4, 5, 6] if effective_dakuan == 2 else [2, 3]
+
+            base_qs = self._list_queryset(q, shenhe_field_ok)
+            total_count = base_qs.count()
+            awaiting_count = self._list_queryset(q & Q(zhuangtai=1), shenhe_field_ok).count()
+            processed_count = self._list_queryset(
+                q & Q(zhuangtai__in=processed_statuses), shenhe_field_ok,
+            ).count()
+            agg = base_qs.aggregate(total=Sum('jine'))
+            total_amount = agg.get('total') or 0
+
+            stats = {
+                'total': total_count,
+                'awaiting': awaiting_count,
+                'processed': processed_count,
+                'total_amount': str(round(float(total_amount), 2)),
+            }
+
+            queryset = base_qs.order_by('create_time')
+            total = queryset.count()
+            records = list(queryset[(page - 1) * page_size: page * page_size])
+
+            audit_ids = [
+                getattr(item, 'shenhe_jilu_id', None)
+                for item in records if getattr(item, 'shenhe_jilu_id', None)
+            ]
+            audit_meta_map = {}
+            if audit_ids:
+                try:
+                    from .tixian_shenhe_services import load_audit_meta_map
+                    audit_meta_map = load_audit_meta_map(audit_ids)
+                except Exception as e:
+                    kefu_txsh_list_logger.error(
+                        'kefu_txsh_list: 查询审核表信息失败: %s', e,
+                        exc_info=True,
+                    )
+
+            audit_mode_map = {
+                aid: meta.get('dakuan_mode', 2) for aid, meta in audit_meta_map.items()
+            }
+            list_data = []
+            for item in records:
+                shenhe_jilu_id = getattr(item, 'shenhe_jilu_id', None) if shenhe_field_ok else None
+                shenhe_danhao = (getattr(item, 'shenhe_danhao', None) or '') if shenhe_field_ok else ''
+                if shenhe_jilu_id and not shenhe_danhao:
+                    shenhe_danhao = audit_meta_map.get(shenhe_jilu_id, {}).get('shenhe_danhao', '')
+                list_data.append({
+                    'id': item.id,
+                    'shenhe_jilu_id': shenhe_jilu_id,
+                    'shenhe_danhao': shenhe_danhao,
+                    'yonghuid': item.yonghuid,
+                    'avatar': item.avatar or '',
+                    'phone': item.phone or '',
+                    'nicheng': item.nicheng or '',
+                    'leixing': item.leixing,
+                    'zhifu': item.zhifu or '',
+                    'skzhanghao': item.skzhanghao or '',
+                    'jine': str(item.jine) if item.jine is not None else '0.00',
+                    'zhuangtai': item.zhuangtai,
+                    'fangshi': item.fangshi,
+                    'dakuan_mode': self._resolve_row_dakuan_mode(item, audit_mode_map, shenhe_field_ok),
+                    'shenheid': item.shenheid or '',
+                    'bhliyou': item.bhliyou or '',
+                    'create_time': item.create_time.strftime('%Y-%m-%d %H:%M:%S') if item.create_time else '',
+                    'update_time': item.update_time.strftime('%Y-%m-%d %H:%M:%S') if item.update_time else '',
+                })
+
+            return Response({
+                'code': 0,
+                'data': {
+                    'list': list_data,
+                    'total': total,
+                    'stats': stats,
+                },
+            })
+
+        except DatabaseError as e:
+            kefu_txsh_list_logger.error(
+                'kefu_txsh_list 数据库错误 dakuan_mode=%s params=%s err=%s',
+                dakuan_mode_filter, req_params, e,
+                exc_info=True,
+            )
+            return Response({
+                'code': 500,
+                'msg': '数据库查询失败，请确认已执行 python manage.py migrate yonghu',
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        except Exception as e:
+            kefu_txsh_list_logger.error(
+                'kefu_txsh_list 接口异常 dakuan_mode=%s params=%s err=%s',
+                dakuan_mode_filter, req_params, e,
+                exc_info=True,
+            )
+            return Response({
+                'code': 500,
+                'msg': '获取提现列表失败',
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+import logging
+from decimal import Decimal
+from django.core.exceptions import ObjectDoesNotExist
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+
+from yonghu.models import UserMain, UserKefu, Tixianjilu, UserDashou, UserGuanshi
+
+logger = logging.getLogger(__name__)
+
+class KefuWithdrawDetailView(APIView):
+    """
+    客服获取提现详情接口
+    请求：POST /yonghu/kefu_txsh_detail
+    参数：{
+        "phone": "客服手机号",
+        "tixian_id": "提现记录ID"
+    }
+    认证：JWT
+    返回：code=0 + 提现记录详情 + 用户扩展信息
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        phone = request.data.get('phone', '').strip()
+        tixian_id = request.data.get('tixian_id')
+
+        if not phone or not tixian_id:
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 客服身份验证
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            logger.warning(f"手机号不匹配: {phone}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            logger.warning(f"用户类型非客服: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            logger.warning(f"客服扩展表不存在: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            logger.warning(f"客服账号已禁用: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 查询提现记录
+        try:
+            record = Tixianjilu.objects.get(id=tixian_id)
+        except Tixianjilu.DoesNotExist:
+            return Response({'code': 404, 'msg': '提现记录不存在'}, status=status.HTTP_404_NOT_FOUND)
+
+        # 查询用户主表
+        try:
+            user = UserMain.objects.get(yonghuid=record.yonghuid)
+        except UserMain.DoesNotExist:
+            user = None
+
+        # 构建基础返回数据（字段必须与前端一致）
+        data = {
+            'id': record.id,
+            'yonghuid': record.yonghuid,
+            'avatar': record.avatar or '',
+            'phone': record.phone or '',
+            'nicheng': record.nicheng or '',
+            'leixing': record.leixing,          # 1打手 2管事
+            'zhifu': record.zhifu or '',
+            'skzhanghao': record.skzhanghao or '',
+            'jine': str(record.jine) if record.jine else '0.00',
+            'zhuangtai': record.zhuangtai,
+            'fangshi': record.fangshi,
+            'shenheid': record.shenheid or '',
+            'bhliyou': record.bhliyou or '',
+            'create_time': record.create_time,
+            'update_time': record.update_time,
+        }
+
+        # 根据提现类型添加扩展信息
+        if user:
+            if record.leixing == 1:  # 打手
+                try:
+                    dashou = UserDashou.objects.get(user=user)
+                    # 计算成交率和退款率
+                    total = dashou.jiedanzongliang or 0
+                    completed = dashou.chengjiaozongliang or 0
+                    refund = dashou.tuikuanliang or 0
+                    completion_rate = round((completed / total * 100) if total > 0 else 0)
+                    refund_rate = round((refund / completed * 100) if completed > 0 else 0)
+
+                    data['dashouInfo'] = {
+                        'zhuangtai': dashou.zhuangtai,                     # 工作状态
+                        'zaixianzhuangtai': dashou.zaixianzhuangtai,       # 在线状态
+                        'zhanghaozhuangtai': dashou.zhanghaozhuangtai,     # 账号状态
+                        'yue': float(dashou.yue) if dashou.yue else 0.00,  # 可提现余额
+                        'zonge': float(dashou.zonge) if dashou.zonge else 0.00,  # 接单总额
+                        'jifen': dashou.jifen,                             # 积分
+                        'jiedanzongliang': dashou.jiedanzongliang,         # 接单总量
+                        'chengjiaozongliang': dashou.chengjiaozongliang,   # 成交总量
+                        'tuikuanliang': dashou.tuikuanliang,               # 退款总量
+                        'completionRate': completion_rate,
+                        'refundRate': refund_rate,
+                    }
+                except ObjectDoesNotExist:
+                    data['dashouInfo'] = None
+            elif record.leixing == 2:  # 管事
+                try:
+                    guanshi = UserGuanshi.objects.get(user=user)
+                    data['guanshiInfo'] = {
+                        'zhuangtai': guanshi.zhuangtai,                    # 账号状态
+                        'yue': float(guanshi.yue) if guanshi.yue else 0.00,
+                        'yaogingshuliang': guanshi.yaogingshuliang,        # 邀请打手总数
+                        'jinrichongzhi': guanshi.jinrichongzhi,            # 今日充值
+                        'jinyuechongzhi': guanshi.jinyuechongzhi,          # 今月充值
+                        'chongzhifenrun': float(guanshi.chongzhifenrun) if guanshi.chongzhifenrun else 0.00,
+                    }
+                except ObjectDoesNotExist:
+                    data['guanshiInfo'] = None
+
+        return Response({'code': 0, 'data': data})
+
+import logging
+import json
+from decimal import Decimal
+from django.db import transaction
+from django.utils import timezone
+from django.core.exceptions import ObjectDoesNotExist
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+
+from yonghu.models import UserMain, UserKefu, Tixianjilu, UserDashou, UserGuanshi
+
+logger = logging.getLogger(__name__)
+
+class KefuWithdrawActionView(APIView):
+    """
+    客服处理提现接口（同意/拒绝）—— 仅此接口处理后台审核打款
+    POST /yonghu/kefu_txsh_action
+
+    单条：{ phone, action, tixian_id, yonghuid, leixing, reason? }
+    批量：{ phone, action, batch_list: [{tixian_id, yonghuid, leixing}, ...], reason? }
+
+    自动打款(dakuan_mode=2)：同意→6待收款；拒绝→5+驳回原因+退还可到账金额(shijidaozhang)，手续费不退，不更新平台收支/每日统计
+    手动打款(dakuan_mode=1)：原逻辑不变
+    状态要求：Tixianjilu.zhuangtai=1 且 TixianShenheJilu.zhuangtai=1（审核中），其他状态一律拒绝
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def _verify_kefu(self, request, phone):
+        if not phone:
+            return None, Response({'code': 401, 'msg': '手机号不能为空'}, status=status.HTTP_400_BAD_REQUEST)
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            return None, Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+        if current_user.user_type != 'kefu':
+            return None, Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            return None, Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+        if kefu.zhuangtai != 1:
+            return None, Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+        return current_user, None
+
+    def _parse_items(self, request):
+        """解析单条或 batch_list，返回 [{tixian_id, yonghuid, leixing}]"""
+        batch_list = request.data.get('batch_list')
+        if batch_list is not None:
+            if not isinstance(batch_list, list) or len(batch_list) == 0:
+                return None, Response({'code': 400, 'msg': 'batch_list 不能为空'}, status=status.HTTP_400_BAD_REQUEST)
+            items = []
+            for idx, row in enumerate(batch_list):
+                if not isinstance(row, dict):
+                    return None, Response({'code': 400, 'msg': f'batch_list[{idx}] 格式错误'}, status=status.HTTP_400_BAD_REQUEST)
+                tid = row.get('tixian_id')
+                yid = (row.get('yonghuid') or '').strip()
+                lx = row.get('leixing')
+                if not tid or not yid or lx is None:
+                    return None, Response(
+                        {'code': 400, 'msg': f'batch_list[{idx}] 缺少 tixian_id / yonghuid / leixing'},
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+                try:
+                    items.append({
+                        'tixian_id': int(tid),
+                        'yonghuid': yid,
+                        'leixing': int(lx),
+                    })
+                except (TypeError, ValueError):
+                    return None, Response({'code': 400, 'msg': f'batch_list[{idx}] 参数格式错误'}, status=status.HTTP_400_BAD_REQUEST)
+            return items, None
+
+        tixian_id = request.data.get('tixian_id')
+        if not tixian_id:
+            return None, Response({'code': 400, 'msg': '提现记录ID不能为空'}, status=status.HTTP_400_BAD_REQUEST)
+        yonghuid = (request.data.get('yonghuid') or '').strip()
+        leixing = request.data.get('leixing')
+        try:
+            item = {'tixian_id': int(tixian_id), 'yonghuid': yonghuid, 'leixing': int(leixing) if leixing is not None else None}
+        except (TypeError, ValueError):
+            return None, Response({'code': 400, 'msg': '参数格式错误'}, status=status.HTTP_400_BAD_REQUEST)
+        return [item], None
+
+    def _process_auto_item(self, item, action, reason, kefu_user):
+        """自动打款单条处理（须在 transaction.atomic 内调用）"""
+        from .models import TixianShenheJilu
+        from .tixian_shenhe_services import refund_balance, sync_audit_and_jilu_status
+
+        tixian_id = item['tixian_id']
+        req_yonghuid = item['yonghuid']
+        req_leixing = item['leixing']
+
+        if req_leixing not in [1, 2, 3, 4, 5, 6]:
+            raise ValueError(f'提现记录{tixian_id}：提现类型无效')
+
+        try:
+            tixian = Tixianjilu.objects.select_for_update().get(id=tixian_id)
+        except Tixianjilu.DoesNotExist:
+            raise ValueError(f'提现记录{tixian_id}不存在')
+
+        if tixian.yonghuid != req_yonghuid:
+            raise ValueError(f'提现记录{tixian_id}：用户ID不匹配')
+        if tixian.leixing != req_leixing:
+            raise ValueError(f'提现记录{tixian_id}：提现类型不匹配')
+        if tixian.zhuangtai != 1:
+            raise ValueError(f'提现记录{tixian_id}：非审核中状态，无法处理')
+        if not tixian.shenhe_jilu_id:
+            raise ValueError(f'提现记录{tixian_id}：非自动打款审核记录')
+
+        try:
+            audit = TixianShenheJilu.objects.select_for_update().get(id=tixian.shenhe_jilu_id)
+        except TixianShenheJilu.DoesNotExist:
+            raise ValueError(f'提现记录{tixian_id}：审核记录不存在')
+
+        if audit.yonghuid != req_yonghuid:
+            raise ValueError(f'提现记录{tixian_id}：审核记录用户ID不匹配')
+        if audit.leixing != req_leixing:
+            raise ValueError(f'提现记录{tixian_id}：审核记录提现类型不匹配')
+        if audit.zhuangtai != 1:
+            raise ValueError(f'提现记录{tixian_id}：审核记录非审核中状态')
+
+        try:
+            user = UserMain.objects.select_for_update().get(yonghuid=req_yonghuid)
+        except UserMain.DoesNotExist:
+            raise ValueError(f'用户{req_yonghuid}不存在')
+
+        if action == 1:
+            sync_audit_and_jilu_status(audit, 6, shenhe_ren_id=kefu_user.yonghuid)
+            tixian.shenheid = kefu_user.yonghuid
+            tixian.save(update_fields=['shenheid', 'update_time'])
+        else:
+            sync_audit_and_jilu_status(
+                audit, 5,
+                bhliyou=reason,
+                bo_hui_ren_id=kefu_user.yonghuid,
+            )
+            # 退还可到账金额，申请时扣的 shenqing_jine 中的手续费(shouxufei)不退
+            refund_balance(user, audit.leixing, audit.shijidaozhang)
+            tixian.shenheid = kefu_user.yonghuid
+            tixian.bhliyou = reason
+            tixian.save(update_fields=['shenheid', 'bhliyou', 'update_time'])
+
+    def _process_manual_item(self, item, action, reason, phone):
+        """手动打款单条处理（原逻辑，须在 transaction.atomic 内调用）"""
+        tixian_id = item['tixian_id']
+        try:
+            tixian = Tixianjilu.objects.select_for_update().get(id=tixian_id)
+        except Tixianjilu.DoesNotExist:
+            raise ValueError(f'提现记录{tixian_id}不存在')
+
+        req_yonghuid = item.get('yonghuid')
+        req_leixing = item.get('leixing')
+        if req_yonghuid and tixian.yonghuid != req_yonghuid:
+            raise ValueError(f'提现记录{tixian_id}：用户ID不匹配')
+        if req_leixing is not None and tixian.leixing != req_leixing:
+            raise ValueError(f'提现记录{tixian_id}：提现类型不匹配')
+        if tixian.zhuangtai != 1:
+            raise ValueError(f'提现记录{tixian_id}：非审核中状态，无法处理')
+
+        if getattr(tixian, 'shenhe_jilu_id', None):
+            raise ValueError(f'提现记录{tixian_id}：自动打款请走自动流程')
+
+        try:
+            user = UserMain.objects.get(yonghuid=tixian.yonghuid)
+        except UserMain.DoesNotExist:
+            raise ValueError(f'用户{tixian.yonghuid}不存在')
+
+        if action == 1:
+            tixian.zhuangtai = 2
+            try:
+                from dingdan.utils import update_daily_payout
+                update_daily_payout(tixian.jine)
+                from peizhi.models import Szjilu
+                szjilu, _ = Szjilu.objects.get_or_create(id=1)
+                szjilu.zongsy -= tixian.jine
+                szjilu.zongzc += tixian.jine
+                szjilu.jrzc += tixian.jine
+                szjilu.update_time = timezone.now()
+                szjilu.save()
+            except Exception as e:
+                logger.error(f'更新收支记录失败: {e}')
+        else:
+            from .tixian_shenhe_services import refund_balance
+            try:
+                refund_balance(user, tixian.leixing, tixian.jine)
+            except ValueError as e:
+                raise ValueError(str(e))
+            tixian.zhuangtai = 3
+            tixian.bhliyou = reason
+
+        tixian.shenheid = phone
+        tixian.update_time = timezone.now()
+        tixian.save()
+
+    def post(self, request):
+        logger.info(f'接收到提现处理请求，数据: {request.data}')
+
+        phone = request.data.get('phone', '').strip()
+        action_raw = request.data.get('action')
+        reason = request.data.get('reason', '').strip()
+
+        try:
+            action = int(action_raw)
+        except (TypeError, ValueError):
+            return Response({'code': 400, 'msg': 'action 参数必须为数字'}, status=status.HTTP_400_BAD_REQUEST)
+        if action not in [1, 2]:
+            return Response({'code': 400, 'msg': 'action 必须为1(同意)或2(拒绝)'}, status=status.HTTP_400_BAD_REQUEST)
+        if action == 2 and not reason:
+            return Response({'code': 400, 'msg': '拒绝提现时理由不能为空'}, status=status.HTTP_400_BAD_REQUEST)
+
+        kefu_user, err_resp = self._verify_kefu(request, phone)
+        if err_resp:
+            return err_resp
+
+        items, err_resp = self._parse_items(request)
+        if err_resp:
+            return err_resp
+
+        is_batch = isinstance(request.data.get('batch_list'), list) and len(request.data.get('batch_list')) > 0
+
+        try:
+            with transaction.atomic():
+                for item in items:
+                    tixian_id = item['tixian_id']
+                    try:
+                        tixian_probe = Tixianjilu.objects.select_for_update().get(id=tixian_id)
+                    except Tixianjilu.DoesNotExist:
+                        raise ValueError(f'提现记录{tixian_id}不存在')
+
+                    # 有关联审核记录(shenhe_jilu_id)即为 zddksh 自动打款，不依赖 dakuan_mode 字段
+                    is_auto = bool(getattr(tixian_probe, 'shenhe_jilu_id', None))
+
+                    if is_auto:
+                        self._process_auto_item(item, action, reason, kefu_user)
+                    else:
+                        if is_batch:
+                            raise ValueError(f'提现记录{tixian_id}：批量操作仅支持自动打款记录')
+                        self._process_manual_item(item, action, reason, phone)
+
+        except ValueError as e:
+            return Response({'code': 400, 'msg': str(e)}, status=status.HTTP_400_BAD_REQUEST)
+        except Exception as e:
+            logger.error(f'处理提现事务失败: {e}', exc_info=True)
+            return Response({'code': 500, 'msg': f'处理失败: {str(e)}'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        msg = '批量处理成功' if is_batch and len(items) > 1 else '处理成功'
+        return Response({'code': 0, 'msg': msg, 'data': {'count': len(items)}})
+
+
+
+
+
+class KefuPunishView(APIView):
+    """
+    客服处罚打手接口
+    请求：POST /yonghu/kefuchufa
+    参数：{
+        "phone": "客服手机号",
+        "dingdan_id": "订单ID",
+        "reason": "处罚原因（可选）"
+    }
+    认证：JWT
+    返回：code=0 成功
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 获取参数
+        phone = request.data.get('phone', '').strip()
+        dingdan_id = request.data.get('dingdan_id', '').strip()
+        reason = request.data.get('reason', '').strip()
+
+        if not phone or not dingdan_id:
+            return Response({'code': 401, 'msg': '参数不完整'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 2. 客服身份验证
+        current_user = request.user
+        if getattr(current_user, 'phone', '') != phone:
+            logger.warning(f"手机号不匹配: {phone}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'kefu':
+            logger.warning(f"用户类型非客服: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            kefu = current_user.kefu_profile
+        except ObjectDoesNotExist:
+            logger.warning(f"客服扩展表不存在: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if kefu.zhuangtai != 1:
+            logger.warning(f"客服账号已禁用: {current_user.yonghuid}")
+            return Response({'code': 401, 'msg': '认证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 查询订单
+        try:
+            order = Dingdan.objects.get(dingdan_id=dingdan_id)
+        except Dingdan.DoesNotExist:
+            return Response({'code': 404, 'msg': '订单不存在'}, status=status.HTTP_404_NOT_FOUND)
+
+        # 4. 获取打手ID
+        dashou_id = order.jiedan_dashou_id
+        if not dashou_id:
+            return Response({'code': 400, 'msg': '订单未接单，无法处罚打手'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 5. 查询打手
+        try:
+            dashou_user = UserMain.objects.get(yonghuid=dashou_id)
+            dashou = dashou_user.dashou_profile
+        except UserMain.DoesNotExist:
+            return Response({'code': 404, 'msg': '打手用户不存在'}, status=status.HTTP_404_NOT_FOUND)
+        except ObjectDoesNotExist:
+            return Response({'code': 400, 'msg': '该用户不是打手'}, status=status.HTTP_400_BAD_REQUEST)
+        # 🔴 新增：检查该订单是否已经存在处罚记录
+        if Chufajilu.objects.filter(dingdan_id=dingdan_id).exists():
+            logger.warning(f"订单 {dingdan_id} 已有处罚记录，禁止再次处罚")
+            return Response({'code': 400, 'msg': '该订单已被处罚过，不能重复处罚'},
+                            status=status.HTTP_400_BAD_REQUEST)
+
+        # 6. 使用事务
+        with transaction.atomic():
+            # 创建处罚记录（积分扣除5分）
+            jifen = 5
+            chufa = Chufajilu.objects.create(
+                dashouid=dashou_id,
+                qingqiuid=phone,           # 客服手机号作为请求人
+                cfliyou=reason or '',
+                sqzhuangtai=0,              # 待处理
+                jifen=jifen,
+                dingdan_id=dingdan_id,
+            )
+
+            # 扣除打手积分
+            if dashou.jifen >= jifen:
+                dashou.jifen -= jifen
+            else:
+                dashou.jifen = 0
+            dashou.save()
+
+            # 可选：更新订单的 clkf 字段记录处理客服
+            order.clkf = phone
+            order.save()
+
+        return Response({'code': 0, 'msg': '处罚成功'})
+
+
+from django.db import transaction
+from django.contrib.auth.hashers import make_password
+
+class AdKftjView(APIView):
+    """
+    添加客服接口
+    权限：管理员JWT
+    请求：POST /yonghu/adkftj
+    参数：{
+        "zhanghao": "管理员账号",
+        "phone": "客服手机号（必填）",
+        "password": "密码（必填）",
+        "erjimima": "二级密码（必填）",
+        "nicheng": "昵称（可选）"
+    }
+    返回：code=0
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 参数
+        zhanghao = request.data.get('zhanghao', '').strip()
+        phone = request.data.get('phone', '').strip()
+        password = request.data.get('password', '').strip()
+        erjimima = request.data.get('erjimima', '').strip()
+        nicheng = request.data.get('nicheng', '').strip()
+
+        if not all([zhanghao, phone, password, erjimima]):
+            return Response({'code': 400, 'message': '手机号、密码、二级密码不能为空'})
+
+        # 2. 管理员验证（同前）
+        current_user = request.user
+        if current_user.phone != zhanghao or current_user.user_type != 'admin':
+            return Response({'code': 401, 'message': '身份验证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+        try:
+            admin_profile = current_user.admin_profile
+        except:
+            return Response({'code': 401, 'message': '身份验证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 检查手机号是否已被使用
+        #if UserMain.objects.filter(phone=phone).exists():
+            #return Response({'code': 400, 'message': '该手机号已被注册'})
+
+        # 4. 生成唯一 yonghuid
+        def generate_yonghuid():
+            import random, time
+            for _ in range(10):
+                timestamp = str(int(time.time()))[-5:]
+                rand = str(random.randint(0, 99)).zfill(2)
+                uid = timestamp + rand
+                if len(uid) == 7 and not UserMain.objects.filter(yonghuid=uid).exists():
+                    return uid
+            raise Exception('无法生成唯一用户ID')
+
+        with transaction.atomic():
+            # 创建主表用户
+            user = UserMain.objects.create(
+                yonghuid=generate_yonghuid(),
+                phone=phone,
+                password=password,
+                user_type='kefu',
+                openid=f'kefu_{phone}'  # 临时openid
+            )
+            # 创建客服扩展表
+            kefu = UserKefu.objects.create(
+                user=user,
+                nicheng=nicheng or f'客服{user.yonghuid}',
+                erjimima=erjimima,  # 建议实际项目中加密存储
+                zhuangtai=1,
+                jinrichuli=0,
+                jinyuechuli=0,
+                zongchuli=0
+            )
+
+        return Response({'code': 0, 'message': '添加成功'})
+
+
+
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import JSONParser
+from django.db.models import Q
+import logging
+
+from yonghu.models import UserMain, UserKefu, AdminProfile
+
+logger = logging.getLogger(__name__)
+
+class AdKfglView(APIView):
+    """
+    客服管理列表接口
+    权限：管理员JWT
+    请求：POST /yonghu/adkfgl
+    参数：{
+        "zhanghao": "管理员账号",
+        "keyword": "搜索关键词（可选，匹配客服ID或昵称）"
+    }
+    返回：{
+        "code": 0,
+        "data": {
+            "list": [客服对象...]
+        }
+    }
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        # 1. 参数获取
+        zhanghao = request.data.get('zhanghao', '').strip()
+        keyword = request.data.get('keyword', '').strip()
+
+        if not zhanghao:
+            return Response({'code': 400, 'message': '参数不完整'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 2. 管理员身份验证
+        current_user = request.user
+        if not hasattr(current_user, 'phone') or str(current_user.phone) != zhanghao:
+            return Response({'code': 401, 'message': '身份验证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        if current_user.user_type != 'admin':
+            return Response({'code': 401, 'message': '身份验证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        try:
+            admin_profile = current_user.admin_profile
+        except AttributeError:
+            return Response({'code': 401, 'message': '身份验证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 3. 查询所有客服（通过扩展表关联主表）
+        queryset = UserKefu.objects.select_related('user').all()
+
+        if keyword:
+            queryset = queryset.filter(
+                #Q(user__yonghuid__icontains=keyword) |
+                Q(nicheng__icontains=keyword) |
+                Q(user__phone__icontains=keyword)
+            )
+
+        # 4. 构建返回数据
+        kefu_list = []
+        for kefu in queryset:
+            user = kefu.user
+            kefu_list.append({
+                'yonghuid': user.phone,
+                'phone': user.phone or '',
+                'nicheng': kefu.nicheng or '',
+                'zhuangtai': kefu.zhuangtai,
+                'jinrichuli': kefu.jinrichuli,
+                'jinyuechuli': kefu.jinyuechuli,
+                'zongchuli': kefu.zongchuli,
+            })
+
+        return Response({
+            'code': 0,
+            'data': {'list': kefu_list}
+        })
+
+
+
+
+
+class AdKfxgView(APIView):
+    """
+    修改客服信息接口
+    权限：管理员JWT
+    请求：POST /yonghu/adkfxg
+    参数：{
+        "zhanghao": "管理员账号",
+        "uid": "客服ID (yonghuid)",
+        "nicheng": "新昵称（可选）",
+        "phone": "新手机号（可选）",
+        "password": "新密码（可选）",
+        "erjimima": "新二级密码（可选）",
+        "zhuangtai": 0/1（可选）
+    }
+    返回：code=0
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser]
+
+    def post(self, request):
+        zhanghao = request.data.get('zhanghao', '').strip()
+        uid = request.data.get('uid', '').strip()
+
+        if not zhanghao or not uid:
+            return Response({'code': 400, 'message': '参数不完整'})
+
+        # 管理员验证
+        current_user = request.user
+        if current_user.phone != zhanghao or current_user.user_type != 'admin':
+            return Response({'code': 401, 'message': '身份验证失败'})
+        try:
+            admin_profile = current_user.admin_profile
+        except:
+            return Response({'code': 401, 'message': '身份验证失败'})
+
+        # 查询客服
+        try:
+            user = UserMain.objects.get(phone=uid, user_type='kefu')
+            kefu = user.kefu_profile
+        except (UserMain.DoesNotExist, UserKefu.DoesNotExist):
+            return Response({'code': 404, 'message': '客服不存在'})
+
+        # 更新数据
+        with transaction.atomic():
+            # 更新主表字段
+            if 'phone' in request.data:
+                new_phone = request.data.get('phone').strip()
+                if new_phone and UserMain.objects.filter(phone=new_phone).exclude(phone=uid).exists():
+                    return Response({'code': 400, 'message': '手机号已被使用'})
+                user.phone = new_phone
+            if 'password' in request.data:
+                user.password = request.data['password']
+            user.save()
+
+            # 更新扩展表
+            if 'nicheng' in request.data:
+                kefu.nicheng = request.data['nicheng']
+            if 'erjimima' in request.data:
+                kefu.erjimima = request.data['erjimima']
+            if 'zhuangtai' in request.data:
+                kefu.zhuangtai = int(request.data['zhuangtai'])
+            kefu.save()
+
+        return Response({'code': 0, 'message': '修改成功'})
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# views_tixian_v3.py
+
+import decimal
+import json
+import random
+import string
+import time
+from datetime import date
+import logging
+
+import requests
+from django.db import transaction
+from django.conf import settings
+from django.core.cache import cache
+from django.utils import timezone
+from rest_framework.views import APIView
+from rest_framework import permissions, status
+from rest_framework.response import Response
+
+
+from houtai.utils import TixianRiTongji
+
+from houtai.utils import update_tixian_daily_stat,decrease_tixian_daily_stat  # 引入公共方法
+
+logger = logging.getLogger(__name__)
+
+def generate_tixian_id():
+    """生成唯一提现订单号：TX + 时间戳(13位) + 4位随机数"""
+    timestamp = str(int(time.time() * 1000))
+    rand = ''.join(random.choices(string.digits, k=4))
+    return f'TX{timestamp}{rand}'
+
+
+class TixianShenqingV3View(APIView):
+    """
+    自动提现收款接口（新流程第二步）
+    POST /yonghu/tixiansq
+    必须传 shenhe_danhao；审核状态须为 6=待收款；申请时已扣款，本接口不再扣款
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        shenhe_danhao = (request.data.get('shenhe_danhao') or '').strip()
+        tixianjilu_id = request.data.get('tixianjilu_id') or request.data.get('id')
+        if shenhe_danhao or tixianjilu_id:
+            from .tixian_shenhe_views import process_audit_collect
+            return process_audit_collect(request)
+        return Response({
+            'code': 7,
+            'msg': '缺少提现记录或审核单号，请先提交申请并等待审核通过后再收款',
+        })
+
+    '''【已废弃留存】旧版 tixiansq：申请+扣款+打款一步完成；新流程 post() 只走 process_audit_collect，绝不调用本方法
+    def _legacy_direct_withdraw(self, request):
+        """【已废弃】旧版直接扣款+打款，仅作代码留存"""
+        user_main = request.user
+        yonghuid = user_main.yonghuid
+
+        from utils.redis_lock import acquire_lock, release_lock
+
+        lock_key = f"tixian_lock:{yonghuid}"
+        if not acquire_lock(lock_key, timeout=10):
+            return Response({'code': 429, 'msg': '操作频繁，请稍后重试'})
+
+        try:
+            leixing = request.data.get('leixing')
+            jine_str = request.data.get('jine')
+            if leixing is None or jine_str is None:
+                return Response({'code': 1, 'msg': '缺少参数: leixing 或 jine'})
+
+            try:
+                leixing = int(leixing)
+                jine = decimal.Decimal(jine_str)
+            except (ValueError, decimal.InvalidOperation):
+                return Response({'code': 2, 'msg': '参数格式错误'})
+
+            if leixing not in [1, 2, 3, 4]:
+                return Response({'code': 3, 'msg': '提现类型无效'})
+            if jine <= 0.1:
+                return Response({'code': 4, 'msg': '提现金额必须大于0.1'})
+
+            # ========== 3. 获取费率 ==========
+            try:
+                if leixing == 1:
+                    lilu_obj = Lilubiao.objects.get(fadanpingtai='5')
+                elif leixing == 2:
+                    lilu_obj = Lilubiao.objects.get(fadanpingtai='6')
+                elif leixing == 3:
+                    lilu_obj = Lilubiao.objects.get(fadanpingtai='8')
+                elif leixing == 4:  # 🆕 考核官费率（fadanpingtai='9'）
+                    lilu_obj = Lilubiao.objects.get(fadanpingtai='9')
+                else:
+                    return Response({'code': 5, 'msg': '未知提现类型'})
+                feilv = decimal.Decimal(str(lilu_obj.lilu))
+            except Lilubiao.DoesNotExist:
+                return Response({'code': 5, 'msg': '费率未配置'})
+
+            shouxufei = (jine * feilv).quantize(decimal.Decimal('0.01'))
+            shijidaozhang = (jine - shouxufei).quantize(decimal.Decimal('0.01'))
+            if shijidaozhang <= 0:
+                return Response({'code': 6, 'msg': '提现金额过低，扣除手续费后无实际到账'})
+
+            # ========== 4. 幂等性检查：同一用户不能有处理中的提现（状态0） ==========
+            # if TixianAutoRecord.objects.filter(yonghuid=yonghuid, zhuangtai=0).exists():
+            #     return Response({'code': 18, 'msg': '您有正在处理中的提现，请勿重复提交'}, status=status.HTTP_400_BAD_REQUEST)
+
+            # ========== 5. 平台每日总额校验 ==========
+            today = date.today()
+            try:
+                daily_total_obj = TixianRiTongji.objects.get(riqi=today, leixing=leixing)
+                daily_total = daily_total_obj.total_amount
+            except TixianRiTongji.DoesNotExist:
+                daily_total = decimal.Decimal('0')
+            try:
+                total_limit_obj = TixianQuotaDefault.objects.get(leixing=leixing + 3)  # 打手->4, 管事->5, 组长->6, 考核官->7
+                total_limit = total_limit_obj.default_quota
+            except TixianQuotaDefault.DoesNotExist:
+                total_limit = decimal.Decimal('100')
+            if daily_total + shijidaozhang > total_limit:
+                return Response({
+                    'code': 33,
+                    'msg': f'今日该角色提现总额已达上限，请明日再来'
+                })
+
+            # ========== 6. 数据库事务：扣款 + 更新个人当日提现 + 创建记录 ==========
+            try:
+                with transaction.atomic():
+                    if leixing == 1:  # 打手
+                        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+                        if dashou.zhanghaozhuangtai != 1:
+                            return Response({'code': 8, 'msg': '打手账号被封禁'})
+                        if dashou.zhuangtai != 1:
+                            return Response({'code': 9, 'msg': '有订单进行中，请完成后提现'})
+                        if dashou.jifen != 10:
+                            return Response({'code': 10, 'msg': '积分不是10分'})
+                        if dashou.yue < jine:
+                            return Response({'code': 11, 'msg': f'余额不足，当前余额: {dashou.yue}'})
+
+                        # 个人每日限额
+                        if dashou.last_tixian_date != today:
+                            dashou.jinritixian_jine = decimal.Decimal('0.00')
+                            dashou.last_tixian_date = today
+                        quota = dashou.ewai_xiane if (dashou.kaioi_ewai_xiane and dashou.ewai_xiane > 0) \
+                            else TixianQuotaDefault.objects.get(leixing=1).default_quota
+                        if dashou.jinritixian_jine + jine > quota:
+                            return Response({
+                                'code': 12,
+                                'msg': f'今日提现已达个人限额，今日已提{dashou.jinritixian_jine}元，限额{quota}元'
+                            })
+
+                        # 扣款 & 累加个人当日提现
+                        dashou.yue -= jine
+                        dashou.jinritixian_jine += jine
+                        dashou.save()
+                        nicheng = dashou.nicheng or ''
+
+                    elif leixing == 2:  # 管事
+                        guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+                        if guanshi.zhuangtai != 1:
+                            return Response({'code': 14, 'msg': '管事账号被封禁'})
+                        if guanshi.yue < jine:
+                            return Response({'code': 15, 'msg': f'余额不足，当前余额: {guanshi.yue}'})
+
+                        if guanshi.last_tixian_date != today:
+                            guanshi.jinritixian_jine = decimal.Decimal('0.00')
+                            guanshi.last_tixian_date = today
+                        quota = guanshi.ewai_xiane if (guanshi.kaioi_ewai_xiane and guanshi.ewai_xiane > 0) \
+                            else TixianQuotaDefault.objects.get(leixing=2).default_quota
+                        if guanshi.jinritixian_jine + jine > quota:
+                            return Response({
+                                'code': 16,
+                                'msg': f'今日提现已达个人限额，今日已提{guanshi.jinritixian_jine}元，限额{quota}元'
+                            })
+
+                        guanshi.yue -= jine
+                        guanshi.jinritixian_jine += jine
+                        guanshi.save()
+                        nicheng = '管事用户'
+
+                    elif leixing == 3:  # 组长
+                        zuzhang = UserZuzhang.objects.select_for_update().get(user=user_main)
+                        if zuzhang.zhuangtai != 1:
+                            return Response({'code': 30, 'msg': '组长账号被封禁'})
+                        if zuzhang.ketixian_jine < jine:
+                            return Response({'code': 31, 'msg': f'组长可提现金额不足，当前余额: {zuzhang.ketixian_jine}'})
+
+                        # 组长个人每日限额（字段不同）
+                        if zuzhang.last_tixian_time and zuzhang.last_tixian_time.date() != today:
+                            zuzhang.jinri_tixian = decimal.Decimal('0.00')
+                        elif not zuzhang.last_tixian_time:
+                            zuzhang.jinri_tixian = decimal.Decimal('0.00')
+                        try:
+                            default_quota = TixianQuotaDefault.objects.get(leixing=3).default_quota
+                        except TixianQuotaDefault.DoesNotExist:
+                            default_quota = decimal.Decimal('0.00')
+                        quota = zuzhang.ewai_tixian_xiane if (zuzhang.kaioi_ewai_tixian and zuzhang.ewai_tixian_xiane > 0) else default_quota
+                        if zuzhang.jinri_tixian + jine > quota:
+                            return Response({
+                                'code': 32,
+                                'msg': f'今日提现已达个人限额，今日已提{zuzhang.jinri_tixian}元，限额{quota}元'
+                            })
+
+                        zuzhang.ketixian_jine -= jine
+                        zuzhang.jinri_tixian += jine
+                        zuzhang.last_tixian_time = timezone.now()
+                        zuzhang.save()
+                        nicheng = ''
+
+                    elif leixing == 4:  # 🆕 考核官
+                        kaoheguan = UserShenheguan.objects.select_for_update().get(user=user_main)
+                        # 校验1: 账号状态（zhuangtai=1正常）
+                        if kaoheguan.zhuangtai != 1:
+                            return Response({'code': 40, 'msg': '考核官账号已被封禁，无法提现'})
+                        # 校验2: 可提现余额是否足够
+                        if kaoheguan.yue < jine:
+                            return Response({'code': 41, 'msg': f'考核官可提现金额不足，当前余额: {kaoheguan.yue}'})
+
+                        # 考核官没有个人每日限额字段，跳过个人限额检查
+                        # 扣款
+                        kaoheguan.yue -= jine
+                        kaoheguan.save()
+                        nicheng = '考核官'
+
+                    # 生成订单号，创建记录（状态0）
+                    tixian_id = generate_tixian_id()
+                    auto_record = TixianAutoRecord.objects.create(
+                        tixian_id=tixian_id,
+                        yonghuid=yonghuid,
+                        leixing=leixing,
+                        jine=jine,
+                        shouxufei=shouxufei,
+                        shijidaozhang=shijidaozhang,
+                        feilv=feilv,
+                        zhuangtai=0,
+                    )
+
+                # 事务结束，余额已扣，个人当日提现已累加，记录已创建
+
+            except TixianQuotaDefault.DoesNotExist:
+                return Response({'code': 17, 'msg': '默认提现限额未配置'})
+            except Exception as e:
+                logger.error(f"提现申请事务异常: {str(e)}", exc_info=True)
+                return Response({'code': 99, 'msg': '提现申请失败，请稍后重试'})
+
+            # ========== 7. 调用微信接口（事务外） ==========
+            try:
+                url = 'https://api.mch.weixin.qq.com/v3/fund-app/mch-transfer/transfer-bills'
+                transfer_scene_id = settings.WECHAT_PAY_V3_CONFIG['TRANSFER_SCENE_ID']
+
+                transfer_scene_report_infos = []
+                if transfer_scene_id == '1005':
+                    if leixing == 1:
+                        role = "打手"
+                        desc = "佣金提现"
+                    elif leixing == 2:
+                        role = "管事"
+                        desc = "分红提现"
+                    elif leixing == 3:
+                        role = "组长"
+                        desc = "分红提现"
+                    elif leixing == 4:  # 🆕 考核官
+                        role = "考核官"
+                        desc = "分佣提现"
+                    else:
+                        role = "用户"
+                        desc = "提现"
+                    transfer_scene_report_infos = [
+                        {"info_type": "岗位类型", "info_content": role},
+                        {"info_type": "报酬说明", "info_content": desc}
+                    ]
+                elif transfer_scene_id == '1009':
+                    transfer_scene_report_infos = [
+                        {"info_type": "采购商品名称", "info_content": "平台服务"}
+                    ]
+
+                body = {
+                    'appid': settings.WECHAT_PAY_V3_CONFIG['APPID'],
+                    'out_bill_no': tixian_id,
+                    'transfer_scene_id': transfer_scene_id,
+                    'openid': user_main.openid,
+                    'transfer_amount': int(shijidaozhang * 100),
+                    'transfer_remark': f'平台提现-{yonghuid}',
+                    'transfer_scene_report_infos': transfer_scene_report_infos,
+                }
+                body_json = json.dumps(body, separators=(',', ':'))
+
+                auth = build_authorization('POST', url, body_json)
+                headers = {
+                    'Authorization': auth,
+                    'Content-Type': 'application/json',
+                    'Accept': 'application/json',
+                    'User-Agent': 'Mozilla/5.0',
+                }
+
+                resp = requests.post(url, data=body_json, headers=headers, timeout=10)
+                wx_result = resp.json()
+
+                if resp.status_code == 200 and wx_result.get('state') == 'WAIT_USER_CONFIRM':
+                    package_info = wx_result.get('package_info')
+                    auto_record.wechat_package = json.dumps(package_info)
+                    auto_record.save(update_fields=['wechat_package'])
+
+                    update_tixian_daily_stat(auto_record.leixing, auto_record.shijidaozhang)
+
+                    return Response({
+                        'code': 0,
+                        'msg': '提现申请成功，请确认收款',
+                        'data': {
+                            'tixian_id': tixian_id,
+                            'package_info': package_info,
+                            'shouxufei': str(shouxufei),
+                            'shijidaozhang': str(shijidaozhang),
+                            'current_rate': str(feilv),
+                            'mch_id': settings.WECHAT_PAY_V3_CONFIG['MCHID'],
+                            'app_id': settings.WECHAT_PAY_V3_CONFIG['APPID'],
+                        }
+                    })
+                else:
+                    err_msg = wx_result.get('message', wx_result.get('code', '微信接口调用失败'))
+                    raise Exception(f'微信转账接口失败: {err_msg} (HTTP {resp.status_code})')
+
+            except Exception as e:
+                # 微信调用失败，回滚操作
+                logger.error(f"微信调用失败: {str(e)}", exc_info=True)
+                with transaction.atomic():
+                    auto_record.zhuangtai = 2
+                    auto_record.fail_reason = str(e)
+                    auto_record.save(update_fields=['zhuangtai', 'fail_reason'])
+
+                    if leixing == 1:
+                        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+                        dashou.yue += jine
+                        dashou.jinritixian_jine -= jine
+                        dashou.save()
+                    elif leixing == 2:
+                        guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+                        guanshi.yue += jine
+                        guanshi.jinritixian_jine -= jine
+                        guanshi.save()
+                    elif leixing == 3:
+                        zuzhang = UserZuzhang.objects.select_for_update().get(user=user_main)
+                        zuzhang.ketixian_jine += jine
+                        zuzhang.jinri_tixian -= jine
+                        zuzhang.save()
+                    elif leixing == 4:  # 🆕 考核官回滚
+                        kaoheguan = UserShenheguan.objects.select_for_update().get(user=user_main)
+                        kaoheguan.yue += jine
+                        kaoheguan.save()
+                return Response({
+                    'code': 99,
+                    'msg': '运营账户资金不足，需等管理员充值后才能提现'
+                })
+
+        finally:
+            release_lock(lock_key)
+    '''
+
+
+
+
+
+
+
+
+
+from utils.wechat_v3 import verify_wechat_sign, decrypt_callback_ciphertext
+
+class TixianCallbackV3View(APIView):
+    """
+    微信转账结果回调接口（最终状态通知）
+    处理微信异步发送的转账成功/失败结果
+    """
+    permission_classes = []  # 无需认证，签名验证保证安全
+
+    def post(self, request):
+        headers = request.headers
+        body = request.body.decode('utf-8')
+
+        # 1. 验证签名
+        if not verify_wechat_sign(headers, body):
+            return Response({'code': 'FAIL', 'message': '签名验证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 解密数据
+        try:
+            data = json.loads(body)
+            resource = data.get('resource')
+            if not resource:
+                return Response({'code': 'FAIL', 'message': 'resource不存在'}, status=status.HTTP_400_BAD_REQUEST)
+
+            associated_data = resource.get('associated_data', '')
+            nonce = resource.get('nonce')
+            ciphertext = resource.get('ciphertext')
+            if not nonce or not ciphertext:
+                return Response({'code': 'FAIL', 'message': '解密字段缺失'}, status=status.HTTP_400_BAD_REQUEST)
+
+            plaintext = decrypt_callback_ciphertext(associated_data, nonce, ciphertext)
+            callback_data = json.loads(plaintext)
+        except Exception as e:
+            logger.error(f"回调解密失败: {str(e)}", exc_info=True)
+            return Response({'code': 'FAIL', 'message': f'解密失败: {str(e)}'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 3. 获取关键信息
+        out_bill_no = callback_data.get('out_bill_no')          # 商户提现单号（即 tixian_id）
+        transfer_status = callback_data.get('transfer_status')  # SUCCESS / FAIL
+        wechat_transfer_no = callback_data.get('transfer_no')   # 微信转账单号
+        fail_reason = callback_data.get('fail_reason', '')
+
+        if not out_bill_no:
+            return Response({'code': 'FAIL', 'message': 'out_bill_no缺失'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 4. 幂等处理：只更新状态为0（处理中）的记录，已最终状态不再处理
+        with transaction.atomic():
+            try:
+                auto_record = TixianAutoRecord.objects.select_for_update().get(tixian_id=out_bill_no)
+            except TixianAutoRecord.DoesNotExist:
+                # 记录不存在，视为已处理，返回成功
+                return Response({'code': 'SUCCESS', 'message': 'ok'})
+
+            # 如果已经是最新状态，直接返回成功（幂等）
+            if auto_record.zhuangtai != 0:
+                return Response({'code': 'SUCCESS', 'message': 'already processed'})
+
+            if transfer_status == 'SUCCESS':
+                from .tixian_shenhe_services import mark_transfer_success
+                mark_transfer_success(
+                    auto_record,
+                    wechat_transfer_no=wechat_transfer_no,
+                    with_accounting=True,
+                )
+
+            else:  # transfer_status == 'FAIL'
+                auto_record.zhuangtai = 2
+                auto_record.fail_reason = fail_reason or '微信转账失败'
+                auto_record.save(update_fields=['zhuangtai', 'fail_reason'])
+
+                if not auto_record.shenhe_danhao:
+                    logger.error('回调失败但打款记录无审核单号 bill=%s', out_bill_no)
+                else:
+                    # 申请时已扣款，回调失败不退余额，恢复待收款(6)可重试
+                    from .models import TixianShenheJilu
+                    from .tixian_shenhe_services import (
+                        release_collect_quota_for_record,
+                        sync_audit_and_jilu_status,
+                    )
+                    try:
+                        audit = TixianShenheJilu.objects.select_for_update().get(
+                            shenhe_danhao=auto_record.shenhe_danhao
+                        )
+                        audit.tixian_auto_id = None
+                        audit.fail_reason = auto_record.fail_reason
+                        sync_audit_and_jilu_status(audit, 6, fail_reason=auto_record.fail_reason)
+                    except TixianShenheJilu.DoesNotExist:
+                        logger.warning(f'回调失败但审核记录不存在: {auto_record.shenhe_danhao}')
+                    release_collect_quota_for_record(auto_record)
+
+        return Response({'code': 'SUCCESS', 'message': 'ok'})
+
+
+
+class TixianQueRenAutoView(APIView):
+    """
+    用户确认提现结果
+    POST /yonghu/tixianqr
+    新审核流程：打款记录带 shenhe_danhao 时，确认成功同步审核表+提现记录表为 2；取消不退款（申请已扣），恢复待收款 6 可重试
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        try:
+            tixian_id = request.data.get('tixian_id')
+            result = request.data.get('result')  # 1成功 0失败/取消
+
+            if not tixian_id or result is None:
+                return Response({'code': 1, 'msg': '缺少参数'}, status=status.HTTP_400_BAD_REQUEST)
+
+            try:
+                result = int(result)
+            except ValueError:
+                return Response({'code': 2, 'msg': '参数格式错误'}, status=status.HTTP_400_BAD_REQUEST)
+
+            if result not in [0, 1]:
+                return Response({'code': 3, 'msg': 'result值无效'}, status=status.HTTP_400_BAD_REQUEST)
+
+            user_main = request.user
+
+            with transaction.atomic():
+                try:
+                    auto_record = TixianAutoRecord.objects.select_for_update().get(
+                        tixian_id=tixian_id,
+                        yonghuid=user_main.yonghuid,
+                    )
+                except TixianAutoRecord.DoesNotExist:
+                    return Response({'code': 4, 'msg': '提现记录不存在'}, status=status.HTTP_404_NOT_FOUND)
+
+                if result == 1:
+                    if auto_record.zhuangtai == 1:
+                        return Response({'code': 0, 'msg': '提现成功', 'data': None})
+
+                    if auto_record.zhuangtai != 0:
+                        return Response({'code': 5, 'msg': '该提现已处理'})
+
+                    from .tixian_shenhe_services import mark_transfer_success
+                    mark_transfer_success(auto_record, with_accounting=True)
+
+                    return Response({'code': 0, 'msg': '提现成功', 'data': None})
+
+                # 用户取消或失败
+                auto_record.zhuangtai = 2
+                auto_record.fail_reason = '用户取消收款'
+                auto_record.save(update_fields=['zhuangtai', 'fail_reason'])
+
+                if not auto_record.shenhe_danhao:
+                    logger.error('确认取消但打款记录无审核单号 bill=%s', tixian_id)
+                    return Response({'code': 5, 'msg': '该提现已处理'})
+
+                # 申请时已扣款，取消不退余额，审核单恢复 6 待收款，可再次点收款
+                from .models import TixianShenheJilu
+                from .tixian_shenhe_services import (
+                    release_collect_quota_for_record,
+                    sync_audit_and_jilu_status,
+                )
+                try:
+                    audit = TixianShenheJilu.objects.select_for_update().get(
+                        shenhe_danhao=auto_record.shenhe_danhao,
+                    )
+                    audit.tixian_auto_id = None
+                    sync_audit_and_jilu_status(
+                        audit, 6,
+                        fail_reason='用户取消收款，可重新发起',
+                    )
+                except TixianShenheJilu.DoesNotExist:
+                    logger.warning(f'确认取消但审核记录不存在: {auto_record.shenhe_danhao}')
+                release_collect_quota_for_record(auto_record)
+
+                return Response({'code': 0, 'msg': '提现已取消', 'data': None})
+
+        except Exception as e:
+            logger.error(f'提现确认异常: {str(e)}', exc_info=True)
+            return Response({'code': 99, 'msg': '系统错误'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+
+
+# views_tixian_v3.py
+import decimal
+import json
+import random
+import string
+import time
+from datetime import date
+
+import requests
+from django.db import transaction
+from django.conf import settings
+from rest_framework.views import APIView
+from rest_framework import permissions, status
+from rest_framework.response import Response
+from peizhi.models import TixianQuotaDefault
+from .models import UserMain, UserDashou, UserGuanshi, Tixianjilu, TixianAutoRecord
+from utils.wechat_v3 import build_authorization
+
+
+'''def generate_tixian_id():
+    """生成唯一提现订单号：TX + 时间戳(13位) + 4位随机数"""
+    timestamp = str(int(time.time() * 1000))
+    rand = ''.join(random.choices(string.digits, k=4))
+    return f'TX{timestamp}{rand}'
+
+class TixianShenqingV3View(APIView):
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        # ---------- 1. 获取用户 ----------
+        user_main = request.user
+        yonghuid = user_main.yonghuid
+
+        # ---------- 2. 参数获取与校验 ----------
+        leixing = request.data.get('leixing')
+        jine_str = request.data.get('jine')
+        if leixing is None or jine_str is None:
+            return Response({'code': 1, 'msg': '缺少参数: leixing 或 jine'}, status=status.HTTP_400_BAD_REQUEST)
+
+        try:
+            leixing = int(leixing)
+            jine = decimal.Decimal(jine_str)
+        except (ValueError, decimal.InvalidOperation):
+            return Response({'code': 2, 'msg': '参数格式错误'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 🔥【修改】支持组长提现类型 3
+        if leixing not in [1, 2, 3]:
+            return Response({'code': 3, 'msg': '提现类型无效'}, status=status.HTTP_400_BAD_REQUEST)
+        if jine <= 0.1:
+            return Response({'code': 4, 'msg': '提现金额必须大于0.1'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # ---------- 3. 获取费率 ----------
+        try:
+            if leixing == 1:
+                lilu_obj = Lilubiao.objects.get(fadanpingtai='5')
+            elif leixing == 2:
+                lilu_obj = Lilubiao.objects.get(fadanpingtai='6')
+            else:  # leixing == 3 组长提现
+                lilu_obj = Lilubiao.objects.get(fadanpingtai='8')
+            feilv = decimal.Decimal(str(lilu_obj.lilu))
+        except Lilubiao.DoesNotExist:
+            return Response({'code': 5, 'msg': '费率未配置'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        shouxufei = (jine * feilv).quantize(decimal.Decimal('0.01'))
+        shijidaozhang = (jine - shouxufei).quantize(decimal.Decimal('0.01'))
+        if shijidaozhang <= 0:
+            return Response({'code': 6, 'msg': '提现金额过低，扣除手续费后无实际到账'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # ---------- 4. 幂等性检查：同一用户不能有处理中的提现（状态0） ----------
+        if TixianAutoRecord.objects.filter(yonghuid=yonghuid, zhuangtai=0).exists():
+            return Response({'code': 18, 'msg': '您有正在处理中的提现，请勿重复提交'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # ---------- 5. 数据库事务：扣款 + 创建记录 ----------
+        try:
+            with transaction.atomic():
+                if leixing == 1:
+                    dashou = UserDashou.objects.select_for_update().get(user=user_main)
+
+                    if dashou.zhanghaozhuangtai != 1:
+                        return Response({'code': 8, 'msg': '打手账号被封禁'}, status=status.HTTP_400_BAD_REQUEST)
+                    if dashou.zhuangtai != 1:
+                        return Response({'code': 9, 'msg': '有订单进行中，请完成后提现'}, status=status.HTTP_400_BAD_REQUEST)
+                    if dashou.jifen != 10:
+                        return Response({'code': 10, 'msg': '积分不足10分'}, status=status.HTTP_400_BAD_REQUEST)
+                    if dashou.yue < jine:
+                        return Response({'code': 11, 'msg': f'余额不足，当前余额: {dashou.yue}'}, status=status.HTTP_400_BAD_REQUEST)
+
+                    today = date.today()
+                    if dashou.last_tixian_date != today:
+                        dashou.jinritixian_jine = decimal.Decimal('0.00')
+                        dashou.last_tixian_date = today
+
+                    quota = dashou.ewai_xiane if dashou.kaioi_ewai_xiane and dashou.ewai_xiane > 0 \
+                        else TixianQuotaDefault.objects.get(leixing=1).default_quota
+
+                    if dashou.jinritixian_jine + jine > quota:
+                        return Response({
+                            'code': 12,
+                            'msg': f'今日提现已达限额，今日已提{dashou.jinritixian_jine}元，限额{quota}元'
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                    dashou.yue -= jine
+                    dashou.save()
+                    nicheng = dashou.nicheng or ''
+
+                elif leixing == 2:
+                    guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+
+                    if guanshi.zhuangtai != 1:
+                        return Response({'code': 14, 'msg': '管事账号被封禁'}, status=status.HTTP_400_BAD_REQUEST)
+                    if guanshi.yue < jine:
+                        return Response({'code': 15, 'msg': f'余额不足，当前余额: {guanshi.yue}'}, status=status.HTTP_400_BAD_REQUEST)
+
+                    today = date.today()
+                    if guanshi.last_tixian_date != today:
+                        guanshi.jinritixian_jine = decimal.Decimal('0.00')
+                        guanshi.last_tixian_date = today
+
+                    quota = guanshi.ewai_xiane if guanshi.kaioi_ewai_xiane and guanshi.ewai_xiane > 0 \
+                        else TixianQuotaDefault.objects.get(leixing=2).default_quota
+
+                    if guanshi.jinritixian_jine + jine > quota:
+                        return Response({
+                            'code': 16,
+                            'msg': f'今日提现已达限额，今日已提{guanshi.jinritixian_jine}元，限额{quota}元'
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                    guanshi.yue -= jine
+                    guanshi.save()
+                    nicheng = '管事用户'
+
+                # 🔥【新增】组长提现分支
+                else:  # leixing == 3
+                    zuzhang = UserZuzhang.objects.select_for_update().get(user=user_main)
+
+                    if zuzhang.zhuangtai != 1:
+                        return Response({'code': 30, 'msg': '组长账号被封禁'}, status=status.HTTP_400_BAD_REQUEST)
+                    if zuzhang.ketixian_jine < jine:
+                        return Response({'code': 31, 'msg': f'组长可提现金额不足，当前余额: {zuzhang.ketixian_jine}'},
+                                        status=status.HTTP_400_BAD_REQUEST)
+
+                    # 组长每日限额（类似打手/管事）
+                    today = date.today()
+                    # last_tixian_time 是 DateTimeField，需要判断日期
+                    if zuzhang.last_tixian_time and zuzhang.last_tixian_time.date() != today:
+                        zuzhang.jinri_tixian = decimal.Decimal('0.00')
+                    elif not zuzhang.last_tixian_time:
+                        zuzhang.jinri_tixian = decimal.Decimal('0.00')
+                    # 获取限额配置
+                    try:
+                        default_quota = TixianQuotaDefault.objects.get(leixing=3).default_quota
+                    except TixianQuotaDefault.DoesNotExist:
+                        default_quota = decimal.Decimal('0.00')
+                    quota = zuzhang.ewai_tixian_xiane if zuzhang.kaioi_ewai_tixian and zuzhang.ewai_tixian_xiane > 0 else default_quota
+
+                    if zuzhang.jinri_tixian + jine > quota:
+                        return Response({
+                            'code': 32,
+                            'msg': f'今日提现已达限额，今日已提{zuzhang.jinri_tixian}元，限额{quota}元'
+                        }, status=status.HTTP_400_BAD_REQUEST)
+
+                    zuzhang.ketixian_jine -= jine
+                    zuzhang.jinri_tixian += jine  # 累加今日提现
+                    zuzhang.last_tixian_time = timezone.now()
+                    zuzhang.save()
+                    nicheng = ''  # 组长暂不显示昵称
+
+                # 生成订单号，创建提现记录（状态0）
+                tixian_id = generate_tixian_id()
+                auto_record = TixianAutoRecord.objects.create(
+                    tixian_id=tixian_id,
+                    yonghuid=yonghuid,
+                    leixing=leixing,
+                    jine=jine,
+                    shouxufei=shouxufei,
+                    shijidaozhang=shijidaozhang,
+                    feilv=feilv,
+                    zhuangtai=0,
+                )
+            # 事务结束，数据库已扣款，记录已创建，状态为0
+
+        except TixianQuotaDefault.DoesNotExist:
+            return Response({'code': 17, 'msg': '默认提现限额未配置'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        except Exception as e:
+            # 数据库操作异常，直接返回错误
+            return Response({'code': 99, 'msg': '提现申请失败，请稍后重试'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+        # ---------- 6. 调用微信接口（事务外） ----------
+        try:
+            url = 'https://api.mch.weixin.qq.com/v3/fund-app/mch-transfer/transfer-bills'
+            transfer_scene_id = settings.WECHAT_PAY_V3_CONFIG['TRANSFER_SCENE_ID']
+
+            transfer_scene_report_infos = []
+            if transfer_scene_id == '1005':
+                # 🔥【修改】根据提现类型设置岗位类型和报酬说明
+                if leixing == 1:
+                    role = "打手"
+                    desc = "佣金提现"
+                elif leixing == 2:
+                    role = "管事"
+                    desc = "分红提现"
+                else:  # leixing == 3
+                    role = "组长"
+                    desc = "分红提现"
+                transfer_scene_report_infos = [
+                    {"info_type": "岗位类型", "info_content": role},
+                    {"info_type": "报酬说明", "info_content": desc}
+                ]
+            elif transfer_scene_id == '1009':
+                transfer_scene_report_infos = [
+                    {"info_type": "采购商品名称", "info_content": "平台服务"}
+                ]
+
+            body = {
+                'appid': settings.WECHAT_PAY_V3_CONFIG['APPID'],
+                'out_bill_no': tixian_id,
+                'transfer_scene_id': transfer_scene_id,
+                'openid': user_main.openid,
+                'transfer_amount': int(shijidaozhang * 100),
+                'transfer_remark': f'平台提现-{yonghuid}',
+                'transfer_scene_report_infos': transfer_scene_report_infos,
+            }
+            body_json = json.dumps(body, separators=(',', ':'))
+
+            auth = build_authorization('POST', url, body_json)
+            headers = {
+                'Authorization': auth,
+                'Content-Type': 'application/json',
+                'Accept': 'application/json',
+                'User-Agent': 'Mozilla/5.0',
+            }
+
+            resp = requests.post(url, data=body_json, headers=headers, timeout=10)
+            wx_result = resp.json()
+
+            if resp.status_code == 200 and wx_result.get('state') == 'WAIT_USER_CONFIRM':
+                package_info = wx_result.get('package_info')
+                auto_record.wechat_package = json.dumps(package_info)
+                auto_record.save(update_fields=['wechat_package'])
+                return Response({
+                    'code': 0,
+                    'msg': '提现申请成功，请确认收款',
+                    'data': {
+                        'tixian_id': tixian_id,
+                        'package_info': package_info,
+                        'shouxufei': str(shouxufei),
+                        'shijidaozhang': str(shijidaozhang),
+                        'current_rate': str(feilv),
+                        'mch_id': settings.WECHAT_PAY_V3_CONFIG['MCHID'],
+                    }
+                })
+            else:
+                err_msg = wx_result.get('message', wx_result.get('code', '微信接口调用失败'))
+                raise Exception(f'微信转账接口失败: {err_msg} (HTTP {resp.status_code})')
+
+        except Exception as e:
+            # 微信调用异常，回滚操作
+            with transaction.atomic():
+                auto_record.zhuangtai = 2
+                auto_record.fail_reason = str(e)
+                auto_record.save(update_fields=['zhuangtai', 'fail_reason'])
+
+                if leixing == 1:
+                    dashou = UserDashou.objects.select_for_update().get(user=user_main)
+                    dashou.yue += jine
+                    dashou.save()
+                elif leixing == 2:
+                    guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+                    guanshi.yue += jine
+                    guanshi.save()
+                else:  # leixing == 3
+                    zuzhang = UserZuzhang.objects.select_for_update().get(user=user_main)
+                    zuzhang.ketixian_jine += jine
+                    # 注意：今日提现累加已在事务内扣减时增加，回滚时需同时恢复今日提现金额
+                    zuzhang.jinri_tixian -= jine
+                    zuzhang.save()
+
+            return Response({
+                'code': 99,
+                'msg': '今日账户资金不足请明日再来'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+
+
+
+
+class TixianQueRenAutoView(APIView):
+    """
+    用户确认提现结果通知接口
+    POST /yonghu/tixianqr
+    新流程须传 shenhe_danhao；成功后将审核/提现记录置为 2，禁止重复打款
+    """
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        shenhe_danhao = (request.data.get('shenhe_danhao') or '').strip()
+        if shenhe_danhao:
+            from .tixian_shenhe_views import process_audit_confirm
+            return process_audit_confirm(request)
+
+        try:
+            tixian_id = request.data.get('tixian_id')
+            result = request.data.get('result')  # 1成功 0失败/取消
+
+            if not tixian_id or result is None:
+                return Response({'code': 1, 'msg': '缺少参数'}, status=status.HTTP_400_BAD_REQUEST)
+
+            try:
+                result = int(result)
+            except ValueError:
+                return Response({'code': 2, 'msg': '参数格式错误'}, status=status.HTTP_400_BAD_REQUEST)
+
+            if result not in [0, 1]:
+                return Response({'code': 3, 'msg': 'result值无效'}, status=status.HTTP_400_BAD_REQUEST)
+
+            user_main = request.user
+
+            with transaction.atomic():
+                # 获取自动提现记录，并加锁
+                try:
+                    auto_record = TixianAutoRecord.objects.select_for_update().get(
+                        tixian_id=tixian_id,
+                        yonghuid=user_main.yonghuid
+                    )
+                except TixianAutoRecord.DoesNotExist:
+                    return Response({'code': 4, 'msg': '提现记录不存在'}, status=status.HTTP_404_NOT_FOUND)
+
+                # 检查记录状态，只有处理中(0)才能更新
+                if auto_record.zhuangtai != 0:
+                    return Response({'code': 5, 'msg': '该提现已处理'}, status=status.HTTP_400_BAD_REQUEST)
+
+                if result == 1:
+                    # 用户确认成功
+                    # 1. 更新自动提现记录状态为成功
+                    auto_record.zhuangtai = 1
+                    auto_record.save()
+
+                    # 2. 在旧表 tixianjilu 中插入一条记录，供用户查看
+                    # 获取用户信息
+                    avatar = user_main.avatar or ''
+                    phone = user_main.phone or ''
+                    if auto_record.leixing == 1:
+                        try:
+                            dashou = UserDashou.objects.get(user=user_main)
+                            nicheng = dashou.nicheng or ''
+                        except UserDashou.DoesNotExist:
+                            nicheng = ''
+                    else:
+                        nicheng = '管事用户'
+
+                    # 旧表字段：注意旧表 jine 存的是实际到账金额（shijidaozhang）
+                    Tixianjilu.objects.create(
+                        yonghuid=user_main.yonghuid,
+                        avatar=avatar,
+                        phone=phone,
+                        nicheng=nicheng,
+                        leixing=auto_record.leixing,
+                        zhifu='',  # 自动提现无收款码
+                        skzhanghao='',
+                        jine=auto_record.shijidaozhang,  # 实际到账金额
+                        zhuangtai=2,  # 成功状态 2（根据旧表：1审核中，2成功，3失败）
+                        fangshi=1,  # 默认微信？但实际自动打款，可以固定为1
+                        shenheid=None,
+                        bhliyou=''
+                    )
+
+                    # 3. 更新扩展表中的今日提现金额
+                    today = date.today()
+                    if auto_record.leixing == 1:
+                        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+                        if dashou.last_tixian_date != today:
+                            dashou.jinritixian_jine = decimal.Decimal('0.00')
+                            dashou.last_tixian_date = today
+                        dashou.jinritixian_jine += auto_record.jine  # 注意累加的是申请金额还是实际到账？通常累加申请金额
+                        dashou.save()
+                    else:
+                        guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+                        if guanshi.last_tixian_date != today:
+                            guanshi.jinritixian_jine = decimal.Decimal('0.00')
+                            guanshi.last_tixian_date = today
+                        guanshi.jinritixian_jine += auto_record.jine
+                        guanshi.save()
+
+
+
+                    try:
+
+                        from dingdan.utils import update_daily_payout
+                        update_daily_payout(auto_record.shijidaozhang)
+
+
+                        szjilu = Szjilu.objects.select_for_update().get(id=1)
+                        szjilu.zongsy -= auto_record.shijidaozhang
+                        szjilu.zongzc += auto_record.shijidaozhang
+                        szjilu.jrzc += auto_record.shijidaozhang
+                        szjilu.save()
+                    except Szjilu.DoesNotExist:
+                        from dingdan.utils import update_daily_payout
+                        update_daily_payout(auto_record.shijidaozhang)
+
+
+                        Szjilu.objects.create(
+                            id=1,
+                            zongsy=-auto_record.shijidaozhang,
+                            zongzc=auto_record.shijidaozhang,
+                            jrzc=auto_record.shijidaozhang
+                        )
+                    except Exception as e:
+                        logger.error(f"更新收支记录失败: {str(e)}")
+                        raise
+
+
+
+                    # 返回成功
+                    return Response({
+                        'code': 0,
+                        'msg': '提现成功',
+                        'data': {
+                            'new_yongjin': str(dashou.yue) if auto_record.leixing == 1 else None,
+                            'new_fenyong': str(guanshi.yue) if auto_record.leixing == 2 else None,
+                        }
+                    })
+
+                else:
+                    # 用户取消或失败
+                    # 1. 将自动提现记录状态置为失败
+                    auto_record.zhuangtai = 2
+                    auto_record.fail_reason = '用户取消确认'
+                    auto_record.save()
+
+                    # 2. 恢复之前扣除的余额
+                    if auto_record.leixing == 1:
+                        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+                        dashou.yue += auto_record.jine
+                        dashou.save()
+                    else:
+                        guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+                        guanshi.yue += auto_record.jine
+                        guanshi.save()
+
+                    return Response({
+                        'code': 0,
+                        'msg': '提现已取消',
+                        'data': None
+                    })
+
+        except Exception as e:
+            return Response({
+                'code': 99,
+                'msg': f'系统错误: {str(e)}',
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+
+
+
+
+
+
+from utils.wechat_v3 import verify_wechat_sign, decrypt_callback_ciphertext
+
+
+
+class TixianCallbackV3View(APIView):
+    """
+    微信转账结果回调接口（最终状态通知）
+    处理微信异步发送的转账成功/失败结果
+    """
+    permission_classes = []  # 无需认证，签名验证保证安全
+
+    def post(self, request):
+        headers = request.headers
+        body = request.body.decode('utf-8')
+
+        # 1. 验证签名
+        if not verify_wechat_sign(headers, body):
+            return Response({'code': 'FAIL', 'message': '签名验证失败'}, status=status.HTTP_401_UNAUTHORIZED)
+
+        # 2. 解密数据
+        try:
+            data = json.loads(body)
+            resource = data.get('resource')
+            if not resource:
+                return Response({'code': 'FAIL', 'message': 'resource不存在'}, status=status.HTTP_400_BAD_REQUEST)
+
+            associated_data = resource.get('associated_data', '')
+            nonce = resource.get('nonce')
+            ciphertext = resource.get('ciphertext')
+            if not nonce or not ciphertext:
+                return Response({'code': 'FAIL', 'message': '解密字段缺失'}, status=status.HTTP_400_BAD_REQUEST)
+
+            plaintext = decrypt_callback_ciphertext(associated_data, nonce, ciphertext)
+            callback_data = json.loads(plaintext)
+        except Exception as e:
+            return Response({'code': 'FAIL', 'message': f'解密失败: {str(e)}'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 3. 获取关键信息
+        out_bill_no = callback_data.get('out_bill_no')          # 商户提现单号（即 tixian_id）
+        transfer_status = callback_data.get('transfer_status')  # SUCCESS / FAIL
+        wechat_transfer_no = callback_data.get('transfer_no')   # 微信转账单号
+        fail_reason = callback_data.get('fail_reason', '')      # 失败原因
+
+        if not out_bill_no:
+            return Response({'code': 'FAIL', 'message': 'out_bill_no缺失'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # 4. 幂等处理：只更新状态为 0（处理中）的记录，已最终状态不再处理
+        with transaction.atomic():
+            try:
+                auto_record = TixianAutoRecord.objects.select_for_update().get(tixian_id=out_bill_no)
+            except TixianAutoRecord.DoesNotExist:
+                return Response({'code': 'SUCCESS', 'message': 'ok'})  # 记录不存在，视为已处理
+
+            # 如果已经是最新状态，直接返回成功（幂等）
+            if auto_record.zhuangtai in [1, 2]:
+                return Response({'code': 'SUCCESS', 'message': 'already processed'})
+
+            if transfer_status == 'SUCCESS':
+                # 微信转账成功
+                auto_record.zhuangtai = 1
+                auto_record.wechat_transfer_no = wechat_transfer_no
+                auto_record.save()
+
+                # 更新今日已提现金额
+                yonghuid = auto_record.yonghuid
+                leixing = auto_record.leixing
+                try:
+                    user_main = UserMain.objects.get(yonghuid=yonghuid)
+                except UserMain.DoesNotExist:
+                    pass
+                else:
+                    if leixing == 1:
+                        dashou = UserDashou.objects.get(user=user_main)
+                        dashou.jinritixian_jine += auto_record.jine
+                        dashou.save()
+                    else:
+                        guanshi = UserGuanshi.objects.get(user=user_main)
+                        guanshi.jinritixian_jine += auto_record.jine
+                        guanshi.save()
+
+                # 向旧表插入记录（如果还未插入）
+                # 由于确认接口可能已插入，这里需要检查是否已存在，避免重复
+                if not Tixianjilu.objects.filter(yonghuid=yonghuid, jine=auto_record.shijidaozhang, create_time__date=date.today()).exists():
+                    avatar = user_main.avatar or ''
+                    phone = user_main.phone or ''
+                    nicheng = '管事用户' if leixing == 2 else (UserDashou.objects.get(user=user_main).nicheng or '')
+                    Tixianjilu.objects.create(
+                        yonghuid=yonghuid,
+                        avatar=avatar,
+                        phone=phone,
+                        nicheng=nicheng,
+                        leixing=leixing,
+                        zhifu='',
+                        skzhanghao='',
+                        jine=auto_record.shijidaozhang,
+                        zhuangtai=2,   # 旧表成功状态为2
+                        fangshi=1,
+                        shenheid=None,
+                        bhliyou=''
+                    )
+
+                # 更新收支记录表（id=1）
+
+                try:
+
+                    from dingdan.utils import update_daily_payout
+                    update_daily_payout(auto_record.shijidaozhang)
+
+                    szjilu = Szjilu.objects.select_for_update().get(id=1)
+                    szjilu.zongsy -= auto_record.shijidaozhang  # 总收益减少
+                    szjilu.zongzc += auto_record.shijidaozhang  # 总支出增加
+                    szjilu.jrzc += auto_record.shijidaozhang  # 今日支出增加
+                    szjilu.save()
+                except Szjilu.DoesNotExist:
+                    from dingdan.utils import update_daily_payout
+                    update_daily_payout(auto_record.shijidaozhang)
+                    # 如果记录不存在，创建一条
+                    Szjilu.objects.create(
+                        id=1,
+                        zongsy=-auto_record.shijidaozhang,
+                        zongzc=auto_record.shijidaozhang,
+                        jrzc=auto_record.shijidaozhang
+                    )
+                except Exception as e:
+                    logger.error(f"更新收支记录失败: {str(e)}")
+                    raise  # 抛出异常让事务回滚
+
+
+            else:  # transfer_status == 'FAIL'
+                # 微信转账失败
+                auto_record.zhuangtai = 2
+                auto_record.fail_reason = fail_reason or '微信转账失败'
+                auto_record.save()
+
+                # 恢复用户余额（仅当之前已扣减）
+                yonghuid = auto_record.yonghuid
+                leixing = auto_record.leixing
+                try:
+                    user_main = UserMain.objects.get(yonghuid=yonghuid)
+                except UserMain.DoesNotExist:
+                    pass
+                else:
+                    if leixing == 1:
+                        dashou = UserDashou.objects.select_for_update().get(user=user_main)
+                        dashou.yue += auto_record.jine
+                        dashou.save()
+                    else:
+                        guanshi = UserGuanshi.objects.select_for_update().get(user=user_main)
+                        guanshi.yue += auto_record.jine
+                        guanshi.save()
+
+        return Response({'code': 'SUCCESS', 'message': 'ok'})'''
+
+
+
+
+
+
+
+
+
+
+
+
+
+from .models import (
+    UserMain, UserBoss, UserDashou, UserGuanshi,
+    UserZuzhang
+)
+
+
+class WechatLoginAndGuanshiRegisterView(APIView):
+    """
+    未登录用户微信登录+管事注册一体化接口
+    路径: /api/yonghu/zuzhangyqmzc
+    方法: POST
+    权限: 允许所有
+    请求体: { "code": "微信登录code", "inviteCode": "组长邀请码" }
+    成功返回 code: 200，数据同 GuanshiRegisterView
+    """
+    permission_classes = [AllowAny]
+
+    def post(self, request):
+        code = request.data.get('code', '').strip()
+        yaoqingma = request.data.get('inviteCode', '').strip()
+
+        if not code:
+            return Response({'code': 400, 'msg': '微信授权码不能为空', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST)
+
+        if not yaoqingma:
+            return Response({'code': 400, 'msg': '邀请码不能为空', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST)
+
+        if len(yaoqingma) > 100:
+            return Response({'code': 400, 'msg': '邀请码长度超过限制', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST)
+
+        wechat_data = self._get_wechat_openid(code)
+        if not wechat_data or 'openid' not in wechat_data:
+            error_msg = wechat_data.get('errmsg', '微信授权失败')
+            return Response({'code': 400, 'msg': f'微信登录失败: {error_msg}', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST)
+
+        openid = wechat_data['openid']
+        kehuduan_ip = self._huoqu_kehuduan_ip(request)
+
+        with transaction.atomic():
+            user_main, created = UserMain.objects.select_for_update().get_or_create(
+                openid=openid,
+                defaults={
+                    'yonghuid': self._shengcheng_yonghu_id(),
+                    'user_type': 'normal',
+                }
+            )
+            user_main.ip = kehuduan_ip
+            user_main.last_login_time = timezone.now()
+            user_main.save()
+
+            if created:
+                UserBoss.objects.create(user=user_main, nickname='微信用户')
+
+            if hasattr(user_main, 'guanshi_profile'):
+                return self._fanhui_xianyou_guanshi_info(user_main)
+
+            try:
+                zuzhang = UserZuzhang.objects.select_related('user').get(yaoqingma=yaoqingma)
+            except UserZuzhang.DoesNotExist:
+                return Response({'code': 404, 'msg': '邀请码无效或不存在', 'data': None},
+                                status=status.HTTP_404_NOT_FOUND)
+
+            if zuzhang.zhuangtai != 1:
+                return Response({'code': 403, 'msg': '该邀请码对应的组长账号已被禁用', 'data': None},
+                                status=status.HTTP_403_FORBIDDEN)
+
+            zuzhang_yonghuid = zuzhang.user.yonghuid
+
+            guanshi_yaoqingma = chuangjianYaoqingma(str(user_main.yonghuid))
+            guanshi_profile = UserGuanshi.objects.create(
+                user=user_main,
+                yaoqingma=guanshi_yaoqingma,
+                yaoqingren=zuzhang_yonghuid,
+            )
+
+            UserZuzhang.objects.filter(pk=zuzhang.pk).update(
+                yaoqing_zongshu=models.F('yaoqing_zongshu') + 1
+            )
+            # ========== 新增：组长每日统计（邀请管事 action=1） ==========
+            try:
+                from houtai.utils import update_zuzhang_daily_by_action
+                update_zuzhang_daily_by_action(
+                    yonghuid=zuzhang_yonghuid,
+                    action=1  # 1 = 邀请管事
+                )
+                logger.info(f"组长每日统计更新成功（邀请管事）：组长{zuzhang_yonghuid}")
+            except Exception as e:
+                logger.error(f"组长每日统计更新失败（邀请管事）：{str(e)}")
+
+            if not hasattr(user_main, 'dashou_profile'):
+                dashou_profile = UserDashou.objects.create(
+                    user=user_main,
+                    nicheng='大神',
+                    chenghao='普通大神',
+                    yaoqingren=zuzhang_yonghuid,
+                )
+            else:
+                dashou_profile = user_main.dashou_profile
+
+
+
+        refresh = RefreshToken.for_user(user_main)
+        token = str(refresh.access_token)
+
+        response_data = self._zhuangbei_fanhui_shuju(
+            user_main, dashou_profile, guanshi_profile, token
+        )
+
+        return Response({'code': 200, 'msg': '登录并注册成功！', 'data': response_data})
+
+    # ---------- 辅助方法（与接口1完全相同，完整列出以保证完整性） ----------
+
+    def _get_wechat_openid(self, code):
+        try:
+            appid = getattr(settings, 'WEIXIN_APPID', '')
+            secret = getattr(settings, 'WEIXIN_SECRET', '')
+            if not appid or not secret:
+                raise ValueError('微信配置未设置')
+            url = 'https://api.weixin.qq.com/sns/jscode2session'
+            params = {
+                'appid': appid,
+                'secret': secret,
+                'js_code': code,
+                'grant_type': 'authorization_code'
+            }
+            response = requests.get(url, params=params, timeout=10)
+            result = response.json()
+            if 'openid' in result:
+                return result
+            else:
+                errcode = result.get('errcode', 'unknown')
+                errmsg = result.get('errmsg', '未知错误')
+                return {'errmsg': f'[{errcode}]{errmsg}'}
+        except requests.exceptions.Timeout:
+            logger.error('请求微信接口超时')
+            return {'errmsg': '请求微信接口超时'}
+        except Exception as e:
+            logger.error(f'请求微信接口异常: {e}')
+            return {'errmsg': f'请求微信接口异常: {str(e)}'}
+
+    def _shengcheng_yonghu_id(self):
+        for _ in range(10):
+            timestamp_part = str(int(time.time()))[-5:].zfill(5)
+            random_part = str(random.randint(0, 99)).zfill(2)
+            user_id = timestamp_part + random_part
+            if len(user_id) == 7 and user_id.isdigit():
+                if not UserMain.objects.filter(yonghuid=user_id).exists():
+                    return user_id
+        raise Exception('生成用户ID失败')
+
+    def _huoqu_kehuduan_ip(self, request):
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0].strip()
+            if ip:
+                return ip
+        ip = request.META.get('REMOTE_ADDR', '')
+        return ip if ip else '0.0.0.0'
+
+    def _huoqu_qun_peizhi(self):
+        try:
+            qun_configs = Qunpeizhi.objects.filter(id__in=[1, 2])
+            result = {
+                'dashouqun': '',
+                'dashouqunid': '',
+                'guanshiqun': '',
+                'guanshiqunid': ''
+            }
+            for config in qun_configs:
+                if config.id == 1:
+                    result['dashouqun'] = config.neirong or ''
+                    result['dashouqunid'] = config.qunid or ''
+                elif config.id == 2:
+                    result['guanshiqun'] = config.neirong or ''
+                    result['guanshiqunid'] = config.qunid or ''
+            return result
+        except Exception as e:
+            logger.error(f"获取群配置失败: {e}")
+            return {'dashouqun': '', 'dashouqunid': '', 'guanshiqun': '', 'guanshiqunid': ''}
+
+    def _zhuangbei_dashou_fanhui(self, dashou_profile):
+        data = {
+            'dashounicheng': dashou_profile.nicheng,
+            'zhanghaostatus': dashou_profile.zhanghaozhuangtai,
+            'yongjin': str(dashou_profile.yue),
+            'zonge': str(dashou_profile.zonge),
+            'yajin': str(dashou_profile.yajin),
+            'chenghao': dashou_profile.chenghao,
+            'jinfen': dashou_profile.jifen,
+            'chengjiaoliang': dashou_profile.chengjiaozongliang,
+            'zaixianzhuangtai': dashou_profile.zaixianzhuangtai,
+            'dashouzhuangtai': dashou_profile.zhuangtai,
+        }
+        huiyuan_list = []
+        try:
+            records = Huiyuangoumai.objects.filter(yonghu_id=dashou_profile.user.yonghuid)
+            for record in records:
+                shifou_daoqi = record.jiance_shifou_daoqi()
+                huiyuan_list.append({
+                    'huiyuan_id': record.huiyuan_id,
+                    'huiyuan_zhuangtai': record.huiyuan_zhuangtai,
+                    'daoqi_time': record.daoqi_time.isoformat() if record.daoqi_time else None,
+                    'shifou_daoqi': shifou_daoqi,
+                    'jieshao': record.jieshao
+                })
+        except Exception as e:
+            logger.warning(f"获取会员列表失败: {e}")
+        data['clumber'] = huiyuan_list
+        return data
+
+    def _fanhui_xianyou_guanshi_info(self, user_main):
+        guanshi_profile = user_main.guanshi_profile
+        dashou_profile = getattr(user_main, 'dashou_profile', None)
+        group_info = self._huoqu_qun_peizhi()
+        dashou_status = 1 if dashou_profile else 0
+        shangjia_status = 1 if hasattr(user_main, 'shop_profile') else 0
+        guanshi_status = 1
+        try:
+            nicheng = user_main.boss_profile.nickname or '微信用户'
+        except:
+            nicheng = '微信用户'
+        refresh = RefreshToken.for_user(user_main)
+        token = str(refresh.access_token)
+        data = {
+            'token': token,
+            'nicheng': nicheng,
+            'uid': user_main.yonghuid,
+            'touxiang': user_main.avatar or '',
+            'shangjiastatus': shangjia_status,
+            'dashoustatus': dashou_status,
+            'guanshistatus': guanshi_status,
+            **group_info,
+        }
+        guanshi_data = {
+            'gszhstatus': guanshi_profile.zhuangtai,
+            'yaoqingzongshu': guanshi_profile.yaogingshuliang,
+            'fenyongzonge': str(guanshi_profile.chongzhifenrun),
+            'fenyongtixian': str(guanshi_profile.yue),
+            'yichongzhiDashou': guanshi_profile.jinrichongzhi,
+        }
+        data.update(guanshi_data)
+        if dashou_profile:
+            dashou_data = self._zhuangbei_dashou_fanhui(dashou_profile)
+            data.update(dashou_data)
+        else:
+            data.update({
+                'dashounicheng': '',
+                'zhanghaostatus': 0,
+                'yongjin': '0.00',
+                'zonge': '0.00',
+                'yajin': '0.00',
+                'chenghao': '',
+                'jinfen': 0,
+                'chengjiaoliang': 0,
+                'zaixianzhuangtai': 0,
+                'dashouzhuangtai': 0,
+                'clumber': []
+            })
+        return Response({'code': 200, 'msg': '您已是管事', 'data': data})
+
+    def _zhuangbei_fanhui_shuju(self, user_main, dashou_profile, guanshi_profile, token):
+        try:
+            nicheng = user_main.boss_profile.nickname or '微信用户'
+        except:
+            nicheng = '微信用户'
+        dashou_status = 1
+        shangjia_status = 1 if hasattr(user_main, 'shop_profile') else 0
+        guanshi_status = 1
+        group_info = self._huoqu_qun_peizhi()
+        data = {
+            'token': token,
+            'nicheng': nicheng,
+            'uid': user_main.yonghuid,
+            'touxiang': user_main.avatar or '',
+            'shangjiastatus': shangjia_status,
+            'dashoustatus': dashou_status,
+            'guanshistatus': guanshi_status,
+            **group_info,
+        }
+        guanshi_data = {
+            'gszhstatus': guanshi_profile.zhuangtai,
+            'yaoqingzongshu': guanshi_profile.yaogingshuliang,
+            'fenyongzonge': str(guanshi_profile.chongzhifenrun),
+            'fenyongtixian': str(guanshi_profile.yue),
+            'yichongzhiDashou': guanshi_profile.jinrichongzhi,
+        }
+        data.update(guanshi_data)
+        dashou_data = self._zhuangbei_dashou_fanhui(dashou_profile)
+        data.update(dashou_data)
+        return data
+'''class WechatLoginAndGuanshiRegisterView(APIView):
+    """
+    微信登录并注册管事一体化接口
+    访问路径: /api/yonghu/zuzhangyqmzc
+    请求方法: POST
+    权限要求: 允许所有（内部根据是否有code区分已登录/未登录）
+
+    请求体（未登录用户）:
+        {
+            "code": "微信登录code",
+            "inviteCode": "组长邀请码"
+        }
+    请求体（已登录用户）:
+        {
+            "inviteCode": "组长邀请码"
+        }
+
+    功能:
+        1. 未登录用户：通过code完成微信登录，自动注册管事及打手身份。
+        2. 已登录用户：直接使用当前用户注册管事及打手身份。
+    """
+    throttle_classes = []  # 可根据需要添加限流
+    permission_classes = [AllowAny]
+
+    def post(self, request):
+        try:
+            # ========== 1. 获取并验证参数 ==========
+            code = request.data.get('code', '').strip()
+            yaoqingma = request.data.get('inviteCode', '').strip()
+
+            if not yaoqingma:
+                return Response({
+                    'code': 1,
+                    'msg': '邀请码不能为空',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            if len(yaoqingma) > 100:
+                return Response({
+                    'code': 2,
+                    'msg': '邀请码长度超过限制',
+                    'data': None
+                }, status=status.HTTP_400_BAD_REQUEST)
+
+            # ========== 2. 区分已登录/未登录流程 ==========
+            if code:
+                # 2.1 未登录流程：通过code获取openid
+                wechat_data = self._get_wechat_openid(code)
+                if not wechat_data or 'openid' not in wechat_data:
+                    error_msg = wechat_data.get('errmsg', '微信授权失败')
+                    return Response({
+                        'code': 3,
+                        'msg': f'微信登录失败: {error_msg}',
+                        'data': None
+                    }, status=status.HTTP_400_BAD_REQUEST)
+
+                openid = wechat_data['openid']
+                kehuduan_ip = self._huoqu_kehuduan_ip(request)
+
+                # 2.2 在事务中创建或获取用户（确保原子性）
+                with transaction.atomic():
+                    user_main, created = UserMain.objects.select_for_update().get_or_create(
+                        openid=openid,
+                        defaults={
+                            'yonghuid': self._shengcheng_yonghu_id(),
+                            'user_type': 'normal',
+                        }
+                    )
+
+                    # 更新IP和最后登录时间
+                    user_main.ip = kehuduan_ip
+                    user_main.last_login_time = timezone.now()
+                    user_main.save()
+
+                    if created:
+                        # 新用户：创建老板扩展表
+                        UserBoss.objects.create(
+                            user=user_main,
+                            nickname='微信用户'
+                        )
+                        # 注意：商家扩展表暂不自动创建，后续由用户主动开通
+            else:
+                # 2.3 已登录流程：直接使用当前认证用户
+                if not request.user.is_authenticated:
+                    return Response({
+                        'code': 4,
+                        'msg': '用户未登录，请提供code参数',
+                        'data': None
+                    }, status=status.HTTP_401_UNAUTHORIZED)
+                user_main = request.user
+                created = False  # 标记不是新用户
+
+            # ========== 3. 检查用户是否已是管事 ==========
+            if hasattr(user_main, 'guanshi_profile'):
+                # 用户已是管事，直接返回现有信息
+                return self._fanhui_xianyou_guanshi_info(user_main)
+
+            # ========== 4. 验证邀请码对应的组长 ==========
+            try:
+                zuzhang = UserZuzhang.objects.select_related('user').get(yaoqingma=yaoqingma)
+            except UserZuzhang.DoesNotExist:
+                return Response({
+                    'code': 5,
+                    'msg': '邀请码无效或不存在',
+                    'data': None
+                }, status=status.HTTP_404_NOT_FOUND)
+
+            # 验证组长账号状态
+            if zuzhang.zhuangtai != 1:
+                return Response({
+                    'code': 6,
+                    'msg': '该邀请码对应的组长账号已被禁用',
+                    'data': None
+                }, status=status.HTTP_403_FORBIDDEN)
+
+            # 获取组长用户ID
+            zuzhang_yonghuid = zuzhang.user.yonghuid
+
+            # ========== 5. 使用事务执行注册 ==========
+            with transaction.atomic():
+                # 5.1 创建管事扩展表
+                # 生成管事的邀请码（使用当前用户ID）
+                guanshi_yaoqingma = chuangjianYaoqingma(str(user_main.yonghuid))
+
+                guanshi_profile = UserGuanshi.objects.create(
+                    user=user_main,
+                    yaoqingma=guanshi_yaoqingma,
+                    yaoqingren=zuzhang_yonghuid,  # 邀请人ID
+                    # 其他字段使用默认值
+                )
+
+                # 5.2 更新组长的邀请总数
+                UserZuzhang.objects.filter(pk=zuzhang.pk).update(
+                    yaoqing_zongshu=models.F('yaoqing_zongshu') + 1
+                )
+
+                # 5.3 检查用户是否已是打手，如果不是则创建
+                if not hasattr(user_main, 'dashou_profile'):
+                    dashou_profile = UserDashou.objects.create(
+                        user=user_main,
+                        nicheng='大手子',           # 默认昵称
+                        chenghao='普通大手',         # 默认称号
+                        yaoqingren=zuzhang_yonghuid, # 邀请人ID
+                        # 其他字段使用默认值
+                    )
+                else:
+                    dashou_profile = user_main.dashou_profile
+
+                # 5.4 如果是新用户，还需要创建其他基础表？老板表已在创建用户时创建
+                # 商家表暂不自动创建
+
+            # ========== 6. 生成JWT token（新用户需要） ==========
+            if created:
+                refresh = RefreshToken.for_user(user_main)
+                token = str(refresh.access_token)
+            else:
+                # 已登录用户，可能不需要返回新token，但为了统一，也可以生成新的
+                refresh = RefreshToken.for_user(user_main)
+                token = str(refresh.access_token)
+
+            # ========== 7. 准备返回数据 ==========
+            response_data = self._zhuangbei_fanhui_shuju(
+                user_main,
+                dashou_profile,
+                guanshi_profile,
+                token
+            )
+
+            return Response({
+                'code': 0,
+                'msg': '注册成功！',
+                'data': response_data
+            })
+
+        except Exception as e:
+            logger.error(f"管事注册接口异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 99,
+                'msg': '系统繁忙，请稍后重试',
+                'data': None
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    # ---------- 辅助方法 ----------
+
+    def _get_wechat_openid(self, code):
+        """调用微信接口获取openid"""
+        try:
+            appid = getattr(settings, 'WEIXIN_APPID', '')
+            secret = getattr(settings, 'WEIXIN_SECRET', '')
+
+            if not appid or not secret:
+                raise ValueError('微信配置未设置')
+
+            url = 'https://api.weixin.qq.com/sns/jscode2session'
+            params = {
+                'appid': appid,
+                'secret': secret,
+                'js_code': code,
+                'grant_type': 'authorization_code'
+            }
+
+            response = requests.get(url, params=params, timeout=10)
+            result = response.json()
+
+            if 'openid' in result:
+                return result
+            else:
+                errcode = result.get('errcode', 'unknown')
+                errmsg = result.get('errmsg', '未知错误')
+                return {'errmsg': f'[{errcode}]{errmsg}'}
+
+        except requests.exceptions.Timeout:
+            return {'errmsg': '请求微信接口超时'}
+        except Exception as e:
+            return {'errmsg': f'请求微信接口异常: {str(e)}'}
+
+    def _shengcheng_yonghu_id(self):
+        """生成7位数字用户ID（与打手端一致）"""
+        for _ in range(10):
+            timestamp_part = str(int(time.time()))[-5:].zfill(5)
+            random_part = str(random.randint(0, 99)).zfill(2)
+            user_id = timestamp_part + random_part
+            if len(user_id) == 7 and user_id.isdigit():
+                if not UserMain.objects.filter(yonghuid=user_id).exists():
+                    return user_id
+        raise Exception('生成用户ID失败')
+
+    def _huoqu_kehuduan_ip(self, request):
+        """获取客户端真实IP地址"""
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0].strip()
+            if ip:
+                return ip
+        ip = request.META.get('REMOTE_ADDR', '')
+        return ip if ip else '0.0.0.0'
+
+    def _huoqu_qun_peizhi(self):
+        """获取群配置信息（与打手端一致）"""
+        try:
+            qun_configs = Qunpeizhi.objects.filter(id__in=[1, 2])
+            result = {
+                'dashouqun': '',
+                'dashouqunid': '',
+                'guanshiqun': '',
+                'guanshiqunid': ''
+            }
+            for config in qun_configs:
+                if config.id == 1:
+                    result['dashouqun'] = config.neirong or ''
+                    result['dashouqunid'] = config.qunid or ''
+                elif config.id == 2:
+                    result['guanshiqun'] = config.neirong or ''
+                    result['guanshiqunid'] = config.qunid or ''
+            return result
+        except Exception:
+            return {
+                'dashouqun': '',
+                'dashouqunid': '',
+                'guanshiqun': '',
+                'guanshiqunid': ''
+            }
+
+    def _fanhui_xianyou_guanshi_info(self, user_main):
+        """
+        返回已是管事的用户信息（无需注册）
+        """
+        guanshi_profile = user_main.guanshi_profile
+        dashou_profile = getattr(user_main, 'dashou_profile', None)
+
+        # 获取群配置
+        group_info = self._huoqu_qun_peizhi()
+
+        # 身份状态
+        dashou_status = 1 if dashou_profile else 0
+        shangjia_status = 1 if hasattr(user_main, 'shop_profile') else 0
+        guanshi_status = 1
+
+        # 获取老板昵称
+        try:
+            boss_profile = user_main.boss_profile
+            nicheng = boss_profile.nickname or '微信用户'
+        except:
+            nicheng = '微信用户'
+
+        # 生成token（用户已登录，但可以生成新token）
+        refresh = RefreshToken.for_user(user_main)
+        token = str(refresh.access_token)
+
+        # 准备数据
+        data = {
+            'token': token,
+            'nicheng': nicheng,
+            'uid': user_main.yonghuid,
+            'touxiang': user_main.avatar or '',
+            'shangjiastatus': shangjia_status,
+            'dashoustatus': dashou_status,
+            'guanshistatus': guanshi_status,
+            **group_info,
+        }
+
+        # 添加管事信息
+        guanshi_data = self._zhuangbei_guanshi_fanhui(guanshi_profile)
+        data.update(guanshi_data)
+
+        # 添加打手信息（如果存在）
+        if dashou_profile:
+            dashou_data = self._zhuangbei_dashou_fanhui(dashou_profile)
+            data.update(dashou_data)
+        else:
+            # 默认空打手数据（前端可能需要）
+            data.update({
+                'dashounicheng': '',
+                'zhanghaostatus': 0,
+                'yongjin': '0.00',
+                'zonge': '0.00',
+                'yajin': '0.00',
+                'chenghao': '',
+                'jinfen': 0,
+                'chengjiaoliang': 0,
+                'zaixianzhuangtai': 0,
+                'dashouzhuangtai': 0,
+                'clumber': []
+            })
+
+        return Response({
+            'code': 0,
+            'msg': '您已是管事',
+            'data': data
+        })
+
+    def _zhuangbei_guanshi_fanhui(self, guanshi_profile):
+        """准备管事信息返回数据"""
+        return {
+            'gszhstatus': guanshi_profile.zhuangtai or '',
+            'yaoqingzongshu': guanshi_profile.yaogingshuliang,
+            'fenyongzonge': str(guanshi_profile.chongzhifenrun),
+            'fenyongtixian': str(guanshi_profile.yue),
+            'yichongzhiDashou': guanshi_profile.jinrichongzhi,  # 注意：这里用jinrichongzhi作为示例，实际可能需要根据业务调整
+            # 如果业务有更准确的字段，请替换
+        }
+
+    def _zhuangbei_dashou_fanhui(self, dashou_profile):
+        """准备打手信息返回数据（与打手端一致）"""
+        data = {
+            'dashounicheng': dashou_profile.nicheng,
+            'zhanghaostatus': dashou_profile.zhanghaozhuangtai,
+            'yongjin': str(dashou_profile.yue),
+            'zonge': str(dashou_profile.zonge),
+            'yajin': str(dashou_profile.yajin),
+            'chenghao': dashou_profile.chenghao,
+            'jinfen': dashou_profile.jifen,
+            'chengjiaoliang': dashou_profile.chengjiaozongliang,
+            'zaixianzhuangtai': dashou_profile.zaixianzhuangtai,
+            'dashouzhuangtai': dashou_profile.zhuangtai,
+        }
+
+        # 处理会员列表（clumber）
+        huiyuan_list = []
+        try:
+            records = Huiyuangoumai.objects.filter(yonghu_id=dashou_profile.user.yonghuid)
+            for record in records:
+                shifou_daoqi = record.jiance_shifou_daoqi()
+                huiyuan_list.append({
+                    'huiyuan_id': record.huiyuan_id,
+                    'huiyuan_zhuangtai': record.huiyuan_zhuangtai,
+                    'daoqi_time': record.daoqi_time.isoformat() if record.daoqi_time else None,
+                    'shifou_daoqi': shifou_daoqi,
+                    'jieshao': record.jieshao
+                })
+        except Exception as e:
+            # 如果表不存在或出错，返回空列表
+            logger.warning(f"获取会员列表失败: {e}")
+        data['clumber'] = huiyuan_list
+        return data
+
+    def _zhuangbei_fanhui_shuju(self, user_main, dashou_profile, guanshi_profile, token):
+        """准备完整的返回数据（新注册）"""
+        # 获取老板昵称
+        try:
+            boss_profile = user_main.boss_profile
+            nicheng = boss_profile.nickname or '微信用户'
+        except:
+            nicheng = '微信用户'
+
+        # 身份状态
+        dashou_status = 1
+        shangjia_status = 1 if hasattr(user_main, 'shop_profile') else 0
+        guanshi_status = 1
+
+        # 获取群配置
+        group_info = self._huoqu_qun_peizhi()
+
+        # 基础数据
+        data = {
+            'token': token,
+            'nicheng': nicheng,
+            'uid': user_main.yonghuid,
+            'touxiang': user_main.avatar or '',
+            'shangjiastatus': shangjia_status,
+            'dashoustatus': dashou_status,
+            'guanshistatus': guanshi_status,
+            **group_info,
+        }
+
+        # 添加管事信息
+        guanshi_data = self._zhuangbei_guanshi_fanhui(guanshi_profile)
+        data.update(guanshi_data)
+
+        # 添加打手信息
+        dashou_data = self._zhuangbei_dashou_fanhui(dashou_profile)
+        data.update(dashou_data)
+
+        return data'''
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+'''class GuanshiRegisterView(APIView):
+    """
+    已登录用户注册管事接口
+    访问路径: /api/yonghu/guanshizhuce
+    请求方法: POST
+    权限要求: JWT认证
+    请求体: { "inviteCode": "组长邀请码" }
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 1. 获取并验证邀请码
+        yaoqingma = request.data.get('inviteCode', '').strip()
+        if not yaoqingma:
+            return Response({
+                'code': 1,
+                'msg': '邀请码不能为空',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        if len(yaoqingma) > 100:
+            return Response({
+                'code': 2,
+                'msg': '邀请码长度超过限制',
+                'data': None
+            }, status=status.HTTP_400_BAD_REQUEST)
+
+        current_user = request.user
+
+        # 2. 检查用户是否已是管事
+        if hasattr(current_user, 'guanshi_profile'):
+            # 用户已是管事，直接返回现有信息
+            return self._fanhui_xianyou_guanshi_info(current_user)
+
+        # 3. 验证邀请码对应的组长
+        try:
+            zuzhang = UserZuzhang.objects.select_related('user').get(yaoqingma=yaoqingma)
+        except UserZuzhang.DoesNotExist:
+            return Response({
+                'code': 3,
+                'msg': '邀请码无效或不存在',
+                'data': None
+            }, status=status.HTTP_404_NOT_FOUND)
+
+        if zuzhang.zhuangtai != 1:
+            return Response({
+                'code': 4,
+                'msg': '该邀请码对应的组长账号已被禁用',
+                'data': None
+            }, status=status.HTTP_403_FORBIDDEN)
+
+        zuzhang_yonghuid = zuzhang.user.yonghuid
+
+        # 4. 事务内创建管事实体和打手（如果需要）
+        with transaction.atomic():
+            # 创建管事扩展表
+            guanshi_yaoqingma = chuangjianYaoqingma(str(current_user.yonghuid))
+            guanshi_profile = UserGuanshi.objects.create(
+                user=current_user,
+                yaoqingma=guanshi_yaoqingma,
+                yaoqingren=zuzhang_yonghuid,
+                # 其他字段使用默认值
+            )
+
+            # 更新组长的邀请总数
+            UserZuzhang.objects.filter(pk=zuzhang.pk).update(
+                yaoqing_zongshu=models.F('yaoqing_zongshu') + 1
+            )
+
+            # 检查用户是否已是打手，如果不是则创建
+            if not hasattr(current_user, 'dashou_profile'):
+                dashou_profile = UserDashou.objects.create(
+                    user=current_user,
+                    nicheng='大手子',
+                    chenghao='普通大手',
+                    yaoqingren=zuzhang_yonghuid,
+                )
+            else:
+                dashou_profile = current_user.dashou_profile
+
+        # 5. 生成新token（可选，为了统一处理）
+        refresh = RefreshToken.for_user(current_user)
+        token = str(refresh.access_token)
+
+        # 6. 准备返回数据
+        response_data = self._zhuangbei_fanhui_shuju(
+            current_user, dashou_profile, guanshi_profile, token
+        )
+
+        return Response({
+            'code': 0,
+            'msg': '注册成功！',
+            'data': response_data
+        })
+
+    # ---------- 辅助方法 ----------
+    def _huoqu_qun_peizhi(self):
+        """获取群配置信息"""
+        try:
+            qun_configs = Qunpeizhi.objects.filter(id__in=[1, 2])
+            result = {
+                'dashouqun': '',
+                'dashouqunid': '',
+                'guanshiqun': '',
+                'guanshiqunid': ''
+            }
+            for config in qun_configs:
+                if config.id == 1:
+                    result['dashouqun'] = config.neirong or ''
+                    result['dashouqunid'] = config.qunid or ''
+                elif config.id == 2:
+                    result['guanshiqun'] = config.neirong or ''
+                    result['guanshiqunid'] = config.qunid or ''
+            return result
+        except Exception:
+            return {
+                'dashouqun': '',
+                'dashouqunid': '',
+                'guanshiqun': '',
+                'guanshiqunid': ''
+            }
+
+    def _fanhui_xianyou_guanshi_info(self, user_main):
+        """返回已是管事的用户信息"""
+        guanshi_profile = user_main.guanshi_profile
+        dashou_profile = getattr(user_main, 'dashou_profile', None)
+
+        group_info = self._huoqu_qun_peizhi()
+
+        dashou_status = 1 if dashou_profile else 0
+        shangjia_status = 1 if hasattr(user_main, 'shop_profile') else 0
+        guanshi_status = 1
+
+        try:
+            nicheng = user_main.boss_profile.nickname or '微信用户'
+        except:
+            nicheng = '微信用户'
+
+        refresh = RefreshToken.for_user(user_main)
+        token = str(refresh.access_token)
+
+        data = {
+            'token': token,
+            'nicheng': nicheng,
+            'uid': user_main.yonghuid,
+            'touxiang': user_main.avatar or '',
+            'shangjiastatus': shangjia_status,
+            'dashoustatus': dashou_status,
+            'guanshistatus': guanshi_status,
+            **group_info,
+        }
+
+        # 添加管事信息
+        guanshi_data = self._zhuangbei_guanshi_fanhui(guanshi_profile)
+        data.update(guanshi_data)
+
+        # 添加打手信息（如果存在）
+        if dashou_profile:
+            dashou_data = self._zhuangbei_dashou_fanhui(dashou_profile)
+            data.update(dashou_data)
+        else:
+            data.update({
+                'dashounicheng': '',
+                'zhanghaostatus': 0,
+                'yongjin': '0.00',
+                'zonge': '0.00',
+                'yajin': '0.00',
+                'chenghao': '',
+                'jinfen': 0,
+                'chengjiaoliang': 0,
+                'zaixianzhuangtai': 0,
+                'dashouzhuangtai': 0,
+                'clumber': []
+            })
+
+        return Response({
+            'code': 0,
+            'msg': '您已是管事',
+            'data': data
+        })
+
+    def _zhuangbei_guanshi_fanhui(self, guanshi_profile):
+        """组装管事信息"""
+        return {
+            'gszhstatus': guanshi_profile.zhuangtai or '',
+            'yaoqingzongshu': guanshi_profile.yaogingshuliang,
+            'fenyongzonge': str(guanshi_profile.chongzhifenrun),
+            'fenyongtixian': str(guanshi_profile.yue),
+            'yichongzhiDashou': guanshi_profile.jinrichongzhi,  # 根据实际字段调整
+        }
+
+    def _zhuangbei_dashou_fanhui(self, dashou_profile):
+        """组装打手信息"""
+        data = {
+            'dashounicheng': dashou_profile.nicheng,
+            'zhanghaostatus': dashou_profile.zhanghaozhuangtai,
+            'yongjin': str(dashou_profile.yue),
+            'zonge': str(dashou_profile.zonge),
+            'yajin': str(dashou_profile.yajin),
+            'chenghao': dashou_profile.chenghao,
+            'jinfen': dashou_profile.jifen,
+            'chengjiaoliang': dashou_profile.chengjiaozongliang,
+            'zaixianzhuangtai': dashou_profile.zaixianzhuangtai,
+            'dashouzhuangtai': dashou_profile.zhuangtai,
+        }
+
+        # 会员列表
+        huiyuan_list = []
+        try:
+            records = Huiyuangoumai.objects.filter(yonghu_id=dashou_profile.user.yonghuid)
+            for record in records:
+                shifou_daoqi = record.jiance_shifou_daoqi()
+                huiyuan_list.append({
+                    'huiyuan_id': record.huiyuan_id,
+                    'huiyuan_zhuangtai': record.huiyuan_zhuangtai,
+                    'daoqi_time': record.daoqi_time.isoformat() if record.daoqi_time else None,
+                    'shifou_daoqi': shifou_daoqi,
+                    'jieshao': record.jieshao
+                })
+        except Exception as e:
+            logger.warning(f"获取会员列表失败: {e}")
+        data['clumber'] = huiyuan_list
+        return data
+
+    def _zhuangbei_fanhui_shuju(self, user_main, dashou_profile, guanshi_profile, token):
+        """组装完整返回数据（新注册）"""
+        try:
+            nicheng = user_main.boss_profile.nickname or '微信用户'
+        except:
+            nicheng = '微信用户'
+
+        dashou_status = 1
+        shangjia_status = 1 if hasattr(user_main, 'shop_profile') else 0
+        guanshi_status = 1
+
+        group_info = self._huoqu_qun_peizhi()
+
+        data = {
+            'token': token,
+            'nicheng': nicheng,
+            'uid': user_main.yonghuid,
+            'touxiang': user_main.avatar or '',
+            'shangjiastatus': shangjia_status,
+            'dashoustatus': dashou_status,
+            'guanshistatus': guanshi_status,
+            **group_info,
+        }
+
+        guanshi_data = self._zhuangbei_guanshi_fanhui(guanshi_profile)
+        data.update(guanshi_data)
+
+        dashou_data = self._zhuangbei_dashou_fanhui(dashou_profile)
+        data.update(dashou_data)
+
+        return data'''
+
+
+
+
+
+
+
+
+
+
+
+
+
+from django.db import transaction, models
+
+class GuanshiRegisterView(APIView):
+    """
+    已登录用户注册管事接口
+    路径: /api/yonghu/guanshizhuce
+    方法: POST
+    权限: JWT认证
+    请求体: { "inviteCode": "组长邀请码" }
+    成功返回 code: 200
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 1. 获取并验证邀请码
+        yaoqingma = request.data.get('inviteCode', '').strip()
+        if not yaoqingma:
+            return Response({'code': 400, 'msg': '邀请码不能为空', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST)
+
+        if len(yaoqingma) > 100:
+            return Response({'code': 400, 'msg': '邀请码长度超过限制', 'data': None},
+                            status=status.HTTP_400_BAD_REQUEST)
+
+        current_user = request.user
+
+        # 2. 检查用户是否已是管事
+        if hasattr(current_user, 'guanshi_profile'):
+            # 用户已是管事，直接返回现有信息
+            return self._fanhui_xianyou_guanshi_info(current_user)
+
+        # 3. 验证邀请码对应的组长
+        try:
+            zuzhang = UserZuzhang.objects.select_related('user').get(yaoqingma=yaoqingma)
+        except UserZuzhang.DoesNotExist:
+            return Response({'code': 404, 'msg': '邀请码无效或不存在', 'data': None},
+                            status=status.HTTP_404_NOT_FOUND)
+
+        if zuzhang.zhuangtai != 1:
+            return Response({'code': 403, 'msg': '该邀请码对应的组长账号已被禁用', 'data': None},
+                            status=status.HTTP_403_FORBIDDEN)
+
+        zuzhang_yonghuid = zuzhang.user.yonghuid
+
+        # 4. 事务内创建管事实体和打手（如果需要）
+        with transaction.atomic():
+            # 创建管事扩展表
+            guanshi_yaoqingma = chuangjianYaoqingma(str(current_user.yonghuid))
+            guanshi_profile = UserGuanshi.objects.create(
+                user=current_user,
+                yaoqingma=guanshi_yaoqingma,
+                yaoqingren=zuzhang_yonghuid,
+            )
+
+            # 更新组长的邀请总数
+            UserZuzhang.objects.filter(pk=zuzhang.pk).update(
+                yaoqing_zongshu=models.F('yaoqing_zongshu') + 1
+            )
+            # ========== 新增：组长每日统计（邀请管事 action=1） ==========
+            try:
+                from houtai.utils import update_zuzhang_daily_by_action
+                update_zuzhang_daily_by_action(
+                    yonghuid=zuzhang_yonghuid,
+                    action=1  # 1 = 邀请管事
+                )
+                logger.info(f"组长每日统计更新成功（邀请管事）：组长{zuzhang_yonghuid}")
+            except Exception as e:
+                logger.error(f"组长每日统计更新失败（邀请管事）：{str(e)}")
+
+            # 检查用户是否已是打手，如果不是则创建
+            if not hasattr(current_user, 'dashou_profile'):
+                dashou_profile = UserDashou.objects.create(
+                    user=current_user,
+                    nicheng='大手子',
+                    chenghao='普通大手',
+                    yaoqingren=zuzhang_yonghuid,
+                )
+            else:
+                dashou_profile = current_user.dashou_profile
+
+        # 5. 生成新token
+        refresh = RefreshToken.for_user(current_user)
+        token = str(refresh.access_token)
+
+        # 6. 准备返回数据（包含所有字段）
+        response_data = self._zhuangbei_fanhui_shuju(
+            current_user, dashou_profile, guanshi_profile, token
+        )
+
+        return Response({'code': 200, 'msg': '注册成功！', 'data': response_data})
+
+    # ---------- 辅助方法 ----------
+
+    def _huoqu_qun_peizhi(self):
+        """获取群配置信息"""
+        try:
+            qun_configs = Qunpeizhi.objects.filter(id__in=[1, 2])
+            result = {
+                'dashouqun': '',
+                'dashouqunid': '',
+                'guanshiqun': '',
+                'guanshiqunid': ''
+            }
+            for config in qun_configs:
+                if config.id == 1:
+                    result['dashouqun'] = config.neirong or ''
+                    result['dashouqunid'] = config.qunid or ''
+                elif config.id == 2:
+                    result['guanshiqun'] = config.neirong or ''
+                    result['guanshiqunid'] = config.qunid or ''
+            return result
+        except Exception as e:
+            logger.error(f"获取群配置失败: {e}")
+            return {'dashouqun': '', 'dashouqunid': '', 'guanshiqun': '', 'guanshiqunid': ''}
+
+    def _zhuangbei_dashou_fanhui(self, dashou_profile):
+        """组装打手信息（字段名与前端完全匹配）"""
+        data = {
+            'dashounicheng': dashou_profile.nicheng,
+            'zhanghaostatus': dashou_profile.zhanghaozhuangtai,
+            'yongjin': str(dashou_profile.yue),
+            'zonge': str(dashou_profile.zonge),
+            'yajin': str(dashou_profile.yajin),
+            'chenghao': dashou_profile.chenghao,
+            'jinfen': dashou_profile.jifen,
+            'chengjiaoliang': dashou_profile.chengjiaozongliang,
+            'zaixianzhuangtai': dashou_profile.zaixianzhuangtai,
+            'dashouzhuangtai': dashou_profile.zhuangtai,
+        }
+
+        # 会员列表
+        huiyuan_list = []
+        try:
+            records = Huiyuangoumai.objects.filter(yonghu_id=dashou_profile.user.yonghuid)
+            for record in records:
+                shifou_daoqi = record.jiance_shifou_daoqi()
+                huiyuan_list.append({
+                    'huiyuan_id': record.huiyuan_id,
+                    'huiyuan_zhuangtai': record.huiyuan_zhuangtai,
+                    'daoqi_time': record.daoqi_time.isoformat() if record.daoqi_time else None,
+                    'shifou_daoqi': shifou_daoqi,
+                    'jieshao': record.jieshao
+                })
+        except Exception as e:
+            logger.warning(f"获取会员列表失败: {e}")
+        data['clumber'] = huiyuan_list
+        return data
+
+    def _fanhui_xianyou_guanshi_info(self, user_main):
+        """用户已是管事时的返回"""
+        guanshi_profile = user_main.guanshi_profile
+        dashou_profile = getattr(user_main, 'dashou_profile', None)
+
+        group_info = self._huoqu_qun_peizhi()
+
+        dashou_status = 1 if dashou_profile else 0
+        shangjia_status = 1 if hasattr(user_main, 'shop_profile') else 0
+        guanshi_status = 1
+
+        try:
+            nicheng = user_main.boss_profile.nickname or '微信用户'
+        except:
+            nicheng = '微信用户'
+
+        refresh = RefreshToken.for_user(user_main)
+        token = str(refresh.access_token)
+
+        data = {
+            'token': token,
+            'nicheng': nicheng,
+            'uid': user_main.yonghuid,
+            'touxiang': user_main.avatar or '',
+            'shangjiastatus': shangjia_status,
+            'dashoustatus': dashou_status,
+            'guanshistatus': guanshi_status,
+            **group_info,
+        }
+
+        # 管事信息
+        guanshi_data = {
+            'gszhstatus': guanshi_profile.zhuangtai,
+            'yaoqingzongshu': guanshi_profile.yaogingshuliang,
+            'fenyongzonge': str(guanshi_profile.chongzhifenrun),
+            'fenyongtixian': str(guanshi_profile.yue),
+            'yichongzhiDashou': guanshi_profile.jinrichongzhi,
+        }
+        data.update(guanshi_data)
+
+        if dashou_profile:
+            dashou_data = self._zhuangbei_dashou_fanhui(dashou_profile)
+            data.update(dashou_data)
+        else:
+            data.update({
+                'dashounicheng': '',
+                'zhanghaostatus': 0,
+                'yongjin': '0.00',
+                'zonge': '0.00',
+                'yajin': '0.00',
+                'chenghao': '',
+                'jinfen': 0,
+                'chengjiaoliang': 0,
+                'zaixianzhuangtai': 0,
+                'dashouzhuangtai': 0,
+                'clumber': []
+            })
+
+        return Response({'code': 200, 'msg': '您已是管事', 'data': data})
+
+    def _zhuangbei_fanhui_shuju(self, user_main, dashou_profile, guanshi_profile, token):
+        """组装完整返回数据（新注册）"""
+        try:
+            nicheng = user_main.boss_profile.nickname or '微信用户'
+        except:
+            nicheng = '微信用户'
+
+        dashou_status = 1
+        shangjia_status = 1 if hasattr(user_main, 'shop_profile') else 0
+        guanshi_status = 1
+
+        group_info = self._huoqu_qun_peizhi()
+
+        data = {
+            'token': token,
+            'nicheng': nicheng,
+            'uid': user_main.yonghuid,
+            'touxiang': user_main.avatar or '',
+            'shangjiastatus': shangjia_status,
+            'dashoustatus': dashou_status,
+            'guanshistatus': guanshi_status,
+            **group_info,
+        }
+
+        # 管事信息
+        guanshi_data = {
+            'gszhstatus': guanshi_profile.zhuangtai,
+            'yaoqingzongshu': guanshi_profile.yaogingshuliang,
+            'fenyongzonge': str(guanshi_profile.chongzhifenrun),
+            'fenyongtixian': str(guanshi_profile.yue),
+            'yichongzhiDashou': guanshi_profile.jinrichongzhi,
+        }
+        data.update(guanshi_data)
+
+        dashou_data = self._zhuangbei_dashou_fanhui(dashou_profile)
+        data.update(dashou_data)
+
+        return data
+
+
+
+
+from rest_framework_simplejwt.authentication import JWTAuthentication
+from django.db import IntegrityError
+
+
+class ZuzhangZhuceView(APIView):
+    """
+    组长注册/激活接口
+    POST /yonghu/zuzhangzhuce
+    请求体: {"inviteCode": "xxx"}
+    返回:
+        {
+            "code": 200,
+            "msg": "success",
+            "data": {
+                "ketixian": "0.00",        # 可提现金额
+                "guanshiCount": 0,          # 邀请的管事数量
+                "fenhongZonge": "0.00"      # 分红总额
+            }
+        }
+    或错误码
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    # 硬编码激活码（注意转义特殊字符）
+    ACTIVATION_CODE = "jdjdhsavjsjdb64646/'3464jdjs"
+
+    def post(self, request):
+        user = request.user
+        invite_code = request.data.get('inviteCode', '').strip()
+
+        if not invite_code:
+            return Response({'code': 400, 'msg': '邀请码不能为空'}, status=400)
+
+        # 检查是否已是组长
+        try:
+            zuzhang = UserZuzhang.objects.select_related('user').get(user=user)
+            # 已注册，直接返回数据
+            data = self._build_response_data(zuzhang, user)
+            return Response({'code': 200, 'msg': '已注册', 'data': data})
+        except UserZuzhang.DoesNotExist:
+            pass
+
+        # 比对激活码
+        if invite_code != self.ACTIVATION_CODE:
+            return Response({'code': 400, 'msg': '邀请码无效'}, status=400)
+
+        # 生成唯一组长邀请码：时间戳 + 用户ID后6位 + 随机字符
+        yaoqingma = self._generate_unique_yaoqingma(user.yonghuid)
+
+        # 创建组长扩展记录
+        try:
+            with transaction.atomic():
+                zuzhang = UserZuzhang.objects.create(
+                    user=user,
+                    yaoqingma=yaoqingma,
+                    fenyong_zonge=0.00,
+                    ketixian_jine=0.00,
+                    yaoqing_zongshu=0,
+                    jinri_fenyong=0.00,
+                    jinyue_fenyong=0.00,
+                    zhuangtai=1,
+                    jinri_tixian=0.00,
+                    ewai_tixian_xiane=0.00,
+                    kaioi_ewai_tixian=False,
+                    kaioi_ewai_fenhong=False,
+                    ewai_fenhong_jine=0.00
+                )
+        except IntegrityError:
+            # 极低概率重复，重试一次
+            yaoqingma = self._generate_unique_yaoqingma(user.yonghuid, retry=True)
+            zuzhang = UserZuzhang.objects.create(
+                user=user,
+                yaoqingma=yaoqingma,
+                # 其他字段默认同上
+                fenyong_zonge=0.00,
+                ketixian_jine=0.00,
+                yaoqing_zongshu=0,
+                jinri_fenyong=0.00,
+                jinyue_fenyong=0.00,
+                zhuangtai=1,
+                jinri_tixian=0.00,
+                ewai_tixian_xiane=0.00,
+                kaioi_ewai_tixian=False,
+                kaioi_ewai_fenhong=False,
+                ewai_fenhong_jine=0.00
+            )
+
+        data = self._build_response_data(zuzhang, user)
+        return Response({'code': 200, 'msg': '注册成功', 'data': data})
+
+    def _generate_unique_yaoqingma(self, yonghuid, retry=False):
+        """生成唯一邀请码：时间戳+用户ID后6位+随机2位字符"""
+        import random, string
+        timestamp = str(int(time.time()))[-6:]  # 取后6位
+        uid_part = yonghuid[-6:] if len(yonghuid) >= 6 else yonghuid.rjust(6, '0')
+        rand_str = ''.join(random.choices(string.ascii_uppercase + string.digits, k=2))
+        base = f"Z{timestamp}{uid_part}{rand_str}"
+        # 确保唯一性（若已存在则追加随机数，最多尝试3次）
+        for _ in range(3):
+            if not UserZuzhang.objects.filter(yaoqingma=base).exists():
+                return base
+            base = base + random.choice(string.digits)
+        # 极端情况，再附加时间戳毫秒
+        millis = str(time.time()).replace('.', '')[-4:]
+        return base + millis
+
+    def _build_response_data(self, zuzhang, user):
+        """组装前端所需数据"""
+        # 计算邀请的管事数量（通过UserGuanshi表的yaoqingren字段关联到user的yonghuid）
+        guanshi_count = UserGuanshi.objects.filter(yaoqingren=user.yonghuid).count()
+        return {
+            'ketixian': str(zuzhang.ketixian_jine),      # 可提现余额
+            'guanshiCount': guanshi_count,                # 邀请管事数
+            'fenhongZonge': str(zuzhang.fenyong_zonge)    # 分红总额
+        }
+
+
+
+class ZuzhangXinxiView(APIView):
+    """
+    组长信息查询接口
+    POST /yonghu/zuzhangxinxi
+    请求体: 无
+    返回: 同注册接口成功返回格式
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        user = request.user
+        try:
+            zuzhang = UserZuzhang.objects.get(user=user)
+        except UserZuzhang.DoesNotExist:
+            return Response({'code': 404, 'msg': '用户不是组长'}, status=404)
+
+        guanshi_count = UserGuanshi.objects.filter(yaoqingren=user.yonghuid).count()
+        data = {
+            'ketixian': str(zuzhang.ketixian_jine),
+            'guanshiCount': guanshi_count,
+            'fenhongZonge': str(zuzhang.fenyong_zonge)
+        }
+        return Response({'code': 200, 'msg': 'success', 'data': data})
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# apps/yonghu/views_dashou_jianquan.py
+"""
+打手 IM 消息权限鉴权接口
+URL: /yonghu/dshqltqx
+方法: POST
+认证: JWT Token (request.user)
+
+鉴权逻辑（满足任意一条即通过）：
+    1. 押金 >= 5 元 → 通过
+    2. 拥有未过期会员 → 通过
+    3. 存在订单状态为 2 或 8 的订单（作为接单打手） → 通过
+    以上均不满足 → 拒绝
+"""
+
+
+class DashouJianquanView(APIView):
+    """打手消息权限鉴权"""
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # ========== 1. 通过 JWT 获取当前登录用户 ==========
+        user = request.user  # UserMain 实例
+
+        # ========== 2. 检查是否为已注册打手 ==========
+        try:
+            dashou = user.dashou_profile  # OneToOneField 反向查询
+        except UserDashou.DoesNotExist:
+            return Response({
+                'code': 0,
+                'allow': 0,
+                'msg': '您尚未注册打手身份，请先注册'
+            })
+
+        # ========== 3. 条件一：押金 >= 5 元 ==========
+        if dashou.yajin and dashou.yajin >= 5:
+            return Response({
+                'code': 0,
+                'allow': 1,
+                'msg': '鉴权通过（押金满足条件）'
+            })
+
+        # ========== 4. 条件二：存在未过期会员 ==========
+        # 高效查询：利用 yonghu_id + huiyuan_zhuangtai 复合索引
+        huiyuan_list = Huiyuangoumai.objects.filter(
+            yonghu_id=user.yonghuid,
+            huiyuan_zhuangtai=1  # 只查状态为"可用"的，减少内存遍历
+        ).only('id', 'daoqi_time', 'huiyuan_zhuangtai')
+
+        for hy in huiyuan_list:
+            if not hy.jiance_shifou_daoqi():  # 未过期返回 False
+                return Response({
+                    'code': 0,
+                    'allow': 1,
+                    'msg': '鉴权通过（会员未过期）'
+                })
+
+        # ========== 5. 条件三：存在订单状态为 2 或 8 的订单 ==========
+        # 利用 jiedan_dashou_id + zhuangtai 复合索引，只查 1 条
+        has_valid_order = Dingdan.objects.filter(
+            jiedan_dashou_id=user.yonghuid,
+            zhuangtai__in=[2, 8]
+        ).only('id').exists()  # exists() 高性能判断，只发 SELECT 1 LIMIT 1
+
+        if has_valid_order:
+            return Response({
+                'code': 0,
+                'allow': 1,
+                'msg': '鉴权通过（存在有效订单）'
+            })
+
+        # ========== 6. 以上均不满足 → 拒绝 ==========
+        return Response({
+            'code': 0,
+            'allow': 0,
+            'msg': '消息权限不足，请充值会员或联系管理员'
+        })
+
+
+
+# apps/yonghu/views_laoban_jianquan.py
+"""
+老板（普通用户） IM 消息权限鉴权接口
+URL: /yonghu/lbhqltqx
+方法: POST
+认证: JWT Token (request.user)
+
+鉴权逻辑：
+    查询平台订单扩展表（DingdanPingtai），
+    通过关联的订单主表（Dingdan）查找该老板的订单，
+    只要存在任意一条订单状态在 1~8 范围内 → 通过
+"""
+
+
+
+class LaobanJianquanView(APIView):
+    """老板消息权限鉴权"""
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # ========== 1. 通过 JWT 获取当前登录用户 ==========
+        user = request.user  # UserMain 实例
+
+        # ========== 2. 高效查询平台订单扩展表 ==========
+        # 利用 DingdanPingtai.laoban_id 索引 + Dingdan.zhuangtai 索引
+        # 只查 1 条，用 exists() 实现最高性能
+        has_valid_order = DingdanPingtai.objects.filter(
+            laoban_id=user.yonghuid
+        ).filter(
+            dingdan__zhuangtai__in=[1, 2, 3, 4, 5, 6, 7, 8]
+        ).only('id').exists()
+
+        if has_valid_order:
+            return Response({
+                'code': 0,
+                'allow': 1,
+                'msg': '鉴权通过'
+            })
+
+        return Response({
+            'code': 0,
+            'allow': 0,
+            'msg': '您暂无订单记录，消息功能暂不可用'
+        })
+
+
+
+# views.py (在处罚相关app的views中)
+import logging
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework.views import APIView
+from django.db.models import Count, Q, Case, When, IntegerField
+from dingdan.models import Fadan
+from dingdan.models import FadanShensuTupian
+
+logger = logging.getLogger('xiaochengxu')
+
+class FaKuanJiFenTongJiView(APIView):
+    """
+    获取罚款与积分处罚统计总览
+    路径: POST /yonghu/cffktjhq
+    """
+    permission_classes = [IsAuthenticated, DashouPermission]
+
+    def post(self, request):
+        try:
+            user_main = request.user
+            yonghuid = user_main.yonghuid
+
+            # ================= 罚款统计 =================
+            fadan_stats = Fadan.objects.filter(beichufa_id=yonghuid).aggregate(
+                total=Count('id'),
+                daijiaona=Count('id', filter=Q(zhuangtai=1)),
+                shensuzhong=Count('id', filter=Q(zhuangtai=3)),
+                yijiaona=Count('id', filter=Q(zhuangtai=2)),
+                yibohui=Count('id', filter=Q(zhuangtai=4)),
+            )
+
+            # ================= 积分处罚统计 =================
+            jifen_stats = Chufajilu.objects.filter(dashouid=yonghuid).aggregate(
+                total=Count('id'),
+                daichuli=Count('id', filter=Q(sqzhuangtai=0) | Q(sqzhuangtai=3)),
+                yichuli=Count('id', filter=Q(sqzhuangtai=1) | Q(sqzhuangtai=2)),
+                # 细分
+                daichuli_0=Count('id', filter=Q(sqzhuangtai=0)),
+                shensuzhong_3=Count('id', filter=Q(sqzhuangtai=3)),
+                yichufa_1=Count('id', filter=Q(sqzhuangtai=1)),
+                yibohui_2=Count('id', filter=Q(sqzhuangtai=2)),
+            )
+
+            data = {
+                "fakuan": {
+                    "total": fadan_stats['total'],
+                    "daijiaona": fadan_stats['daijiaona'],
+                    "shensuzhong": fadan_stats['shensuzhong'],
+                    "yijiaona": fadan_stats['yijiaona'],
+                    "yibohui": fadan_stats['yibohui'],
+                },
+                "jifen": {
+                    "total": jifen_stats['total'],
+                    "daichuli": jifen_stats['daichuli'],
+                    "yichuli": jifen_stats['yichuli'],
+                    "daichuli_0": jifen_stats['daichuli_0'],
+                    "shensuzhong_3": jifen_stats['shensuzhong_3'],
+                    "yichufa_1": jifen_stats['yichufa_1'],
+                    "yibohui_2": jifen_stats['yibohui_2'],
+                }
+            }
+
+            return Response({'code': 0, 'msg': '获取统计成功', 'data': data})
+
+        except Exception as e:
+            logger.error(f"获取统计异常 {yonghuid}: {e}", exc_info=True)
+            return Response({'code': 99, 'msg': '系统繁忙'}, status=500)
+class DaShouFaKuanLieBiaoView(APIView):
+    """
+    打手罚款列表接口
+    路径：POST /yonghu/dsfklbhq
+    参数：
+        page: 页码（默认1）
+        page_size: 每页条数（默认10，最大50）
+        zhuangtai: 状态筛选（1待缴纳/2已缴纳/3申诉中/4申诉成功，0或不传表示全部）
+        sousuo_dingdan_id: 订单号模糊搜索
+    返回：{
+        list: [{
+            id, beichufa_id, guanliandingdan_id, chufaliyou, fakuanjine, zhuangtai,
+            yingxiang_qiangdan, shensuliyou, bohuiliyou,
+            zhengju_tupian: [...],    // 证据图片（yongtu=1）
+            shensu_tupian: [...],     // 申诉图片（yongtu=2）
+            create_time, update_time
+        }],
+        has_more, page, page_size
+    }
+    """
+    permission_classes = [IsAuthenticated, DashouPermission]
+
+    def post(self, request):
+        try:
+            user_main = request.user
+            yonghuid = user_main.yonghuid
+
+            # 获取分页参数
+            page = int(request.data.get('page', 1))
+            page_size = int(request.data.get('page_size', 10))
+            if page_size > 50:
+                page_size = 50
+            if page_size < 1:
+                page_size = 10
+
+            # 状态筛选
+            zhuangtai = request.data.get('zhuangtai')
+            # 订单号搜索
+            sousuo_dingdan_id = request.data.get('sousuo_dingdan_id', '').strip()
+
+            # 基础查询：当前用户的罚单
+            qs = Fadan.objects.filter(beichufa_id=yonghuid)
+
+            # 状态筛选
+            if zhuangtai is not None and int(zhuangtai) in [1, 2, 3, 4]:
+                qs = qs.filter(zhuangtai=int(zhuangtai))
+
+            # 订单号模糊搜索
+            if sousuo_dingdan_id:
+                qs = qs.filter(guanliandingdan_id__icontains=sousuo_dingdan_id)
+
+            # 按创建时间倒序
+            qs = qs.order_by('-create_time')
+
+            # 分页
+            paginator = Paginator(qs, page_size)
+            try:
+                page_obj = paginator.page(page)
+            except Exception:
+                return Response({
+                    'code': 0, 'msg': '获取成功',
+                    'data': {'list': [], 'has_more': False, 'page': page, 'page_size': page_size}
+                })
+
+            records = list(page_obj)
+            fadan_ids = [r.id for r in records]
+
+            # 批量获取图片，按用途分组
+            zhengju_map = {}   # key: fadan_id, value: [url, ...]
+            shensu_map = {}
+            if fadan_ids:
+                tupians = FadanShensuTupian.objects.filter(
+                    fadan_id__in=fadan_ids
+                ).values('fadan_id', 'tupian_url', 'yongtu')
+                for t in tupians:
+                    fid = t['fadan_id']
+                    url = t['tupian_url']
+                    if t['yongtu'] == 1:
+                        zhengju_map.setdefault(fid, []).append(url)
+                    else:
+                        shensu_map.setdefault(fid, []).append(url)
+
+            # 组装返回数据
+            chufa_list = []
+            for r in records:
+                rid = r.id
+                item = {
+                    'id': rid,
+                    'beichufa_id': r.beichufa_id,
+                    'guanliandingdan_id': r.guanliandingdan_id or '',
+                    'chufaliyou': r.chufaliyou or '',
+                    'fakuanjine': str(r.fakuanjine),
+                    'zhuangtai': r.zhuangtai,
+                    'yingxiang_qiangdan': r.yingxiang_qiangdan,
+                    'shensuliyou': r.shensuliyou or '',
+                    'bohuiliyou': r.bohuiliyou or '',
+                    'zhengju_tupian': zhengju_map.get(rid, []),   # 证据图片
+                    'shensu_tupian': shensu_map.get(rid, []),     # 申诉图片
+                    'create_time': r.create_time.strftime('%Y-%m-%d %H:%M:%S') if r.create_time else '',
+                    'update_time': r.update_time.strftime('%Y-%m-%d %H:%M:%S') if r.update_time else '',
+                }
+                chufa_list.append(item)
+
+            has_more = page_obj.has_next()
+            return Response({
+                'code': 0,
+                'msg': '获取成功',
+                'data': {
+                    'list': chufa_list,
+                    'has_more': has_more,
+                    'page': page,
+                    'page_size': page_size,
+                }
+            })
+
+        except Exception as e:
+            logger.error(f"获取罚款列表异常 {yonghuid if 'yonghuid' in locals() else ''}: {e}", exc_info=True)
+            return Response({'code': 99, 'msg': '系统繁忙'}, status=500)
+
+
+
+class FaKuanShenSuView(APIView):
+    """
+    罚款申诉提交/修改接口
+    路径：POST /yonghu/fkss
+    参数：
+        fadan_id: 罚单ID
+        shensu_liyou: 申诉理由
+        shensu_tupian_urls: 图片相对URL数组（可空数组，但至少要有理由）
+    逻辑：
+        - 仅待缴纳状态且无驳回理由的罚单可申诉
+        - 允许对已有申诉进行修改：先删除旧申诉图片（yongtu=2），再添加新图片
+    """
+    permission_classes = [IsAuthenticated, DashouPermission]
+
+    def post(self, request):
+        try:
+            user_main = request.user
+            yonghuid = user_main.yonghuid
+            fadan_id = request.data.get('fadan_id')
+            shensu_liyou = request.data.get('shensu_liyou', '').strip()
+            tupian_urls = request.data.get('shensu_tupian_urls', [])
+
+            if not fadan_id:
+                return Response({'code': 400, 'msg': '缺少罚款ID'}, status=400)
+            if not shensu_liyou:
+                return Response({'code': 400, 'msg': '请输入申诉理由'}, status=400)
+
+            # 查询罚单，确保属于当前打手
+            try:
+                fadan = Fadan.objects.get(id=fadan_id, beichufa_id=yonghuid)
+            except Fadan.DoesNotExist:
+                return Response({'code': 404, 'msg': '罚单不存在或无权操作'}, status=404)
+
+            # 只允许待缴纳状态（状态1）且没有驳回理由的罚单申诉
+            if fadan.zhuangtai != 1:
+                return Response({'code': 400, 'msg': '当前状态不可申诉'}, status=400)
+            if fadan.bohuiliyou:
+                return Response({'code': 400, 'msg': '该罚单申诉已被驳回，不可再次申诉'}, status=400)
+
+            # 更新罚单状态为申诉中，并记录理由
+            fadan.zhuangtai = 3
+            fadan.shensuliyou = shensu_liyou
+            fadan.save()
+
+            # 删除旧的申诉图片（yongtu=2），仅删除打手自己上传的申诉图
+            FadanShensuTupian.objects.filter(fadan=fadan, yongtu=2).delete()
+
+            # 插入新上传的申诉图片
+            for url in tupian_urls:
+                FadanShensuTupian.objects.create(
+                    fadan=fadan,
+                    beichufa_id=yonghuid,
+                    tupian_url=url,
+                    yongtu=2
+                )
+
+            return Response({'code': 0, 'msg': '申诉提交成功'})
+
+        except Exception as e:
+            logger.error(f"罚款申诉异常 {yonghuid if 'yonghuid' in locals() else ''}: {e}", exc_info=True)
+            return Response({'code': 99, 'msg': '系统繁忙'}, status=500)
+
+
+
+
+
+
+
+# 需要替换为你自己项目中的导入路径
+from shangpin.models import Czjilu
+import string  # 【致命错误修正】必须导入 string
+from django.views import View
+
+logger = logging.getLogger('xiaochengxu')
+
+# ==================== 1. 罚款支付下单接口 ====================
+class FaKuanPayView(APIView):
+    """
+    罚款微信支付下单接口（完全照抄 YajinGoumai）
+    路径：POST /yonghu/fkjn
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            fadan_id = request.data.get('fadan_id')
+            if not fadan_id:
+                return Response({'code': 400, 'message': '参数不完整'}, status=status.HTTP_400_BAD_REQUEST)
+
+            try:
+                fadan = Fadan.objects.get(id=fadan_id, beichufa_id=request.user.yonghuid)
+            except Fadan.DoesNotExist:
+                return Response({'code': 404, 'message': '罚单不存在或不属于您'}, status=status.HTTP_404_NOT_FOUND)
+
+            if fadan.zhuangtai not in [1, 3]:
+                return Response({'code': 400, 'message': '罚单当前状态不可支付'}, status=status.HTTP_400_BAD_REQUEST)
+
+            jine = float(fadan.fakuanjine)
+
+            timestamp_ms = int(time.time() * 1000)
+            timestamp_ns = int(time.time_ns() // 1000) % 1000000
+            random_num = random.randint(0, 99)
+            dingdanid = f"FK{timestamp_ms:011d}{timestamp_ns:06d}{random_num:02d}"
+
+            chongzhi_jilu = Czjilu.objects.create(
+                dingdan_id=dingdanid,
+                zhuangtai=9,
+                yonghuid=request.user.yonghuid,
+                jine=jine,
+                leixing=4,
+                shuoming=settings.FAKUAN_PAY_DESCRIPTION
+            )
+
+            try:
+                pay_params = self.generate_wechat_pay_params(
+                    dingdanid=dingdanid,
+                    jine=jine,
+                    openid=request.user.openid,
+                    pay_type='fakuan'
+                )
+            except Exception as e:
+                chongzhi_jilu.delete()
+                logger.error(f"生成微信支付参数失败: {str(e)}")
+                return Response({
+                    'code': 500,
+                    'message': f'支付参数生成失败: {str(e)}'
+                }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+            return Response({
+                'code': 200,
+                'message': '支付参数生成成功',
+                'payParams': pay_params,
+                'dingdanid': dingdanid
+            }, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            logger.error(f"罚款支付下单接口异常: {str(e)}", exc_info=True)
+            return Response({
+                'code': 500,
+                'message': '服务器内部错误，请稍后重试'
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def generate_wechat_pay_params(self, dingdanid, jine, openid, pay_type):
+        APPID = settings.WEIXIN_APPID
+        MCHID = settings.WEIXIN_MCHID
+        KEY = settings.WEIXIN_SHANGHUMIYAO
+
+        if pay_type == 'fakuan':
+            PAY_DESCRIPTION = settings.FAKUAN_PAY_DESCRIPTION
+            NOTIFY_URL = settings.FAKUAN_PAY_NOTIFY_URL   # 回调地址在这里
+        else:
+            raise Exception('未知的支付类型')
+
+        nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+        total_fee = int(jine * 100)
+        trade_type = 'JSAPI'
+        user_ip = self.get_client_ip()
+
+        # 第一次签名
+        sign_data = {
+            'appid': APPID,
+            'mch_id': MCHID,
+            'nonce_str': nonce_str,
+            'body': PAY_DESCRIPTION,
+            'out_trade_no': dingdanid,
+            'total_fee': total_fee,
+            'spbill_create_ip': user_ip,
+            'notify_url': NOTIFY_URL,    # 关键：把回调地址传入
+            'trade_type': trade_type,
+            'openid': openid
+        }
+
+        sorted_sign_data = sorted(sign_data.items(), key=lambda x: x[0])
+        sign_string = '&'.join([f"{key}={value}" for key, value in sorted_sign_data if value])
+        sign_string += f'&key={KEY}'
+        sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+
+        # 构建 XML，这里必须包含 notify_url
+        xml_data = f"""<xml>
+<appid>{APPID}</appid>
+<body>{PAY_DESCRIPTION}</body>
+<mch_id>{MCHID}</mch_id>
+<nonce_str>{nonce_str}</nonce_str>
+<notify_url>{NOTIFY_URL}</notify_url>
+<openid>{openid}</openid>
+<out_trade_no>{dingdanid}</out_trade_no>
+<spbill_create_ip>{user_ip}</spbill_create_ip>
+<total_fee>{total_fee}</total_fee>
+<trade_type>{trade_type}</trade_type>
+<sign>{sign}</sign>
+</xml>"""
+
+        response = requests.post(
+            'https://api.mch.weixin.qq.com/pay/unifiedorder',
+            data=xml_data.encode('utf-8'),
+            headers={'Content-Type': 'application/xml'},
+            timeout=10
+        )
+
+        root = ET.fromstring(response.content)
+        return_code = root.find('return_code').text
+        result_code = root.find('result_code').text
+
+        if return_code == 'SUCCESS' and result_code == 'SUCCESS':
+            prepay_id = root.find('prepay_id').text
+            timestamp = str(int(time.time()))
+            nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+            package = f'prepay_id={prepay_id}'
+            sign_type = 'MD5'
+
+            pay_sign_data = {
+                'appId': APPID,
+                'timeStamp': timestamp,
+                'nonceStr': nonce_str,
+                'package': package,
+                'signType': sign_type
+            }
+
+            sorted_pay_sign_data = sorted(pay_sign_data.items(), key=lambda x: x[0])
+            pay_sign_string = '&'.join([f"{key}={value}" for key, value in sorted_pay_sign_data])
+            pay_sign_string += f'&key={KEY}'
+            pay_sign = hashlib.md5(pay_sign_string.encode('utf-8')).hexdigest().upper()
+
+            return {
+                'appId': APPID,
+                'timeStamp': timestamp,
+                'nonceStr': nonce_str,
+                'package': package,
+                'signType': sign_type,
+                'paySign': pay_sign
+            }
+        else:
+            err_code = root.find('err_code')
+            err_code_des = root.find('err_code_des')
+            error_details = f"return_code: {return_code}"
+            if err_code is not None:
+                error_details += f", err_code: {err_code.text}"
+            if err_code_des is not None:
+                error_details += f", err_code_des: {err_code_des.text}"
+            raise Exception(f"微信支付下单失败: {error_details}")
+
+    def get_client_ip(self):
+        request = self.request
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0]
+        else:
+            ip = request.META.get('REMOTE_ADDR')
+        return ip if ip else '127.0.0.1'
+
+# ==================== 2. 罚款支付回调接口 ====================
+class FaKuanHuitiaoView(View):
+    """
+    罚款支付回调接口（严格借鉴 YajinHuitiao 接口，参数一个不少）
+    路径：POST /yonghu/fk_huitiao
+    """
+    def post(self, request):
+        try:
+            # 1. 解析微信回调XML数据
+            request_body = request.body
+            logger.info(f"收到微信支付回调，原始数据: {request_body.decode('utf-8')}")
+
+            root = ET.fromstring(request_body)
+
+            # 获取关键字段
+            return_code = root.find('return_code').text
+            result_code = root.find('result_code').text
+            out_trade_no = root.find('out_trade_no').text  # 订单ID
+            transaction_id = root.find('transaction_id').text  # 微信交易号
+            total_fee = int(root.find('total_fee').text)  # 支付金额（分）
+
+            logger.info(f"回调数据解析: 订单{out_trade_no}, 状态{return_code}/{result_code}, 金额{total_fee}分")
+
+            # 2. 验证基本返回状态
+            if return_code != 'SUCCESS' or result_code != 'SUCCESS':
+                logger.warning(f"微信支付回调状态异常: {return_code}/{result_code}")
+                return self.wechat_response('FAIL', '支付失败')
+
+            # 3. 验证签名（确保是微信发来的）
+            if not self.verify_signature(request_body):
+                logger.error(f"签名验证失败: {out_trade_no}")
+                return self.wechat_response('FAIL', '签名验证失败')
+
+            # 4. 查询订单
+            try:
+                order = Czjilu.objects.get(dingdan_id=out_trade_no)
+                logger.info(f"找到订单: {order.dingdan_id}, 状态: {order.zhuangtai}, 金额: {order.jine}")
+            except Czjilu.DoesNotExist:
+                logger.error(f"订单不存在: {out_trade_no}")
+                return self.wechat_response('FAIL', '订单不存在')
+
+            # 5. 检查订单状态是否为未支付（9）
+            if order.zhuangtai != 9:
+                logger.warning(f"订单状态不是未支付: {order.dingdan_id}, 当前状态: {order.zhuangtai}")
+                # 已处理过的订单直接返回成功，避免微信重复回调
+                return self.wechat_response('SUCCESS', 'OK')
+
+            # 6. 验证金额（微信返回的是分，需要转换）
+            wechat_amount_yuan = total_fee / 100  # 转换为元
+            order_amount_yuan = float(order.jine)  # 订单金额（元）
+
+            # 允许1分钱的误差（浮点数比较）
+            if abs(wechat_amount_yuan - order_amount_yuan) > 0.01:
+                logger.error(f"金额不一致: 订单金额{order_amount_yuan}元, 支付金额{wechat_amount_yuan}元")
+                return self.wechat_response('FAIL', '金额不一致')
+
+            # 7. 更新订单状态为已支付（3）
+            order.zhuangtai = 3
+            order.save(update_fields=['zhuangtai'])
+            logger.info(f"订单状态更新成功: {order.dingdan_id} -> 3")
+
+            # 8. 更新罚单状态为已缴纳（2）
+            try:
+                # 根据订单中的用户ID和金额匹配待缴纳的罚单
+                fadan = Fadan.objects.filter(
+                    beichufa_id=order.yonghuid,
+                    fakuanjine=order.jine,
+                    zhuangtai__in=[1, 3]
+                ).first()
+                if fadan:
+                    fadan.zhuangtai = 2  # 已缴纳
+                    fadan.save(update_fields=['zhuangtai'])
+                    logger.info(f"罚单 {fadan.id} 已自动标记为已缴纳")
+
+                    from yonghu.fadan_fenhong_utils import process_fadan_fenhong
+                    success, msg = process_fadan_fenhong(fadan.id)
+                    if not success:
+                        logger.error(f"罚单 {fadan.id} 分红处理失败: {msg}")
+                    else:
+                        logger.info(f"罚单 {fadan.id} 分红处理完成: {msg}")
+
+
+
+                    #from utils.fadan_utils import fadan_fenhong
+                    #fadan_fenhong(fadan.id)
+
+
+            except Exception as e:
+                logger.error(f"更新罚单状态失败: {str(e)}", exc_info=True)
+
+            # 9. 更新收支记录表
+            try:
+                from peizhi.models import Szjilu
+                from decimal import Decimal
+
+                # 获取订单金额（确保是Decimal类型）
+                jine_decimal = Decimal(str(order.jine)) if not isinstance(order.jine, Decimal) else order.jine
+
+                from dingdan.utils import update_daily_income
+                update_daily_income(jine_decimal)
+
+                # 查询或创建ID=1的收支记录
+                szjilu, created = Szjilu.objects.get_or_create(
+                    id=1,
+                    defaults={
+                        'zongsy': Decimal('0.00'),
+                        'zongls': Decimal('0.00'),
+                        'zongzc': Decimal('0.00'),
+                        'jrzc': Decimal('0.00'),
+                        'jrls': Decimal('0.00')
+                    }
+                )
+
+                # 更新三个字段
+                szjilu.zongsy += jine_decimal  # 总收益
+                szjilu.zongls += jine_decimal  # 总流水
+                szjilu.jrls += jine_decimal  # 今日流水
+
+                szjilu.save()
+
+
+
+                logger.info(f"收支记录更新成功: 订单{order.dingdan_id}, 金额{jine_decimal}元")
+
+            except Exception as e:
+                # 收支记录更新失败不影响主流程，只记录日志
+                logger.error(f"更新收支记录失败: {str(e)}", exc_info=True)
+
+            # 10. 返回成功响应给微信
+            logger.info(f"罚款支付回调处理完成: {out_trade_no}")
+            return self.wechat_response('SUCCESS', 'OK')
+
+        except ET.ParseError as e:
+            logger.error(f"XML解析失败: {str(e)}")
+            return self.wechat_response('FAIL', '数据格式错误')
+        except Exception as e:
+            logger.error(f"罚款支付回调处理异常: {str(e)}", exc_info=True)
+            # 返回FAIL让微信重试
+            return self.wechat_response('FAIL', '处理异常')
+
+    def verify_signature(self, xml_data):
+        """验证微信支付签名（完全照搬 YajinHuitiao 的 verify_signature）"""
+        try:
+            root = ET.fromstring(xml_data)
+            sign = root.find('sign').text
+
+            if not sign:
+                logger.error("签名字段不存在")
+                return False
+
+            # 获取所有参数并排除sign
+            params = {}
+            for child in root:
+                if child.tag != 'sign' and child.text is not None:
+                    params[child.tag] = child.text
+
+            # 按照参数名ASCII码从小到大排序
+            sorted_params = sorted(params.items(), key=lambda x: x[0])
+
+            # 拼接字符串
+            sign_string = '&'.join([f"{key}={value}" for key, value in sorted_params if value])
+            sign_string += f'&key={settings.WEIXIN_SHANGHUMIYAO}'
+
+            # 计算签名
+            calculated_sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+
+            is_valid = sign == calculated_sign
+            if not is_valid:
+                logger.error(f"签名验证失败: 计算签名{calculated_sign}, 收到签名{sign}")
+
+            return is_valid
+
+        except Exception as e:
+            logger.error(f"验证签名异常: {str(e)}")
+            return False
+
+    def wechat_response(self, return_code, return_msg):
+        """返回微信支付回调响应（完全照搬 YajinHuitiao 的 wechat_response）"""
+        xml_response = f"""<xml>
+<return_code><![CDATA[{return_code}]]></return_code>
+<return_msg><![CDATA[{return_msg}]]></return_msg>
+</xml>"""
+
+        logger.info(f"返回微信响应: {return_code} - {return_msg}")
+        return HttpResponse(xml_response, content_type='application/xml')
+
+
+# ==================== 3. 支付轮询接口 ====================
+class FaKuanPayPollView(APIView):
+    """罚款支付轮询接口（借鉴 YajinLunxun）"""
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            dingdanid = request.data.get('dingdanid')
+            if not dingdanid:
+                return Response({'code': 400, 'message': '订单ID不能为空'})
+
+            order = Czjilu.objects.get(dingdan_id=dingdanid, yonghuid=request.user.yonghuid)
+            if order.zhuangtai == 3:
+                return Response({'code': 200, 'message': '支付成功'})
+            else:
+                return Response({'code': 400, 'message': '订单尚未支付'})
+        except Czjilu.DoesNotExist:
+            return Response({'code': 400, 'message': '订单不存在'})
+        except Exception as e:
+            logger.error(f"轮询异常: {str(e)}")
+            return Response({'code': 500, 'message': '服务器内部错误'})
+
+
+# ==================== 4. 支付失败处理接口 ====================
+class FaKuanPayFailView(APIView):
+    """罚款支付失败处理接口（借鉴 YajinShibai）"""
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            dingdanid = request.data.get('dingdanid')
+            if not dingdanid:
+                return Response({'code': 400, 'message': '订单ID不能为空'})
+
+            order = Czjilu.objects.get(dingdan_id=dingdanid, yonghuid=request.user.yonghuid)
+            if order.zhuangtai == 9:  # 未支付
+                order.delete()
+                logger.info(f"用户{request.user.yonghuid}删除未支付订单: {dingdanid}")
+                return Response({'code': 200, 'message': '订单已删除'})
+            else:
+                return Response({'code': 400, 'message': '订单状态不是未支付，无法删除'})
+        except Czjilu.DoesNotExist:
+            return Response({'code': 400, 'message': '订单不存在'})
+        except Exception as e:
+            logger.error(f"支付失败处理异常: {str(e)}")
+            return Response({'code': 500, 'message': '服务器内部错误'})
+
+
+
+
+
+
+
+from shangpin.models import Czjilu
+from dengji.models import Chenghao, ShenheJilu, KaoheCishuFeiyong, YonghuChenghao
+from dengji.utils import get_tag_fee   # 您需要确保此函数已定义
+
+logger = logging.getLogger('xiaochengxu')
+from dengji.utils import create_shenhe_jilu
+from dengji.utils import validate_shenheguan
+
+
+'''class KaohePayView(APIView):
+    """
+    考核支付下单接口
+    路径：POST /yonghu/khzf
+    参数：
+        tag_id: 标签ID
+        game_nick: 游戏昵称
+        remark: 备注
+        reapply: 是否再次申请 (true/false)
+        jilu_id: 再次申请时的原记录ID（reapply=true时必传）
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            user = request.user
+            tag_id = request.data.get('tag_id')
+            game_nick = request.data.get('game_nick', '').strip()
+            remark = request.data.get('remark', '').strip()
+            reapply = request.data.get('reapply', False)
+            jilu_id = request.data.get('jilu_id') if reapply else None
+
+            if not tag_id or not game_nick:
+                return Response({'code': 400, 'message': '标签ID和游戏昵称不能为空'})
+
+            # 1. 验证标签
+            try:
+                chenghao = Chenghao.objects.get(id=tag_id)
+            except Chenghao.DoesNotExist:
+                return Response({'code': 404, 'message': '标签不存在'})
+
+            # 2. 检查用户是否已拥有该标签
+            if YonghuChenghao.objects.filter(yonghu=user, chenghao=chenghao).exists():
+                return Response({'code': 400, 'message': '您已拥有该标签，无需重复考核'})
+
+            # 3. 检查是否有未完成的申请
+            if ShenheJilu.objects.filter(
+                shenqingren_id=user.yonghuid,
+                chenghao=chenghao,
+                zhuangtai__in=[0, 3]   # 审核中、待审核
+            ).exists():
+                return Response({'code': 400, 'message': '您有未完成的考核申请，请等待结果'})
+
+            # 4. 计算考核次数
+            if reapply and jilu_id:
+                last = ShenheJilu.objects.filter(
+                    jilu_id=jilu_id, shenqingren_id=user.yonghuid, zhuangtai=2
+                ).first()
+                if not last:
+                    return Response({'code': 400, 'message': '原记录不存在或状态不是未通过'})
+                new_cishu = last.cishu + 1
+            else:
+                max_cishu = ShenheJilu.objects.filter(
+                    shenqingren_id=user.yonghuid,
+                    chenghao=chenghao,
+                    zhuangtai__in=[1, 2]
+                ).aggregate(max=models.Max('cishu'))['max'] or 0
+                new_cishu = max_cishu + 1
+
+            # 5. 获取本次费用
+            fee = get_tag_fee(chenghao, new_cishu)
+            if fee <= 0:
+                return Response({'code': 400, 'message': '本次费用为0，请直接使用免费申请接口'})
+
+            # 6. 生成订单ID
+            timestamp_ms = int(time.time() * 1000)
+            timestamp_ns = int(time.time_ns() // 1000) % 1000000
+            random_num = random.randint(0, 99)
+            dingdanid = f"KH{timestamp_ms:011d}{timestamp_ns:06d}{random_num:02d}"
+
+            # 7. 创建支付订单（Czjilu）
+            order = Czjilu.objects.create(
+                dingdan_id=dingdanid,
+                zhuangtai=9,           # 未支付
+                yonghuid=user.yonghuid,
+                jine=float(fee),
+                leixing=5,             # 5-考核支付
+                shuoming=settings.KAOHE_PAY_DESCRIPTION
+            )
+
+            # 8. 构造 attach 参数（微信回调原样返回）
+
+            # 在原有下单逻辑中增加
+            shenheguan_id = request.data.get('shenheguan_id', '').strip()
+            attach_data = {
+                'tag_id': tag_id,
+                'game_nick': game_nick,
+                'remark': remark,
+                'reapply': reapply,
+                'jilu_id': jilu_id if reapply else None,
+                'shenheguan_id': shenheguan_id,  # 新增
+            }
+            # 然后将 attach_data 序列化后作为 attach 参数传给微信支付统一下单
+
+            attach_str = json.dumps(attach_data, ensure_ascii=False)
+
+            # 9. 生成微信支付参数
+            try:
+                pay_params = self.generate_wechat_pay_params(
+                    dingdanid=dingdanid,
+                    jine=float(fee),
+                    openid=user.openid,
+                    attach=attach_str,
+                    pay_type='kaohe'
+                )
+            except Exception as e:
+                order.delete()  # 下单失败，删除订单记录
+                logger.error(f"生成微信支付参数失败: {str(e)}")
+                return Response({'code': 500, 'message': f'支付参数生成失败: {str(e)}'})
+
+            return Response({
+                'code': 200,
+                'message': '支付参数生成成功',
+                'payParams': pay_params,
+                'dingdanid': dingdanid
+            })
+
+        except Exception as e:
+            logger.error(f"考核支付下单异常: {str(e)}", exc_info=True)
+            return Response({'code': 500, 'message': '服务器内部错误'})
+
+    def generate_wechat_pay_params(self, dingdanid, jine, openid, attach, pay_type):
+        """生成微信JSAPI支付参数（完整照搬罚款支付逻辑，仅修改描述和回调地址）"""
+        APPID = settings.WEIXIN_APPID
+        MCHID = settings.WEIXIN_MCHID
+        KEY = settings.WEIXIN_SHANGHUMIYAO
+
+        if pay_type == 'kaohe':
+            PAY_DESCRIPTION = settings.KAOHE_PAY_DESCRIPTION
+            NOTIFY_URL = settings.KAOHE_PAY_NOTIFY_URL
+        else:
+            raise Exception('未知支付类型')
+
+        nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+        total_fee = int(jine * 100)
+        trade_type = 'JSAPI'
+        user_ip = self.get_client_ip()
+
+        # 第一次签名（统一下单）
+        sign_data = {
+            'appid': APPID,
+            'mch_id': MCHID,
+            'nonce_str': nonce_str,
+            'body': PAY_DESCRIPTION,
+            'out_trade_no': dingdanid,
+            'total_fee': total_fee,
+            'spbill_create_ip': user_ip,
+            'notify_url': NOTIFY_URL,
+            'trade_type': trade_type,
+            'openid': openid,
+            'attach': attach,                 # 附加数据，回调时原样返回
+        }
+
+        sorted_sign_data = sorted(sign_data.items(), key=lambda x: x[0])
+        sign_string = '&'.join([f"{key}={value}" for key, value in sorted_sign_data if value])
+        sign_string += f'&key={KEY}'
+        sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+
+        # 构建XML请求体
+        xml_data = f"""<xml>
+<appid>{APPID}</appid>
+<body>{PAY_DESCRIPTION}</body>
+<mch_id>{MCHID}</mch_id>
+<nonce_str>{nonce_str}</nonce_str>
+<notify_url>{NOTIFY_URL}</notify_url>
+<openid>{openid}</openid>
+<out_trade_no>{dingdanid}</out_trade_no>
+<spbill_create_ip>{user_ip}</spbill_create_ip>
+<total_fee>{total_fee}</total_fee>
+<trade_type>{trade_type}</trade_type>
+<attach><![CDATA[{attach}]]></attach>
+<sign>{sign}</sign>
+</xml>"""
+
+        response = requests.post(
+            'https://api.mch.weixin.qq.com/pay/unifiedorder',
+            data=xml_data.encode('utf-8'),
+            headers={'Content-Type': 'application/xml'},
+            timeout=10
+        )
+
+        root = ET.fromstring(response.content)
+        return_code = root.find('return_code').text
+        result_code = root.find('result_code').text
+
+        if return_code == 'SUCCESS' and result_code == 'SUCCESS':
+            prepay_id = root.find('prepay_id').text
+            timestamp = str(int(time.time()))
+            nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+            package = f'prepay_id={prepay_id}'
+            sign_type = 'MD5'
+
+            # 第二次签名（前端调起支付用）
+            pay_sign_data = {
+                'appId': APPID,
+                'timeStamp': timestamp,
+                'nonceStr': nonce_str,
+                'package': package,
+                'signType': sign_type,
+            }
+            sorted_pay_sign_data = sorted(pay_sign_data.items(), key=lambda x: x[0])
+            pay_sign_string = '&'.join([f"{key}={value}" for key, value in sorted_pay_sign_data])
+            pay_sign_string += f'&key={KEY}'
+            pay_sign = hashlib.md5(pay_sign_string.encode('utf-8')).hexdigest().upper()
+
+            return {
+                'appId': APPID,
+                'timeStamp': timestamp,
+                'nonceStr': nonce_str,
+                'package': package,
+                'signType': sign_type,
+                'paySign': pay_sign,
+            }
+        else:
+            err_code = root.find('err_code')
+            err_code_des = root.find('err_code_des')
+            error_details = f"return_code: {return_code}"
+            if err_code is not None:
+                error_details += f", err_code: {err_code.text}"
+            if err_code_des is not None:
+                error_details += f", err_code_des: {err_code_des.text}"
+            raise Exception(f"微信支付下单失败: {error_details}")
+
+    def get_client_ip(self):
+        request = self.request
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0]
+        else:
+            ip = request.META.get('REMOTE_ADDR')
+        return ip if ip else '127.0.0.1'
+
+
+
+from dengji.utils import create_shenhe_jilu
+from dengji.utils import validate_shenheguan
+class KaohePayCallbackView(View):
+    """
+    考核支付回调接口
+    路径：/yonghu/kh_huitiao
+    """
+    def post(self, request):
+        try:
+            request_body = request.body
+            logger.info(f"收到考核支付回调: {request_body.decode('utf-8')}")
+
+            root = ET.fromstring(request_body)
+
+            return_code = root.find('return_code').text
+            result_code = root.find('result_code').text
+            out_trade_no = root.find('out_trade_no').text
+            transaction_id = root.find('transaction_id').text
+            total_fee = int(root.find('total_fee').text)
+
+            if return_code != 'SUCCESS' or result_code != 'SUCCESS':
+                logger.warning(f"支付状态异常: {return_code}/{result_code}")
+                return self.wechat_response('FAIL', '支付失败')
+
+            # 验证签名
+            if not self.verify_signature(request_body):
+                logger.error("签名验证失败")
+                return self.wechat_response('FAIL', '签名验证失败')
+
+            # 查找订单
+            try:
+                order = Czjilu.objects.get(dingdan_id=out_trade_no, leixing=5)
+            except Czjilu.DoesNotExist:
+                logger.error(f"考核订单不存在: {out_trade_no}")
+                return self.wechat_response('FAIL', '订单不存在')
+
+            if order.zhuangtai != 9:
+                logger.warning(f"订单状态非未支付: {order.zhuangtai}")
+                return self.wechat_response('SUCCESS', 'OK')
+
+            # 验证金额
+            wechat_yuan = total_fee / 100
+            if abs(wechat_yuan - float(order.jine)) > 0.01:
+                logger.error(f"金额不一致: 订单{order.jine}, 回调{wechat_yuan}")
+                return self.wechat_response('FAIL', '金额不一致')
+
+            # 更新订单状态为已支付
+            order.zhuangtai = 3
+            order.save()
+
+            # 解析 attach 获取业务参数
+            attach_element = root.find('attach')
+            if attach_element is not None and attach_element.text:
+                try:
+                    attach_data = json.loads(attach_element.text)
+                    tag_id = attach_data.get('tag_id')
+                    game_nick = attach_data.get('game_nick', '')
+                    remark = attach_data.get('remark', '')
+                    reapply = attach_data.get('reapply', False)
+                    jilu_id = attach_data.get('jilu_id') if reapply else None
+                    shenheguan_id = attach_data.get('shenheguan_id', '').strip()  # 新增
+
+                    # 获取用户
+                    user = UserMain.objects.get(yonghuid=order.yonghuid)
+
+                    # 尝试获取标签和费用，用于验证指定考核官是否合法
+                    try:
+                        chenghao = Chenghao.objects.get(id=tag_id)
+                        # 重新计算费用以便验证（实际上订单金额即费用）
+                        # 若指定了考核官，进行校验；不合法则忽略指定
+                        if shenheguan_id:
+                            valid, _ = validate_shenheguan(shenheguan_id, chenghao.bankuai, order.jine, user)
+                            if not valid:
+                                logger.warning(f"指定考核官无效，忽略: {shenheguan_id}")
+                                shenheguan_id = ''  # 忽略无效指定
+                    except Exception as e:
+                        logger.error(f"验证指定考核官异常: {e}")
+                        shenheguan_id = ''  # 异常也忽略
+
+                    # 调用创建审核记录的函数
+                    success, msg, record = create_shenhe_jilu(
+                        user=user,
+                        tag_id=tag_id,
+                        game_nick=game_nick,
+                        remark=remark,
+                        reapply=reapply,
+                        jilu_id=jilu_id,
+                        shenheguan_id=shenheguan_id,   # 新增
+                    )
+                    if not success:
+                        logger.error(f"创建审核记录失败: {msg}")
+                except Exception as e:
+                    logger.error(f"解析attach或创建审核记录失败: {e}", exc_info=True)
+
+            # 更新收支记录
+            try:
+                from peizhi.models import Szjilu
+                from decimal import Decimal
+                from dingdan.utils import update_daily_income
+
+                jine_decimal = Decimal(str(order.jine))
+                update_daily_income(jine_decimal)
+
+                szjilu, _ = Szjilu.objects.get_or_create(
+                    id=1,
+                    defaults={
+                        'zongsy': Decimal('0.00'),
+                        'zongls': Decimal('0.00'),
+                        'zongzc': Decimal('0.00'),
+                        'jrzc': Decimal('0.00'),
+                        'jrls': Decimal('0.00'),
+                    }
+                )
+                szjilu.zongsy += jine_decimal
+                szjilu.zongls += jine_decimal
+                szjilu.jrls += jine_decimal
+                szjilu.save()
+            except Exception as e:
+                logger.error(f"更新收支记录失败: {e}", exc_info=True)
+
+            return self.wechat_response('SUCCESS', 'OK')
+
+        except ET.ParseError as e:
+            logger.error(f"XML解析失败: {e}")
+            return self.wechat_response('FAIL', '数据格式错误')
+        except Exception as e:
+            logger.error(f"考核支付回调异常: {e}", exc_info=True)
+            return self.wechat_response('FAIL', '处理异常')
+
+    def verify_signature(self, xml_data):
+        """验证微信支付签名（与罚款回调完全一致）"""
+        try:
+            root = ET.fromstring(xml_data)
+            sign = root.find('sign').text
+            if not sign:
+                return False
+
+            params = {}
+            for child in root:
+                if child.tag != 'sign' and child.text is not None:
+                    params[child.tag] = child.text
+
+            sorted_params = sorted(params.items(), key=lambda x: x[0])
+            sign_string = '&'.join([f"{key}={value}" for key, value in sorted_params if value])
+            sign_string += f'&key={settings.WEIXIN_SHANGHUMIYAO}'
+            calculated_sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+            return sign == calculated_sign
+        except Exception as e:
+            logger.error(f"签名验证异常: {e}")
+            return False
+
+    def wechat_response(self, return_code, return_msg):
+        xml = f"""<xml>
+<return_code><![CDATA[{return_code}]]></return_code>
+<return_msg><![CDATA[{return_msg}]]></return_msg>
+</xml>"""
+        return HttpResponse(xml, content_type='application/xml')'''
+
+
+class KaohePayView(APIView):
+    """
+    考核支付下单接口
+    路径：POST /yonghu/khzf
+    参数：
+        tag_id: 标签ID
+        game_nick: 游戏昵称
+        remark: 备注
+        reapply: 是否再次申请 (true/false)
+        jilu_id: 再次申请时的原记录ID（reapply=true时必传）
+        shenheguan_id: 指定考核官ID（可选）
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            user = request.user
+            tag_id = request.data.get('tag_id')
+            game_nick = request.data.get('game_nick', '').strip()
+            remark = request.data.get('remark', '').strip()
+            reapply = request.data.get('reapply', False)
+            jilu_id = request.data.get('jilu_id') if reapply else None
+            shenheguan_id = request.data.get('shenheguan_id', '').strip()
+
+            logger.info(f"用户 {user.yonghuid} 发起考核支付申请，标签ID: {tag_id}, 再次申请: {reapply}")
+
+            if not tag_id or not game_nick:
+                logger.warning(f"用户 {user.yonghuid} 参数不完整: tag_id={tag_id}, game_nick={game_nick}")
+                return Response({'code': 400, 'message': '标签ID和游戏昵称不能为空'})
+
+            # 1. 检查是否有未支付的考核订单
+            unpaid_order = Czjilu.objects.filter(
+                yonghuid=user.yonghuid,
+                leixing=5,
+                zhuangtai=9
+            ).exists()
+            if unpaid_order:
+                logger.warning(f"用户 {user.yonghuid} 存在未支付的考核订单")
+                return Response({'code': 400, 'message': '您有未支付的考核订单，请先完成支付或取消'})
+
+            # 2. 验证标签
+            try:
+                chenghao = Chenghao.objects.get(id=tag_id)
+                logger.info(f"标签验证通过: {chenghao.mingcheng}")
+            except Chenghao.DoesNotExist:
+                logger.error(f"标签不存在: tag_id={tag_id}")
+                return Response({'code': 404, 'message': '标签不存在'})
+
+            # 3. 检查用户是否已拥有该标签
+            if YonghuChenghao.objects.filter(yonghu=user, chenghao=chenghao).exists():
+                logger.warning(f"用户 {user.yonghuid} 已拥有标签 {chenghao.mingcheng}")
+                return Response({'code': 400, 'message': '您已拥有该标签，无需重复考核'})
+
+            # 4. 检查是否有未完成的申请
+            if ShenheJilu.objects.filter(
+                    shenqingren_id=user.yonghuid,
+                    chenghao=chenghao,
+                    zhuangtai__in=[0, 3]  # 审核中、待审核
+            ).exists():
+                logger.warning(f"用户 {user.yonghuid} 有未完成的考核申请")
+                return Response({'code': 400, 'message': '您有未完成的考核申请，请等待结果'})
+
+            # 5. 计算考核次数和费用
+            if reapply and jilu_id:
+                last = ShenheJilu.objects.filter(
+                    jilu_id=jilu_id,
+                    shenqingren_id=user.yonghuid,
+                    zhuangtai=2
+                ).first()
+                if not last:
+                    logger.warning(f"用户 {user.yonghuid} 再次申请失败：原记录不存在或状态不是未通过，jilu_id={jilu_id}")
+                    return Response({'code': 400, 'message': '原记录不存在或状态不是未通过'})
+                new_cishu = last.cishu + 1
+                logger.info(f"再次申请，原记录ID: {jilu_id}，新次数: {new_cishu}")
+            else:
+                max_cishu = ShenheJilu.objects.filter(
+                    shenqingren_id=user.yonghuid,
+                    chenghao=chenghao,
+                    zhuangtai__in=[1, 2]
+                ).aggregate(max=models.Max('cishu'))['max'] or 0
+                new_cishu = max_cishu + 1
+                logger.info(f"首次申请，计算次数: {new_cishu}")
+
+            # 6. 获取本次费用
+            fee = get_tag_fee(chenghao, new_cishu)
+            logger.info(f"本次考核费用: {fee}元，次数: {new_cishu}")
+
+            if fee <= 0:
+                logger.warning(f"费用为0，应使用免费申请接口，tag_id={tag_id}, cishu={new_cishu}")
+                return Response({'code': 400, 'message': '本次费用为0，请直接使用免费申请接口'})
+
+            # 7. 生成订单ID
+            timestamp_ms = int(time.time() * 1000)
+            timestamp_ns = int(time.time_ns() // 1000) % 1000000
+            random_num = random.randint(0, 99)
+            dingdanid = f"KH{timestamp_ms:011d}{timestamp_ns:06d}{random_num:02d}"
+            logger.info(f"生成订单ID: {dingdanid}")
+
+            # 8. 创建支付订单（Czjilu）
+            order = Czjilu.objects.create(
+                dingdan_id=dingdanid,
+                zhuangtai=9,  # 未支付
+                yonghuid=user.yonghuid,
+                jine=float(fee),
+                leixing=5,  # 5-考核支付
+                shuoming=settings.KAOHE_PAY_DESCRIPTION
+            )
+            logger.info(f"创建支付订单成功: {dingdanid}")
+
+            # 9. 保存考核支付临时上下文（用于回调时取业务参数）
+            try:
+                from dengji.models import KaohePayTemp
+                KaohePayTemp.objects.create(
+                    dingdan_id=dingdanid,
+                    yonghuid=user.yonghuid,
+                    tag_id=tag_id,
+                    game_nick=game_nick,
+                    remark=remark,
+                    reapply=reapply,
+                    jilu_id=jilu_id if reapply else None,
+                    shenheguan_id=shenheguan_id,
+                    cishu=new_cishu,
+                    fee=fee,
+                )
+                logger.info(f"保存临时上下文成功: {dingdanid}")
+            except Exception as e:
+                logger.error(f"保存临时上下文失败: {str(e)}", exc_info=True)
+                # 临时表保存失败应该回滚订单
+                order.delete()
+                return Response({'code': 500, 'message': '系统异常，请稍后重试'})
+
+            # 10. 构造 attach 参数（只传订单ID，确保不超127字节）
+            attach_str = json.dumps({'oid': dingdanid}, ensure_ascii=False)
+            logger.info(f"attach内容: {attach_str}，长度: {len(attach_str.encode('utf-8'))}字节")
+
+            # 11. 生成微信支付参数
+            try:
+                pay_params = self.generate_wechat_pay_params(
+                    dingdanid=dingdanid,
+                    jine=float(fee),
+                    openid=user.openid,
+                    attach=attach_str,
+                    pay_type='kaohe'
+                )
+                logger.info(f"微信支付参数生成成功: {dingdanid}")
+            except Exception as e:
+                order.delete()  # 下单失败，删除订单记录
+                # 同时删除临时表记录
+                try:
+                    from dengji.models import KaohePayTemp
+                    KaohePayTemp.objects.filter(dingdan_id=dingdanid).delete()
+                except Exception as del_e:
+                    logger.error(f"删除临时表记录失败: {str(del_e)}")
+                logger.error(f"生成微信支付参数失败: {str(e)}", exc_info=True)
+                return Response({'code': 500, 'message': f'支付参数生成失败: {str(e)}'})
+
+            return Response({
+                'code': 200,
+                'message': '支付参数生成成功',
+                'payParams': pay_params,
+                'dingdanid': dingdanid
+            })
+
+        except Exception as e:
+            logger.error(f"考核支付下单异常: {str(e)}", exc_info=True)
+            return Response({'code': 500, 'message': '服务器内部错误'})
+
+    def generate_wechat_pay_params(self, dingdanid, jine, openid, attach, pay_type):
+        """生成微信JSAPI支付参数"""
+        APPID = settings.WEIXIN_APPID
+        MCHID = settings.WEIXIN_MCHID
+        KEY = settings.WEIXIN_SHANGHUMIYAO
+
+        if pay_type == 'kaohe':
+            PAY_DESCRIPTION = settings.KAOHE_PAY_DESCRIPTION
+            NOTIFY_URL = settings.KAOHE_PAY_NOTIFY_URL
+        else:
+            raise Exception('未知支付类型')
+
+        nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+        total_fee = int(jine * 100)
+        trade_type = 'JSAPI'
+        user_ip = self.get_client_ip()
+
+        logger.info(f"微信支付下单参数: out_trade_no={dingdanid}, total_fee={total_fee}, openid={openid}, ip={user_ip}")
+
+        # 第一次签名（统一下单）
+        sign_data = {
+            'appid': APPID,
+            'mch_id': MCHID,
+            'nonce_str': nonce_str,
+            'body': PAY_DESCRIPTION,
+            'out_trade_no': dingdanid,
+            'total_fee': total_fee,
+            'spbill_create_ip': user_ip,
+            'notify_url': NOTIFY_URL,
+            'trade_type': trade_type,
+            'openid': openid,
+            'attach': attach,
+        }
+
+        sorted_sign_data = sorted(sign_data.items(), key=lambda x: x[0])
+        sign_string = '&'.join([f"{key}={value}" for key, value in sorted_sign_data if value])
+        sign_string += f'&key={KEY}'
+        sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+
+        # 构建XML请求体
+        xml_data = f"""<xml>
+<appid>{APPID}</appid>
+<body>{PAY_DESCRIPTION}</body>
+<mch_id>{MCHID}</mch_id>
+<nonce_str>{nonce_str}</nonce_str>
+<notify_url>{NOTIFY_URL}</notify_url>
+<openid>{openid}</openid>
+<out_trade_no>{dingdanid}</out_trade_no>
+<spbill_create_ip>{user_ip}</spbill_create_ip>
+<total_fee>{total_fee}</total_fee>
+<trade_type>{trade_type}</trade_type>
+<attach><![CDATA[{attach}]]></attach>
+<sign>{sign}</sign>
+</xml>"""
+
+        logger.info(f"微信支付请求XML: {xml_data[:500]}...")  # 只打印前500字符
+
+        response = requests.post(
+            'https://api.mch.weixin.qq.com/pay/unifiedorder',
+            data=xml_data.encode('utf-8'),
+            headers={'Content-Type': 'application/xml'},
+            timeout=10
+        )
+
+        logger.info(f"微信支付响应: {response.text}")
+
+        root = ET.fromstring(response.content)
+
+        # 安全获取return_code
+        return_code_node = root.find('return_code')
+        if return_code_node is None or return_code_node.text is None:
+            logger.error(f"微信返回缺少return_code节点，原始内容: {response.text}")
+            raise Exception('微信支付接口异常，缺少return_code')
+        return_code = return_code_node.text
+
+        # 安全获取result_code
+        result_code_node = root.find('result_code')
+        if result_code_node is None or result_code_node.text is None:
+            logger.error(f"微信返回缺少result_code节点，原始内容: {response.text}")
+            raise Exception('微信支付接口异常，缺少result_code')
+        result_code = result_code_node.text
+
+        if return_code == 'SUCCESS' and result_code == 'SUCCESS':
+            prepay_id_node = root.find('prepay_id')
+            if prepay_id_node is None or prepay_id_node.text is None:
+                logger.error(f"统一下单成功但未返回prepay_id，原始内容: {response.text}")
+                raise Exception('微信支付接口异常，缺少prepay_id')
+            prepay_id = prepay_id_node.text
+
+            timestamp = str(int(time.time()))
+            nonce_str = ''.join(random.choices(string.ascii_letters + string.digits, k=32))
+            package = f'prepay_id={prepay_id}'
+            sign_type = 'MD5'
+
+            # 第二次签名（前端调起支付用）
+            pay_sign_data = {
+                'appId': APPID,
+                'timeStamp': timestamp,
+                'nonceStr': nonce_str,
+                'package': package,
+                'signType': sign_type,
+            }
+            sorted_pay_sign_data = sorted(pay_sign_data.items(), key=lambda x: x[0])
+            pay_sign_string = '&'.join([f"{key}={value}" for key, value in sorted_pay_sign_data])
+            pay_sign_string += f'&key={KEY}'
+            pay_sign = hashlib.md5(pay_sign_string.encode('utf-8')).hexdigest().upper()
+
+            logger.info(f"微信支付预下单成功，prepay_id={prepay_id}")
+
+            return {
+                'appId': APPID,
+                'timeStamp': timestamp,
+                'nonceStr': nonce_str,
+                'package': package,
+                'signType': sign_type,
+                'paySign': pay_sign,
+            }
+        else:
+            # 安全获取错误信息
+            err_code_node = root.find('err_code')
+            err_code = err_code_node.text if err_code_node is not None else '未知错误码'
+            err_code_des_node = root.find('err_code_des')
+            err_code_des = err_code_des_node.text if err_code_des_node is not None else '未知错误描述'
+            error_details = f"return_code: {return_code}, result_code: {result_code}, err_code: {err_code}, err_code_des: {err_code_des}"
+            logger.error(f"微信支付下单失败: {error_details}")
+            raise Exception(f"微信支付下单失败: {error_details}")
+
+    def get_client_ip(self):
+        """获取客户端IP"""
+        request = self.request
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0]
+        else:
+            ip = request.META.get('REMOTE_ADDR', '127.0.0.1')
+        return ip if ip else '127.0.0.1'
+
+
+class KaohePayCallbackView(View):
+    """
+    考核支付回调接口
+    路径：/yonghu/kh_huitiao
+    """
+
+    def post(self, request):
+        try:
+            request_body = request.body
+            logger.info(f"收到考核支付回调: {request_body.decode('utf-8')}")
+
+            root = ET.fromstring(request_body)
+
+            # 安全获取return_code
+            return_code_node = root.find('return_code')
+            if return_code_node is None or return_code_node.text is None:
+                logger.error(f"微信回调XML缺少return_code节点，原始内容: {request_body.decode('utf-8')}")
+                return self.wechat_response('FAIL', '数据格式错误')
+            return_code = return_code_node.text
+
+            # 安全获取result_code
+            result_code_node = root.find('result_code')
+            if result_code_node is None or result_code_node.text is None:
+                logger.error(f"微信回调XML缺少result_code节点，原始内容: {request_body.decode('utf-8')}")
+                return self.wechat_response('FAIL', '数据格式错误')
+            result_code = result_code_node.text
+
+            # 安全获取out_trade_no
+            out_trade_no_node = root.find('out_trade_no')
+            if out_trade_no_node is None or out_trade_no_node.text is None:
+                logger.error(f"微信回调XML缺少out_trade_no节点，原始内容: {request_body.decode('utf-8')}")
+                return self.wechat_response('FAIL', '数据格式错误')
+            out_trade_no = out_trade_no_node.text
+
+            # 安全获取transaction_id
+            transaction_id_node = root.find('transaction_id')
+            if transaction_id_node is None or transaction_id_node.text is None:
+                logger.error(f"微信回调XML缺少transaction_id节点，原始内容: {request_body.decode('utf-8')}")
+                return self.wechat_response('FAIL', '数据格式错误')
+            transaction_id = transaction_id_node.text
+
+            # 安全获取total_fee
+            total_fee_node = root.find('total_fee')
+            if total_fee_node is None or total_fee_node.text is None:
+                logger.error(f"微信回调XML缺少total_fee节点，原始内容: {request_body.decode('utf-8')}")
+                return self.wechat_response('FAIL', '数据格式错误')
+            total_fee = int(total_fee_node.text)
+
+            logger.info(
+                f"回调参数解析成功: out_trade_no={out_trade_no}, transaction_id={transaction_id}, total_fee={total_fee}")
+
+            if return_code != 'SUCCESS' or result_code != 'SUCCESS':
+                logger.warning(f"支付状态异常: return_code={return_code}, result_code={result_code}")
+                return self.wechat_response('FAIL', '支付失败')
+
+            # 验证签名
+            if not self.verify_signature(request_body):
+                logger.error(f"签名验证失败，订单号: {out_trade_no}")
+                return self.wechat_response('FAIL', '签名验证失败')
+            logger.info(f"签名验证成功，订单号: {out_trade_no}")
+
+            # 查找订单
+            try:
+                order = Czjilu.objects.get(dingdan_id=out_trade_no, leixing=5)
+                logger.info(f"找到订单: {out_trade_no}, 当前状态: {order.zhuangtai}")
+            except Czjilu.DoesNotExist:
+                logger.error(f"考核订单不存在: {out_trade_no}")
+                return self.wechat_response('FAIL', '订单不存在')
+
+            if order.zhuangtai != 9:
+                logger.warning(f"订单状态非未支付: {order.zhuangtai}, 订单号: {out_trade_no}")
+                # 已支付的订单直接返回成功，避免微信重复回调
+                if order.zhuangtai == 3:
+                    logger.info(f"订单已支付，直接返回成功: {out_trade_no}")
+                    return self.wechat_response('SUCCESS', 'OK')
+                return self.wechat_response('FAIL', '订单状态异常')
+
+            # 验证金额
+            wechat_yuan = total_fee / 100
+            if abs(wechat_yuan - float(order.jine)) > 0.01:
+                logger.error(f"金额不一致: 订单金额={order.jine}, 回调金额={wechat_yuan}, 订单号: {out_trade_no}")
+                return self.wechat_response('FAIL', '金额不一致')
+            logger.info(f"金额验证通过: {wechat_yuan}元")
+
+            # 更新订单状态为已支付
+            order.zhuangtai = 3
+            order.save()
+            logger.info(f"订单状态更新为已支付: {out_trade_no}")
+
+            # 从临时表获取业务参数并创建审核记录
+            try:
+                from dengji.models import KaohePayTemp
+                from dengji.utils import create_shenhe_jilu_from_temp
+                from yonghu.models import UserMain
+
+                temp = KaohePayTemp.objects.get(dingdan_id=out_trade_no, yonghuid=order.yonghuid)
+                logger.info(f"找到临时表记录: {out_trade_no}, 用户ID: {order.yonghuid}")
+
+                user = UserMain.objects.get(yonghuid=order.yonghuid)
+                logger.info(f"获取用户信息成功: {user.yonghuid}")
+
+                success, msg, record = create_shenhe_jilu_from_temp(user, temp)
+                if success:
+                    logger.info(f"创建审核记录成功: jilu_id={record.jilu_id}, 订单号: {out_trade_no}")
+                else:
+                    logger.error(f"创建审核记录失败: {msg}, 订单号: {out_trade_no}")
+                    # 订单已支付但记录创建失败，需要标记订单异常，人工介入
+                    order.zhuangtai = 10  # 10表示支付成功但业务处理失败
+                    order.save()
+                    logger.error(f"订单状态标记为异常(10): {out_trade_no}")
+
+            except KaohePayTemp.DoesNotExist:
+                logger.error(f"临时表无记录，订单号: {out_trade_no}, 用户ID: {order.yonghuid}")
+                # 尝试从attach解析（兼容旧数据）
+                attach_element = root.find('attach')
+                if attach_element is not None and attach_element.text:
+                    try:
+                        attach_data = json.loads(attach_element.text)
+                        logger.info(f"从attach解析数据成功: {attach_data}")
+                        # 这里可以保留旧逻辑，但建议只记录日志
+                    except Exception as e:
+                        logger.error(f"解析attach失败: {str(e)}")
+            except Exception as e:
+                logger.error(f"处理临时表或创建审核记录异常: {str(e)}", exc_info=True)
+                # 标记订单异常
+                order.zhuangtai = 10
+                order.save()
+                logger.error(f"订单状态标记为异常(10): {out_trade_no}")
+
+            # 更新收支记录
+            try:
+                from peizhi.models import Szjilu
+                from decimal import Decimal
+                from dingdan.utils import update_daily_income
+
+                jine_decimal = Decimal(str(order.jine))
+                update_daily_income(jine_decimal)
+                logger.info(f"更新每日收入成功: {jine_decimal}元")
+
+                szjilu, created = Szjilu.objects.get_or_create(
+                    id=1,
+                    defaults={
+                        'zongsy': Decimal('0.00'),
+                        'zongls': Decimal('0.00'),
+                        'zongzc': Decimal('0.00'),
+                        'jrzc': Decimal('0.00'),
+                        'jrls': Decimal('0.00'),
+                    }
+                )
+                szjilu.zongsy += jine_decimal
+                szjilu.zongls += jine_decimal
+                szjilu.jrls += jine_decimal
+                szjilu.save()
+                logger.info(f"更新收支记录成功: zongsy={szjilu.zongsy}")
+            except Exception as e:
+                logger.error(f"更新收支记录失败: {str(e)}", exc_info=True)
+
+            logger.info(f"考核支付回调处理完成，订单号: {out_trade_no}")
+            return self.wechat_response('SUCCESS', 'OK')
+
+        except ET.ParseError as e:
+            logger.error(f"XML解析失败: {str(e)}, 原始数据: {request.body.decode('utf-8')}")
+            return self.wechat_response('FAIL', '数据格式错误')
+        except Exception as e:
+            logger.error(f"考核支付回调异常: {str(e)}", exc_info=True)
+            return self.wechat_response('FAIL', '处理异常')
+
+    def verify_signature(self, xml_data):
+        """验证微信支付签名"""
+        try:
+            root = ET.fromstring(xml_data)
+            sign_node = root.find('sign')
+            if sign_node is None or sign_node.text is None:
+                logger.error("微信回调XML缺少sign节点")
+                return False
+            sign = sign_node.text
+
+            params = {}
+            for child in root:
+                if child.tag != 'sign' and child.text is not None:
+                    params[child.tag] = child.text
+
+            sorted_params = sorted(params.items(), key=lambda x: x[0])
+            sign_string = '&'.join([f"{key}={value}" for key, value in sorted_params if value])
+            sign_string += f'&key={settings.WEIXIN_SHANGHUMIYAO}'
+            calculated_sign = hashlib.md5(sign_string.encode('utf-8')).hexdigest().upper()
+
+            result = sign == calculated_sign
+            if not result:
+                logger.error(f"签名验证失败: 原签名={sign}, 计算签名={calculated_sign}")
+            return result
+        except Exception as e:
+            logger.error(f"签名验证异常: {str(e)}", exc_info=True)
+            return False
+
+    def wechat_response(self, return_code, return_msg):
+        """构造微信回调响应XML"""
+        xml = f"""<xml>
+<return_code><![CDATA[{return_code}]]></return_code>
+<return_msg><![CDATA[{return_msg}]]></return_msg>
+</xml>"""
+        logger.info(f"返回微信响应: {xml}")
+        return HttpResponse(xml, content_type='application/xml')
+
+
+
+
+class KaohePayPollView(APIView):
+    """考核支付轮询"""
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        dingdanid = request.data.get('dingdanid')
+        if not dingdanid:
+            return Response({'code': 400, 'message': '订单ID不能为空'})
+        try:
+            order = Czjilu.objects.get(dingdan_id=dingdanid, yonghuid=request.user.yonghuid, leixing=5)
+            if order.zhuangtai == 3:
+                return Response({'code': 200, 'message': '支付成功'})
+            return Response({'code': 400, 'message': '订单尚未支付'})
+        except Czjilu.DoesNotExist:
+            return Response({'code': 400, 'message': '订单不存在'})
+
+
+class KaohePayFailView(APIView):
+    """考核支付失败处理"""
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        dingdanid = request.data.get('dingdanid')
+        if not dingdanid:
+            return Response({'code': 400, 'message': '订单ID不能为空'})
+        try:
+            order = Czjilu.objects.get(dingdan_id=dingdanid, yonghuid=request.user.yonghuid, leixing=5)
+            if order.zhuangtai == 9:
+                order.delete()
+                return Response({'code': 200, 'message': '订单已删除'})
+            return Response({'code': 400, 'message': '订单状态无法删除'})
+        except Czjilu.DoesNotExist:
+            return Response({'code': 400, 'message': '订单不存在'})
+
+
+
+
+
+
+
+
+
+
+class TixianAssetView(APIView):
+    """
+    获取用户所有可提现资产及费率
+    请求方式：POST
+    认证：JWT Token
+    返回：
+    {
+        "code": 200,
+        "msg": "success",
+        "data": {
+            "dashou_yue": "123.45",
+            "dashou_yajin": "500.00",
+            "shangjia_yue": "0.00",
+            "guanshi_fenyong": "67.89",
+            "zuzhang_fenyong": "0.00",
+            "kaoheguan_fenyong": "0.00",
+            "dashou_rate": 0.08,
+            "dashou_yajin_rate": 0.05,
+            "shangjia_rate": 0.06,
+            "guanshi_rate": 0.08,
+            "zuzhang_rate": 0.05,
+            "kaoheguan_rate": 0.07
+        }
+    }
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        user = request.user
+        # 初始化返回数据，默认全部为0
+        data = {
+            'dashou_yue': '0.00',
+            'dashou_yajin': '0.00',
+            'shangjia_yue': '0.00',
+            'guanshi_fenyong': '0.00',
+            'zuzhang_fenyong': '0.00',
+            'kaoheguan_fenyong': '0.00',
+            'dashou_rate': 0.00,
+            'dashou_yajin_rate': 0.00,
+            'shangjia_rate': 0.00,
+            'guanshi_rate': 0.00,
+            'zuzhang_rate': 0.00,
+            'kaoheguan_rate': 0.00,
+        }
+
+        # ------------------- 打手资产 -------------------
+        try:
+            dashou = user.dashou_profile
+            data['dashou_yue'] = str(dashou.yue)
+            data['dashou_yajin'] = str(dashou.yajin)
+        except ObjectDoesNotExist:
+            pass
+
+        # ------------------- 商家资产 -------------------
+        try:
+            shangjia = user.shop_profile
+            data['shangjia_yue'] = str(shangjia.yue)
+        except ObjectDoesNotExist:
+            pass
+
+        # ------------------- 管事资产 -------------------
+        try:
+            guanshi = user.guanshi_profile
+            data['guanshi_fenyong'] = str(guanshi.yue)
+        except ObjectDoesNotExist:
+            pass
+
+        # ------------------- 组长资产 -------------------
+        try:
+            zuzhang = user.zuzhang_profile
+            data['zuzhang_fenyong'] = str(zuzhang.ketixian_jine)
+        except ObjectDoesNotExist:
+            pass
+
+        # ------------------- 审核官（考核官）资产 -------------------
+        try:
+            kaoheguan = user.shenheguan_profile
+            data['kaoheguan_fenyong'] = str(kaoheguan.yue)
+        except ObjectDoesNotExist:
+            pass
+
+        # ------------------- 费率查询（从 Lilubiao 获取） -------------------
+        # 打手提现费率 (类型 '5')
+        lilu_obj = Lilubiao.objects.filter(fadanpingtai='5').first()
+        data['dashou_rate'] = float(lilu_obj.lilu) if lilu_obj and lilu_obj.lilu is not None else 0.00
+
+        # 打手保证金提现费率 (类型 '11')
+        lilu_obj = Lilubiao.objects.filter(fadanpingtai='11').first()
+        data['dashou_yajin_rate'] = float(lilu_obj.lilu) if lilu_obj and lilu_obj.lilu is not None else 0.00
+
+        # 商家提现费率 (类型 '10')
+        lilu_obj = Lilubiao.objects.filter(fadanpingtai='10').first()
+        data['shangjia_rate'] = float(lilu_obj.lilu) if lilu_obj and lilu_obj.lilu is not None else 0.00
+
+        # 管事提现费率 (类型 '6')
+        lilu_obj = Lilubiao.objects.filter(fadanpingtai='6').first()
+        data['guanshi_rate'] = float(lilu_obj.lilu) if lilu_obj and lilu_obj.lilu is not None else 0.00
+
+        # 组长提现费率 (类型 '8')
+        lilu_obj = Lilubiao.objects.filter(fadanpingtai='8').first()
+        data['zuzhang_rate'] = float(lilu_obj.lilu) if lilu_obj and lilu_obj.lilu is not None else 0.00
+
+        # 审核官（考核官）提现费率 (类型 '9')
+        lilu_obj = Lilubiao.objects.filter(fadanpingtai='9').first()
+        data['kaoheguan_rate'] = float(lilu_obj.lilu) if lilu_obj and lilu_obj.lilu is not None else 0.00
+
+        return Response({
+            'code': 200,
+            'msg': '获取成功',
+            'data': data
+        }, status=status.HTTP_200_OK)
+
+
+
+
+
+
+
+# views.py 或相应的视图文件
+
+
+class GuanshiContactView(APIView):
+    """
+    管事获取自己的邀请人（组长）信息
+    路径: /api/yonghu/guanshi_contact
+    方法: POST
+    权限: JWT认证
+    请求体: 无（仅需携带合法token）
+    成功返回:
+        code: 200,
+        data: {
+            uid: "1234567",       // 组长用户ID
+            nicheng: "张三",      // 组长昵称
+            touxiang: "avatar/xxx.jpg"  // 组长头像相对路径（前端拼接完整URL）
+        }
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        # 1. 获取当前登录用户（必须已通过JWT认证）
+        current_user = request.user  # 类型: UserMain
+
+        # 2. 校验是否为管事身份（存在管事扩展表记录）
+        try:
+            guanshi_profile = current_user.guanshi_profile
+        except ObjectDoesNotExist:
+            return Response({
+                'code': 403,
+                'msg': '您还不是管事，无法获取组长信息',
+                'data': None
+            })
+
+        # 3. 获取邀请人ID（管事扩展表中的 yaoqingren 字段存储的是邀请人的 yonghuid）
+        inviter_yonghuid = guanshi_profile.yaoqingren
+        if not inviter_yonghuid:
+            return Response({
+                'code': 404,
+                'msg': '未找到邀请人信息',
+                'data': None
+            })
+
+        # 4. 根据邀请人用户ID查询用户主表
+        try:
+            inviter_user = UserMain.objects.get(yonghuid=inviter_yonghuid)
+        except UserMain.DoesNotExist:
+            logger.error(f"邀请人用户不存在: yonghuid={inviter_yonghuid}")
+            return Response({
+                'code': 404,
+                'msg': '邀请人账号异常',
+                'data': None
+            })
+
+        # 5. 获取邀请人昵称（从老板扩展表取，若不存在则给默认值）
+        try:
+            inviter_nicheng = inviter_user.boss_profile.nickname
+        except ObjectDoesNotExist:
+            inviter_nicheng = '组长'  # 兜底昵称
+
+        # 6. 构造返回数据
+        response_data = {
+            'uid': inviter_user.yonghuid,
+            'nicheng': inviter_nicheng,
+            'touxiang': inviter_user.avatar or ''  # 头像相对路径
+        }
+
+        return Response({
+            'code': 200,
+            'msg': '获取成功',
+            'data': response_data
+        })
\ No newline at end of file