Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -80,8 +80,11 @@ class UpdateRoute extends Command
             }
             }
             echo date('Y-m-d H:i:s').' 执行的项目id:'.$v.PHP_EOL;
             echo date('Y-m-d H:i:s').' 执行的项目id:'.$v.PHP_EOL;
             ProjectServer::useProject($v);
             ProjectServer::useProject($v);
-            $keywordModel = new Keyword();
             $bak_lists = DB::connection('custom_mysql')->table('gl_product_keyword_bak')->where('status',1)->get()->toArray();
             $bak_lists = DB::connection('custom_mysql')->table('gl_product_keyword_bak')->where('status',1)->get()->toArray();
+            $keywordModel = new Keyword();
+            $keywordModel->truncate();
+            $routeMapModel = new RouteMap();
+            $routeMapModel->del(['source'=>'product_keyword']);
             foreach ($bak_lists as $bakV){
             foreach ($bak_lists as $bakV){
                 $info = $keywordModel->read(['title'=>$bakV['title']],['id']);
                 $info = $keywordModel->read(['title'=>$bakV['title']],['id']);
                 if($info !== false){
                 if($info !== false){

@@ -235,4 +235,16 @@ class InquiryForwardController extends BaseController
 
 
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * 获取询盘统计
+     * @param InquiryForwardLogic $inquiryForwardLogic
+     * @author Akun
+     * @date 2025/04/14 11:41
+     */
+    public function getInquiryCount(InquiryForwardLogic $inquiryForwardLogic)
+    {
+        $data = $inquiryForwardLogic->inquiryCount();
+        $this->response('success', Code::SUCCESS, $data);
+    }
 }
 }

@@ -149,7 +149,7 @@ class InquiryForwardLogic extends BaseLogic
 
 
                 //获取国家
                 //获取国家
                 $country = $this->param['country'] ?? '';
                 $country = $this->param['country'] ?? '';
-                if(!$country){
+                if (!$country) {
                     $country = file_get_contents("http://ip.globalso.com?ip=" . $this->param['ip']);
                     $country = file_get_contents("http://ip.globalso.com?ip=" . $this->param['ip']);
                 }
                 }
 
 
@@ -413,4 +413,51 @@ class InquiryForwardLogic extends BaseLogic
         }
         }
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * 获取询盘统计数据
+     * @return array
+     * @author Akun
+     * @date 2025/04/14 11:42
+     */
+    public function inquiryCount()
+    {
+        $start_date = isset($this->param['start_date']) && $this->param['start_date'] ? $this->param['start_date'] : date('Y-m-d', strtotime('-3 month'));
+        $end_date = isset($this->param['end_date']) && $this->param['end_date'] ? $this->param['end_date'] : date('Y-m-d');
+
+        //选择的时间跨度大于三个月，以开始时间为基准，只查询三个月的数据
+        $start_date_3_moth = date('Y-m-d', strtotime($start_date . ' + 3 month'));
+        if ($end_date > $start_date_3_moth) {
+            $end_date = $start_date_3_moth;
+        }
+
+        //构建初始化数据
+        $data = [];
+        $s_date = $start_date;
+        while ($s_date <= $end_date) {
+            $data[$s_date] = [
+                'total' => 0,
+                'invalid' => 0,
+                'init' => 0
+            ];
+            $s_date = date('Y-m-d', strtotime($s_date . ' + 1 day'));
+        }
+
+        //统计数据赋值
+        $result = $this->model->list(['inquiry_date' => ['between', [$start_date, $end_date]]], 'id', ['status', 'inquiry_date'], 'asc');
+        foreach ($result as $value) {
+            $inquiry_date = substr($value['inquiry_date'], 0, 10);
+            $data[$inquiry_date]['total'] += 1;
+
+            if ($value['status'] == InquiryInfo::STATUS_INVALID) {
+                $data[$inquiry_date]['invalid'] += 1;
+            }
+
+            if ($value['status'] == InquiryInfo::STATUS_INIT) {
+                $data[$inquiry_date]['init'] += 1;
+            }
+        }
+
+        return $this->success($data);
+    }
 }
 }

@@ -370,6 +370,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/setInquiryExpired', [Aside\Optimize\InquiryForwardController::class, 'setInquiryExpired'])->name('admin.inquiry_forward_setInquiryExpired');
         Route::any('/setInquiryExpired', [Aside\Optimize\InquiryForwardController::class, 'setInquiryExpired'])->name('admin.inquiry_forward_setInquiryExpired');
         Route::any('/getInquiryDetailList', [Aside\Optimize\InquiryForwardController::class, 'getInquiryDetailList'])->name('admin.inquiry_forward_getInquiryDetailList');
         Route::any('/getInquiryDetailList', [Aside\Optimize\InquiryForwardController::class, 'getInquiryDetailList'])->name('admin.inquiry_forward_getInquiryDetailList');
         Route::any('/stopForwardInquiry', [Aside\Optimize\InquiryForwardController::class, 'stopForwardInquiry'])->name('admin.inquiry_forward_stopForwardInquiry');
         Route::any('/stopForwardInquiry', [Aside\Optimize\InquiryForwardController::class, 'stopForwardInquiry'])->name('admin.inquiry_forward_stopForwardInquiry');
+        Route::any('/getInquiryCount', [Aside\Optimize\InquiryForwardController::class, 'getInquiryCount'])->name('admin.inquiry_forward_getInquiryCount');
     });
     });
 
 
     Route::prefix('custom_module')->group(function () {
     Route::prefix('custom_module')->group(function () {