Skip to content

F
financial-system
Commit 0aec42a8 authored by xupeng's avatar xupeng
Browse files
Options

Merge remote-tracking branch 'origin/development' into development

parents 843e2b79 33108689
Show whitespace changes
Inline Side-by-side
Showing with 176 additions and 157 deletions
app/api/account/crud.py
View file @ 0aec42a8
......@@ -268,13 +268,16 @@ def get_account_type(**data):
condition.append(f" type={data.get('type')}")
if condition:
total_sql = f"select count(id) as num from fi_account_type where {' and '.join(condition)}"
gift_sql = f"select id,keyName,keyValue,type from fi_account_type where {' and '.join(condition)} limit {(int(data.get('page')) - 1) * data.get('size')},{data.get('size')}"
gift_sql = f"select id,keyName,keyValue,type,createTime as create_time from fi_account_type where {' and '.join(condition)} limit {(int(data.get('page')) - 1) * data.get('size')},{data.get('size')}"
else:
total_sql = f"select count(id) as num from fi_account_type"
gift_sql = f"select id,keyName,keyValue,type from fi_account_type limit {(int(data.get('page')) - 1) * data.get('size')},{data.get('size')}"
gift_sql = f"select id,keyName,keyValue,type,createTime as create_time from fi_account_type limit {(int(data.get('page')) - 1) * data.get('size')},{data.get('size')}"
total = LinkMysql(env.DB_3YV2).query_mysql(total_sql)
output = LinkMysql(env.DB_3YV2).query_mysql(gift_sql)
if output:
for i in output:
time_array = time.localtime(i['create_time'])
i['create_time'] = time.strftime("%Y-%m-%d %H:%M:%S", time_array)
return output, total[0]['num']
return [], 0
......
app/api/export/crud.py
View file @ 0aec42a8
......@@ -8,6 +8,7 @@ from libs.functions import get_now_datetime
from libs.orm import QueryAllData
from models.export import ExportFile
import pandas as pd
from xpinyin import Pinyin
from starlette.responses import StreamingResponse
......@@ -85,6 +86,9 @@ class CalculationMonthlyBill(object):
assert_list.append(f" reference_type in{tuple(k_list)}")
if len(k_list) == 1:
assert_list.append(f" reference_type='{k_list[0]}'")
if not k_list:
py = Pinyin().get_pinyin(name)
assert_list.append(f" reference_type='{py.replace('-', '')}'")
if key_type:
assert_list.append(f" reference_type like '%{key_type}%'")
if assert_list:
......@@ -231,7 +235,7 @@ class ReferenceTypeClassification():
def classification_summary(self):
data_sql = f"select uuid,type,amount/1000 as amount,create_time from {self.date} where reference_type='{self.reference_type}' GROUP BY uuid,type"
data_sql = f"select uuid,type,sum(amount)/1000 as amount,create_time from {self.date} where reference_type='{self.reference_type}' GROUP BY uuid,type"
guild_sql = f"select uuid from guild"
account_sql = f"select uuid,name from fi_account"
anchor_sql = f"select uuid from v2_user where is_achor in(1,2)"
......@@ -257,9 +261,9 @@ class ReferenceTypeClassification():
op['money'] = round(float(op['amount']), 2)
if op.get('uuid') in guild_data:
op['nickname'] = '公会'
if op.get('uuid') in anchor_data:
elif op.get('uuid') in anchor_data:
op['nickname'] = '主播'
if account_dict.get(op['uuid']):
elif account_dict.get(op['uuid']):
op['nickname'] = account_dict.get(op['uuid'])
else:
op['nickname'] = '用户'
......@@ -277,6 +281,6 @@ class ReferenceTypeClassification():
if self.income:
income = pd.DataFrame(self.income)
igs = income.groupby("nickname").sum()
for k,v in igs.to_dict().get('money').items():
for k, v in igs.to_dict().get('money').items():
res_list.append({"type": "入账", "name": k, "money": v})
return res_list
app/api/statement/guild.py
View file @ 0aec42a8
......@@ -150,6 +150,8 @@ def account_thead_task(data):
account = LinkMysql(env.DB_3YV2).query_mysql(account_sql)
if account:
data['transfer_name'] = account[0]['name']
else:
data['transfer_name'] = data.get('transfer_uuid')
def accout_list_data(**params):
......
libs/business.py
View file @ 0aec42a8
from core.config.env import env
from libs.db_link import LinkMysql
TYPE_NAME = {
"updateUserNameFee": "用户昵称修改",
"updateFamilyNameFee": "家族改名",
"userExchange": "珍珠兑换钻石",
"userRecharge": "充值",
"pay_discount": "充值折扣",
"studioGift": "直播间送礼",
"turntableIncome": "转盘",
"turntableExpend": "转盘中奖",
"recyclingGifts": "回收礼物",
"buyIdentity": "开贵族",
"buyGuard": "开守护",
"studioBarrage": "弹幕消费",
"buyProp": "购买道具",
"bei_to_change_account": "购买bei+",
"bei_to_cancel_account": "bei+订单退款",
"signInDeductMoney": "用户补签",
"signInReward": "签到奖励",
"sign_in_backpack_account": "背包礼物奖励",
"live_support": "主播扶持分配",
"room_support": "直播间扶持 - 领取钻石奖励",
"lucky_gift_jackpot": "赠送幸运礼物",
"gameReward": "游戏奖励",
"userWithdrawal": "用户提现",
"sendRedBox": "发送红包",
"userRedBox": "红包领取",
"returnRedBox": "红包退还",
"send_diamond_red_packet": "钻石红包发送",
"get_red_packet": "钻石红包领取",
"send_diamond_red_packet_back": "钻石红包退还",
"send_gift_red_packet": "礼物红包发送",
"get_gift_red_packet": "礼物红包领取",
"send_gift_red_packet_back": "礼物红包退还",
"first_recharge_gift": "首充礼包",
"user_clean_up": "余额清算(线上，线下)",
"cleargiftstore": "背包礼物过期",
"daily_task": "任务奖励发放钻石",
"voiceChatFee": "语聊消费",
"helpExchange": "用户打榜兑换投票次数",
"vip_recharge": "vip购买",
"PlatformLeakRepair": "平台补漏",
"voice": "用户上麦",
"MagicHegemony": "魔法争霸赛活动",
"Points_mall_exchange": "积分商城兑换",
"privateMessageCharge": "私信收费",
"personalMessageGift": "私信礼物",
"level_gift": "升级礼包",
"zhou_xing_backpack_account": "周星奖励发放",
"zhou_xing_consumable_account": "周星奖励发放",
"NamedGift": "冠名礼物",
"whoIsUndercoverJoin": "谁是卧底游戏",
"game:NDJ": "扭蛋机消费",
"gama:KMH": "参与游戏-开盲盒",
"game_transfer": "商城礼物盲盒-许愿池，八卦象",
"gama:ZJD": "参与游戏-砸金蛋",
"guildExchange": "公会结算",
"marginRecharge": "保证金缴纳",
"pledgeDeduction": "保证金扣减",
"guildExchangeDraw": "公会钻石结算",
"fanExpansion": "公会家族扩充",
"guildTrafficPromotion": "流量推广",
"trafficPromotion": "流量购买",
"guildWithdrawal": "公会提现",
"guildWithdrawal_ServiceFee": "提现服务费",
"free_guild_profit_Exchange": "自由公会收益",
"subordinate_guild_ti_xian": "下级公会提现",
"investmentIncome": "招商收益",
"platformRecharge": "转账",
"platformSubsidies": "平台补贴",
"currencyUpgrade": "旧币兑换(钻石)",
"PlatformDeduction": "平台扣除",
"thrid_game_transfer_user": "引流转盘奖励",
"blind_box_mall_account_recharge": "盲盒商城账户充值（人民币）",
"pk_season": "PK赛季奖励",
"finance_admin_fix": "财务系统修复",
"pk_shout_anonymity": "pk喊话",
"pk_shout": "pk喊话",
"GameConsumption": "五子棋游戏",
"fj_shop_withdraw": "商城提现",
"fj_shop_recharge": "商城订单结算",
"physical_blind_box_recharge": "实物盲盒 - 使用抽奖券并中奖",
"blind_box_redeem_points": "实物盲盒 - 兑换积分",
"blind_box_delivery": "实物盲盒 - 提货",
"physical_blind_box_refund": "实物盲盒-回收",
"zhou_xing_consume": "周星活动购买道具（创造营）",
"zhou_xing_award": "周星活动领奖",
"talentCertification": "达人认证缴费",
"Payment": "公会解约结算平台打款",
"guild_clear": "公会结算",
"shop_complete_payment": "积分商城改版 - 支付",
"points_mall_points_return": "积分商城改版 - 退款",
"cash_payment_money_return": "积分商城改版 - 退款",
"ConsignmentPaymentConfirmation_release": "用户发布转售动态",
"ConsignmentPaymentConfirmation_callback": "用户撤销转售",
"ConsignmentPaymentConfirmation": "【礼物】购买成功",
"ConsignmentPaymentConfirmation_withdraw": "【实物】确认收货",
"ConsignmentPaymentConfirmation_dress": "【转售装扮】购买成功",
"week_star_buy_dress": "购买限定装扮装扮",
"week_star_award_diamond": "榜单奖励领取",
"game_transfer_to_platform": "游戏账户向平台账户转账",
"recharge_bag_award": "超值礼包",
"HairSpotSong": "点歌功能付费",
"RetreatSpotSong": "点歌退款（主播拒绝、用户撤销）",
"BranchSpotSong": "点歌收益分配",
"guild_transfer_to_anchor": "公会转账",
"guild_transfer_to_anchor_trans_fee": "公会转账手续费",
"SmashGoldenEggs": "参与游戏-钻石",
"game_backpack_account": "游戏中奖",
"turntable_game_balance_add": "用户中奖",
"collection": "天外物舱-购买礼物使用权",
"fairy_star_consume": "①、3月仙女活动②、2022【贝洛的愿望】-道具购买",
"relic_buy_prop": "2022-11_遗迹修复活动-购买道具",
"relic_recharge": "2022-11_遗迹修复活动-活动充值",
"seven_country_award": "2022_七国游记活动-榜单奖励领取",
"time_detective_award": "时空侦探活动-榜单领奖",
"translate": "翻译付费",
"userWithdrawal_dec": "用户提现扣除项",
"heart_season_award": "怦然心动活动榜单奖励",
"OnePieceActivityBuyItem": "航海活动购买道具",
"challenge": "用户发起挑战功能",
"AnnualCelebration": "年度活动",
"LaborDayActivityBuyProp": "四季仙踪活动道具购买",
"april_fools_2022": "4月活动奖励",
"wzzyn_2022_consume": "端午活动用户购买道具",
"wzzyn_2022": "端午活动奖励",
"april_fools_2022_consume": "4月活动购买道具",
"LaborDayActivity": "四季仙踪活动奖励",
"NewYearActivity": "春节活动",
"OnePieceActivity": "航海活动奖励",
"heart_season_buy_prop": "怦然心动道具购买",
"baseSalaryExpend": "底薪",
"guildRecharge": "公会充值",
"blind_box_transfer_to_backpack": "商城礼物盲盒预支",
"activity_fairy_star": "三月活动奖励",
"inviteGift": "邀请礼包",
"activityReward": "活动奖励",
"taskReward": "任务奖励",
"luckyGiftReward": "幸运大暴击",
"parentAdd": "上级补差",
"januaryWishDrawal": "新语新愿",
"AprilPearlRecord": "四月镖客行活奖励",
"bei_out_of_account": "bei+订单收入",
"dynamicGift": "动态礼物",
"whoIsUndercoverWin": "谁是卧底竞技奖励",
"NationalDayActivity": "国庆奖励",
"user_atransfer_guild": "用户转账给公会",
"guildWithdrawalPledge": "公会提现审核",
"voiceGift": "上麦送礼",
"radioStationFee": "电台收费",
"fansCharge": "粉丝收费",
}
sql = f"SELECT keyName,keyValue,type FROM fi_account_type"
res_data = LinkMysql(env.DB_3YV2).query_mysql(sql)
TYPE_NAME = {}
for i in res_data:
if not TYPE_NAME.get(i['keyValue']):
TYPE_NAME[i['keyValue']] = i['keyName']
# TYPE_NAME_T = {
# "updateUserNameFee": "用户昵称修改",
# "updateFamilyNameFee": "家族改名",
# "userExchange": "珍珠兑换钻石",
# "userRecharge": "充值",
# "pay_discount": "充值折扣",
# "studioGift": "直播间送礼",
# "turntableIncome": "转盘",
# "turntableExpend": "转盘中奖",
# "recyclingGifts": "回收礼物",
# "buyIdentity": "开贵族",
# "buyGuard": "开守护",
# "studioBarrage": "弹幕消费",
# "buyProp": "购买道具",
# "bei_to_change_account": "购买bei+",
# "bei_to_cancel_account": "bei+订单退款",
# "signInDeductMoney": "用户补签",
# "signInReward": "签到奖励",
# "sign_in_backpack_account": "背包礼物奖励",
# "live_support": "主播扶持分配",
# "room_support": "直播间扶持 - 领取钻石奖励",
# "lucky_gift_jackpot": "赠送幸运礼物",
# "gameReward": "游戏奖励",
# "userWithdrawal": "用户提现",
# "sendRedBox": "发送红包",
# "userRedBox": "红包领取",
# "returnRedBox": "红包退还",
# "send_diamond_red_packet": "钻石红包发送",
# "get_red_packet": "钻石红包领取",
# "send_diamond_red_packet_back": "钻石红包退还",
# "send_gift_red_packet": "礼物红包发送",
# "get_gift_red_packet": "礼物红包领取",
# "send_gift_red_packet_back": "礼物红包退还",
# "first_recharge_gift": "首充礼包",
# "user_clean_up": "余额清算(线上，线下)",
# "cleargiftstore": "背包礼物过期",
# "daily_task": "任务奖励发放钻石",
# "voiceChatFee": "语聊消费",
# "helpExchange": "用户打榜兑换投票次数",
# "vip_recharge": "vip购买",
# "PlatformLeakRepair": "平台补漏",
# "voice": "用户上麦",
# "MagicHegemony": "魔法争霸赛活动",
# "Points_mall_exchange": "积分商城兑换",
# "privateMessageCharge": "私信收费",
# "personalMessageGift": "私信礼物",
# "level_gift": "升级礼包",
# "zhou_xing_backpack_account": "周星奖励发放",
# "zhou_xing_consumable_account": "周星奖励发放",
# "NamedGift": "冠名礼物",
# "whoIsUndercoverJoin": "谁是卧底游戏",
# "game:NDJ": "扭蛋机消费",
# "gama:KMH": "参与游戏-开盲盒",
# "game_transfer": "商城礼物盲盒-许愿池，八卦象",
# "gama:ZJD": "参与游戏-砸金蛋",
# "guildExchange": "公会结算",
# "marginRecharge": "保证金缴纳",
# "pledgeDeduction": "保证金扣减",
# "guildExchangeDraw": "公会钻石结算",
# "fanExpansion": "公会家族扩充",
# "guildTrafficPromotion": "流量推广",
# "trafficPromotion": "流量购买",
# "guildWithdrawal": "公会提现",
# "guildWithdrawal_ServiceFee": "提现服务费",
# "free_guild_profit_Exchange": "自由公会收益",
# "subordinate_guild_ti_xian": "下级公会提现",
# "investmentIncome": "招商收益",
# "platformRecharge": "转账",
# "platformSubsidies": "平台补贴",
# "currencyUpgrade": "旧币兑换(钻石)",
# "PlatformDeduction": "平台扣除",
# "thrid_game_transfer_user": "引流转盘奖励",
# "blind_box_mall_account_recharge": "盲盒商城账户充值（人民币）",
# "pk_season": "PK赛季奖励",
# "finance_admin_fix": "财务系统修复",
# "pk_shout_anonymity": "pk喊话-匿名喊话",
# "pk_shout": "pk喊话-普通、炸弹喊话",
# "GameConsumption": "五子棋游戏",
# "fj_shop_withdraw": "商城提现",
# "fj_shop_recharge": "商城订单结算",
# "physical_blind_box_recharge": "实物盲盒 - 使用抽奖券并中奖",
# "blind_box_redeem_points": "实物盲盒 - 兑换积分",
# "blind_box_delivery": "实物盲盒 - 提货",
# "physical_blind_box_refund": "实物盲盒-回收",
# "zhou_xing_consume": "周星活动购买道具（创造营）",
# "zhou_xing_award": "周星活动领奖",
# "talentCertification": "达人认证缴费",
# "Payment": "公会解约结算平台打款",
# "guild_clear": "公会结算",
# "shop_complete_payment": "积分商城改版 - 支付",
# "points_mall_points_return": "积分商城改版 - 退款",
# "cash_payment_money_return": "积分商城改版 - 退款",
# "ConsignmentPaymentConfirmation_release": "用户发布转售动态",
# "ConsignmentPaymentConfirmation_callback": "用户撤销转售",
# "ConsignmentPaymentConfirmation": "【礼物】购买成功",
# "ConsignmentPaymentConfirmation_withdraw": "【实物】确认收货",
# "ConsignmentPaymentConfirmation_dress": "【转售装扮】购买成功",
# "week_star_buy_dress": "购买限定装扮装扮",
# "week_star_award_diamond": "榜单奖励领取",
# "game_transfer_to_platform": "游戏账户向平台账户转账",
# "recharge_bag_award": "超值礼包",
# "HairSpotSong": "点歌功能付费",
# "RetreatSpotSong": "点歌退款（主播拒绝、用户撤销）",
# "BranchSpotSong": "点歌收益分配",
# "guild_transfer_to_anchor": "公会转账",
# "guild_transfer_to_anchor_trans_fee": "公会转账手续费",
# "SmashGoldenEggs": "参与游戏-钻石",
# "game_backpack_account": "游戏中奖",
# "turntable_game_balance_add": "用户中奖",
# "collection": "天外物舱-购买礼物使用权",
# "fairy_star_consume": "①、3月仙女活动②、2022【贝洛的愿望】-道具购买",
# "relic_buy_prop": "2022-11_遗迹修复活动-购买道具",
# "relic_recharge": "2022-11_遗迹修复活动-活动充值",
# "seven_country_award": "2022_七国游记活动-榜单奖励领取",
# "time_detective_award": "时空侦探活动-榜单领奖",
# "translate": "翻译付费",
# "userWithdrawal_dec": "用户提现扣除项",
# "heart_season_award": "怦然心动活动榜单奖励",
# "OnePieceActivityBuyItem": "航海活动购买道具",
# "challenge": "用户发起挑战功能",
# "AnnualCelebration": "年度活动",
# "LaborDayActivityBuyProp": "四季仙踪活动道具购买",
# "april_fools_2022": "4月活动奖励",
# "wzzyn_2022_consume": "端午活动用户购买道具",
# "wzzyn_2022": "端午活动奖励",
# "april_fools_2022_consume": "4月活动购买道具",
# "LaborDayActivity": "四季仙踪活动奖励",
# "NewYearActivity": "春节活动",
# "OnePieceActivity": "航海活动奖励",
# "heart_season_buy_prop": "怦然心动道具购买",
# "baseSalaryExpend": "底薪",
# "guildRecharge": "公会充值",
# "blind_box_transfer_to_backpack": "商城礼物盲盒预支",
# "activity_fairy_star": "三月活动奖励",
# "inviteGift": "邀请礼包",
# "activityReward": "活动奖励",
# "taskReward": "任务奖励",
# "luckyGiftReward": "幸运大暴击",
# "parentAdd": "上级补差",
# "januaryWishDrawal": "新语新愿",
# "AprilPearlRecord": "四月镖客行活奖励",
# "bei_out_of_account": "bei+订单收入",
# "dynamicGift": "动态礼物",
# "whoIsUndercoverWin": "谁是卧底竞技奖励",
# "NationalDayActivity": "国庆奖励",
# "user_atransfer_guild": "用户转账给公会",
# "guildWithdrawalPledge": "公会提现审核",
# "voiceGift": "上麦送礼",
# "radioStationFee": "电台收费",
# "fansCharge": "粉丝收费",
# }
requirements.txt
View file @ 0aec42a8
......@@ -44,3 +44,4 @@ uvicorn==0.20.0
xmltodict==0.13.0
openpyxl==3.1.2
redis==4.3.4
xpinyin==0.7.6
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment