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

@@ -83,9 +83,11 @@ class MonthProjectCount extends Command
             $res = (new FormGlobalsoApi())->getInquiryAll($url,$v);
             $res = (new FormGlobalsoApi())->getInquiryAll($url,$v);
             echo date('Y-m-d H:i:s') . '月份：'.$v. PHP_EOL;
             echo date('Y-m-d H:i:s') . '月份：'.$v. PHP_EOL;
             $arr['total'] = $arr['month_total'] = 0;
             $arr['total'] = $arr['month_total'] = 0;
+            echo date('Y-m-d H:i:s') . '返回值：'.json_encode($res) . PHP_EOL;
             if(isset($res['data']['count'])){
             if(isset($res['data']['count'])){
                 echo date('Y-m-d H:i:s') . '数据：'.$res['data']['count'] . PHP_EOL;
                 echo date('Y-m-d H:i:s') . '数据：'.$res['data']['count'] . PHP_EOL;
                 $arr['month_total'] = $res['data']['count'] + InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);
                 $arr['month_total'] = $res['data']['count'] + InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);
+                echo date('Y-m-d H:i:s') . '加上其他询盘后的：'.$arr['month_total'] . PHP_EOL;
             }
             }
             //获取上一个的count
             //获取上一个的count
             $previousMonth = date('Y-m', strtotime($v . ' -1 month'));
             $previousMonth = date('Y-m', strtotime($v . ' -1 month'));

+<?php
+/**
+ * @remark :
+ * @name   :InquiryFieldController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/8/13 10:45
+ */
+
+namespace App\Http\Controllers\Bside\Inquiry;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Bside\BaseController;
+use App\Models\Inquiry\InquiryField;
+
+/**
+ * @remark :詢盤字段映射
+ * @name   :InquiryFieldController
+ * @author :lyh
+ * @method :post
+ * @time   :2024/8/13 10:45
+ */
+class InquiryFieldController extends BaseController
+{
+    /**
+     * @remark :詢盤字段映射
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2024/8/13 10:59
+     */
+    public function lists(){
+        $inquiryModel = new InquiryField();
+        $lists = $inquiryModel->list($this->map);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
+     * @remark :保存數據
+     * @name   :save
+     * @author :lyh
+     * @method :post
+     * @time   :2024/8/13 11:13
+     */
+    public function save(){
+        $this->request->validate([
+            'data'=>'required',
+        ],[
+            'data.required' => 'data不能为空',
+        ]);
+        $inquiryModel = new InquiryField();
+        foreach ($this->param['data'] as $v){
+            if(isset($v['id']) && !empty($v['id'])){
+                $inquiryModel->edit(['en_name'=>$v['en_name']],['id'=>$v['id']]);
+            }else{
+                $inquiryModel->addReturnId(['name'=>$v['name'], 'en_name'=>$v['en_name']]);
+            }
+        }
+        $this->response('success');
+    }
+
+    /**
+     * @remark :刪除數據
+     * @name   :del
+     * @author :lyh
+     * @method :post
+     * @time   :2024/8/13 11:14
+     */
+    public function del(){
+
+        $this->request->validate([
+            'id'=>'required',
+        ],[
+            'id.required' => 'name不能为空',
+        ]);
+        $inquiryModel = new InquiryField();
+        $inquiryModel->del(['id'=>['in',$this->param['id']]]);
+        $this->response('success');
+    }
+}

@@ -174,7 +174,7 @@ class ProductController extends BaseController
         $this->param['featured_status']  = $this->param['featured_status'] ?? 0;
         $this->param['featured_status']  = $this->param['featured_status'] ?? 0;
         if($this->param['featured_status'] != Category::STATUS_ACTIVE) {
         if($this->param['featured_status'] != Category::STATUS_ACTIVE) {
             $cateModel = new Category();
             $cateModel = new Category();
-            $featured_ids = $cateModel->where('title', 'like', 'Featured%')->pluck('id')->toArray();
+            $featured_ids = $cateModel->formatQuery(['title'=>['in',['Featured','featured']]])->pluck('id')->toArray();
             if(!empty($featured_ids)){
             if(!empty($featured_ids)){
                 $status = [];
                 $status = [];
                 if(isset($this->map['status'])){
                 if(isset($this->map['status'])){

@@ -9,7 +9,7 @@
 
 
 namespace App\Http\Logic\Aside\ExtensionModule;
 namespace App\Http\Logic\Aside\ExtensionModule;
 
 
-use App\Http\Logic\Bside\BaseLogic;
+use App\Http\Logic\Aside\BaseLogic;
 use App\Models\ExtentModule\ExtensionModule;
 use App\Models\ExtentModule\ExtensionModule;
 use App\Models\ExtentModule\ExtensionModuleField;
 use App\Models\ExtentModule\ExtensionModuleField;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
@@ -43,7 +43,8 @@ class ExtensionModuleLogic extends BaseLogic
         if($info !== false){
         if($info !== false){
             $this->fail('当前拓展数据名称已存在');
             $this->fail('当前拓展数据名称已存在');
         }
         }
-        $this->param['data'] = empty($this->param['data']) ? null : json_encode($this->param['data']);
+        $this->param['operator_id'] = $this->manager['id'];
+        $this->param['data'] = json_encode($this->param['data'] ?? []);
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){
             $id = $this->param['id'];
             $id = $this->param['id'];
             $this->model->edit($this->param,['id'=>$id]);
             $this->model->edit($this->param,['id'=>$id]);

@@ -578,6 +578,13 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/addModuleValue', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'addModuleValue'])->name('extension_module_addModuleValue');
         Route::any('/addModuleValue', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'addModuleValue'])->name('extension_module_addModuleValue');
         Route::any('/editModuleValue', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'editModuleValue'])->name('extension_module_editModuleValue');
         Route::any('/editModuleValue', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'editModuleValue'])->name('extension_module_editModuleValue');
     });
     });
+
+    //自定义小语种文本信息
+    Route::prefix('inquiry_field')->group(function () {
+        Route::any('/', [\App\Http\Controllers\Bside\Inquiry\InquiryFieldController::class, 'lists'])->name('inquiry_field_lists');
+        Route::any('/save', [\App\Http\Controllers\Bside\Inquiry\InquiryFieldController::class, 'save'])->name('inquiry_field_save');
+        Route::any('/del', [\App\Http\Controllers\Bside\Inquiry\InquiryFieldController::class, 'del'])->name('inquiry_field_del');
+    });
 });
 });
 //无需登录验证的路由组
 //无需登录验证的路由组
 Route::group([], function () {
 Route::group([], function () {