shish 4 years ago
parent
commit
dbd0bdd3cc

+ 1 - 1
app-ghs/controllers/StatCgGhsController.php

@@ -21,7 +21,7 @@ class StatCgGhsController extends BaseController
         if (isset($get['shopId']) && !empty($get['shopId'])) {
             $where['shopId'] = $get['shopId'];
         }
-        $selectTime = $get['selectTime'] ?? 'thisMonth';
+        $selectTime = $get['selectTime'] ?? 'today';
         if (!empty($selectTime)) {
             $startTime = $get['startTime'] ?? '';
             $endTime = $get['endTime'] ?? '';

+ 1 - 1
app-ghs/controllers/StatController.php

@@ -26,7 +26,7 @@ class StatController extends BaseController
         if (isset($get['shopId']) && !empty($get['shopId'])) {
             $where['shopId'] = $get['shopId'];
         }
-        $selectTime = $get['selectTime'] ?? '';
+        $selectTime = $get['selectTime'] ?? 'today';
         if (!empty($selectTime)) {
             $startTime = $get['startTime'] ?? '';
             $endTime = $get['endTime'] ?? '';

+ 1 - 1
app-ghs/controllers/StatItemController.php

@@ -21,7 +21,7 @@ class StatItemController extends BaseController
         if (isset($get['shopId']) && !empty($get['shopId'])) {
             $where['shopId'] = $get['shopId'];
         }
-        $selectTime = $get['selectTime'] ?? 'thisMonth';
+        $selectTime = $get['selectTime'] ?? 'today';
         if (!empty($selectTime)) {
             $startTime = $get['startTime'] ?? '';
             $endTime = $get['endTime'] ?? '';

+ 1 - 1
app-ghs/controllers/StatKdController.php

@@ -20,7 +20,7 @@ class StatKdController extends BaseController
         if (isset($get['shopId']) && !empty($get['shopId'])) {
             $where['shopId'] = $get['shopId'];
         }
-        $selectTime = $get['selectTime'] ?? 'thisMonth';
+        $selectTime = $get['selectTime'] ?? 'today';
         if (!empty($selectTime)) {
             $startTime = $get['startTime'] ?? '';
             $endTime = $get['endTime'] ?? '';

+ 1 - 1
app-ghs/controllers/StatYjController.php

@@ -19,7 +19,7 @@ class StatYjController extends BaseController
 		if (isset($get['shopId']) && !empty($get['shopId'])) {
 			$where['shopId'] = $get['shopId'];
 		}
-		$selectTime = $get['selectTime'] ?? '';
+		$selectTime = $get['selectTime'] ?? 'today';
 		if (!empty($selectTime)) {
 			$startTime = $get['startTime'] ?? '';
 			$endTime = $get['endTime'] ?? '';

+ 1 - 1
app-hd/controllers/ConsoleController.php

@@ -59,7 +59,7 @@ class ConsoleController extends BaseController
 
         if (isset($this->shop) && !empty($this->shop)) {
             //今天访客
-            $todayVisit = StatVisitService::getTodayVisitNum($this->shopId);
+            $todayVisit = 0;
             //今天开单
             $orderData = StatOrderService::getTodayNum($this->shopId);
             $todayOrder = isset($orderData['riseNum']) ? $orderData['riseNum'] : 0;

+ 0 - 42
biz-hd/stat/services/StatVisitService.php

@@ -32,48 +32,6 @@ class StatVisitService extends BaseService
         }
     }
 
-    //将昨天的保存入库
-    public static function saveYesterdayNum($shopId)
-    {
-        $yesTime = date("Ymd", strtotime("-1 day"));
-        $resource = self::getByCondition(['shopId' => $shopId, 'time' => $yesTime]);
-        //有数据表示已经保存过了
-        if (!empty($resource)) {
-            return [];
-        }
-        $wholeSiteView = StatVisitClass::getKeyName($shopId, 'whole_site_view', $yesTime);
-        //获取访问次数
-        $viewNum = Yii::$app->redis->executeCommand('GET', [$wholeSiteView]);
-
-        //获取访问客户数
-        $wholeSiteVisit = StatVisitClass::getKeyName($shopId, 'whole_site_visit', $yesTime);
-        $visitNum = Yii::$app->redis->executeCommand('SCARD', [$wholeSiteVisit]);
-
-        $shop = ShopClass::getById($shopId, true);
-        if (empty($shop)) {
-            util::fail('没有找到门店');
-        }
-        $sjId = $shop->sjId ?? 0;
-        $currentTotalVisit = $shop->totalVisit;
-        $currentTotalView = $shop->totalView;
-        $currentTotalVisit = stringUtil::calcAdd($currentTotalVisit, $visitNum);
-        $currentTotalView = stringUtil::calcAdd($currentTotalView, $viewNum);
-        //保存累计访问量
-        $shop->totalVisit = $currentTotalVisit;
-        $shop->totalView = $currentTotalView;
-        $shop->save();
-
-        //保存访客数
-        $data = ['time' => $yesTime, 'totalNum' => $currentTotalVisit, 'riseNum' => $visitNum, 'shopId' => $shopId, 'sjId' => $sjId, 'createTime' => date("Y-m-d H:i:s")];
-        self::add($data);
-
-        //保存访问量
-        $data = ['time' => $yesTime, 'totalNum' => $currentTotalView, 'riseNum' => $viewNum, 'shopId' => $shopId, 'sjId' => $sjId, 'addTime' => time()];
-        StatViewClass::add($data);
-
-        self::clearYesNum($shopId);
-    }
-
     //清空昨天的缓存
     public static function clearYesNum($shopId)
     {

+ 1 - 17
console/controllers/ShellController.php

@@ -23,23 +23,7 @@ class ShellController extends Controller
 	// 10 0 * * * /usr/local/nginx/html/huahuibao/yii shell/per-day
 	public function actionPerDay()
 	{
-		$query = xhMerchant::find();
-		foreach ($query->batch(50) as $merchantList) {
-			if (!empty($merchantList)) {
-				foreach ($merchantList as $merchant) {
-					$merchant = $merchant->toArray();
-					$sjId = $merchant['id'];
-					$name = $merchant['name'];
-					$visitData = StatVisitService::saveYesterdayNum($sjId);//访问量
-					if (!empty($visitData)) {
-						$log = "商家:{$name}({$sjId}):";
-						$time = date("Y-m-d", $visitData['time']);
-						$log .= "访问量:date:{$time} num:{$visitData['riseNum']}\r\n";
-						stringUtil::log($log, '/opt/shell/log/merchant_visit_log_' . date("Ymd") . '.txt');
-					}
-				}
-			}
-		}
+
 	}
 	
 	/**