mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 修改财务流水分支逻辑并优化订单枚举类

Browse Source
This commit is contained in:
mkm 2024-06-15 17:13:44 +08:00
parent 68624a0304
commit f8e232fc58
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
View File

@ -63,13 +63,15 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt
}
if ($item['financial_pm'] == 0) {
$item['number'] = '-' . $item['number'];
$item['financial_type_name'] = '订单支出给'.OrderEnum::getFinancialType($item['financial_type']);
} else {
$item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']).'获得';
$item['number'] = '+' . $item['number'];
}
$item['staff_name'] = SystemStoreStaff::where('id', $item['staff_id'])->value('staff_name');
$item['store_name'] = $item['store_id'] > 0 ? SystemStore::where('id', $item['store_id'])->value('name') : '';
$item['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']);
$item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']);
})
->toArray();
}

15
app/common/enum/OrderEnum.php
View File

@ -145,11 +145,18 @@ class OrderEnum
self::USER_ORDER_PAY => '用户订单支付',
self::MERCHANT_ORDER_PAY => '商户订单支付',
self::PLATFORM_ORDER_PAY => '平台订单支付',
self::MERCHANT_ORDER_OBTAINS => '商户订单获得',
self::ORDER_HANDLING_FEES => '订单手续费',
self::PLATFORM_ORDER_OBTAINS => '平台订单获得',
self::SUPPLIER_ORDER_OBTAINS => '供应商订单获得',
self::MERCHANT_ORDER_OBTAINS => '商户',
self::ORDER_HANDLING_FEES => '手续费',
self::PLATFORM_ORDER_OBTAINS => '平台',
self::SUPPLIER_ORDER_OBTAINS => '供应商',
self::SYSTEM_SET => '平台设置',
self::VILLAGE_ORDER_OBTAINS => '村长',
self::BRIGADE_ORDER_OBTAINS=>'队长',
self::OTHER_ORDER_OBTAINS=>'其他',
];

2
app/common/logic/PayNotifyLogic.php
View File

@ -369,7 +369,7 @@ class PayNotifyLogic extends BaseLogic
$financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
}
//供应链订单获得
$financeLogic->in($transaction_id, $count_frees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0,0, $order['pay_type']);
$financeLogic->in($transaction_id, bcsub($order['pay_price'], $count_frees, 2), OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0,0, $order['pay_type']);
$financeLogic->out($transaction_id, $count_frees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
// }
$financeLogic->save();