Commit 88a6c586 authored by 陈涛's avatar 陈涛

修改删除账目管理

parent f90d93a6
......@@ -146,9 +146,9 @@ async def create_adjust(
)
adjust_assets = fund_data["adjust_assets"]
adjust_assets.setdefault(create_adjust_bill.currency, 0)
adjust_assets.setdefault('fund_share', 0)
# adjust_assets.setdefault('fund_share', 0)
adjust_assets[create_adjust_bill.currency] += create_adjust_bill.volume
adjust_assets['fund_share'] += create_adjust_bill.fund_share
# adjust_assets['fund_share'] += create_adjust_bill.fund_share
bulk_list = await build_nav_bulk_list(
nav_collect=nav_collect,
......@@ -157,7 +157,7 @@ async def create_adjust(
settlement_time=fund_data["settlement_time"],
adjust_assets_changed={
create_adjust_bill.currency: create_adjust_bill.volume,
"fund_share": create_adjust_bill.fund_share
# "fund_share": create_adjust_bill.fund_share
}
)
await update_fund(fund_collect, create_adjust_bill.fund_id, adjust_assets=adjust_assets)
......@@ -350,15 +350,15 @@ async def update_adjust_bill(
permission_role_collect)
fund_data = await fund_collect.find_one({"id": fund_id})
bill_data = await bill_collect.find_one({"id": bill_id, "bill_type": BillType.adjust})
A = {bill_data["currency"]: bill_data["volume"], "fund_share": bill_data["fund_share"]}
B = {update_item.currency: update_item.volume, "fund_share": update_item.fund_share}
A = {bill_data["currency"]: bill_data["volume"]}
B = {update_item.currency: update_item.volume}
changed = {k: B.get(k, 0) - A.get(k, 0) for k in set(A) | set(B)}
bulk_list = await build_nav_bulk_list(
nav_collect=nav_collect,
fund_id=fund_id,
record_time=bill_data["record_time"],
settlement_time=fund_data["settlement_time"],
asset_changed=changed
adjust_assets_changed=changed
)
adjust_assets = fund_data["adjust_assets"]
for key, value in changed.items():
......@@ -481,10 +481,10 @@ async def query_bill(
elif bill_data["bill_type"] == BillType.adjust:
adjust_changed.update({
bill_data["currency"]: -bill_data["volume"],
"fund_share": -bill_data["fund_share"]
# "fund_share": -bill_data["fund_share"]
})
adjust_assets[bill_data["currency"]] -= bill_data["volume"]
adjust_assets["fund_share"] -= bill_data["fund_share"]
# adjust_assets["fund_share"] -= bill_data["fund_share"]
else:
raise APIError(message="该账单不支持删除")
bulk_list = await build_nav_bulk_list(
......
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