mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#45) from dev into preview

Browse Source 
Reviewed-on: #45
This commit is contained in:
chenbo 2023-09-27 10:58:31 +08:00
commit 29e88fb534
4 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/api/controller/CommonController.php
View File

@ -7,7 +7,7 @@ use think\facade\Db;
class CommonController extends BaseApiController 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() public function province()
@ -70,4 +70,11 @@ class CommonController extends BaseApiController
return $this->data($data->toArray()); 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);
}
} }

2
app/api/controller/CronController.php
View File

@ -19,7 +19,7 @@ use app\job\TaskAdd;
*/ */
class CronController extends BaseApiController class CronController extends BaseApiController
{ {
public array $notNeedLogin = ['settlement','task_add']; public array $notNeedLogin = ['settlement','task_add', 'town_task_add', 'town_task_settlement'];
/** /**
* 小组服务公司任务结算 * 小组服务公司任务结算

4
app/common/logic/approve/ApproveLogic.php
View File

@ -52,8 +52,8 @@ class ApproveLogic extends BaseLogic
$requestResponse = HttpClient::create()->request('POST', env('url.shop_prefix') . '/api/merchant/syncStatus/'.$shopMerchantInfo['mer_intention_id'], [ $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']??''] 'body' => ['status' => $status, 'type' => $approve['type'] ==2 ? 1: 2, 'remark'=> $params['remark']??'']
]); ]);
Log::info('通知商城审批状态-参数', ['status' => $status, 'type' => $approve['type']]); Log::info(['通知商城审批状态-参数', ['status' => $status, 'type' => $approve['type']]]);
Log::info('通知商城审批状态-响应', [$requestResponse->getContent()]); Log::info(['通知商城审批状态-响应', [$requestResponse->getContent()]]);
} }
public static function detail($id) public static function detail($id)

16
app/common/logic/task/TaskLogic.php
View File

@ -383,7 +383,21 @@ class TaskLogic extends BaseLogic
// 第三阶段金额 // 第三阶段金额
return $tempalte['new_money_three']; 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) { if ($v_day_count<= $stageDayOneAccumulative) {
// 第一阶段金额 // 第一阶段金额
return $tempalte['money']; return $tempalte['money'];