diff --git a/app/api/controller/RemoteController.php b/app/api/controller/RemoteController.php index 6284d1e2a..ed1ce68b8 100644 --- a/app/api/controller/RemoteController.php +++ b/app/api/controller/RemoteController.php @@ -176,7 +176,7 @@ class RemoteController extends BaseApiController * 获取坐标的距离 */ public function coordinate($parmas,$longitude1,$latitude1){ - $res = HttpClient::create()->request('GET', 'http://logistics.lihaink.cn/api/getCarHistory', [ + $res = HttpClient::create()->request('GET', 'https://logistics.lihaink.cn/api/getCarHistory', [ 'query' => $parmas, ]); $json=json_decode($res->getContent(),true); diff --git a/app/common/logic/finance/ShareProfit.php b/app/common/logic/finance/ShareProfit.php index c4577c7c7..9562b0b82 100644 --- a/app/common/logic/finance/ShareProfit.php +++ b/app/common/logic/finance/ShareProfit.php @@ -67,12 +67,18 @@ class ShareProfit } if(isset($datas['template_info']['type']) && $datas['template_info']['type'] ==35){ - $user_ids = User::where('company_id', $datas['company_id'])->where('is_captain', 1)->field('id,nickname,brigade')->select(); + if($company['responsible_area']){ + $responsible_area=explode(',',$company['responsible_area']); + }else{ + Log::error('结算失败:没有区域'.json_encode($data)); + return false; + } + $director_uid = Task::where('id', $datas['task_id'])->value('director_uid'); $shareholder_user = User::where('id', $director_uid)->field('id,nickname,brigade')->find(); - $money=bcdiv($data['money'],count($user_ids),2); + $money=bcdiv($datas['template_info']['over_decimal'],count($responsible_area),2); $left_amount=0; - foreach ($user_ids as $kkk => $vvv) { + foreach ($responsible_area as $kkk => $vvv) { $left_amount+=bcadd(1000,$money,2); $company_log = [ 'sn' => generate_sn(UserAccountLog::class, 'sn', 20), @@ -82,7 +88,7 @@ class ShareProfit 'action' => CompanyAccountLog::INC,//1-增加 2-减少 'left_amount' =>$left_amount,//变动后数量 'change_amount' => $money,//变动数量 - 'remark' =>$shareholder_user['nickname'].'完成了'.$vvv['brigade'].'队的股金:'.$money.'元', + 'remark' =>$shareholder_user['nickname'].'完成了'.$vvv.'队的股金:'.$money.'元', 'status'=>1, ]; CompanyAccountLog::create($company_log); diff --git a/app/job/TaskInformationJob.php b/app/job/TaskInformationJob.php index fe9d2c0cf..bc35f6bef 100644 --- a/app/job/TaskInformationJob.php +++ b/app/job/TaskInformationJob.php @@ -24,7 +24,7 @@ class TaskInformationJob // } try { TaskSchedulingPlan::where('id', $data['id'])->update(['is_pay' => 1]); - $company = Company::where('id', $data['company_id'])->field('id,deposit,company_money,shareholder_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足 + $company = Company::where('id', $data['company_id'])->field('id,deposit,responsible_area,company_money,shareholder_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足 $arr['status'] = 0; $arr['company_account_type'] = 1; //信息更新