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

任务安排-1.定时下发任务2.任务进度和详情3市场部长/服务部长协助负责人工作任务结算逻辑

Browse Source
This commit is contained in:
chenbo 2023-12-27 11:36:49 +08:00
parent ad8bec449c
commit b08fcdd13f
6 changed files with 1238 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/adminapi/controller/TaskController.php
View File

@ -2,6 +2,8 @@
namespace app\adminapi\controller;
use app\common\logic\CompanyLogic;
use app\common\logic\task\TaskLogic;
use think\facade\Db;
use app\common\model\user\Task;
@ -211,5 +213,22 @@ class TaskController extends BaseAdminController
}
}
// 手动结算
public function manualSettlement()
{
$taskId = $this->request->param('task_id');
$result = TaskLogic::manualSettlement($taskId);
if (true === $result) {
return $this->success('手动结算完成', [], 1, 1);
}
return $this->fail(TaskLogic::getError());
}
// 任务进度和详情
public function taskProgress()
{
$taskId = $this->request->param('task_id');
$detail = TaskLogic::taskProgress($taskId);
return $this->success('', compact('detail'));
}
}

23
app/api/controller/CeshiController.php
View File

@ -704,19 +704,16 @@ class CeshiController extends BaseApiController
public function testShopApi()
{
$id = $this->request->param('id');
$templateInfo = TaskTemplate::where(['id'=>$id])->find();
$townCompany = Company::where(['id' => $templateInfo['company_id']])->find();
$dayCount = 4; //$taskTemplateInfo['day_count'];
$targetgroupServiceCompanyCount = floor($dayCount /2 ); // 目标小组团队数
echo $targetgroupServiceCompanyCount;
$targetInformationCount = 0; // 目标收集户数
for ($j = 0; $j < $targetgroupServiceCompanyCount; $j++) {
for ($i = 0; $i < $dayCount; $i++) {
$targetInformationCount +=5;
$param['start_time'] = strtotime(date('Y-m-d', $templateInfo['cretate_time'])) + 86400;
$param['end_time'] = time();
$param['mer_intention_id'] = 131;
// $param['goods_id'] = '17,18';
$param['type_id'] = 10;
// todo 返回字段要对接
$result = ShopRequestLogic::getGeneralMerchantProductListing($param);
dd($result);
}
}
echo $targetInformationCount;
}
}

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

@ -36,7 +36,8 @@ class CronController extends BaseApiController
$plan_ids = [];
foreach ($plan_all as $k => $v) {
$all = TaskTemplate::where('status', 1)->where('task_scheduling', $v['id'])->limit(30)->select()->toArray();
// cron_time 定时下发日期 小于等于当前日期就都下发
$all = TaskTemplate::where('status', 1)->where('task_scheduling', $v['id'])->where('cron_time', '<=', $time)->select()->toArray();
$plan_ids[] = $v['id'];
if ($all) {
$plan_all[$k]['template'] = $all;

11
app/api/controller/TaskController.php
View File

@ -1014,4 +1014,15 @@ class TaskController extends BaseApiController
return $this->success('成功', []);
}
}
// 任务进度
public function taskProgress()
{
$taskId = $this->request->get('task_id');
$taskTypeValue = $this->request->get('task_type_value');
// 服务部长协助负责人开展工作任务
if ($taskTypeValue == 'town_task_type_1') {
}
}
}

131
app/common/logic/ShopRequestLogic.php
View File

@ -231,4 +231,135 @@ class ShopRequestLogic extends BaseLogic
return false;
}
}
/**
* 查询镇级下的镇级供应链商户
*/
public static function getTownSupplyChainMerchant($param)
{
try {
$requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/supply_chain_merchant', [
'query' => $param
]);
return json_decode($requestResponse->getContent(), true);
} catch (Exception $e) {
self::setError($e->getMessage());
return false;
}
}
/**
* 查询镇级下的镇级供应链商户
*/
public static function getTownGeneralMerchant($param)
{
try {
$requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/general_merchant', [
'query' => $param
]);
return json_decode($requestResponse->getContent(), true);
} catch (Exception $e) {
self::setError($e->getMessage());
return false;
}
}
/**
* 查询镇级供应链商户的上架商品数
*/
public static function getTownSupplyChainMerchantProductCount($param)
{
try {
$requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/supply_chain_product', [
'query' => $param
]);
return json_decode($requestResponse->getContent(), true);
} catch (Exception $e) {
self::setError($e->getMessage());
return false;
}
}
/**
* 查询普通商户的上架商品数
*/
public static function getTownGeneralMerchantProductCount($param)
{
try {
$requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/general_merchant_product', [
'query' => $param
]);
return json_decode($requestResponse->getContent(), true);
} catch (Exception $e) {
self::setError($e->getMessage());
return false;
}
}
/**
* 供应链商户入驻20天后是否完成库存更新
*/
public static function getStockUpdate1($param)
{
try {
$requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/supply_chain_product_stock_count1', [
'query' => $param
]);
return json_decode($requestResponse->getContent(), true);
} catch (Exception $e) {
self::setError($e->getMessage());
return false;
}
}
/**
* 普通商户入驻20天后是否完成库存更新
*/
public static function getGeneralStockUpdate1($param)
{
try {
$requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/product_stock_count1', [
'query' => $param
]);
return json_decode($requestResponse->getContent(), true);
} catch (Exception $e) {
self::setError($e->getMessage());
return false;
}
}
/**
* 查询供应链商户指定商品采购金额
*/
public static function getMerchantPurchaseAmount($param)
{
try {
$requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/supply_chain_product_price', [
'query' => $param
]);
return json_decode($requestResponse->getContent(), true);
} catch (Exception $e) {
self::setError($e->getMessage());
return false;
}
}
/**
* 查询一般商户采购金额
*/
public static function getGeneralMerchantPurchaseAmount1($param)
{
try {
$requestResponse = HttpClient::create()->request('GET', env('url.shop_prefix'). '/api/statistics/general_product_price', [
'query' => $param
]);
return json_decode($requestResponse->getContent(), true);
} catch (Exception $e) {
self::setError($e->getMessage());
return false;
}
}
}

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

File diff suppressed because it is too large Load Diff