From 73818f6e24de88447661ae8dc1f62a07d7f0254d Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Fri, 15 Sep 2023 18:12:13 +0800 Subject: [PATCH 1/9] fix --- app/adminapi/controller/CompanyController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php index 413593b6d..d47e29128 100644 --- a/app/adminapi/controller/CompanyController.php +++ b/app/adminapi/controller/CompanyController.php @@ -404,7 +404,7 @@ class CompanyController extends BaseAdminController $statusRe = app(JunziqianController::class)->shopMerchantStatusQuery($master_email); Log::info(['商户入驻请求-通滩镇商户-认证状态查询结果', $statusRe]); if($statusRe->success == true) { - $statusData = json_decode($statusRe->data, true); + $statusData = json_decode(json_encode($statusRe->data), true); if ($statusData['status'] == 1) { // 生成合同 $createContractData = [ From da37c73b7ffae7683138d6ed7ec172e571ef1307 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Fri, 15 Sep 2023 18:23:15 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/admin/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/admin/index.html b/public/admin/index.html index ffdcca334..fb53f0745 100644 --- a/public/admin/index.html +++ b/public/admin/index.html @@ -52,7 +52,7 @@ } } - + @@ -63,7 +63,7 @@ - + @@ -86,7 +86,7 @@ - + From 88b79bfef699a063f5de3b4feb71ad3cb0d83ec3 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 25 Sep 2023 14:46:29 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20app/api/controller/Com?= =?UTF-8?q?panyController.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复镇查询 --- app/api/controller/CompanyController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index 91e3405ff..83148b9ad 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -352,9 +352,9 @@ class CompanyController extends BaseApiController */ public function street_company(){ $street=$this->request->param('street_code'); - $company = Company::where('street', $street)->where('company_type',41)->find(); + $company=Db::query("select * from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 41,'street'=>$street], true); if($company){ - return $this->success('ok',['title'=>$company['company_name'],'organization_code'=>$company['organization_code']]); + return $this->success('ok',['title'=>$company[0]['company_name'],'organization_code'=>$company[0]['organization_code']]); }else{ return $this->fail('没有镇管理公司'); } From 876aa66048f03d6cf37c9277b198cc9cbfc86bc6 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 25 Sep 2023 16:05:27 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20app/api/controller/Com?= =?UTF-8?q?panyController.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新 --- app/api/controller/CompanyController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index 83148b9ad..a83217ed2 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -352,7 +352,7 @@ class CompanyController extends BaseApiController */ public function street_company(){ $street=$this->request->param('street_code'); - $company=Db::query("select * from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 41,'street'=>$street], true); + $company=Db::query("select * from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 16,'street'=>$street], true); if($company){ return $this->success('ok',['title'=>$company[0]['company_name'],'organization_code'=>$company[0]['organization_code']]); }else{ From 0f9d69f1d02154620313ed8ce9b637b0a683377b Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 25 Sep 2023 19:25:59 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/TaskController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index 85e9e6c70..213760bdc 100644 --- a/app/api/controller/TaskController.php +++ b/app/api/controller/TaskController.php @@ -228,7 +228,7 @@ class TaskController extends BaseApiController if($res>200){ return $this->fail('定位坐标大于200米，请重新打卡。'.$res.'米'); } - $res = App(RemoteController::class)->coordinate($datas, $parmas['terminus']['lnglat'][0], $parmas['terminus']['lnglat'][1]); + $res_two = App(RemoteController::class)->coordinate($datas, $parmas['terminus']['lnglat'][0], $parmas['terminus']['lnglat'][1]); if($res===false){ return $this->fail('GPS无轨迹'); } @@ -240,9 +240,9 @@ class TaskController extends BaseApiController } $res = App(RemoteController::class)->calculateDistance($task['extend']['transfer']['lnglat'][0],$task['extend']['transfer']['lnglat'][1], $parmas['transfer']['lnglat'][0], $parmas['transfer']['lnglat'][1]); if($res>200){ - return $this->fail('定位坐标大于100米，请重新打卡。'.$res.'米'); + return $this->fail('定位坐标大于200米，请重新打卡。'.$res.'米'); } - $res = App(RemoteController::class)->coordinate($datas, $parmas['transfer']['lnglat'][0], $parmas['transfer']['lnglat'][1]); + $res_two = App(RemoteController::class)->coordinate($datas, $parmas['transfer']['lnglat'][0], $parmas['transfer']['lnglat'][1]); if($res===false){ return $this->fail('GPS无轨迹'); } @@ -251,7 +251,7 @@ class TaskController extends BaseApiController if (isset($task['extend']['update']['terminus']) && isset($task['extend']['update']['transfer'])) { $data['status'] = 3; } - if($res<200){ + if($res_two<1000){ $data['extend'] = json_encode($task['extend']); Task::where('id', $parmas['id'])->update($data); return $this->success('更新成功'); From f0d4d0589ee02b7fd2f4828c233f6979a6ea5b52 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 25 Sep 2023 21:34:14 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/RechargeLogic.php | 3 +++ app/common/logic/PayNotifyLogic.php | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/app/api/logic/RechargeLogic.php b/app/api/logic/RechargeLogic.php index 509c72747..ae8989490 100755 --- a/app/api/logic/RechargeLogic.php +++ b/app/api/logic/RechargeLogic.php @@ -49,6 +49,9 @@ class RechargeLogic extends BaseLogic if(isset($params['task_id']) &&$params['task_id']>0){ $data['extend']=json_encode(['task_id'=>$params['task_id'],'type'=>1]); } + if(isset($params['type']) &&$params['type']==300){ + $data['change_type']=300; + } $order = RechargeOrder::create($data); return [ diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index bae2a6688..2e5ce42e2 100755 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -16,6 +16,7 @@ namespace app\common\logic; use app\common\enum\PayEnum; use app\common\enum\user\AccountLogEnum; +use app\common\model\Company; use app\common\model\company\CompanyAccountLog; use app\common\model\recharge\RechargeOrder; use app\common\model\task\Task; @@ -72,6 +73,24 @@ class PayNotifyLogic extends BaseLogic Task::where('id', $order['extend']['task_id'])->update(['status' => 3,'extend'=>json_encode($extend)]); TaskTemplate::where('id', $find['template_id'])->update(['over_decimal' => $order->order_amount]); } else { + + if($order['change_type']==300){ + $company=Company::where('user_id',$order['user_id'])->find(); + $left_amount= $company['deposit']+$order->order_amount; + $datas = [ + 'order_sn' => $order->sn, + 'user_id' => $order->user_id, + 'company_id' => $company['id']??0, + 'change_type' => 300, + 'change_object' => 2, + 'action' => 1, + 'change_amount' => $order->order_amount, + 'left_amount' =>$left_amount, + 'remark' => '保证金充值', + ]; + CompanyAccountLog::create($datas); + Company::where('id',$company['id'])->update(['deposit'=>$left_amount]); + }else{ // 增加用户累计充值金额及用户余额 $user = User::findOrEmpty($order->user_id); $user->total_recharge_amount += $order->order_amount; @@ -87,6 +106,8 @@ class PayNotifyLogic extends BaseLogic $order->sn, '用户充值' ); + } + } // 更新充值订单状态 From 285554a8ba7a7aa54cd89bbfc0cd4df1e15b36a7 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 25 Sep 2023 21:58:23 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/RechargeController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/api/controller/RechargeController.php b/app/api/controller/RechargeController.php index b63c35f44..ef420ff4c 100755 --- a/app/api/controller/RechargeController.php +++ b/app/api/controller/RechargeController.php @@ -16,7 +16,7 @@ namespace app\api\controller; use app\api\lists\recharge\RechargeLists; use app\api\logic\RechargeLogic; use app\api\validate\RechargeValidate; - +use app\common\model\company\CompanyAccountLog; /** * 充值控制器 @@ -36,6 +36,12 @@ class RechargeController extends BaseApiController { return $this->dataLists(new RechargeLists()); } + public function deposit_lists() + { + $params=$this->request->param(); + $list=CompanyAccountLog::where('company_id',$this->userId)->page($params['page'],15)->select(); + return $this->success('ok',['count'=>0,'extend'=>[],'lists'=>$list,'page_no'=>$params['page'],'page_size'=>$params['page_size']]); + } /** From b358dfe299c43fff5ac1dd293e064fb66b17535f Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 25 Sep 2023 22:00:21 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/RechargeController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/controller/RechargeController.php b/app/api/controller/RechargeController.php index ef420ff4c..0b3dea986 100755 --- a/app/api/controller/RechargeController.php +++ b/app/api/controller/RechargeController.php @@ -39,8 +39,8 @@ class RechargeController extends BaseApiController public function deposit_lists() { $params=$this->request->param(); - $list=CompanyAccountLog::where('company_id',$this->userId)->page($params['page'],15)->select(); - return $this->success('ok',['count'=>0,'extend'=>[],'lists'=>$list,'page_no'=>$params['page'],'page_size'=>$params['page_size']]); + $list=CompanyAccountLog::where('company_id',$this->userId)->page($params['page_no'],15)->select(); + return $this->success('ok',['count'=>0,'extend'=>[],'lists'=>$list,'page_no'=>$params['page_no'],'page_size'=>$params['page_size']]); } From 3034eaf5b1a4338bf71eaeed45a1abb991afb97c Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 25 Sep 2023 22:04:03 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/RechargeController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/api/controller/RechargeController.php b/app/api/controller/RechargeController.php index 0b3dea986..a80090373 100755 --- a/app/api/controller/RechargeController.php +++ b/app/api/controller/RechargeController.php @@ -40,7 +40,13 @@ class RechargeController extends BaseApiController { $params=$this->request->param(); $list=CompanyAccountLog::where('company_id',$this->userId)->page($params['page_no'],15)->select(); - return $this->success('ok',['count'=>0,'extend'=>[],'lists'=>$list,'page_no'=>$params['page_no'],'page_size'=>$params['page_size']]); + $datas=[]; + foreach($list as $k=>$v){ + $datas[$k]['create_time']=$v['create_time']; + $datas[$k]['order_amount']=$v['change_amount']; + $datas[$k]['tips']='充值保证金'.$v['change_amount']; + } + return $this->success('ok',['count'=>0,'extend'=>[],'lists'=>$datas,'page_no'=>$params['page_no'],'page_size'=>$params['page_size']]); }