diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index ef41b354f..83c21337c 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -290,7 +290,9 @@ class CompanyController extends BaseApiController Db::startTrans(); // 上交股金金额 $amount = $serviceGroupCompany['shareholder_money']; - + if ($amount == 0) { + return $this->fail('股金金额不能为0'); + } $sharecapitalChangeLogData = [ 'subordinate_company_id' => $serviceGroupCompany['id'], 'parent_company_id' => $villageCompany['id'], @@ -334,7 +336,7 @@ class CompanyController extends BaseApiController ]; CompanyAccountLog::create($company_log2); Db::commit(); - return $this->success('上交成功'); + return $this->success('上交成功', [], 1, 1); } catch (Exception $e) { Db::rollback(); return $this->fail($e->getMessage()); diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 9cb74cf0e..63e0691e4 100755 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -81,8 +81,8 @@ class PayNotifyLogic extends BaseLogic 'sn' => $order->sn, 'user_id' => $order->user_id, 'company_id' => $company['id']??0, - 'change_type' => 300, - 'change_object' => 2, + 'change_type' => CompanyAccountLog::COMPANY_DEPOSIT, + 'change_object' => CompanyAccountLog::DEPOSIT, 'action' => 1, 'change_amount' => $order->order_amount, 'left_amount' =>$left_amount, diff --git a/app/common/logic/finance/ShareProfit.php b/app/common/logic/finance/ShareProfit.php index cf6a5a124..a08b9edec 100644 --- a/app/common/logic/finance/ShareProfit.php +++ b/app/common/logic/finance/ShareProfit.php @@ -81,11 +81,11 @@ class ShareProfit $money = bcdiv($datas['template_info']['over_decimal'], count($responsible_area), 2); $left_amount = 0; foreach ($responsible_area as $kkk => $vvv) { - $left_amount += bcadd(1000, $money, 2); + $left_amount += bcadd($company['shareholder_money'], $money, 2); $company_log = [ 'sn' => generate_sn(UserAccountLog::class, 'sn', 20), 'company_id' => $datas['company_id'], - 'change_object' => CompanyAccountLog::COMPANY_MONEY, //变动对象 + 'change_object' => CompanyAccountLog::SHAREHOLDER, //变动对象 'change_type' => CompanyAccountLog::TASK_INC_SHAREHOLDER_MONEY, //变动类型 'action' => CompanyAccountLog::INC, //1-增加 2-减少 'left_amount' => $left_amount, //变动后数量