fix: 会员永久分红生效,管事/组长分红配置按俱乐部读取
This commit is contained in:
@@ -3205,9 +3205,12 @@ class GetGuanliDetailView(APIView):
|
||||
m['jiage'] = str(m['jiage'])
|
||||
m['guanshifc'] = str(m['guanshifc'])
|
||||
|
||||
# 获取多次分红配置(按次数和会员组织)
|
||||
# 查询该管事的所有多次分红记录
|
||||
duoci_records = DuociFenhong.query.filter(yonghuid=yonghuid).order_by('cishu')
|
||||
# 获取多次分红配置(按次数和会员组织,按俱乐部隔离)
|
||||
from jituan.services.club_penalty import resolve_gsfenhong_club_id
|
||||
guanshi_club = resolve_gsfenhong_club_id(dashouid=yonghuid)
|
||||
duoci_records = DuociFenhong.query.filter(
|
||||
yonghuid=yonghuid, club_id=guanshi_club,
|
||||
).order_by('cishu')
|
||||
custom_first = {} # 首次分红定制(cishu=1)
|
||||
extra_map = {} # 其他次数 { cishu: { huiyuan_id: { guanshi_fenhong, jieshao, jiage } } }
|
||||
|
||||
@@ -3947,8 +3950,12 @@ class GetZuzhangDetailView(APIView):
|
||||
m['jiage'] = str(m['jiage'])
|
||||
m['zuzhangfc'] = str(m['zuzhangfc'])
|
||||
|
||||
# 获取多次分红配置(按次数和会员组织)
|
||||
duoci_records = DuociFenhong.query.filter(yonghuid=yonghuid).order_by('cishu')
|
||||
# 获取多次分红配置(按次数和会员组织,按俱乐部隔离)
|
||||
from jituan.services.club_penalty import resolve_gsfenhong_club_id
|
||||
zuzhang_club = resolve_gsfenhong_club_id(dashouid=yonghuid)
|
||||
duoci_records = DuociFenhong.query.filter(
|
||||
yonghuid=yonghuid, club_id=zuzhang_club,
|
||||
).order_by('cishu')
|
||||
custom_first = {} # 首次分红定制(cishu=1)
|
||||
extra_map = {} # 其他次数 { cishu: { huiyuan_id: { zuzhang_fenhong, jieshao, jiage } } }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user