派单统计时机:生成链接不计派单;客户填单成功才计;退款/结单在真正完成时统计。
客服日统计联动:update_shangjia_daily(..., order_id=...) 会同步更新对应派单客服的日统计。 客服 /me 接口:返回今日/累计派单、结单、退款等 stats。 角色权限修复:预置角色(总管/财务/派单员)每次访问时强制同步权限,换角色后权限才生效。 展示增强:订单详情带派单员头像;客服列表带金额字段;管理员同意退款补商家+客服统计。
This commit is contained in:
@@ -13,6 +13,16 @@ def seed_global_permissions():
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _sync_role_permissions(role, perm_codes):
|
||||||
|
"""同步角色权限(系统预置角色与模板保持一致)。"""
|
||||||
|
perm_codes = set(perm_codes or [])
|
||||||
|
existing = set(role.role_permissions.values_list('perm_code', flat=True))
|
||||||
|
for code in perm_codes - existing:
|
||||||
|
MerchantStaffRolePermission.objects.get_or_create(role=role, perm_code=code)
|
||||||
|
if role.is_system:
|
||||||
|
role.role_permissions.exclude(perm_code__in=perm_codes).delete()
|
||||||
|
|
||||||
|
|
||||||
def ensure_system_role_templates():
|
def ensure_system_role_templates():
|
||||||
seed_global_permissions()
|
seed_global_permissions()
|
||||||
for tpl in SYSTEM_ROLE_TEMPLATES:
|
for tpl in SYSTEM_ROLE_TEMPLATES:
|
||||||
@@ -27,18 +37,15 @@ def ensure_system_role_templates():
|
|||||||
'status': 1,
|
'status': 1,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
for perm in tpl['permissions']:
|
_sync_role_permissions(role, tpl['permissions'])
|
||||||
MerchantStaffRolePermission.objects.get_or_create(
|
|
||||||
role=role, perm_code=perm,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def ensure_merchant_roles(merchant_id):
|
def ensure_merchant_roles(merchant_id):
|
||||||
"""为商家复制系统角色模板(若尚未存在)。"""
|
"""为商家复制系统角色模板,并同步预置角色权限。"""
|
||||||
ensure_system_role_templates()
|
ensure_system_role_templates()
|
||||||
templates = MerchantStaffRole.query.filter(merchant_id=None, status=1)
|
templates = MerchantStaffRole.query.filter(merchant_id=None, status=1)
|
||||||
for tpl in templates:
|
for tpl in templates:
|
||||||
role, created = MerchantStaffRole.objects.get_or_create(
|
role, _ = MerchantStaffRole.objects.get_or_create(
|
||||||
merchant_id=merchant_id,
|
merchant_id=merchant_id,
|
||||||
role_code=tpl.role_code,
|
role_code=tpl.role_code,
|
||||||
defaults={
|
defaults={
|
||||||
@@ -49,8 +56,5 @@ def ensure_merchant_roles(merchant_id):
|
|||||||
'status': 1,
|
'status': 1,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
if created:
|
tpl_perms = list(tpl.role_permissions.values_list('perm_code', flat=True))
|
||||||
for rp in tpl.role_permissions.all():
|
_sync_role_permissions(role, tpl_perms)
|
||||||
MerchantStaffRolePermission.objects.get_or_create(
|
|
||||||
role=role, perm_code=rp.perm_code,
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -98,6 +98,40 @@ def update_merchant_and_staff_stats(merchant_id, staff_member, amount, action, o
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def get_staff_stats_payload(member):
|
||||||
|
"""子客服个人统计(今日 + 累计),供 /me 与首页展示。"""
|
||||||
|
from django.db.models import Sum
|
||||||
|
|
||||||
|
today = date.today()
|
||||||
|
today_stat = MerchantStaffDailyStats.objects.filter(
|
||||||
|
member_id=member.id, stat_date=today,
|
||||||
|
).first()
|
||||||
|
total = MerchantStaffDailyStats.objects.filter(member_id=member.id).aggregate(
|
||||||
|
dispatch_count=Sum('dispatch_count'),
|
||||||
|
dispatch_amount=Sum('dispatch_amount'),
|
||||||
|
settle_count=Sum('settle_count'),
|
||||||
|
settle_amount=Sum('settle_amount'),
|
||||||
|
refund_count=Sum('refund_count'),
|
||||||
|
refund_amount=Sum('refund_amount'),
|
||||||
|
)
|
||||||
|
return {
|
||||||
|
'today_dispatch_count': (
|
||||||
|
today_stat.dispatch_count if today_stat else int(member.today_dispatch_count or 0)
|
||||||
|
),
|
||||||
|
'today_dispatch_amount': str(
|
||||||
|
today_stat.dispatch_amount if today_stat else (member.today_dispatch_amount or '0.00')
|
||||||
|
),
|
||||||
|
'today_refund_count': today_stat.refund_count if today_stat else 0,
|
||||||
|
'today_settle_count': today_stat.settle_count if today_stat else 0,
|
||||||
|
'dispatch_count': total['dispatch_count'] or 0,
|
||||||
|
'dispatch_amount': str(total['dispatch_amount'] or '0.00'),
|
||||||
|
'settle_count': total['settle_count'] or 0,
|
||||||
|
'settle_amount': str(total['settle_amount'] or '0.00'),
|
||||||
|
'refund_count': total['refund_count'] or 0,
|
||||||
|
'refund_amount': str(total['refund_amount'] or '0.00'),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
def bump_cancel_count(merchant_id, staff_member):
|
def bump_cancel_count(merchant_id, staff_member):
|
||||||
if not staff_member:
|
if not staff_member:
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -45,6 +45,18 @@ def _role_prefix(role_code):
|
|||||||
return m.get(role_code, 'KF')
|
return m.get(role_code, 'KF')
|
||||||
|
|
||||||
|
|
||||||
|
def _role_hint(role_code, tpl_desc=None):
|
||||||
|
hints = {
|
||||||
|
'CHIEF': '总管:除老板专属外,订单/派单/客服/额度/罚单等均可操作',
|
||||||
|
'FINANCE': '财务:查看余额与额度、划额度、看全部订单与统计,不可派单结单',
|
||||||
|
'DISPATCHER': '派单员:派单发单、只看自己派的单,不可结单退款',
|
||||||
|
}
|
||||||
|
if role_code in hints:
|
||||||
|
return hints[role_code]
|
||||||
|
name = (tpl_desc or {}).get(role_code) or role_code
|
||||||
|
return f'自定义角色:{name}'
|
||||||
|
|
||||||
|
|
||||||
class StaffInviteCreateView(APIView):
|
class StaffInviteCreateView(APIView):
|
||||||
permission_classes = [IsAuthenticated]
|
permission_classes = [IsAuthenticated]
|
||||||
|
|
||||||
@@ -188,15 +200,24 @@ class StaffMemberUpdateRoleView(APIView):
|
|||||||
ensure_owner_merchant(request.user.UserUID, request.user)
|
ensure_owner_merchant(request.user.UserUID, request.user)
|
||||||
member_id = request.data.get('member_id')
|
member_id = request.data.get('member_id')
|
||||||
role_id = request.data.get('role_id')
|
role_id = request.data.get('role_id')
|
||||||
m = MerchantStaffMember.query.get(id=member_id, merchant_id=request.user.UserUID, status=MEMBER_STATUS_ACTIVE)
|
m = MerchantStaffMember.query.get(
|
||||||
role = MerchantStaffRole.query.get(id=role_id, merchant_id=request.user.UserUID)
|
id=member_id, merchant_id=request.user.UserUID, status=MEMBER_STATUS_ACTIVE,
|
||||||
|
)
|
||||||
|
role = MerchantStaffRole.query.get(id=role_id, merchant_id=request.user.UserUID, status=1)
|
||||||
old = m.role_id
|
old = m.role_id
|
||||||
m.role = role
|
m.role = role
|
||||||
m.save(update_fields=['role'])
|
m.save(update_fields=['role'])
|
||||||
audit_owner(request.user.UserUID, request.user.UserUID, 'MEMBER_UPDATE_ROLE', request,
|
audit_owner(request.user.UserUID, request.user.UserUID, 'MEMBER_UPDATE_ROLE', request,
|
||||||
resource_type='member', resource_id=member_id,
|
resource_type='member', resource_id=member_id,
|
||||||
value_before={'role_id': old}, value_after={'role_id': role_id})
|
value_before={'role_id': old}, value_after={'role_id': role_id})
|
||||||
return Response({'code': 0, 'msg': '成功', 'data': None})
|
perms = list(role.role_permissions.values_list('perm_code', flat=True))
|
||||||
|
return Response({'code': 0, 'msg': '角色已更新', 'data': {
|
||||||
|
'member_id': m.id,
|
||||||
|
'role_id': role.id,
|
||||||
|
'role_code': role.role_code,
|
||||||
|
'role_name': role.role_name,
|
||||||
|
'permissions': perms,
|
||||||
|
}})
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return _err(e)
|
return _err(e)
|
||||||
|
|
||||||
@@ -242,14 +263,21 @@ class StaffRoleListView(APIView):
|
|||||||
|
|
||||||
def post(self, request):
|
def post(self, request):
|
||||||
try:
|
try:
|
||||||
|
from merchant_ops.constants import PERMISSION_DEFINITIONS, SYSTEM_ROLE_TEMPLATES
|
||||||
ensure_owner_merchant(request.user.UserUID, request.user)
|
ensure_owner_merchant(request.user.UserUID, request.user)
|
||||||
roles = MerchantStaffRole.query.filter(merchant_id=request.user.UserUID, status=1)
|
roles = MerchantStaffRole.query.filter(merchant_id=request.user.UserUID, status=1)
|
||||||
|
tpl_desc = {t['role_code']: t['role_name'] for t in SYSTEM_ROLE_TEMPLATES}
|
||||||
data = []
|
data = []
|
||||||
for r in roles:
|
for r in roles:
|
||||||
perms = list(r.role_permissions.values_list('perm_code', flat=True))
|
perms = list(r.role_permissions.values_list('perm_code', flat=True))
|
||||||
|
perm_labels = [
|
||||||
|
dict(PERMISSION_DEFINITIONS).get(p, p) for p in perms
|
||||||
|
]
|
||||||
data.append({
|
data.append({
|
||||||
'id': r.id, 'role_code': r.role_code, 'role_name': r.role_name,
|
'id': r.id, 'role_code': r.role_code, 'role_name': r.role_name,
|
||||||
'is_system': r.is_system, 'permissions': perms,
|
'is_system': r.is_system, 'permissions': perms,
|
||||||
|
'permission_labels': perm_labels,
|
||||||
|
'role_hint': _role_hint(r.role_code, tpl_desc),
|
||||||
})
|
})
|
||||||
all_perms = list(MerchantStaffPermission.query.filter(status=1).order_by('sort_order').values(
|
all_perms = list(MerchantStaffPermission.query.filter(status=1).order_by('sort_order').values(
|
||||||
'perm_code', 'perm_name'))
|
'perm_code', 'perm_name'))
|
||||||
|
|||||||
@@ -13,7 +13,9 @@ from merchant_ops.services.authz import (
|
|||||||
StaffAuthError, assert_can_bind_staff, get_active_staff_member, resolve_staff_context,
|
StaffAuthError, assert_can_bind_staff, get_active_staff_member, resolve_staff_context,
|
||||||
)
|
)
|
||||||
from merchant_ops.services.audit import audit_staff
|
from merchant_ops.services.audit import audit_staff
|
||||||
|
from merchant_ops.services.stats import get_staff_stats_payload
|
||||||
from merchant_ops.services.wallet import get_or_create_wallet
|
from merchant_ops.services.wallet import get_or_create_wallet
|
||||||
|
from merchant_ops.services.bootstrap import ensure_merchant_roles
|
||||||
from users.business_models import User
|
from users.business_models import User
|
||||||
from users.models import UserShangjia
|
from users.models import UserShangjia
|
||||||
|
|
||||||
@@ -99,9 +101,13 @@ class StaffMeView(APIView):
|
|||||||
if not ctx:
|
if not ctx:
|
||||||
return Response({'code': 404, 'msg': '非子客服身份', 'data': None})
|
return Response({'code': 404, 'msg': '非子客服身份', 'data': None})
|
||||||
member = get_active_staff_member(request.user)
|
member = get_active_staff_member(request.user)
|
||||||
|
ensure_merchant_roles(member.merchant_id)
|
||||||
|
member.refresh_from_db()
|
||||||
|
ctx = resolve_staff_context(request.user)
|
||||||
shangjia = UserShangjia.query.filter(user__UserUID=member.merchant_id).first()
|
shangjia = UserShangjia.query.filter(user__UserUID=member.merchant_id).first()
|
||||||
ctx['merchant_display'] = {
|
ctx['merchant_display'] = {
|
||||||
'nicheng': shangjia.nicheng if shangjia else '',
|
'nicheng': shangjia.nicheng if shangjia else '',
|
||||||
'sjyue': str(shangjia.yue) if shangjia else '0',
|
'sjyue': str(shangjia.yue) if shangjia else '0',
|
||||||
}
|
}
|
||||||
|
ctx['stats'] = get_staff_stats_payload(member)
|
||||||
return Response({'code': 0, 'msg': '成功', 'data': ctx})
|
return Response({'code': 0, 'msg': '成功', 'data': ctx})
|
||||||
|
|||||||
Reference in New Issue
Block a user