diff --git a/app/api/controller/CommonController.php b/app/api/controller/CommonController.php index 0f6d69b6a..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']; + public array $notNeedLogin = ['city', 'area', 'street','province','village','brigade','dict_data_lists','dict_data_lists_by_type_value','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('miniprogram')->where(['name' => $param['name']])->order('id', 'desc')->find(); + return $this->data($data); + } } 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']; /** * 小组服务公司任务结算 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) 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'];