进行了 GVSDSDK 迁移,可能存在诸多问题

This commit is contained in:
2026-06-17 20:37:47 +08:00
parent 72770ad73b
commit d00f0d08e5
132 changed files with 161593 additions and 4827 deletions

View File

@@ -37,9 +37,10 @@ from .models import (
)
from users.models import (
UserMain, AdminProfile, UserDashou, UserBoss,
AdminProfile, UserDashou, UserBoss,
UserShangjia, UserGuanshi, UserZuzhang
)
from gvsdsdk.models import User
from orders.models import Lilubiao, Dingdan, DingdanShangjia
from orders.notice_tasks import dingdan_guangbo
@@ -180,7 +181,7 @@ class AdminConfigQueryView(APIView):
'data': None
}, status=status.HTTP_400_BAD_REQUEST)
# 获取当前用户UserMain实例)
# 获取当前用户User实例
user_main = request.user
# 验证账号比较user_main的phone与前端传递的zhanghao
@@ -2190,10 +2191,10 @@ class KehuGetDingdanLianjieView(APIView):
# 获取商家昵称
shangjia_nicheng = ''
try:
user_main = UserMain.query.get(yonghuid=lianjie_obj.yonghu_id)
user_main = User.query.get(yonghuid=lianjie_obj.yonghu_id)
shangjia_obj = user_main.shop_profile
shangjia_nicheng = shangjia_obj.nicheng
except (UserMain.DoesNotExist, UserShangjia.DoesNotExist):
except (User.DoesNotExist, UserShangjia.DoesNotExist):
logger.warning(f"商家信息不存在 - 用户ID: {lianjie_obj.yonghu_id}")
# ========== 新增:确定俱乐部配置 ==========
@@ -2472,7 +2473,7 @@ class KehuTianxieDingdanView(APIView):
# 验证打手是否存在且有效
try:
# 先查询用户主表
dashou_user = UserMain.query.get(yonghuid=zhiding_dashou)
dashou_user = User.query.get(yonghuid=zhiding_dashou)
logger.info(f"找到打手用户 - 用户ID: {zhiding_dashou}")
# 通过反向关系获取打手扩展信息
@@ -2510,7 +2511,7 @@ class KehuTianxieDingdanView(APIView):
'data': None
}, status=status.HTTP_400_BAD_REQUEST)
except UserMain.DoesNotExist:
except User.DoesNotExist:
logger.warning(f"指定打手用户不存在 - 用户ID: {zhiding_dashou}")
return Response({
'code': 400,
@@ -2570,7 +2571,7 @@ class KehuTianxieDingdanView(APIView):
# 获取商家信息用于返回
try:
user_main = UserMain.query.get(yonghuid=lianjie_obj.yonghu_id)
user_main = User.query.get(yonghuid=lianjie_obj.yonghu_id)
shangjia_obj = user_main.shop_profile
shangjia_mingcheng = shangjia_obj.nicheng
except:
@@ -3250,7 +3251,7 @@ class CheckPhoneAuthView(APIView):
permission_classes = [IsAuthenticated]
def post(self, request):
user = request.user # UserMain 实例
user = request.user # User 实例
# 已经认证过手机号,直接放行
if user.shoujihao_renzheng: