diff --git a/yonghu/views.py b/yonghu/views.py index 90352a6..ea3308e 100644 --- a/yonghu/views.py +++ b/yonghu/views.py @@ -876,6 +876,8 @@ class DashouXinxiAPIView(APIView): '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', + 'dongjie_chi': str(dashou_profile.dongjie_chi) if dashou_profile.dongjie_chi is not None else '0.00', + 'dongjie_chi_yajin': str(dashou_profile.dongjie_chi_yajin) if dashou_profile.dongjie_chi_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, @@ -1073,6 +1075,7 @@ class GuanshiXinxiView(APIView): 'yaoqingzongshu': guanshi_profile.yaogingshuliang, # 邀请打手总数 'fenyongzonge': float(guanshi_profile.chongzhifenrun), # 充值分佣总额 'fenyongtixian': float(guanshi_profile.yue), # 可提现余额 + 'dongjie_chi': float(guanshi_profile.dongjie_chi or 0), # 冻结资金池 'yichongzhiDashou': yichongzhi_count, # 已充值打手数量 } }) @@ -1180,6 +1183,7 @@ class ShangJiaXinXiView(APIView): 'fadanzong': shangjia.fabu, # 发单总量 'tuikuanzong': shangjia.tuikuan, # 退款总量 'sjyue': float(shangjia.yue), # 商家余额 + 'dongjie_chi': float(shangjia.dongjie_chi or 0), # 冻结资金池 'riliushui': float(shangjia.jinriliushui), # 今日流水 'yueliushui': float(shangjia.jinyueliushui), # 今月流水 } @@ -15623,6 +15627,10 @@ class TixianAssetView(APIView): 'guanshi_rate': 0.00, 'zuzhang_rate': 0.00, 'kaoheguan_rate': 0.00, + 'dashou_dongjie_chi': '0.00', + 'dashou_yajin_dongjie_chi': '0.00', + 'guanshi_dongjie_chi': '0.00', + 'shangjia_dongjie_chi': '0.00', } # ------------------- 打手资产 ------------------- @@ -15630,6 +15638,8 @@ class TixianAssetView(APIView): dashou = user.dashou_profile data['dashou_yue'] = str(dashou.yue) data['dashou_yajin'] = str(dashou.yajin) + data['dashou_dongjie_chi'] = str(dashou.dongjie_chi or 0) + data['dashou_yajin_dongjie_chi'] = str(dashou.dongjie_chi_yajin or 0) except ObjectDoesNotExist: pass @@ -15637,6 +15647,7 @@ class TixianAssetView(APIView): try: shangjia = user.shop_profile data['shangjia_yue'] = str(shangjia.yue) + data['shangjia_dongjie_chi'] = str(shangjia.dongjie_chi or 0) except ObjectDoesNotExist: pass @@ -15644,6 +15655,7 @@ class TixianAssetView(APIView): try: guanshi = user.guanshi_profile data['guanshi_fenyong'] = str(guanshi.yue) + data['guanshi_dongjie_chi'] = str(guanshi.dongjie_chi or 0) except ObjectDoesNotExist: pass