Merge branch 'dev/ver/1.0.0'

app/Http/Controllers/Api/Controller.php

@@ -73,4 +73,5 @@ class Controller extends BaseController
         ];
         Log::error(json_encode($err_info, JSON_UNESCAPED_UNICODE));
     }
+
 }

app/Http/Controllers/Api/SearchApiController.php

+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\ApiHelper\ApiCode;
+use App\Http\Requests\InquirySave;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Http;
+
+//搜索
+class SearchApiController extends Controller
+{
+     public $soUrl;
+     public function __construct(){
+         $this->soUrl = env("so_url");
+     }
+
+    //搜索列表
+    public function skuLists(Request $request)
+    {
+        $response = Http::asForm()->post($this->soUrl."/semour/skuLists", $request->input());
+        $data = json_decode($response->body(),true);
+        return  $this->setSuccess("查询成功",ApiCode::API_CODE_SUCCESS,\Arr::get($data,"data"));
+    }
+
+    //商品详情
+    public function goodsDetail(Request $request)
+    {
+        $response = Http::asForm()->post($this->soUrl."/semour/goodsDetail", $request->input());
+        $data = json_decode($response->body(),true);
+        return  $this->setSuccess("查询成功",ApiCode::API_CODE_SUCCESS,\Arr::get($data,"data"));
+    }
+
+}

app/Http/Services/ClassService.php

@@ -9,6 +9,10 @@ class ClassService
     //获取首页需要的所有分类,没有英文名称的不要
     public static function getClassificationForHome()
     {
+        $cache = Redis::get('semour_classification_cache');
+        if ($cache) {
+            return json_decode($cache, true);
+        }
         //先获取所有分类
         $classData = \Http::get(config('website.footstone_url') . '/open/getClassification')->json();
         $secondClassList = [];
@@ -56,13 +60,20 @@ class ClassService
                     }
                 }
             }
-            return array_values($topFields);
+            $data = array_values($topFields);
+            Redis::set('semour_classification_cache', json_encode($data));
+            Redis::expire('semour_classification_cache', 600);
+            return $data;
         }
         return [];
     }
 
     public static function getClassificationById($classId, $includeChildren = false)
     {
+        $cache = Redis::get('semour_classification_cache_' . $classId);
+        if ($cache) {
+            return json_decode($cache, true);
+        }
         $classData = \Http::get(config('website.footstone_url') . '/open/getClassification')->json();
         if (isset($classData['code']) && $classData['code'] == 0) {
             $classificationCache = $classData['data'];
@@ -87,6 +98,8 @@ class ClassService
                 }
             }
             $classification['sku_number'] = $totalSkuNumber;
+            Redis::set('semour_classification_cache_' . $classId, json_encode($classification));
+            Redis::expire('semour_classification_cache_' . $classId, 600);
             return $classification;
         }
         return [];

public/assets/js/brand/list.js

@@ -39,7 +39,7 @@ define('brandlist', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], functio
                     data_["single_price/sort"] = "desc"
                 }
             }
-            $.liexin_ajax(SO_URL + '/semour/skuLists', 'POST', data_, function (res) {
+            $.liexin_ajax( '/api/search/skuLists', 'POST', data_, function (res) {
                 if (res.code == 0) {
                     var dataArr = res.data.lists || [];
                     $(".brandlistCount").html(res.data.total || 0)

public/assets/js/class/class.js

@@ -26,7 +26,7 @@ define('class_p', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function
             if ($("#class_id_three").val()) {
                 data_["class_id2/eq"] = $("#class_id_three").val()
             }
-            $.liexin_ajax(SO_URL + '/semour/skuLists', 'POST', data_, function (res) {
+            $.liexin_ajax('/api/search/skuLists', 'POST', data_, function (res) {
                 if (res.code == 0) {
                     var dataArr = res.data.lists || [];
                     $(".search_result_count").html(res.data.total || 0)

public/assets/js/search/search.js

@@ -39,7 +39,7 @@ define('search', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function (
                     data_["single_price/sort"] = "desc"
                 }
             }
-            $.liexin_ajax(SO_URL + '/semour/skuLists', 'POST', data_, function (res) {
+            $.liexin_ajax('/api/search/skuLists', 'POST', data_, function (res) {
                 console.log(res)
                 if (res.code == 0) {
                     var dataArr = res.data.lists || [];
@@ -73,7 +73,7 @@ define('search', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function (
                             search.page=api.getCurrent()
                             search.getData();
                         }
-           
+
                     });
                 } else {
                     tool.NoData(".data-td")
@@ -134,9 +134,9 @@ define('search', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function (
                     search.onePriceRow($(this).parents(".td-group"))
                     return
                 }
-                
+
                 search.onePriceRow($(this).parents(".td-group"))
-                
+
             }, 600))
             //加购物车
             $("body").on("click",".addCarSearch",function(){
@@ -149,7 +149,7 @@ define('search', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function (
                         liexin_pop.Tip({ title: res.msg })
                         tool.getCarNum()
                     } else {
-                      
+
                         liexin_pop.Tip({ title: res.msg })
                     }
                 })
@@ -193,7 +193,7 @@ define('search', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function (
                     return false;
                 }
             })
-            
+
 
             //计算合计价格
             var ac_price = obj.find(".price-group.act").find(".jtpcval").text();
@@ -204,4 +204,4 @@ define('search', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function (
 })
 
 
-seajs.use(['search'])
\ No newline at end of file
+seajs.use(['search'])

public/assets/js/sku/sku.js

@@ -10,7 +10,7 @@ define('sku', ['liexin_pop', 'tool', 'artTemplate'], function (require, exports,
             sku.handle()
         },
         getData: function () {
-            $.liexin_ajax(SO_URL + '/semour/goodsDetail', 'POST', { goods_id: $("#sku_goods_id").val() }, function (res) {
+            $.liexin_ajax( '/api/search/goodsDetail', 'POST', { goods_id: $("#sku_goods_id").val() }, function (res) {
                 console.log(res)
                 if (res.code == 0) {
                     var json_ = res.data
@@ -63,9 +63,9 @@ define('sku', ['liexin_pop', 'tool', 'artTemplate'], function (require, exports,
                     return
                 }
                 sku.addCar(1)
-                
+
             })
-            
+
         },
         addCar:function(status){
             var data_={
@@ -82,7 +82,7 @@ define('sku', ['liexin_pop', 'tool', 'artTemplate'], function (require, exports,
                         window.location.href="/confirm"
                     }
                 } else {
-                  
+
                     liexin_pop.Tip({ title: res.msg })
                 }
             })
@@ -99,7 +99,7 @@ define('sku', ['liexin_pop', 'tool', 'artTemplate'], function (require, exports,
                     $(this).addClass("act");
                     return false;
                 }
-               
+
                 if ($(this).index() == 0) {
                     //第一个阶梯
 
@@ -125,18 +125,18 @@ define('sku', ['liexin_pop', 'tool', 'artTemplate'], function (require, exports,
                     return false;
                 }
             })
-            
+
 
             //计算合计价格
              var ac_price = Number($(".jtpgroupxps.act").find(".jtpcval").text());
              $(".countskud").text(value_)
              $(".skupriced").text(ac_price)
              $(".skupricedtotal").text(((ac_price * value_) || 0).toFixed(2))
-       
+
         }
     }
     module.exports = sku.init();
 })
 
 
-seajs.use(['sku'])
\ No newline at end of file
+seajs.use(['sku'])

routes/api.php

@@ -22,6 +22,10 @@ Route::middleware(['api'])->namespace('Api')->group(function () {
     Route::POST('auth/set_forget_password', 'AuthApiController@setForgetPassword');
     Route::get('country/list', 'CountryApiController@list');
     Route::get('brand/list', 'BrandApiController@list');
+
+    Route::POST('/search/skuLists', 'SearchApiController@skuLists');
+    Route::POST('/search/goodsDetail', 'SearchApiController@goodsDetail');
+
 });