diff --git a/app/api/controller/CronController.php b/app/api/controller/CronController.php index c4ba87d1b..d39df3548 100644 --- a/app/api/controller/CronController.php +++ b/app/api/controller/CronController.php @@ -26,7 +26,7 @@ class CronController extends BaseApiController */ public function settlement(){ // $all=TaskSchedulingPlan::where('is_pay',0)->with(['template_info','scheduling'])->select()->toArray(); - $all = TaskSchedulingPlan::whereDay('end_time','yesterday') + $all = TaskSchedulingPlan::whereDay('end_time','today') ->withJoin(['scheduling'], 'left') ->where('scheduling.company_type', 18) ->where('is_pay',0) @@ -81,8 +81,8 @@ class CronController extends BaseApiController public function town_task_settlement() { Log::info('镇农科公司定时任务结算执行-开始'.date('Y-m-d H:i:s')); - //yesterday 昨日未结算的任务计划 - $taskSchedulingPlanList = TaskSchedulingPlan::whereDay('end_time','yesterday') + //today 今日未结算的任务计划 + $taskSchedulingPlanList = TaskSchedulingPlan::whereDay('end_time','today') ->withJoin(['scheduling'], 'left') ->where('scheduling.company_type', 41) ->where('is_pay',0) diff --git a/app/common/controller/ImController.php b/app/common/controller/ImController.php index b67463aa9..885db5746 100644 --- a/app/common/controller/ImController.php +++ b/app/common/controller/ImController.php @@ -4,11 +4,11 @@ namespace app\common\controller; use alioss\alioss; use app\common\model\auth\Admin; -use app\common\model\auth\AdminRole; use app\common\model\Company; use app\common\model\im\UserImMessage; use app\common\model\user\User; use GatewayClient\Gateway; +use think\facade\Db; use think\response\Json; class ImController extends BaseLikeAdminController @@ -150,7 +150,7 @@ class ImController extends BaseLikeAdminController //给user用户发 Gateway::sendToUid($this->sceneText(0).'_'.$params['to_user_id'], json_encode($sendData)); } - return $this->success('发送成功'); + return $this->success('发送成功',$sendData); }catch (\Exception $e) { return $this->fail($e->getMessage()); } @@ -225,10 +225,10 @@ class ImController extends BaseLikeAdminController $sendData = [ 'id' => $model->id, 'from_user_id' => $params['from_user_id'], - 'from_user_name' => $fromUserInfo['nickname'], + 'from_user_name' => $fromUserInfo['name'], 'from_user_avatar' => $fromUserInfo['avatar'], 'to_user_id' => $params['to_user_id'], - 'to_user_name' => $toUserInfo['nickname'], + 'to_user_name' => $toUserInfo['name'], 'to_user_avatar' => $toUserInfo['avatar'], 'content' => $result['data'], 'type' => $params['type'], @@ -243,7 +243,7 @@ class ImController extends BaseLikeAdminController //给user用户发 Gateway::sendToUid($this->sceneText(0).'_'.$params['to_user_id'], json_encode($sendData)); } - return $this->success('发送成功'); + return $this->success('发送成功',$sendData ); }catch (\Exception $e) { return $this->fail($e->getMessage()); } @@ -274,27 +274,12 @@ class ImController extends BaseLikeAdminController if(empty($toUserInfo)){ return $this->fail('接收者信息错误'); } + //将消息设置为已读 + UserImMessage::where([['from_user_id','=',$params['from_user_id']],['to_user_id','=',$params['to_user_id']]])->update(['is_read' => 1]); //获取用户消息 - $msgData = UserImMessage::field('id,from_user_id,to_user_id,content,type,is_read,create_time,extends') - ->where([['from_user_id','=',$params['from_user_id']],['to_user_id','=',$params['to_user_id']]]) - ->whereOr([['from_user_id','=',$params['to_user_id']],['to_user_id','=',$params['from_user_id']]]) - ->order('create_time desc')->page($params['page_no'],$params['page_size'])->select()->each(function($item) use($params,$fromUserInfo,$toUserInfo) { - if($item['from_user_id'] == $params['from_user_id']){ - $item['from_user_name'] = $fromUserInfo['name']; - $item['from_user_avatar'] = $fromUserInfo['avatar']; - }else{ - $item['from_user_name'] = $toUserInfo['name']; - $item['from_user_avatar'] = $toUserInfo['avatar']; - } - if($item['to_user_id'] == $params['to_user_id']){ - $item['to_user_name'] = $toUserInfo['name']; - $item['to_user_avatar'] = $toUserInfo['avatar']; - }else{ - $item['to_user_name'] = $fromUserInfo['name']; - $item['to_user_avatar'] = $fromUserInfo['avatar']; - } - - })->toArray(); + $params['page_no'] -= 1; + $sql = "SELECT id,from_user_id,to_user_id,content,type,is_read,create_time,extends FROM la_user_im_message WHERE (from_user_id = {$params['from_user_id']} AND to_user_id = {$params['to_user_id']}) OR (from_user_id = {$params['to_user_id']} AND to_user_id = {$params['from_user_id']}) ORDER BY create_time DESC LIMIT {$params['page_no']},{$params['page_size']}"; + $msgData = Db::query($sql); //返回数据 return $this->success('请求成功',$msgData); } @@ -336,4 +321,33 @@ class ImController extends BaseLikeAdminController //返回数据 return $this->success('请求成功',$users); } + + //获取片区经理用户id + public function getAreaManager(): Json + { + //验证请求方式 + if(!$this->request->isPost()){ + return $this->fail('请求方式错误'); + } + //获取请求参数 + $params = $this->request->post(['user_id']); + if(empty($params['user_id'])){ + return $this->fail('参数错误'); + } + //获取其用户的公司id + $userInfo = User::field('id,company_id')->where('id',$params['user_id'])->findOrEmpty(); + if(empty($userInfo)){ + return $this->fail('未获取到用户信息'); + } + //获取公司信息 + $companyInfo = Company::field('area_manager')->where('id',$userInfo['company_id'])->findOrEmpty(); + if(empty($companyInfo)){ + return $this->fail('用户信息错误'); + } + if($params['user_id'] == $companyInfo['area_manager']){ + return $this->fail('用户身份错误错误'); + } + //返回 + return $this->success('请求成功',['to_user_id'=>$companyInfo['area_manager']]); + } } \ No newline at end of file diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index 6addfed02..ac45ce461 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -112,18 +112,17 @@ class UserInformationg extends BaseModel $item = self::where('id', $id)->field('*,area_id area_name,street_id street_name,village_id village_name,brigade_id brigade_name')->find(); $item['family'] = json_decode($item['family'], true); $item['child_arr'] = json_decode($item['child_arr'], true); - $data = UserInformationgDemand::where('information_id', $id)->order('id', 'desc')->select(); + $data = UserInformationgDemand::where('information_id', $id)->order('id', 'desc')->select()->toArray(); $item['datas'] = []; $datas = []; if ($data) { foreach ($data as $k => $v) { - $a = json_decode($v['data'], true); $arr = [ 'id' => $v['category_child'], 'update_time' => $v['update_time'], - 'datas' => $a + 'datas' => $v['data'] ]; - if ($a) { + if ($v['data']) { array_push($datas, $arr); } }