From 5b0fb32c677e37297373b96e1427c65bdbf6e88e Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Tue, 26 Sep 2023 14:10:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=9D=A3=E4=BF=83=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=94=B6=E9=9B=86=E5=92=8C=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/task/TaskLogic.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php index 124950c56..990450529 100644 --- a/app/common/logic/task/TaskLogic.php +++ b/app/common/logic/task/TaskLogic.php @@ -383,7 +383,21 @@ class TaskLogic extends BaseLogic // 第三阶段金额 return $tempalte['new_money_three']; } - } elseif ($tempalte['types'] == 2) { // 长期任务 + } elseif ($tempalte['types'] == 2) { + // 长期任务 + + // 督促完成需求收集和交易任务 第二个阶段即长期 + $townTaskTypeList = DictData::where(['type_value' => 'town_task_type', 'status' => 1])->column('value', 'id'); + if ($townTaskTypeList[$tempalte['type'] === 'town_task_type_5']) { + if ($v_day_count<= $stageDayOneAccumulative) { + // 第一阶段金额 + return $tempalte['money']; + } elseif ( $v_day_count > $stageDayOneAccumulative) { + // 长期金额 + return $tempalte['money_three']; + } + } + if ($v_day_count<= $stageDayOneAccumulative) { // 第一阶段金额 return $tempalte['money']; From e20f6d9ce5c576f9ee6944191f257c645bd22258 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Tue, 26 Sep 2023 15:52:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/CommonController.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/api/controller/CommonController.php b/app/api/controller/CommonController.php index 0f6d69b6a..ad8363308 100644 --- a/app/api/controller/CommonController.php +++ b/app/api/controller/CommonController.php @@ -7,7 +7,7 @@ use think\facade\Db; class CommonController extends BaseApiController { - public array $notNeedLogin = ['city', 'area', 'street','province','village','brigade','dict_data_lists']; + public array $notNeedLogin = ['city', 'area', 'street','province','village','brigade','dict_data_lists', 'getMiniProgramInfo']; //**省列表 */ public function province() @@ -70,4 +70,11 @@ class CommonController extends BaseApiController return $this->data($data->toArray()); } + + public function getMiniProgramInfo() + { + $param = $this->request->param(); + $data = Db::name('mini_program')->where(['name' => $param['name']])->order('id', 'desc')->find(); + return $this->data($data); + } } From 34d9ba72aebe5963e092c807887428230cf271f2 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Tue, 26 Sep 2023 15:57:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/CommonController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/controller/CommonController.php b/app/api/controller/CommonController.php index ad8363308..6bac5734e 100644 --- a/app/api/controller/CommonController.php +++ b/app/api/controller/CommonController.php @@ -7,7 +7,7 @@ use think\facade\Db; class CommonController extends BaseApiController { - public array $notNeedLogin = ['city', 'area', 'street','province','village','brigade','dict_data_lists', 'getMiniProgramInfo']; + public array $notNeedLogin = ['city', 'area', 'street','province','village','brigade','dict_data_lists','dict_data_lists_by_type_value','getMiniProgramInfo']; //**省列表 */ public function province() @@ -74,7 +74,7 @@ class CommonController extends BaseApiController public function getMiniProgramInfo() { $param = $this->request->param(); - $data = Db::name('mini_program')->where(['name' => $param['name']])->order('id', 'desc')->find(); + $data = Db::name('miniprogram')->where(['name' => $param['name']])->order('id', 'desc')->find(); return $this->data($data); } } From ebd1b1108e2c8315072437110f01015535e6b0a1 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Wed, 27 Sep 2023 09:40:31 +0800 Subject: [PATCH 4/5] debug --- app/common/logic/approve/ApproveLogic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/common/logic/approve/ApproveLogic.php b/app/common/logic/approve/ApproveLogic.php index 31b2aed17..146d2dce2 100644 --- a/app/common/logic/approve/ApproveLogic.php +++ b/app/common/logic/approve/ApproveLogic.php @@ -52,8 +52,8 @@ class ApproveLogic extends BaseLogic $requestResponse = HttpClient::create()->request('POST', env('url.shop_prefix') . '/api/merchant/syncStatus/'.$shopMerchantInfo['mer_intention_id'], [ 'body' => ['status' => $status, 'type' => $approve['type'] ==2 ? 1: 2, 'remark'=> $params['remark']??''] ]); - Log::info('通知商城审批状态-参数', ['status' => $status, 'type' => $approve['type']]); - Log::info('通知商城审批状态-响应', [$requestResponse->getContent()]); + Log::info(['通知商城审批状态-参数', ['status' => $status, 'type' => $approve['type']]]); + Log::info(['通知商城审批状态-响应', [$requestResponse->getContent()]]); } public static function detail($id) From 0779b5c590b2e3a18563dc1f57685defaa56e7ab Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Wed, 27 Sep 2023 10:12:04 +0800 Subject: [PATCH 5/5] debug --- app/api/controller/CronController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/CronController.php b/app/api/controller/CronController.php index 5226f7826..c4ba87d1b 100644 --- a/app/api/controller/CronController.php +++ b/app/api/controller/CronController.php @@ -19,7 +19,7 @@ use app\job\TaskAdd; */ class CronController extends BaseApiController { - public array $notNeedLogin = ['settlement','task_add']; + public array $notNeedLogin = ['settlement','task_add', 'town_task_add', 'town_task_settlement']; /** * 小组服务公司任务结算