From 1223a858edb68acdc07a2d3d1605ac4f17a21a07 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 18 Aug 2023 17:42:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/controller/TaskController.php | 4 ++--
app/common/logic/finance/ShareProfit.php | 12 +++++++++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index c61551bdc..5f604121b 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -58,8 +58,8 @@ class TaskController extends BaseApiController{
$parmas=Request()->param();
$find=Task::where('id',$parmas['id'])->find();
if($find['type']==31){
- if(isset($find['extend']['informationg'])){
- $ids=['ids'];
+ if(isset($find['extend']['informationg']['ids'])){
+ $ids=$find['extend']['informationg']['ids'];
$list= UserInformationg::where('id','in',$ids)
->field('id,name,phone,sex,age,update_time,
area_id,area_id area_name,street_id,street_id street_name,village_id,village_id village_name,brigade_id,brigade_id brigade_name,address'
diff --git a/app/common/logic/finance/ShareProfit.php b/app/common/logic/finance/ShareProfit.php
index ce21af9ad..ed9fdae77 100644
--- a/app/common/logic/finance/ShareProfit.php
+++ b/app/common/logic/finance/ShareProfit.php
@@ -34,15 +34,16 @@ class ShareProfit
Db::startTrans();
try {
$arr = [$company['user_id'], AccountLogEnum::UM_INC_TASK, AccountLogEnum::INC, $master_maoney_user, $data['sn'], $data['msg'] . '获得收益' . $master_maoney_user . '元', ['company_id' => $data['company_id'], 'proportion' => $proportion], $data['status']];
- $arr = [$company['user_id'], AccountLogEnum::UM_INC_TASKUSER, AccountLogEnum::INC, $master_maoney_user, $data['sn'], $data['msg'] . '获得账户余额' . $master_maoney_user . '元', ['company_id' => $data['company_id'], 'proportion' => $proportion], $data['status']];
$this->master($arr);
+ $arr = [$company['user_id'], AccountLogEnum::UM_INC_TASKUSER, AccountLogEnum::INC, $master_maoney_user, $data['sn'], $data['msg'] . '获得账户余额' . $master_maoney_user . '元', ['company_id' => $data['company_id'], 'proportion' => $proportion], $data['status']];
+ $this->Account($arr);
//成员
foreach ($userAll as $key => $value) {
$arr = [$value['id'], AccountLogEnum::UM_INC_TASK, AccountLogEnum::INC, $member_maoney_user, $data['sn'], $data['msg'] . '获得收益' . $member_maoney_user . '元', ['company_id' => $data['company_id'], 'proportion' => $proportion], $data['status']];
- // $this->member($arr);
- $arr = [$value['id'], AccountLogEnum::UM_INC_TASKUSER, AccountLogEnum::INC, $member_maoney_user, $data['sn'], $data['msg'] . '获得账户余额' . $member_maoney_user . '元', ['company_id' => $data['company_id'], 'proportion' => $proportion], $data['status']];
$this->member($arr);
+ $arr = [$value['id'], AccountLogEnum::UM_INC_TASKUSER, AccountLogEnum::INC, $member_maoney_user, $data['sn'], $data['msg'] . '获得账户余额' . $member_maoney_user . '元', ['company_id' => $data['company_id'], 'proportion' => $proportion], $data['status']];
+ $this->Account($arr);
}
//公司
Company::where('id', $data['company_id'])->update(['deposit'=>Db::raw('deposit+' . $master_maoney), 'company_money'=>Db::raw('company_money+' .$master_maoney)]);
@@ -74,4 +75,9 @@ class ShareProfit
User::where('id', $data[0])->update(['deposit'=>Db::raw('deposit+' . $data[3]),'user_money'=>Db::raw('user_money+' . $data[3])]);
return AccountLogLogic::add($data[0], $data[1], $data[2], $data[3], $data[4], $data[5], $data[6], $data[7]);
}
+
+ private function Account($data)
+ {
+ return AccountLogLogic::add($data[0], $data[1], $data[2], $data[3], $data[4], $data[5], $data[6], $data[7]);
+ }
}