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-30 10:57:37 +08:00
parent 94839048a5
commit 9d13dd82ea
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/api/controller/TaskController.php
View File

@ -60,7 +60,11 @@ class TaskController extends BaseApiController
$find = App(RemoteController::class)->shang_date_total_price($company,1,$param);
if ($find != false) {
$transaction_pool=TaskTemplate::where('id',$item['template_id'])->value('transaction_pool');
$find['transaction_pool']=$transaction_pool;
if($transaction_pool==0){
$find['transaction_pool']=0;
}else{
$find['transaction_pool']=$transaction_pool;
}
$res[$k]['extend']['transaction'] = $find;
Task::where('id',$item['id'])->update(['extend'=>json_encode(['transaction'=>$find],true)]);
} else {
@ -89,7 +93,11 @@ class TaskController extends BaseApiController
if ($task != false) {
$find['list'] = $list;
$find['extend']=$task['extend'];
$find['transaction_pool']=$transaction_pool;
if($transaction_pool==0){
$find['transaction_pool']=0;
}else{
$find['transaction_pool']=$transaction_pool;
}
return $this->success('ok', $find);
}
return $this->success('ok');

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

@ -84,14 +84,29 @@ class PayNotifyLogic extends BaseLogic
$order->pay_status = PayEnum::ISPAID;
$order->pay_time = time();
$order->save();
if($order && isset($order['extend']['type']) &&$order['extend']['type']==1){
$find=Task::where('id',$order['extend']['task_id'])->find();
// if($find &&isset($find['extend']['shareholder'])){
Task::where('id',$order['extend']['task_id'])->update(['status'=>3]);
TaskTemplate::where('id',$find['template_id'])->update(['over_decimal'=>$order->order_amount]);
// }
if ($order && isset($order['extend']['type']) && $order['extend']['type'] == 1) {
$find = Task::where('id', $order['extend']['task_id'])->find();
Task::where('id', $order['extend']['task_id'])->update(['status' => 3]);
TaskTemplate::where('id', $find['template_id'])->update(['over_decimal' => $order->order_amount]);
$user_ids = User::where('company_id', $find['company_id'])->where('is_captain', 1)->field('id,nickname,brigade')->select();
$shareholder_user = User::where('id', $find['director_uid'])->field('id,nickname,brigade')->find();
foreach ($user_ids as $kkk => $vvv) {
$company_log = [
'sn' => generate_sn(UserAccountLog::class, 'sn', 20),
'company_id'=>$find['company_id'],
'change_object' => $change_object,//变动对象
'change_type' => $change_type,//变动类型
'action' => $action,//1-增加 2-减少
'left_amount' => $left_amount,//变动后数量
'change_amount' => $changeAmount,//变动数量
'status'=>1,
];
CompanyAccountLog::create($company_log);
$v['extend']['shareholder']['user_list'][$kkk] = ['info'=>$shareholder_user['nickname'].'完成了'.$vvv['brigade'].'队的股金:'.bcdiv($v['recharge'],count($user_ids),2), 'time' => $v['create_time']];
}
}
}
}