From 0d15c095fe61420fd04b629b9a009bfd59c2ba49 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 28 Dec 2023 18:27:41 +0800 Subject: [PATCH 1/4] =?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/IndexController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 0c69da7fb..f719eabdb 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -829,12 +829,12 @@ class IndexController extends BaseApiController public function getCompanyBankInfo() { $parmas = $this->request->param(); - $company = Db::query("select company_name,qualification from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 41,'street'=>$parmas['street_code']], true)[0]; + $company = Db::query("select company_name,qualification from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 41,'street'=>$parmas['street_code']], true); if (empty($company)) { return $this->success('成功', ['corporate_account'=> '22170201040004168', 'corporate_bank'=> '中国农业银行股份有限公司泸州石洞支行', 'company_name' => '泸州里海农业科技有限公司', 'corporate_bank_address'=> '泸州市龙马潭区张家祠东路竹林馨居东侧约60米']); } - + $$company=$company[0]; $company['qualification'] = json_decode($company['qualification'], true); if (!empty($company['qualification']['corporate_account']) && !empty($company['qualification']['corporate_bank'])) { From d85c4dd495c128b09094d85c8dbe7a38c79289af Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 28 Dec 2023 18:57:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/IndexController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index f719eabdb..343bf518b 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -834,7 +834,7 @@ class IndexController extends BaseApiController if (empty($company)) { return $this->success('成功', ['corporate_account'=> '22170201040004168', 'corporate_bank'=> '中国农业银行股份有限公司泸州石洞支行', 'company_name' => '泸州里海农业科技有限公司', 'corporate_bank_address'=> '泸州市龙马潭区张家祠东路竹林馨居东侧约60米']); } - $$company=$company[0]; + $company=$company[0]; $company['qualification'] = json_decode($company['qualification'], true); if (!empty($company['qualification']['corporate_account']) && !empty($company['qualification']['corporate_bank'])) { From 7ea70eb693a868c017ad29aa3e0f7192f777defe Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Tue, 2 Jan 2024 11:06:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=85=AC=E5=8F=B8=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=AE=89=E6=8E=92=20300=E6=88=B7=E6=A1=A3=E6=A1=88=E7=9A=84?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/task_template/TaskTemplateLogic.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/app/common/logic/task_template/TaskTemplateLogic.php b/app/common/logic/task_template/TaskTemplateLogic.php index 50c532f9b..3b23a7b33 100644 --- a/app/common/logic/task_template/TaskTemplateLogic.php +++ b/app/common/logic/task_template/TaskTemplateLogic.php @@ -57,13 +57,13 @@ class TaskTemplateLogic extends BaseLogic } } - if($params['type']==33){ - $count=UserInformationg::where('company_id',$params['company_id'])->where('status',1)->count(); - if($count<300){ - self::setError('用户档案数量300不足，无法创建任务模板'); - return false; - } - } +// if($params['type']==33){ +// $count=UserInformationg::where('company_id',$params['company_id'])->where('status',1)->count(); +// if($count<300){ +// self::setError('用户档案数量300不足，无法创建任务模板'); +// return false; +// } +// } $moeny=TaskTemplate::where('company_id', $params['company_id'])->sum('money'); if($moeny+$params['money']>200){ @@ -148,13 +148,13 @@ class TaskTemplateLogic extends BaseLogic self::setError('已经有同一种任务类型了'); return false; } - if($params['type']==33){ - $count=UserInformationg::where('company_id',$params['company_id'])->where('status',1)->count(); - if($count<300){ - self::setError('用户档案数量300不足，无法创建任务模板'); - return false; - } - } +// if($params['type']==33){ +// $count=UserInformationg::where('company_id',$params['company_id'])->where('status',1)->count(); +// if($count<300){ +// self::setError('用户档案数量300不足，无法创建任务模板'); +// return false; +// } +// } $moeny=TaskTemplate::where('company_id', $params['company_id'])->sum('money'); if($moeny+$params['money']-$find['money']>$taskScheduleAmount){ self::setError('任务模板一阶段合计金额不能大于任务调度金额'); From c5ab197447f146ec9332037c8871959e72d734b8 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Sat, 13 Jan 2024 14:39:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=95=86=E5=9F=8E=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=91=E5=85=AC=E5=8F=B8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/ShopCallController.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/api/controller/ShopCallController.php b/app/api/controller/ShopCallController.php index 1e0f84c86..5aa4ee727 100644 --- a/app/api/controller/ShopCallController.php +++ b/app/api/controller/ShopCallController.php @@ -16,5 +16,12 @@ use think\facade\Log; */ class ShopCallController extends BaseApiController { - + public array $notNeedLogin = ['getVillageCompany']; + public function getVillageCompany() + { + $param = $this->request->param(); + $geoVillage = Db::name('geo_village')->where('village_id', $param['village_id'])->find(); + $company = Company::where(['village' =>$geoVillage['village_code'], 'company_type'=>17])->find(); + return $this->success('成功', compact('company')); + } } \ No newline at end of file