mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 梳理公司余额，股金，押金三类金额的流水记录。

Browse Source
This commit is contained in:
chenbo 2023-10-21 10:37:57 +08:00
parent 4a0b9cfbae
commit 8da2085806
5 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/controller/CompanyController.php
View File

@ -504,8 +504,8 @@ class CompanyController extends BaseAdminController
'sn' => generate_sn(CompanyAccountLog::class, 'sn', 20),
'user_id' => 0,
'company_id' => $param['company_id'],
'change_type' => 300,
'change_object' => 2,
'change_type' => CompanyAccountLog::COMPANY_DEPOSIT,
'change_object' => CompanyAccountLog::DEPOSIT,
'action' => 1,
'change_amount' => $param['deposit'],
'left_amount' =>$left_amount,

2
app/common/logic/finance/ShareProfit.php
View File

@ -85,7 +85,7 @@ class ShareProfit
$company_log = [
'sn' => generate_sn(UserAccountLog::class, 'sn', 20),
'company_id' => $datas['company_id'],
'change_object' => CompanyAccountLog::SHAREHOLDER, //变动对象
'change_object' => CompanyAccountLog::COMPANY_MONEY, //变动对象
'change_type' => CompanyAccountLog::TASK_INC_SHAREHOLDER_MONEY, //变动类型
'action' => CompanyAccountLog::INC, //1-增加 2-减少
'left_amount' => $left_amount, //变动后数量

2
app/common/logic/finance/TownShareProfit.php
View File

@ -183,7 +183,7 @@ class TownShareProfit
// 公司收益
$deposit_count = bcadd($company['deposit'], $masterMoney, 2);
// 公司收益变动记录
$this->AccountLog($company['id'], $deposit_count, $masterMoney, 1, CompanyAccountLog::TASK_INC_DEPOSIT);
$this->AccountLog($company['id'], $deposit_count, $masterMoney, 1, CompanyAccountLog::TASK_INC_INCOME);
$company_money_count = bcadd($company['company_money'], $masterMoney, 2);
//公司余额变动记录
$this->AccountLog($company['id'], $company_money_count, $masterMoney, 1, CompanyAccountLog::TASK_INC_COMPANY_MONEY);

2
app/common/logic/finance/WithdrawLogic.php
View File

@ -72,7 +72,7 @@ class WithdrawLogic extends BaseLogic
$companyAccountLog = [
'sn' => generate_sn(UserAccountLog::class, 'sn', 20),
'company_id' => $companyInfo['id'],
'change_object' => CompanyAccountLog::TASK, //变动对象
'change_object' => CompanyAccountLog::COMPANY_MONEY, //变动对象
'change_type' => CompanyAccountLog::WITHDRAW_DEC_DEPOSIT, //变动类型
'action' => CompanyAccountLog::DEC, //1-增加 2-减少
'left_amount' => $leftMoney, //变动后数量

20
app/common/model/company/CompanyAccountLog.php
View File

@ -41,9 +41,18 @@ class CompanyAccountLog extends BaseModel
*/
const TASK = 1;
/**
* 股金
* 公司股金
*/
const SHAREHOLDER = 2;
/**
* 公司余额
*/
const COMPANY_MONEY = 3;
/**
* 公司押金
*/
const DEPOSIT = 4;
/**
* 动作
@ -72,13 +81,13 @@ class CompanyAccountLog extends BaseModel
const WITHDRAW_DEC_DEPOSIT = 102;
/**
* 用户余额增加类型
* 公司金额变动类型
*/
/**
* 任务收益
*/
const TASK_INC_DEPOSIT = 200;
const TASK_INC_INCOME = 200;
/**
* 公司余额
*/
@ -88,4 +97,9 @@ class CompanyAccountLog extends BaseModel
*/
const TASK_INC_SHAREHOLDER_MONEY = 202;
/**
* 押金
*/
const COMPANY_DEPOSIT = 300;
}