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

更新

Browse Source
This commit is contained in:
mkm 2023-08-31 17:19:51 +08:00
parent 7697b363a5
commit 19653419a1
4 changed files with 53 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/api/controller/CeshiController.php
View File

@ -24,6 +24,24 @@ class CeshiController extends BaseApiController
public function index() public function index()
{ {
$transaction_pool=780;
$shang_date_total_price=[
'arr'=>['total_price'=>305,'day_money'=>580]
];
if(bcadd($shang_date_total_price['arr']['total_price'],$transaction_pool,2)>$shang_date_total_price['arr']['day_money']){
if($shang_date_total_price['arr']['total_price']<$shang_date_total_price['arr']['day_money']){
$shang_date_total_price['arr']['supplement']=bcsub($shang_date_total_price['arr']['day_money'],$shang_date_total_price['arr']['total_price'],2);
}else{
$shang_date_total_price['arr']['supplement']=0;
$shang_date_total_price['arr']['after_transaction_pool']=0;
}
$shang_date_total_price['arr']['before_transaction_pool']=$transaction_pool;
Task::where('id', 839)->update(['status' => 3,'extend'=>json_encode($shang_date_total_price)]);
$day_money=bcsub($shang_date_total_price['arr']['total_price'],$shang_date_total_price['arr']['day_money'],2);//当天还剩多少
TaskTemplate::where('id',109)->update(['transaction_pool'=>bcadd($transaction_pool,$day_money,2)]);
}
// $all=TaskSchedulingPlan::where('is_pay',0)->with(['template_info','scheduling'])->select()->toArray(); // $all=TaskSchedulingPlan::where('is_pay',0)->with(['template_info','scheduling'])->select()->toArray();
// foreach($all as $k=>$v){ // foreach($all as $k=>$v){
// queue(TaskInformationJob::class,$v); // queue(TaskInformationJob::class,$v);

10
app/api/controller/CompanyController.php
View File

@ -193,11 +193,14 @@ class CompanyController extends BaseApiController
*/ */
public function shareholder_info(){ public function shareholder_info(){
// $params = $this->request->param(); // $params = $this->request->param();
$find=Company::where('id',$this->userInfo['company_id'])->field('is_contract,shareholder_money,village')->find()->toArray(); $find=Company::where('id',$this->userInfo['company_id'])->field('shareholder_money,village')->find()->toArray();
if($find &&$find['is_contract']==1){ if($find){
$contract=Contract::where('party_b',$this->userInfo['company_id'])->field('contract_url,create_time')->find(); $contract=Contract::where('party_b',$this->userInfo['company_id'])->where('contract_type',40)->field('contract_url,create_time')->find();
if($contract){
$find['contract_url']='https://worker-task.lihaink.cn'.$contract['contract_url']; $find['contract_url']='https://worker-task.lihaink.cn'.$contract['contract_url'];
$find['contract_time']=$contract['create_time']; $find['contract_time']=$contract['create_time'];
$find['is_contract']=1;
}
$village_info=Company::where('village',$find['village'])->where('company_type',17)->find(); $village_info=Company::where('village',$find['village'])->where('company_type',17)->find();
if($village_info){ if($village_info){
$find['is_amount_turned']=1; $find['is_amount_turned']=1;
@ -205,6 +208,7 @@ class CompanyController extends BaseApiController
$find['is_amount_turned']=0; $find['is_amount_turned']=0;
} }
}else{ }else{
$find['is_contract']=0;
$find['contract_url']=''; $find['contract_url']='';
$find['contract_time']=''; $find['contract_time']='';
$find['is_amount_turned']=0; $find['is_amount_turned']=0;

25
app/common/logic/task/TaskLogic.php
View File

@ -123,10 +123,10 @@ class TaskLogic extends BaseLogic
//入股任务 //入股任务
if ($v['type'] == 35) { if ($v['type'] == 35) {
$responsible_area = Company::where('id', $v['company_id'])->value('responsible_area'); $responsible_area = Company::where('id', $v['company_id'])->value('responsible_area');
if($responsible_area){ if ($responsible_area) {
$responsible_area=explode(',',$responsible_area); $responsible_area = explode(',', $responsible_area);
}else{ } else {
Log::error('定时任务添加失败:没有区域'.json_encode($v)); Log::error('定时任务添加失败:没有区域' . json_encode($v));
return false; return false;
} }
if (isset($v['extend']['shareholder'])) { if (isset($v['extend']['shareholder'])) {
@ -135,10 +135,9 @@ class TaskLogic extends BaseLogic
$v['extend']['shareholder']['money'] = $v['recharge']; $v['extend']['shareholder']['money'] = $v['recharge'];
$v['extend']['shareholder']['over_decimal'] = $v['over_decimal']; $v['extend']['shareholder']['over_decimal'] = $v['over_decimal'];
foreach ($responsible_area as $kkk => $vvv) { foreach ($responsible_area as $kkk => $vvv) {
$v['extend']['shareholder']['user_list'][$kkk] = ['info'=>$shareholder_user['nickname'].'需缴纳'.$vvv.'队,股金:'.bcdiv($v['recharge'],count($responsible_area),2), 'time' => $v['create_time']]; $v['extend']['shareholder']['user_list'][$kkk] = ['info' => $shareholder_user['nickname'] . '需缴纳' . $vvv . '队,股金:' . bcdiv($v['recharge'], count($responsible_area), 2), 'time' => $v['create_time']];
} }
$data['director_uid'] = $v['extend']['shareholder']['user_id']; $data['director_uid'] = $v['extend']['shareholder']['user_id'];
} }
$data['extend'] = json_encode($v['extend']); $data['extend'] = json_encode($v['extend']);
} }
@ -157,11 +156,15 @@ class TaskLogic extends BaseLogic
} else { } else {
$user_count_money = 58 * $user_count_two; $user_count_money = 58 * $user_count_two;
} }
if($user_count_money<$v['transaction_pool']){ $extend = [
TaskTemplate::where('id', $v['id'])->update(['transaction_pool'=>bcsub($v['transaction_pool'],$user_count_money,2)]); 'transaction' => ['arr' => ['day_money' => $user_count_money, 'total_price'=>0]]
}else{ ];
TaskTemplate::where('id', $v['id'])->update(['transaction_pool'=>0]); $data['extend'] = json_encode($extend);
} // if($user_count_money<$v['transaction_pool']){
// TaskTemplate::where('id', $v['id'])->update(['transaction_pool'=>bcsub($v['transaction_pool'],$user_count_money,2)]);
// }else{
// TaskTemplate::where('id', $v['id'])->update(['transaction_pool'=>0]);
// }
} }
$task_id = (new Task())->insertGetId($data); $task_id = (new Task())->insertGetId($data);
TaskSchedulingPlan::where('id', $TaskSchedulingPlan['id'])->update(['task_id' => $task_id, 'is_execute' => 1]); TaskSchedulingPlan::where('id', $TaskSchedulingPlan['id'])->update(['task_id' => $task_id, 'is_execute' => 1]);

14
app/job/TaskInformationJob.php
View File

@ -51,9 +51,19 @@ class TaskInformationJob
$transaction_pool=$data['template_info']['transaction_pool'];//交易金额剩余池 $transaction_pool=$data['template_info']['transaction_pool'];//交易金额剩余池
if(bcadd($shang_date_total_price['arr']['total_price'],$transaction_pool,2)>$shang_date_total_price['arr']['day_money']){ if(bcadd($shang_date_total_price['arr']['total_price'],$transaction_pool,2)>$shang_date_total_price['arr']['day_money']){
Task::where('id', $data['task_id'])->update(['status' => 3,'extend'=>json_encode($shang_date_total_price)]); if($shang_date_total_price['arr']['total_price']<$shang_date_total_price['arr']['day_money']){
$day_money=bcsub($shang_date_total_price['arr']['total_price'],$shang_date_total_price['arr']['day_money'],2);//当天还剩多少 $day_money=bcsub($shang_date_total_price['arr']['total_price'],$shang_date_total_price['arr']['day_money'],2);//当天还剩多少
TaskTemplate::where('id',$data['template_info']['id'])->update(['transaction_pool'=>bcadd($transaction_pool,$day_money,2)]);
$shang_date_total_price['arr']['supplement']=$day_money;
$transaction_pool=$shang_date_total_price['arr']['supplement'];
}else{
$shang_date_total_price['arr']['supplement']=0;
$shang_date_total_price['arr']['after_transaction_pool']=0;
$day_money=0;
}
$shang_date_total_price['arr']['before_transaction_pool']=$transaction_pool;
Task::where('id', $data['task_id'])->update(['status' => 3,'extend'=>json_encode($shang_date_total_price)]);
TaskTemplate::where('id',$data['template_info']['id'])->update(['transaction_pool'=>bcsub($transaction_pool,$day_money,2)]);
$shang_date_total_price['arr']['status']=1; $shang_date_total_price['arr']['status']=1;
} }
$name = $shang_date_total_price['name']; $name = $shang_date_total_price['name'];