作者 刘锟

update

@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Aside\Optimize; @@ -5,7 +5,6 @@ namespace App\Http\Controllers\Aside\Optimize;
5 use App\Enums\Common\Code; 5 use App\Enums\Common\Code;
6 use App\Http\Controllers\Aside\BaseController; 6 use App\Http\Controllers\Aside\BaseController;
7 use App\Http\Logic\Aside\Optimize\InquiryForwardLogic; 7 use App\Http\Logic\Aside\Optimize\InquiryForwardLogic;
8 -use App\Models\Inquiry\AreaTimezone;  
9 8
10 class InquiryForwardController extends BaseController 9 class InquiryForwardController extends BaseController
11 { 10 {
@@ -166,4 +165,21 @@ class InquiryForwardController extends BaseController @@ -166,4 +165,21 @@ class InquiryForwardController extends BaseController
166 165
167 $this->response('success'); 166 $this->response('success');
168 } 167 }
  168 +
  169 + /**
  170 + * 获取询盘详情列表
  171 + * @param InquiryForwardLogic $inquiryForwardLogic
  172 + * @author Akun
  173 + * @date 2025/03/01 9:22
  174 + */
  175 + public function getInquiryDetailList(InquiryForwardLogic $inquiryForwardLogic){
  176 + if (isset($this->param['country'])) {
  177 + $this->map['country'] = ['like', '%' . $this->map['country'] . '%'];
  178 + }
  179 + if (isset($this->param['website'])) {
  180 + $this->map['website'] = ['like', '%' . $this->map['website'] . '%'];
  181 + }
  182 + $lists = $inquiryForwardLogic->getInquiryDetailLists($this->map, $this->page, $this->row, $this->order);
  183 + $this->response('success', Code::SUCCESS, $lists);
  184 + }
169 } 185 }
@@ -306,4 +306,22 @@ class InquiryForwardLogic extends BaseLogic @@ -306,4 +306,22 @@ class InquiryForwardLogic extends BaseLogic
306 } 306 }
307 return $this->success(); 307 return $this->success();
308 } 308 }
  309 +
  310 + /**
  311 + * 获取询盘转发详情列表
  312 + * @param $map
  313 + * @param $page
  314 + * @param $row
  315 + * @param string $order
  316 + * @param string[] $filed
  317 + * @return array
  318 + * @author Akun
  319 + * @date 2025/03/01 9:22
  320 + */
  321 + public function getInquiryDetailLists($map, $page, $row, $order = 'id', $filed = ['*'])
  322 + {
  323 + $model = new InquiryRelayDetail();
  324 + $lists = $model->listsWith($map, $page, $row, $order, $filed, 'desc', ['detailLog']);
  325 + return $this->success($lists);
  326 + }
309 } 327 }
@@ -315,4 +315,29 @@ class Base extends Model @@ -315,4 +315,29 @@ class Base extends Model
315 return $this->formatQuery($data)->pluck($filed)->toArray(); 315 return $this->formatQuery($data)->pluck($filed)->toArray();
316 } 316 }
317 317
  318 + /**
  319 + * 带关联的列表数据
  320 + * @param $map
  321 + * @param $page
  322 + * @param $row
  323 + * @param string $order
  324 + * @param string[] $fields
  325 + * @param string $sort
  326 + * @param array $with
  327 + * @return array
  328 + * @author Akun
  329 + * @date 2025/03/01 9:19
  330 + */
  331 + public function listsWith($map, $page, $row, $order = 'id', $fields = ['*'], $sort = 'desc',$with=[]): array
  332 + {
  333 + $query = $this->formatQuery($map);
  334 + $with && $query->with($with);
  335 + $query = $this->sortOrder($query,$order,$sort);
  336 + $lists = $query->select($fields)->paginate($row, $fields, 'page', $page);
  337 + if (empty($lists)) {
  338 + return [];
  339 + }
  340 + $lists = $lists->toArray();
  341 + return $lists;
  342 + }
318 } 343 }
@@ -8,14 +8,14 @@ @@ -8,14 +8,14 @@
8 8
9 namespace App\Models\Inquiry; 9 namespace App\Models\Inquiry;
10 10
11 -use Illuminate\Database\Eloquent\Model; 11 +use App\Models\Base;
12 12
13 /** 13 /**
14 * 询盘转发详情 14 * 询盘转发详情
15 * Class ReInquiryDetail 15 * Class ReInquiryDetail
16 * @package App\Models\Inquiry 16 * @package App\Models\Inquiry
17 */ 17 */
18 -class InquiryRelayDetail extends Model 18 +class InquiryRelayDetail extends Base
19 { 19 {
20 /** 20 /**
21 * @var string 21 * @var string
@@ -349,6 +349,7 @@ Route::middleware(['aloginauth'])->group(function () { @@ -349,6 +349,7 @@ Route::middleware(['aloginauth'])->group(function () {
349 Route::any('/searchInquiryKeywords', [Aside\Optimize\InquiryForwardController::class, 'searchInquiryKeywords'])->name('admin.inquiry_forward_searchInquiryKeywords'); 349 Route::any('/searchInquiryKeywords', [Aside\Optimize\InquiryForwardController::class, 'searchInquiryKeywords'])->name('admin.inquiry_forward_searchInquiryKeywords');
350 Route::any('/aiRewriteInquiry', [Aside\Optimize\InquiryForwardController::class, 'aiRewriteInquiry'])->name('admin.inquiry_forward_aiRewriteInquiry'); 350 Route::any('/aiRewriteInquiry', [Aside\Optimize\InquiryForwardController::class, 'aiRewriteInquiry'])->name('admin.inquiry_forward_aiRewriteInquiry');
351 Route::any('/setInquiryExpired', [Aside\Optimize\InquiryForwardController::class, 'setInquiryExpired'])->name('admin.inquiry_forward_setInquiryExpired'); 351 Route::any('/setInquiryExpired', [Aside\Optimize\InquiryForwardController::class, 'setInquiryExpired'])->name('admin.inquiry_forward_setInquiryExpired');
  352 + Route::any('/getInquiryDetailList', [Aside\Optimize\InquiryForwardController::class, 'getInquiryDetailList'])->name('admin.inquiry_forward_getInquiryDetailList');
352 }); 353 });
353 354
354 Route::prefix('custom_module')->group(function () { 355 Route::prefix('custom_module')->group(function () {