weiz
/
data_center
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: weiz:a768dc5887c4179410ea7e752b59066aaddfe667
Branches Tags
weiz:master
weiz:dev
weiz:zmj
weiz:zhangwei
weiz:yaooo
...
compare: weiz:f647466d4bb681cb5b21762f27af38d679bd46ff
Branches Tags
weiz:dev
weiz:zmj
weiz:zhangwei
weiz:yaooo
weiz:master

6 Commits
a768dc5887 ... f647466d4b

Author SHA1 Message Date
yaooo f647466d4b 更新细节 2023-11-16 14:28:16 +08:00
yaooo 83ec214d75 更新上传押金凭证 2023-11-16 13:58:05 +08:00
yaooo b2925f1ab2 Merge branch 'dev' of https://gitea.lihaink.cn/weiz/data_center into dev 2023-11-16 11:51:55 +08:00
weiz f30069fbad Merge pull request 'zhangwei' (#35) from zhangwei into dev 
Reviewed-on: #35
 2023-11-16 11:41:00 +08:00
weiz b5eab3df00 update 2023-11-16 11:40:25 +08:00
weiz e86d0a7cbe update 2023-11-16 11:39:33 +08:00
2 changed files with 16 additions and 3 deletions
Show Stats Expand all files Collapse all files

17
app/adminapi/controller/company/CompanyController.php
View File

@ -28,6 +28,17 @@
}
return json($result);
}
//上传押金凭证
public function depositRechargeTransferVoucher(): Json
{
$params=$this->request->post(['company_id','deposit','voucher']);
$result = curl_post(env('project.worker_domain').'/middleapi/company/depositRechargeTransferVoucher',$params,$this->reqHeader);
if($result['code'] == 0){
return $this->fail($result['msg']);
}
return json($result);
}
//公司详情
public function detail(): Json
@ -68,7 +79,8 @@
if(empty($params['company_name']) || empty($params['organization_code']) || empty($params['company_type']) || empty($params['master_name']) || empty($params['master_phone'])){
return $this->fail('缺少必要参数');
}
$result = curl_post(env('project.worker_domain').'/middleapi/company/create',http_build_query($params),$this->reqHeader);
$this->reqHeader[] = 'Content-Type: application/json; charset=utf-8';
$result = curl_post(env('project.worker_domain').'/middleapi/company/create',json_encode($params,true),$this->reqHeader);
if($result['code'] == 0){
return $this->fail($result['msg']);
}
@ -82,7 +94,8 @@
if(empty($params['id']) || empty($params['company_name']) || empty($params['organization_code']) || empty($params['company_type']) || empty($params['master_name']) || empty($params['master_phone'])){
return $this->fail('缺少必要参数');
}
$result = curl_post(env('project.worker_domain').'/middleapi/company/edit',http_build_query($params),$this->reqHeader);
$this->reqHeader[] = 'Content-Type: application/json; charset=utf-8';
$result = curl_post(env('project.worker_domain').'/middleapi/company/edit',json_encode($params,true),$this->reqHeader);
if($result['code'] == 0){
return $this->fail($result['msg']);
}

2
app/adminapi/controller/finance/RefundController.php
View File

@ -54,7 +54,7 @@ class RefundController extends BaseAdminController
public function taskRecord(): Json
{
$params=$this->request->get(['user_info', 'start_time', 'end_time', 'sn', 'order_sn']);
$params=$this->request->get(['user_info', 'start_time', 'end_time', 'sn', 'order_sn', 'refund_type', 'refund_status']);
$result = curl_post(env('project.worker_domain').'/middleapi/refund/record',$params,$this->reqHeader);
if($result['code'] == 0){
return $this->fail($result['msg']);