周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 bfd9bb6ea20de5082a82be3cfd9de2e90df265b2 1 个父辈 38f6897a

gx

内嵌 并排对比
正在显示 3 个修改的文件 包含 25 行增加 和 11 行删除
@@ -150,9 +150,25 @@ class InquiryInfoController extends BaseController @@ -150,9 +150,25 @@ class InquiryInfoController extends BaseController
150 'ip_area'=>'required',// 150 'ip_area'=>'required',//
151 ],[ 151 ],[
152 'ip_area.required' => '国家不能为空', 152 'ip_area.required' => '国家不能为空',
153 -  
154 ]); 153 ]);
155 $info = $inquiryInfoLogic->getSearchIp(); 154 $info = $inquiryInfoLogic->getSearchIp();
156 $this->response('success',Code::SUCCESS,$info); 155 $this->response('success',Code::SUCCESS,$info);
157 } 156 }
  157 +
  158 + /**
  159 + * @remark :手动询盘转发
  160 + * @name :forwardInquiry
  161 + * @author :lyh
  162 + * @method :post
  163 + * @time :2023/7/14 10:43
  164 + */
  165 + public function forwardInquiry(InquiryInfoLogic $inquiryInfoLogic){
  166 + $this->request->validate([
  167 + 'id'=>'required',//
  168 + ],[
  169 + 'id.required' => 'id不能为空',
  170 + ]);
  171 + $inquiryInfoLogic->forwardTime($this->param['id']);
  172 + $this->response('success');
  173 + }
158 } 174 }
@@ -7,8 +7,6 @@ use App\Models\InquiryIP; @@ -7,8 +7,6 @@ use App\Models\InquiryIP;
7 use App\Models\Projects\InquiryInfo; 7 use App\Models\Projects\InquiryInfo;
8 use App\Models\Projects\InquiryUser; 8 use App\Models\Projects\InquiryUser;
9 use Illuminate\Support\Facades\DB; 9 use Illuminate\Support\Facades\DB;
10 -use Illuminate\Support\Facades\Artisan;  
11 -use Illuminate\Console\Scheduling\Schedule;  
12 10
13 /** 11 /**
14 * @remark :询盘中心 12 * @remark :询盘中心
@@ -52,9 +50,6 @@ class InquiryInfoLogic extends BaseLogic @@ -52,9 +50,6 @@ class InquiryInfoLogic extends BaseLogic
52 * @time :2023/7/12 9:22 50 * @time :2023/7/12 9:22
53 */ 51 */
54 public function inquirySave(){ 52 public function inquirySave(){
55 - $this->param['user_id'] = $this->manager['id'];  
56 - $this->param['user_name'] = $this->manager['name'];  
57 - $this->param['send_time'] = date('Y-m-d H:i:s',time() + $this->param['delay'] * 60 * 60) ;  
58 $xp_id = $this->model->insertGetId($this->param); 53 $xp_id = $this->model->insertGetId($this->param);
59 if(!$xp_id){ 54 if(!$xp_id){
60 $this->fail('error'); 55 $this->fail('error');
@@ -68,7 +63,7 @@ class InquiryInfoLogic extends BaseLogic @@ -68,7 +63,7 @@ class InquiryInfoLogic extends BaseLogic
68 63
69 64
70 /** 65 /**
71 - * @remark :逻辑删除 66 + * @remark :删除
72 * @name :inquiryInfoDel 67 * @name :inquiryInfoDel
73 * @author :lyh 68 * @author :lyh
74 * @method :post 69 * @method :post
@@ -96,8 +91,7 @@ class InquiryInfoLogic extends BaseLogic @@ -96,8 +91,7 @@ class InquiryInfoLogic extends BaseLogic
96 * @time :2023/7/12 17:43 91 * @time :2023/7/12 17:43
97 */ 92 */
98 public function inquiryForwardInfo(){ 93 public function inquiryForwardInfo(){
99 - $inquiryUserModel = new InquiryUser();  
100 - $info = $inquiryUserModel->read(['xp_id'=>$this->param['id']]); 94 + $info = $this->model->read(['id'=>$this->param['id']]);
101 if($info === false){ 95 if($info === false){
102 $this->fail('error'); 96 $this->fail('error');
103 } 97 }
@@ -148,7 +142,6 @@ class InquiryInfoLogic extends BaseLogic @@ -148,7 +142,6 @@ class InquiryInfoLogic extends BaseLogic
148 * @time :2023/7/13 17:39 142 * @time :2023/7/13 17:39
149 */ 143 */
150 public function forwardTime($xp_id){ 144 public function forwardTime($xp_id){
151 - $data = [];  
152 //获取数据详情 145 //获取数据详情
153 $param = $this->model->read(['id'=>$xp_id]); 146 $param = $this->model->read(['id'=>$xp_id]);
154 if($param['delay'] == 0){ 147 if($param['delay'] == 0){
@@ -159,7 +152,11 @@ class InquiryInfoLogic extends BaseLogic @@ -159,7 +152,11 @@ class InquiryInfoLogic extends BaseLogic
159 $this->inquiryForward($data); 152 $this->inquiryForward($data);
160 } 153 }
161 //更新数据库,修改状态为已转发 154 //更新数据库,修改状态为已转发
162 - $rs = $this->model->edit(['status'=>3],['id'=>$xp_id]); 155 + $this->param['status'] = 3;
  156 + $this->param['user_id'] = $this->manager['id'];
  157 + $this->param['user_name'] = $this->manager['name'];
  158 + $this->param['send_time'] = date('Y-m-d H:i:s',time() + $param['delay'] * 60 * 60) ;
  159 + $rs = $this->model->edit($this->param,['id'=>$xp_id]);
163 if($rs === false){ 160 if($rs === false){
164 $this->fail('error'); 161 $this->fail('error');
165 } 162 }
@@ -259,6 +259,7 @@ Route::group([], function () { @@ -259,6 +259,7 @@ Route::group([], function () {
259 Route::prefix('inquiry')->group(function () { 259 Route::prefix('inquiry')->group(function () {
260 Route::any('/', [Aside\Projects\InquiryInfoController::class, 'lists'])->name('admin.inquiry_lists'); 260 Route::any('/', [Aside\Projects\InquiryInfoController::class, 'lists'])->name('admin.inquiry_lists');
261 Route::any('/save', [Aside\Projects\InquiryInfoController::class, 'save'])->name('admin.inquiry_save'); 261 Route::any('/save', [Aside\Projects\InquiryInfoController::class, 'save'])->name('admin.inquiry_save');
  262 + Route::any('/forwardInquiry', [Aside\Projects\InquiryInfoController::class, 'forwardInquiry'])->name('admin.inquiry_forwardInquiry');
262 Route::any('/forwardInfo', [Aside\Projects\InquiryInfoController::class, 'forwardInfo'])->name('admin.inquiry_forwardInfo'); 263 Route::any('/forwardInfo', [Aside\Projects\InquiryInfoController::class, 'forwardInfo'])->name('admin.inquiry_forwardInfo');
263 Route::any('/importInquirySave', [Aside\Projects\InquiryInfoController::class, 'importInquirySave'])->name('admin.inquiry_importInquirySave'); 264 Route::any('/importInquirySave', [Aside\Projects\InquiryInfoController::class, 'importInquirySave'])->name('admin.inquiry_importInquirySave');
264 Route::any('/getSearchIpInfo', [Aside\Projects\InquiryInfoController::class, 'getSearchIpInfo'])->name('admin.inquiry_getSearchIpInfo'); 265 Route::any('/getSearchIpInfo', [Aside\Projects\InquiryInfoController::class, 'getSearchIpInfo'])->name('admin.inquiry_getSearchIpInfo');