Merge branch 'develop' into dc

@@ -37,7 +37,7 @@ class CountController extends BaseController
         //TODO::询盘国家统计
         //TODO::询盘国家统计
         $data['country_data'] = $countLogic->inquiry_country_count();
         $data['country_data'] = $countLogic->inquiry_country_count();
         //TODO::来源排名
         //TODO::来源排名
-        $data['country_data'] = $countLogic->referrer_count();
+        $data['referrer_count'] = $countLogic->referrer_count();
         //TODO::访问国家前10
         //TODO::访问国家前10
         $data['access_country_count'] = $countLogic->access_country_count();
         $data['access_country_count'] = $countLogic->access_country_count();
         //TODO::企业中心服务
         //TODO::企业中心服务

@@ -95,8 +95,8 @@ class UserController extends BaseController
         ],[
         ],[
             'id.required' => 'ID不能为空',
             'id.required' => 'ID不能为空',
         ]);
         ]);
-        $userLogic->user_info();
-        $this->response('success');
+        $info = $userLogic->user_info();
+        $this->response('success',Code::SUCCESS,$info);
     }
     }
     /**
     /**
      * @name :删除管理员
      * @name :删除管理员

@@ -64,7 +64,7 @@ class CountLogic extends BaseLogic
         $data = [
         $data = [
             'total_pv'=>$pv,
             'total_pv'=>$pv,
             'total_ip'=>$ip,
             'total_ip'=>$ip,
-            'conversion_rate' => isset($inquiry_num) ? ($inquiry_num / $ip) * 100 : 0,
+            'conversion_rate' => (isset($inquiry_num) && !empty($inquiry_num)) ? ($inquiry_num / $ip) * 100 : 0,
         ];
         ];
         return $this->success($data);
         return $this->success($data);
     }
     }
@@ -148,12 +148,8 @@ class CountLogic extends BaseLogic
      */
      */
     public function referrer_count(){
     public function referrer_count(){
         $data = DB::table('gl_customer_visit')
         $data = DB::table('gl_customer_visit')
-            ->select('referrer_url', 'country', DB::raw('COUNT(*) as count'))
-            ->groupBy('referrer_url', 'country')
-            ->orderByDesc('count')
-            ->limit(8)
-            ->get()
-            ->toArray();
+            ->select('referrer_url', DB::raw('COUNT(*) as count'))->groupBy('referrer_url')
+            ->orderByDesc('count')->limit(8)->get()->toArray();
         $total = DB::table('gl_customer_visit')->count();
         $total = DB::table('gl_customer_visit')->count();
         $data = object_to_array($data);
         $data = object_to_array($data);
         foreach ($data as $k=>$v){
         foreach ($data as $k=>$v){

@@ -116,6 +116,6 @@ class CategoryLogic extends  BaseLogic
      */
      */
     public function getProductNum($cate_id){
     public function getProductNum($cate_id){
         $cate_ids = $this->model->getChildIdsArr($cate_id);
         $cate_ids = $this->model->getChildIdsArr($cate_id);
-        return CategoryRelated::whereIn('cate_id', $cate_ids)->count();
+        return CategoryRelated::whereIn('cate_id', $cate_ids)->distinct()->count('product_id');
     }
     }
 }
 }

@@ -92,6 +92,6 @@ class KeywordLogic extends  BaseLogic
     }
     }
 
 
     public function getProductNum($keyword_id){
     public function getProductNum($keyword_id){
-        return KeywordRelated::where('keyword_id', $keyword_id)->count();
+        return KeywordRelated::where('keyword_id', $keyword_id)->distinct()->count('product_id');
     }
     }
 }
 }

@@ -86,7 +86,15 @@ class ProductLogic extends  BaseLogic
 
 
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
-            foreach ($ids as $id){
+            foreach ($ids as $k => $id) {
+
+                $info = $this->getCacheInfo($id);
+                if(!$info){
+                    unset($ids[$k]);
+                    continue;
+                }
+
+                if($info->status == Product::STATUS_RECYCLE){
                     //删除路由映射
                     //删除路由映射
                     RouteMap::delRoute(RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
                     RouteMap::delRoute(RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
 
 
@@ -95,6 +103,11 @@ class ProductLogic extends  BaseLogic
 
 
                     //删除关键词关联
                     //删除关键词关联
                     KeywordRelated::where('product_id', $id)->delete();
                     KeywordRelated::where('product_id', $id)->delete();
+                }else{
+                    //回收站
+                    parent::save(['id' => $id, 'status' => Product::STATUS_RECYCLE]);
+                    unset($ids[$k]);
+                }
             }
             }
             parent::delete($ids);
             parent::delete($ids);
 
 

@@ -174,7 +174,7 @@ class Logic
     public function delete($ids, $map = []){
     public function delete($ids, $map = []){
         $ids = array_filter(Arr::splitFilterToArray($ids), 'intval');
         $ids = array_filter(Arr::splitFilterToArray($ids), 'intval');
         if(!$ids){
         if(!$ids){
-            $this->fail('ID不能为空');
+            return $this->success();
         }
         }
 
 
         foreach ($ids as $id){
         foreach ($ids as $id){