From adb53a28409aa498f5222318feaac98170df3879 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Mon, 25 Sep 2023 18:25:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?debug=20=E5=8F=91=E9=80=81=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/contract/ContractLogic.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/common/logic/contract/ContractLogic.php b/app/common/logic/contract/ContractLogic.php index ab76008a9..7f2958682 100644 --- a/app/common/logic/contract/ContractLogic.php +++ b/app/common/logic/contract/ContractLogic.php @@ -23,6 +23,7 @@ use think\facade\Db; use app\api\logic\SmsLogic; use app\common\logic\CompanyLogic; use app\common\logic\UserLogic; +use think\facade\Log; /** * Contract逻辑 @@ -297,6 +298,7 @@ class ContractLogic extends BaseLogic public static function postsms($params) { $result = self::detail($params); + Log::info(['发送合同短信', $result]); if ($result && $result['file'] != '') { //发送短信 $data = [ @@ -352,6 +354,7 @@ class ContractLogic extends BaseLogic 'code' => 'api/Hetong/url?id=' . $find['id'].'&type='.$v['type'], 'scene' => 'WQ' ]; + Log::info(['发送合同短信-消息体', $sms]); $result = SmsLogic::contractUrl($sms); if ($result != true) { return self::setError(SmsLogic::getError()); From 7369b477d7177601aeac9466ed2fe6b3ecf2a7a2 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Mon, 25 Sep 2023 18:57:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?41=20=E9=95=87=E5=86=9C=E7=A7=91=E5=85=AC?= =?UTF-8?q?=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/CompanyController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index a83217ed2..fee362002 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -352,7 +352,7 @@ class CompanyController extends BaseApiController */ public function street_company(){ $street=$this->request->param('street_code'); - $company=Db::query("select * from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 16,'street'=>$street], true); + $company=Db::query("select * from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 41,'street'=>$street], true); if($company){ return $this->success('ok',['title'=>$company[0]['company_name'],'organization_code'=>$company[0]['organization_code']]); }else{ From 4e296b792d0083e68e5365f916f3a0a8dceb2545 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Mon, 25 Sep 2023 19:11:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=B8=AD=E5=85=B3=E4=BA=8E=E9=95=87=E5=86=9C=E7=A7=91=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E7=9A=84=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/adminapi/controller/CompanyController.php | 6 ++-- .../task_template/TaskTemplateController.php | 2 +- app/api/controller/CompanyController.php | 4 +-- app/api/controller/CronController.php | 16 ++++----- app/api/controller/TaskController.php | 4 +-- app/api/logic/LoginLogic.php | 2 +- app/common/logic/CompanyLogic.php | 2 +- app/common/logic/task/TaskLogic.php | 36 +++++++++---------- app/common/model/dict/DictData.php | 2 +- app/job/TownTaskAdd.php | 2 +- app/job/TownTaskSettlementJob.php | 2 +- app/task/TownTaskCron.php | 4 +-- app/task/TownTaskSettlementCron.php | 2 +- 13 files changed, 42 insertions(+), 42 deletions(-) diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php index 2fa56677d..20487cfed 100644 --- a/app/adminapi/controller/CompanyController.php +++ b/app/adminapi/controller/CompanyController.php @@ -381,10 +381,10 @@ class CompanyController extends BaseAdminController // $master_email=substr(md5(uniqid()),rand(0, 22),10)."@lihai.com"; // } - // 根据street码查询所属镇管理公司 + // 根据street码查询所属镇农科公司 $company = Company::where(['street' => $params['street'], 'company_type' => 41])->find(); if(empty($company)) { - throw new Exception('当前区域无镇管理公司'); + throw new Exception('当前区域无镇农科公司'); } $data = [ 'mer_intention_id' => $params['mer_intention_id']??'', // 商城商户入驻申请id，签约完成后回调使用 @@ -410,7 +410,7 @@ class CompanyController extends BaseAdminController $approveModel->name = $shopApproveType == 1? '商户入驻审批': '开通交易审批'; $approveModel->admin_id = 0; // 后台发起人id 暂时为0 $approveModel->department_id = '0'; - $approveModel->check_admin_ids = $company['admin_id']; // 当前审批人ID 镇管理公司负责人 + $approveModel->check_admin_ids = $company['admin_id']; // 当前审批人ID 镇农科公司负责人 $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核 $approveModel->other_type = 6; $approveModel->extend = json_encode(array_merge($params, $data)); diff --git a/app/adminapi/controller/task_template/TaskTemplateController.php b/app/adminapi/controller/task_template/TaskTemplateController.php index febc541ad..f301c70c6 100644 --- a/app/adminapi/controller/task_template/TaskTemplateController.php +++ b/app/adminapi/controller/task_template/TaskTemplateController.php @@ -56,7 +56,7 @@ class TaskTemplateController extends BaseAdminController $params['admin_id'] = $this->adminId; $company = Company::find($params['company_id']); if ($company->company_type == 41) { - // 创建 镇管理公司 任务模板 + // 创建 镇农科公司 任务模板 $result = TaskTemplateLogic::addTownTaskTemplate($params); } else { $result = TaskTemplateLogic::add($params); diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index fee362002..80077c3be 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -348,7 +348,7 @@ class CompanyController extends BaseApiController } /** - * 查询镇管理公司 + * 查询镇农科公司 */ public function street_company(){ $street=$this->request->param('street_code'); @@ -356,7 +356,7 @@ class CompanyController extends BaseApiController if($company){ return $this->success('ok',['title'=>$company[0]['company_name'],'organization_code'=>$company[0]['organization_code']]); }else{ - return $this->fail('没有镇管理公司'); + return $this->fail('当前区域无镇农科公司'); } } diff --git a/app/api/controller/CronController.php b/app/api/controller/CronController.php index 90a08d4db..5226f7826 100644 --- a/app/api/controller/CronController.php +++ b/app/api/controller/CronController.php @@ -76,11 +76,11 @@ class CronController extends BaseApiController } /** - * 镇管理公司任务结算 + * 镇农科公司任务结算 */ public function town_task_settlement() { - Log::info('镇管理公司定时任务结算执行-开始'.date('Y-m-d H:i:s')); + Log::info('镇农科公司定时任务结算执行-开始'.date('Y-m-d H:i:s')); //yesterday 昨日未结算的任务计划 $taskSchedulingPlanList = TaskSchedulingPlan::whereDay('end_time','yesterday') ->withJoin(['scheduling'], 'left') @@ -92,18 +92,18 @@ class CronController extends BaseApiController foreach($taskSchedulingPlanList as $taskSchedulingPlan){ queue(TownTaskSettlementJob::class, $taskSchedulingPlan); } - Log::info('镇管理公司定时任务结算执行-结束'.date('Y-m-d H:i:s')); - return $this->success('镇管理公司定时任务结算执行成功'); + Log::info('镇农科公司定时任务结算执行-结束'.date('Y-m-d H:i:s')); + return $this->success('镇农科公司定时任务结算执行成功'); } /** - * 镇管理公司任务下发 + * 镇农科公司任务下发 */ public function town_task_add() { //任务下发 $time = strtotime(date('Y-m-d')); - // 查询系统 所有镇管理公司 未下发 的 任务安排 + // 查询系统 所有镇农科公司 未下发 的 任务安排 $taskSchedulingList = TaskScheduling::where('cron_time', '<', $time)->where('status', 1)->where('company_type', 41)->with('company_info')->select()->toArray(); $taskSchedulingIds = []; @@ -123,7 +123,7 @@ class CronController extends BaseApiController } Company::where('id', 'in', $companyIds)->inc('day_count')->update(); TaskScheduling::where('id', 'in', $taskSchedulingIds)->update(['cron_time' => time()]); - Log::info('镇管理公司定时任务下发执行成功' . date('Y-m-d H:i:s')); - return $this->success('镇管理公司定时任务下发执行成功'); + Log::info('镇农科公司定时任务下发执行成功' . date('Y-m-d H:i:s')); + return $this->success('镇农科公司定时任务下发执行成功'); } } \ No newline at end of file diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index 85e9e6c70..a51e351c3 100644 --- a/app/api/controller/TaskController.php +++ b/app/api/controller/TaskController.php @@ -346,7 +346,7 @@ class TaskController extends BaseApiController } /** - * 镇管理公司任务详情 + * 镇农科公司任务详情 */ public function service_task_detail() { @@ -356,7 +356,7 @@ class TaskController extends BaseApiController } /** - * 镇管理公司任务-督促小组服务团队学习任务 -提交 + * 镇农科公司任务-督促小组服务团队学习任务 -提交 */ public function commit_town_task_type4() { diff --git a/app/api/logic/LoginLogic.php b/app/api/logic/LoginLogic.php index 7192e8ce9..8cf6fafc0 100755 --- a/app/api/logic/LoginLogic.php +++ b/app/api/logic/LoginLogic.php @@ -70,7 +70,7 @@ class LoginLogic extends BaseLogic if ($params['is_captain']) { $group_id=2; } - // 镇管理公司服务部长 + // 镇农科公司服务部长 if ($params['is_service_manager'] == 1) { $user = User::where(['company_id' => $params['company_id'], 'group_id' => 14])->find(); if (!empty($user)) { diff --git a/app/common/logic/CompanyLogic.php b/app/common/logic/CompanyLogic.php index c38ca32e7..97f63ad57 100644 --- a/app/common/logic/CompanyLogic.php +++ b/app/common/logic/CompanyLogic.php @@ -116,7 +116,7 @@ class CompanyLogic extends BaseLogic AdminLogic::insertRole($admin_id, [6]); $admin['group_id']=5; } elseif ($params['company_type']==41) { - //镇管理公司 总负责人 + //镇农科公司 总负责人 AdminLogic::insertRole($admin_id, [7]); //后台角色 $admin['group_id']=15; // 前台角色 } diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php index 9002436d5..124950c56 100644 --- a/app/common/logic/task/TaskLogic.php +++ b/app/common/logic/task/TaskLogic.php @@ -300,7 +300,7 @@ class TaskLogic extends BaseLogic public static function TownCronAdd(array $taskTemplate) { try { - Log::info(['镇管理公司定时任务下发-任务模板', $taskTemplate]); + Log::info(['镇农科公司定时任务下发-任务模板', $taskTemplate]); // 单次任务不重复下发，在结算时刷新任务时间 if ($taskTemplate['types'] == 3) { $task = Task::where('template_id', $taskTemplate['id'])->find(); @@ -325,10 +325,10 @@ class TaskLogic extends BaseLogic 'status' => 1 ]; $TaskSchedulingPlan = TaskSchedulingPlan::create($TaskSchedulingPlan_data); - Log::info(['镇管理公司定时任务下发-添加plan结果', $TaskSchedulingPlan]); + Log::info(['镇农科公司定时任务下发-添加plan结果', $TaskSchedulingPlan]); $serviceManagerUser = User::where(['company_id'=>$taskTemplate['company_id'], 'group_id'=> 14])->find(); - Log::info(['镇管理公司定时任务下发-服务部长user信息', $serviceManagerUser]); + Log::info(['镇农科公司定时任务下发-服务部长user信息', $serviceManagerUser]); $arr = [ 'template_id' => $taskTemplate['id'], 'scheduling_plan_id' => $TaskSchedulingPlan['id'], @@ -352,7 +352,7 @@ class TaskLogic extends BaseLogic } $data['extend'] = json_encode($extend); $task_id = (new Task())->insertGetId($data); - Log::info(['镇管理公司定时任务下发-添加task结果', $task_id]); + Log::info(['镇农科公司定时任务下发-添加task结果', $task_id]); TaskSchedulingPlan::where('id', $TaskSchedulingPlan['id'])->update(['task_id' => $task_id, 'is_execute' => 1]); // 任务累计进行天数 +1 TaskTemplate::where('id', $taskTemplate['id'])->inc('day_count')->update(); @@ -407,7 +407,7 @@ class TaskLogic extends BaseLogic public static function townTaskSettlement($taskSchedulePlan) { try { - Log::info(['镇管理公司定时任务结算执行-任务计划', $taskSchedulePlan]); + Log::info(['镇农科公司定时任务结算执行-任务计划', $taskSchedulePlan]); $taskTemplateInfo = $taskSchedulePlan['template_info']; // 任务类型用的数据字典主键id，将id和value作映射，避免测试和正式环境数据字典数据不一致时出问题 $townTaskTypeList = DictData::where(['type_value' => 'town_task_type', 'status' => 1])->column('value', 'id'); @@ -445,17 +445,17 @@ class TaskLogic extends BaseLogic return true; } } catch (Exception $e) { - Log::error(['镇管理任务结算失败',$e]); + Log::error(['镇农科任务结算失败',$e]); } } /** - * 系统自动判定镇管理公司下属小组服务公司 是否100%完成每日任务：三轮车任务，档案更新任务，平台交易任务 + * 系统自动判定镇农科公司下属小组服务公司 是否100%完成每日任务：三轮车任务，档案更新任务，平台交易任务 */ private static function dealTownTask1($taskSchedulePlan) { - Log::info(['镇管理公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); + Log::info(['镇农科公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); $taskTemplateInfo = $taskSchedulePlan['template_info']; $taskInfo = Task::where(['id' => $taskSchedulePlan['task_id']])->find(); $townCompany = Company::where(['id' => $taskTemplateInfo['company_id']])->find(); @@ -501,7 +501,7 @@ class TaskLogic extends BaseLogic */ private static function dealTownTask2($taskSchedulePlan) { - Log::info(['镇管理公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); + Log::info(['镇农科公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); $taskTemplateInfo = $taskSchedulePlan['template_info']; $townCompany = Company::where(['id' => $taskTemplateInfo['company_id']])->find(); $day = $taskTemplateInfo['stage_day_one'] + $taskTemplateInfo['stage_day_two']; @@ -602,7 +602,7 @@ class TaskLogic extends BaseLogic private static function dealTownTask3($taskSchedulePlan) { - Log::info(['镇管理公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); + Log::info(['镇农科公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); $taskTemplateInfo = $taskSchedulePlan['template_info']; $townCompany = Company::where(['id' => $taskTemplateInfo['company_id']])->find(); $groupServiceCompanyList = Company::where(['street' => $townCompany['street'], 'company_type' => 18])->select()->toArray(); @@ -651,7 +651,7 @@ class TaskLogic extends BaseLogic */ private static function dealTownTask4($taskSchedulePlan) { - Log::info(['镇管理公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); + Log::info(['镇农科公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); $taskTemplateInfo = $taskSchedulePlan['template_info']; $townCompany = Company::where(['id' => $taskTemplateInfo['company_id']])->find(); $taskDayCount = $taskTemplateInfo['day_count']; // 任务累计进行天数 @@ -743,12 +743,12 @@ class TaskLogic extends BaseLogic } /** - * 查镇所属小组服务公司当日实际完成金额总和+镇管理公司的资金池 + * 查镇所属小组服务公司当日实际完成金额总和+镇农科公司的资金池 * 查镇所属小组服务公司当日任务目标金额总和 */ private static function dealTownTask5($taskSchedulePlan) { - Log::info(['镇管理公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); + Log::info(['镇农科公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); $taskTemplateInfo = $taskSchedulePlan['template_info']; $townCompany = Company::where(['id' => $taskTemplateInfo['company_id']])->find(); $townTask = Task::where('id', $taskSchedulePlan['task_id'])->find(); @@ -770,7 +770,7 @@ class TaskLogic extends BaseLogic } } } - // 完成条件： 查镇所属小组服务公司当日实际完成金额总和+镇管理公司的资金池 > 查镇所属小组服务公司当日任务目标金额总和 + // 完成条件： 查镇所属小组服务公司当日实际完成金额总和+镇农科公司的资金池 > 查镇所属小组服务公司当日任务目标金额总和 if($targetAmount != 0 && bcadd($townTransactionPool, $townTotalTradeAmount, 2) >= $targetAmount) { // 将余下金额放入镇交易池 $leftTransactionPool = bcsub(bcadd($townTransactionPool, $townTotalTradeAmount, 2), $targetAmount, 2); @@ -788,13 +788,13 @@ class TaskLogic extends BaseLogic */ private static function dealTownTask6($taskSchedulePlan) { - Log::info(['镇管理公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); + Log::info(['镇农科公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); $taskTemplateInfo = $taskSchedulePlan['template_info']; $taskDayCount = $taskTemplateInfo['day_count']; // 任务累计进行天数 $task = Task::where('id', $taskSchedulePlan['task_id'])->find(); $stageDayOneAccumulative = $taskTemplateInfo['stage_day_one']; // 第一阶段累计天数 $stageDayTwoAccumulative = intval(bcadd($taskTemplateInfo['stage_day_one'], $taskTemplateInfo['stage_day_two'])); // 第二阶段累计天数 第一+第二 - $townCompany = Company::where('id', $taskTemplateInfo['company_id'])->find(); // 镇管理公司 + $townCompany = Company::where('id', $taskTemplateInfo['company_id'])->find(); // 镇农科公司 $villageCompanyList = Company::where(['street' => $townCompany['street'], 'company_type'=> 17])->select()->toArray(); // 村管理公司 // 当前任务进行天数 < 第一+第二阶段天数 只刷新任务时间 @@ -850,10 +850,10 @@ class TaskLogic extends BaseLogic // 安全任务结算 private static function dealTownTask7($taskSchedulePlan) { - Log::info(['镇管理公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); + Log::info(['镇农科公司定时任务结算执行-'.$taskSchedulePlan['template_info']['title']]); $taskTemplateInfo = $taskSchedulePlan['template_info']; - $townCompany = Company::where('id', $taskTemplateInfo['company_id'])->find(); // 镇管理公司 + $townCompany = Company::where('id', $taskTemplateInfo['company_id'])->find(); // 镇农科公司 $task = Task::where('id', $taskSchedulePlan['task_id'])->find(); // 片区下公司有任一投诉都判定为未完成 diff --git a/app/common/model/dict/DictData.php b/app/common/model/dict/DictData.php index 6e69145ca..fa7d99a5f 100755 --- a/app/common/model/dict/DictData.php +++ b/app/common/model/dict/DictData.php @@ -44,7 +44,7 @@ class DictData extends BaseModel return $data['status'] ? '正常' : '停用'; } - // 根据镇管理公司任务类型，获取code + // 根据镇农科公司任务类型，获取code public function getTownTaskType($typeId){ $townTaskTypeList = DictData::where(['type_value' => 'town_task_type', 'status' => 1])->column('value', 'id'); if(isset($townTaskTypeList[$typeId])) { diff --git a/app/job/TownTaskAdd.php b/app/job/TownTaskAdd.php index e5eb68359..50ec8ac55 100644 --- a/app/job/TownTaskAdd.php +++ b/app/job/TownTaskAdd.php @@ -6,7 +6,7 @@ use app\common\logic\task\TaskLogic; use think\queue\Job; /** - * 镇管理公司任务下发执行的具体逻辑 + * 镇农科公司任务下发执行的具体逻辑 */ class TownTaskAdd { diff --git a/app/job/TownTaskSettlementJob.php b/app/job/TownTaskSettlementJob.php index 86d93a782..917944b4a 100644 --- a/app/job/TownTaskSettlementJob.php +++ b/app/job/TownTaskSettlementJob.php @@ -15,7 +15,7 @@ use think\queue\Job; class TownTaskSettlementJob { /** - * 镇管理公司任务结算 + * 镇农科公司任务结算 */ public function fire(Job $job, $taskSchedulingPlan) { diff --git a/app/task/TownTaskCron.php b/app/task/TownTaskCron.php index 835f4a604..2c3e1ee06 100644 --- a/app/task/TownTaskCron.php +++ b/app/task/TownTaskCron.php @@ -19,13 +19,13 @@ class TownTaskCron extends Task { // $this->everyMinute();//每分钟 } /** - * 镇管理公司任务下发 + * 镇农科公司任务下发 */ protected function execute() { //任务下发 $time = strtotime(date('Y-m-d')); - // 查询系统 所有镇管理公司 未下发 的 任务安排 + // 查询系统 所有镇农科公司 未下发 的 任务安排 $taskSchedulingList = TaskScheduling::where('cron_time', '<', $time)->where('status', 1)->where('company_type', 41)->with('company_info')->select()->toArray(); $taskSchedulingIds = []; diff --git a/app/task/TownTaskSettlementCron.php b/app/task/TownTaskSettlementCron.php index 677ca7547..0c3181edb 100644 --- a/app/task/TownTaskSettlementCron.php +++ b/app/task/TownTaskSettlementCron.php @@ -15,7 +15,7 @@ class TownTaskSettlementCron extends Task // $this->everyMinute();//每分钟 } /** - * 镇管理公司任务结算 + * 镇农科公司任务结算 * @return mixed */ protected function execute()