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 10:01:11 +08:00
parent dc840b9e94
commit 5811e364c3
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/controller/RemoteController.php
View File

@ -176,7 +176,7 @@ class RemoteController extends BaseApiController
* 获取坐标的距离 * 获取坐标的距离
*/ */
public function coordinate($parmas,$longitude1,$latitude1){ 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, 'query' => $parmas,
]); ]);
$json=json_decode($res->getContent(),true); $json=json_decode($res->getContent(),true);

14
app/common/logic/finance/ShareProfit.php
View File

@ -67,12 +67,18 @@ class ShareProfit
} }
if(isset($datas['template_info']['type']) && $datas['template_info']['type'] ==35){ 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'); $director_uid = Task::where('id', $datas['task_id'])->value('director_uid');
$shareholder_user = User::where('id', $director_uid)->field('id,nickname,brigade')->find(); $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; $left_amount=0;
foreach ($user_ids as $kkk => $vvv) { foreach ($responsible_area as $kkk => $vvv) {
$left_amount+=bcadd(1000,$money,2); $left_amount+=bcadd(1000,$money,2);
$company_log = [ $company_log = [
'sn' => generate_sn(UserAccountLog::class, 'sn', 20), 'sn' => generate_sn(UserAccountLog::class, 'sn', 20),
@ -82,7 +88,7 @@ class ShareProfit
'action' => CompanyAccountLog::INC,//1-增加 2-减少 'action' => CompanyAccountLog::INC,//1-增加 2-减少
'left_amount' =>$left_amount,//变动后数量 'left_amount' =>$left_amount,//变动后数量
'change_amount' => $money,//变动数量 'change_amount' => $money,//变动数量
'remark' =>$shareholder_user['nickname'].'完成了'.$vvv['brigade'].'队的股金:'.$money.'元', 'remark' =>$shareholder_user['nickname'].'完成了'.$vvv.'队的股金:'.$money.'元',
'status'=>1, 'status'=>1,
]; ];
CompanyAccountLog::create($company_log); CompanyAccountLog::create($company_log);

2
app/job/TaskInformationJob.php
View File

@ -24,7 +24,7 @@ class TaskInformationJob
// } // }
try { try {
TaskSchedulingPlan::where('id', $data['id'])->update(['is_pay' => 1]); 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['status'] = 0;
$arr['company_account_type'] = 1; $arr['company_account_type'] = 1;
//信息更新 //信息更新