From db98fe5b06be5eb7d5af64f11287bfd1a23a1663 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 31 Aug 2023 19:01:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/controller/CeshiController.php | 38 +++++++++++++-------------
app/common/logic/task/TaskLogic.php | 4 +--
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/app/api/controller/CeshiController.php b/app/api/controller/CeshiController.php
index 4d21436e9..5ce89b2fe 100644
--- a/app/api/controller/CeshiController.php
+++ b/app/api/controller/CeshiController.php
@@ -24,33 +24,33 @@ class CeshiController extends BaseApiController
public function index()
{
- $transaction_pool=780;
- $shang_date_total_price=[
- 'arr'=>['total_price'=>305,'day_money'=>580]
- ];
- if(bcadd($shang_date_total_price['arr']['total_price'],$transaction_pool,2)>$shang_date_total_price['arr']['day_money']){
- if($shang_date_total_price['arr']['total_price']<$shang_date_total_price['arr']['day_money']){
- $shang_date_total_price['arr']['supplement']=bcsub($shang_date_total_price['arr']['day_money'],$shang_date_total_price['arr']['total_price'],2);
- }else{
- $shang_date_total_price['arr']['supplement']=0;
- $shang_date_total_price['arr']['after_transaction_pool']=0;
- }
- $shang_date_total_price['arr']['before_transaction_pool']=$transaction_pool;
- Task::where('id', 839)->update(['status' => 3,'extend'=>json_encode($shang_date_total_price)]);
+ // $transaction_pool=780;
+ // $shang_date_total_price=[
+ // 'arr'=>['total_price'=>305,'day_money'=>580]
+ // ];
+ // if(bcadd($shang_date_total_price['arr']['total_price'],$transaction_pool,2)>$shang_date_total_price['arr']['day_money']){
+ // if($shang_date_total_price['arr']['total_price']<$shang_date_total_price['arr']['day_money']){
+ // $shang_date_total_price['arr']['supplement']=bcsub($shang_date_total_price['arr']['day_money'],$shang_date_total_price['arr']['total_price'],2);
+ // }else{
+ // $shang_date_total_price['arr']['supplement']=0;
+ // $shang_date_total_price['arr']['after_transaction_pool']=0;
+ // }
+ // $shang_date_total_price['arr']['before_transaction_pool']=$transaction_pool;
+ // Task::where('id', 839)->update(['status' => 3,'extend'=>json_encode($shang_date_total_price)]);
- $day_money=bcsub($shang_date_total_price['arr']['total_price'],$shang_date_total_price['arr']['day_money'],2);//当天还剩多少
+ // $day_money=bcsub($shang_date_total_price['arr']['total_price'],$shang_date_total_price['arr']['day_money'],2);//当天还剩多少
- TaskTemplate::where('id',109)->update(['transaction_pool'=>bcadd($transaction_pool,$day_money,2)]);
- }
+ // TaskTemplate::where('id',109)->update(['transaction_pool'=>bcadd($transaction_pool,$day_money,2)]);
+ // }
// $all=TaskSchedulingPlan::where('is_pay',0)->with(['template_info','scheduling'])->select()->toArray();
// foreach($all as $k=>$v){
// queue(TaskInformationJob::class,$v);
// }
-return true;
+// return true;
$plan_all = TaskScheduling::where('id',99)->with('company_info')->select()->toArray();
$plan_ids = [];
foreach ($plan_all as $k => $v) {
- $all = TaskTemplate::where('status', 1)->where('task_scheduling', $v['id'])->limit(30)->select()->toArray();
+ $all = TaskTemplate::where('id', 109)->where('task_scheduling', $v['id'])->limit(30)->select()->toArray();
$plan_ids[] = $v['id'];
if ($all) {
$plan_all[$k]['template'] = $all;
@@ -72,7 +72,7 @@ return true;
* 任务刷新
*/
public function ceshi(){
-
+return false;
$time=strtotime(date('Y-m-d'));
// $time=strtotime(date('Y-m-d'));
// $tiem_end=$time+86399;where('cron_time','<',$time)->
diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php
index c77296039..17b3fd2d8 100644
--- a/app/common/logic/task/TaskLogic.php
+++ b/app/common/logic/task/TaskLogic.php
@@ -146,10 +146,10 @@ class TaskLogic extends BaseLogic
//基础金额*(每日基户数*天数)//且户数小于公司总户数
$user_count = UserInformationg::where('company_id', $v['company_id'])->count();
//
- if ($datas['company_info']['day_count'] == 0) {
+ if ($v['day_count'] == 0) {
$user_count_two = 5 * 1;
} else {
- $user_count_two = 5 * $datas['company_info']['day_count'];
+ $user_count_two = 5 * $v['day_count'];
}
if ($user_count_two > $user_count) {
$user_count_money = 58 * $user_count;