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

fixed 应用软件推广

Browse Source
This commit is contained in:
chenbo 2023-11-18 17:33:09 +08:00
parent 0552ae8ebd
commit 2c26571b2e
2 changed files with 6 additions and 5 deletions
app
adminapi/controller/approve
ApproveController.php
common/logic/task
TaskLogic.php

4
app/adminapi/controller/approve/ApproveController.php

@ -36,7 +36,7 @@ class ApproveController extends BaseAdminController
public function audit() public function audit()
{ {
try { try {
$params = $this->request->param(); // id check_status remark $params = $this->request->param(); // id check_status remark amount
$approve = Approve::find($params['id']); $approve = Approve::find($params['id']);
if (!$approve) { if (!$approve) {
$this->fail('数据不存在'); $this->fail('数据不存在');
@ -57,7 +57,7 @@ class ApproveController extends BaseAdminController
$this->fail('该任务提前完成条件：销售总额必须达到30万元及以上'); $this->fail('该任务提前完成条件：销售总额必须达到30万元及以上');
} else { } else {
// 提前完成标识 // 提前完成标识
$extend = json_decode($taskTemplate['extend'], true); $extend = $taskTemplate['extend'];
$extend['early_finish'] = 1; $extend['early_finish'] = 1;
$taskTemplate->extend = json_encode($extend); $taskTemplate->extend = json_encode($extend);
$taskTemplate->save(); $taskTemplate->save();

7
app/common/logic/task/TaskLogic.php

@ -2974,12 +2974,11 @@ class TaskLogic extends BaseLogic
Log::info(['镇农科公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); Log::info(['镇农科公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]);
$taskTemplateInfo = $taskSchedulePlan['template_info']; $taskTemplateInfo = $taskSchedulePlan['template_info'];
$dayCount = $taskTemplateInfo['day_count']; $dayCount = $taskTemplateInfo['day_count'];
$target = $taskTemplateInfo['extend']['target'];
$stageDayOne = $taskTemplateInfo['stage_day_one']; $stageDayOne = $taskTemplateInfo['stage_day_one'];
$stageDayTwoCount = bcadd($taskTemplateInfo['stage_day_one'], $taskTemplateInfo['stage_day_two']); $stageDayTwoCount = bcadd($taskTemplateInfo['stage_day_one'], $taskTemplateInfo['stage_day_two']);
$stageDayThreeCount = bcadd($stageDayTwoCount, $taskTemplateInfo['stage_day_three']); $stageDayThreeCount = bcadd($stageDayTwoCount, $taskTemplateInfo['stage_day_three']);
$villageCompany = Company::where(['id' => $taskTemplateInfo['company_id']])->find(); $villageCompany = Company::where(['id' => $taskTemplateInfo['company_id']])->find();
$task = Task::where('id', $taskSchedulePlan['task_id'])->find();
// 任务累计天数 < stage1 关闭任务 // 任务累计天数 < stage1 关闭任务
if ($dayCount < $stageDayOne) { if ($dayCount < $stageDayOne) {
@ -3045,9 +3044,11 @@ class TaskLogic extends BaseLogic
$param = [ $param = [
'start_time' => $startTime, 'start_time' => $startTime,
'end_time' => $endTime, 'end_time' => $endTime,
'village' => $villageCompany['village'] 'village' => $villageCompany['village'],
]; ];
$result = ShopRequestLogic::getPlantingAndBreedingMerchantTradeAmount($param); // todo 商城接口那边需要确定种养殖基地是何种类型的商户 $result = ShopRequestLogic::getPlantingAndBreedingMerchantTradeAmount($param); // todo 商城接口那边需要确定种养殖基地是何种类型的商户
dd($result);
$tradeAmount = $result['data']['procure_amount']; $tradeAmount = $result['data']['procure_amount'];
// 交易池 // 交易池
$transactionPool = $taskSchedulePlan['template_info']['transaction_pool']; $transactionPool = $taskSchedulePlan['template_info']['transaction_pool'];