diff --git a/app/admin/controller/WorkbenchController.php b/app/admin/controller/WorkbenchController.php index 86053d80..744ab58a 100644 --- a/app/admin/controller/WorkbenchController.php +++ b/app/admin/controller/WorkbenchController.php @@ -178,7 +178,11 @@ class WorkbenchController extends BaseAdminController public function get_user_basic() { $date=$this->request->get('date',''); + $store_id=$this->request->get('store_id'); $where['create_time'] = $this->getDay($date); + if($store_id){ + $where['store_id'] = $store_id; + } $data=(new UserStatisticLogic())->getBasic($where); return $this->data($data); } @@ -189,7 +193,11 @@ class WorkbenchController extends BaseAdminController public function get_user_trend() { $date=$this->request->get('date',''); + $store_id=$this->request->get('store_id'); $where['create_time'] = $this->getDay($date); + if($store_id){ + $where['store_id'] = $store_id; + } $data=(new UserStatisticLogic())->getTrend($where); return $this->data($data); diff --git a/app/admin/logic/statistic/TradeStatisticLogic.php b/app/admin/logic/statistic/TradeStatisticLogic.php index 5c2d1e27..9d2dde9f 100644 --- a/app/admin/logic/statistic/TradeStatisticLogic.php +++ b/app/admin/logic/statistic/TradeStatisticLogic.php @@ -3,6 +3,7 @@ namespace app\admin\logic\statistic; use app\common\logic\BaseLogic; +use app\common\model\store_cash_finance_flow\StoreCashFinanceFlow; use app\common\model\store_finance_flow\StoreFinanceFlow; use app\common\model\store_order\StoreOrder; use app\common\model\user_recharge\UserRecharge; @@ -277,8 +278,10 @@ class TradeStatisticLogic extends BaseLogic $lastOfflineMoney = $this->getOfflineTotalMoney($dateWhere, 'sum', "", $isNum); $offlineCurve = $this->getOfflineTotalMoney($where, 'group', "create_time"); $offlineChain = countRate($offlineMoney, $lastOfflineMoney); + $cash=$this->getStoreCashFinanceFlowMoney($where); $topData[6] = [ 'title' => '现金收银金额', + 'cash_title' => $cash, 'desc' => '选定条件下，用户在线下现金支付的金额', 'total_money' => $offlineMoney, 'rate' => $offlineChain, @@ -433,6 +436,7 @@ class TradeStatisticLogic extends BaseLogic $data['series'][$k]['name'] = $v['title']; $data['series'][$k]['desc'] = $v['desc']; $data['series'][$k]['money'] = $v['total_money']; + $data['series'][$k]['cash_title'] = $v['cash_title']??''; $data['series'][$k]['type'] = $v['type']; $data['series'][$k]['rate'] = $v['rate']; $data['series'][$k]['value'] = array_values($v['value']); @@ -770,6 +774,19 @@ class TradeStatisticLogic extends BaseLogic return $totalMoney; } + /** + * 现金上缴统计 + */ + public function getStoreCashFinanceFlowMoney(array $where,) + { + $receivable= StoreCashFinanceFlow::where('status',0)->whereBetweenTime('create_time', strtotime($where['create_time']['start_time']), strtotime($where['create_time']['end_time']))->sum('receivable'); + if($receivable>0){ + return '未上缴'.$receivable; + }else{ + return '已上缴'; + } + } + /** * 处理Y坐标数据 * @param array $data diff --git a/app/admin/logic/statistic/UserStatisticLogic.php b/app/admin/logic/statistic/UserStatisticLogic.php index aae56b89..4e7e2127 100644 --- a/app/admin/logic/statistic/UserStatisticLogic.php +++ b/app/admin/logic/statistic/UserStatisticLogic.php @@ -26,7 +26,8 @@ class UserStatisticLogic extends BaseLogic $time = [strtotime($time[0]), strtotime($time[1])]; if (count($time) != 2) throw new Exception('参数错误'); - $userVisit = new UserVisit(); + unset($where['create_time']); + // $userVisit = new UserVisit(); /** @var UserServices $user */ $user = new User(); $order = new StoreOrder(); @@ -36,19 +37,19 @@ class UserStatisticLogic extends BaseLogic // /** @var OtherOrderServices $otherOrder */ // $otherOrder = app()->make(OtherOrderServices::class); - $now['people'] = $userVisit->where('create_time', 'between', $time)->group('uid')->count(); //访客数 - $now['browse'] = $userVisit->where('create_time', 'between', $time)->sum('id'); //访问量 - $now['newUser'] = $user->where('create_time', 'between', $time)->count(); //新增用户数 - $now['payPeople'] = $order->where('create_time', 'between', $time)->group('uid')->count(); //成交用户数 - $now['payPercent'] = bcmul((string)($now['people'] > 0 ? bcdiv($now['payPeople'], $now['people'], 4) : 0), '100', 2); //访问-付款转化率 - $now['payUser'] = $user->where('create_time', 'between', $time)->where('user_ship', 1)->count(); //激活付费会员数 - $now['rechargePeople'] = $user_recharge->where('create_time', 'between', $time)->where('paid', 1)->group('uid')->count(); //充值用户数 - $totalPayPrice = $order->where('create_time', 'between', $time)->where('paid', 1)->sum('pay_price'); - $now['payPrice'] = floatval($now['payPeople'] > 0 ? bcdiv($totalPayPrice, $now['payPeople'], 2) : 0); //客单价 - $now['cumulativeUser'] = $user->count(); //累计用户数 - $now['cumulativePayUser'] = 0; //count($otherOrder->getPayUserCount(strtotime($time[1]), $where['channel_type']));//到截至日期有付费会员状态的会员数 - $now['cumulativeRechargePeople'] = $user_recharge->where('paid', 1)->group('uid')->count(); //累计充值用户数 - $now['cumulativePayPeople'] = $order->where('paid', 1)->group('uid')->count(); //累计成交用户数 + $now['now_money'] = $user->where($where)->sum('now_money'); //余额 + $now['purchase_funds'] = $user->where($where)->sum('purchase_funds'); //采购款 + $now['newUser'] = $user->where($where)->where('create_time', 'between', $time)->count(); //新增用户数 + $now['payPeople'] = $order->where($where)->where('create_time', 'between', $time)->group('uid')->count(); //成交用户数 + // $now['payPercent'] = bcmul((string)($now['people'] > 0 ? bcdiv($now['payPeople'], $now['people'], 4) : 0), '100', 2); //访问-付款转化率 + // $now['payUser'] = $user->where('create_time', 'between', $time)->where('user_ship', 1)->count(); //激活付费会员数 + $now['rechargePeople'] = $user_recharge->where($where)->where('create_time', 'between', $time)->where('paid', 1)->group('uid')->count(); //充值用户数 + // $totalPayPrice = $order->where('create_time', 'between', $time)->where('paid', 1)->sum('pay_price'); + // $now['payPrice'] = floatval($now['payPeople'] > 0 ? bcdiv($totalPayPrice, $now['payPeople'], 2) : 0); //客单价 + $now['cumulativeUser'] = $user->where($where)->count(); //累计用户数 + // $now['cumulativePayUser'] = 0; //count($otherOrder->getPayUserCount(strtotime($time[1]), $where['channel_type']));//到截至日期有付费会员状态的会员数 + $now['cumulativeRechargePeople'] = $user_recharge->where($where)->where('paid', 1)->group('uid')->count(); //累计充值用户数 + $now['cumulativePayPeople'] = $order->where($where)->where('paid', 1)->group('uid')->count(); //累计成交用户数 $dayNum = ($time[1] - $time[0]) / 86400 + 1; @@ -58,19 +59,19 @@ class UserStatisticLogic extends BaseLogic ]; // $where['time'] = implode('-', $lastTime); // $toEndtime = implode('-', [0, $lastTime[1]]); - $last['people'] = $userVisit->where('create_time', 'between', $time)->group('uid')->count(); //访客数 - $last['browse'] = $userVisit->where('create_time', 'between', $time)->sum('id'); //访问量 - $last['newUser'] = $user->where('create_time', 'between', $time)->count(); //新增用户数 - $last['payPeople'] = $order->where('create_time', 'between', $time)->group('uid')->count(); //成交用户数 - $last['payPercent'] = bcmul((string)($last['people'] > 0 ? bcdiv($last['payPeople'], $last['people'], 4) : 0), '100', 2); //访问-付款转化率 - $last['payUser'] = $user->where('create_time', 'between', $time)->where('user_ship', 1)->count(); //激活付费会员数 - $last['rechargePeople'] = $user_recharge->where('create_time', 'between', $time)->where('paid', 1)->group('uid')->count(); //充值用户数 - $totalPayPrice = $order->where('create_time', 'between', $time)->where('paid', 1)->sum('pay_price'); - $last['payPrice'] = floatval($last['payPeople'] > 0 ? bcdiv($totalPayPrice, $last['payPeople'], 2) : 0); //客单价 - $last['cumulativeUser'] = $user->count(); //累计用户数 - $last['cumulativePayUser'] = 0; //count($otherOrder->getPayUserCount(strtotime($lastTime[1]) + 86400, $where['channel_type']));//到截至日期有付费会员状态的会员数 - $last['cumulativeRechargePeople'] = $user_recharge->where('paid', 1)->group('uid')->count(); //累计充值用户数 - $last['cumulativePayPeople'] = $order->where('paid', 1)->group('uid')->count(); //累计成交用户数 + $last['now_money'] =$now['now_money']; + $last['purchase_funds'] = $now['purchase_funds']; + $last['newUser'] = $user->where($where)->where('create_time', 'between', $time)->count(); //新增用户数 + $last['payPeople'] = $order->where($where)->where('create_time', 'between', $time)->group('uid')->count(); //成交用户数 + // $last['payPercent'] = bcmul((string)($last['people'] > 0 ? bcdiv($last['payPeople'], $last['people'], 4) : 0), '100', 2); //访问-付款转化率 + // $last['payUser'] = $user->where('create_time', 'between', $time)->where('user_ship', 1)->count(); //激活付费会员数 + $last['rechargePeople'] = $user_recharge->where($where)->where('create_time', 'between', $time)->where('paid', 1)->group('uid')->count(); //充值用户数 + // $totalPayPrice = $order->where('create_time', 'between', $time)->where('paid', 1)->sum('pay_price'); + // $last['payPrice'] = floatval($last['payPeople'] > 0 ? bcdiv($totalPayPrice, $last['payPeople'], 2) : 0); //客单价 + $last['cumulativeUser'] = $user->where($where)->count(); //累计用户数 + // $last['cumulativePayUser'] = 0; //count($otherOrder->getPayUserCount(strtotime($lastTime[1]) + 86400, $where['channel_type']));//到截至日期有付费会员状态的会员数 + $last['cumulativeRechargePeople'] = $user_recharge->where($where)->where('paid', 1)->group('uid')->count(); //累计充值用户数 + $last['cumulativePayPeople'] = $order->where($where)->where('paid', 1)->group('uid')->count(); //累计成交用户数 //组合数据，计算环比 $data = []; @@ -93,18 +94,18 @@ class UserStatisticLogic extends BaseLogic { $time = explode('-', $where['create_time']); $time = [strtotime($time[0]), strtotime($time[1])]; - $channelType = ''; //$where['channel_type']; + unset($where['create_time']); if (count($time) != 2) throw new Exception('参数错误'); $dayCount = ($time[1] - $time[0]) / 86400 + 1; $data = []; if ($dayCount == 1) { - $data = $this->trend($time, $channelType, 0, $excel); + $data = $this->trend($time, $where, 0, $excel); } elseif ($dayCount > 1 && $dayCount <= 31) { - $data = $this->trend($time, $channelType, 1, $excel); + $data = $this->trend($time, $where, 1, $excel); } elseif ($dayCount > 31 && $dayCount <= 92) { - $data = $this->trend($time, $channelType, 3, $excel); + $data = $this->trend($time, $where, 3, $excel); } elseif ($dayCount > 92) { - $data = $this->trend($time, $channelType, 30, $excel); + $data = $this->trend($time, $where, 30, $excel); } return $data; } @@ -117,19 +118,18 @@ class UserStatisticLogic extends BaseLogic * @param $excel * @return array */ - public function trend($time, $channelType, $num, $excel) + public function trend($time, $where, $num, $excel) { $user = new User(); - $userVisit = new UserVisit(); + // $userVisit = new UserVisit(); $order = new StoreOrder(); $recharge = new UserRecharge(); - $newPeople = $visitPeople = $paidPeople = $rechargePeople = $vipPeople = []; - $newPeople['name'] = '新增用户数'; - $visitPeople['name'] = '访客数'; - $paidPeople['name'] = '成交用户数'; - $rechargePeople['name'] = '充值用户'; - $vipPeople['name'] = '新增付费用户数'; + $newPeople = $paidPeople = $rechargePeople = $vipPeople = []; + $newPeople['name'] = '新增用户'; + // $visitPeople['name'] = '访客数'; + $paidPeople['name'] = '成交用户'; + $vipPeople['name'] = '新增会员用户'; if ($num == 0) { $xAxis = ['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23']; $timeType = '%H'; @@ -148,19 +148,17 @@ class UserStatisticLogic extends BaseLogic } } } - $visitPeople = array_column($userVisit->getTrendData($time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days'); - $newPeople = array_column($user->getTrendData($time, $channelType, $timeType), 'num', 'days'); - $paidPeople = array_column($order->getTrendData($time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days'); - $rechargePeople = array_column($recharge->getTrendData(['paid'=>1],$time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days'); - $vipPeople = array_column($recharge->getTrendData(['paid'=>1,'price'=>1000],$time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days'); + // $visitPeople = array_column($userVisit->getTrendData($time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days'); + $newPeople = array_column($user->getTrendData($time, [], $timeType), 'num', 'days'); + $paidPeople = array_column($order->getTrendData($time, $where, $timeType, 'count(distinct(uid))'), 'num', 'days'); + $vipPeople = array_column($user->getTrendData($time, [], $timeType, 'vip_time'), 'days'); $data = $series = []; foreach ($xAxis as $item) { - $data['新增用户数'][] = isset($newPeople[$item]) ? intval($newPeople[$item]) : 0; - $data['访客数'][] = isset($visitPeople[$item]) ? intval($visitPeople[$item]) : 0; - $data['成交用户数'][] = isset($paidPeople[$item]) ? intval($paidPeople[$item]) : 0; - $data['充值用户'][] = isset($rechargePeople[$item]) ? intval($rechargePeople[$item]) : 0; - $data['新增付费用户数'][] = isset($vipPeople[$item]) ? intval($vipPeople[$item]) : 0; + $data['新增用户'][] = isset($newPeople[$item]) ? intval($newPeople[$item]) : 0; + // $data['访客数'][] = isset($visitPeople[$item]) ? intval($visitPeople[$item]) : 0; + $data['成交用户'][] = isset($paidPeople[$item]) ? intval($paidPeople[$item]) : 0; + $data['新增会员用户'][] = isset($vipPeople[$item]) ? intval($vipPeople[$item]) : 0; } foreach ($data as $key => $item) { $series[] = ['name' => $key, 'value' => $item]; diff --git a/app/common/model/store_order/StoreOrder.php b/app/common/model/store_order/StoreOrder.php index 69b1b301..2f817b0d 100644 --- a/app/common/model/store_order/StoreOrder.php +++ b/app/common/model/store_order/StoreOrder.php @@ -78,11 +78,9 @@ class StoreOrder extends BaseModel * @param $timeType * @return mixed */ - public function getTrendData($time, $type, $timeType, $str) + public function getTrendData($time, $where, $timeType, $str) { - return $this->when($type != '', function ($query) use ($type) { - $query->where('channel_type', $type); - })->where('paid', 1)->where('paid', '>=', 0)->where(function ($query) use ($time) { + return $this->where($where)->where('paid', 1)->where('refund_status', '=', 0)->where(function ($query) use ($time) { if ($time[0] == $time[1]) { $query->whereDay('create_time', date('Y-m-d',$time[0])); } else { diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php index 29013228..e0ae912f 100644 --- a/app/common/model/user/User.php +++ b/app/common/model/user/User.php @@ -184,17 +184,15 @@ class User extends BaseModel * @param $timeType * @return mixed */ - public function getTrendData($time, $type, $timeType) + public function getTrendData($time, $where, $timeType,$create_time='create_time') { - return $this->when($type != '', function ($query) use ($type) { - $query->where('user_type', $type); - })->where(function ($query) use ($time) { + return $this->where($where)->where(function ($query) use ($time,$create_time) { if ($time[0] == $time[1]) { - $query->whereDay('create_time', date('Y-m-d',$time[0])); + $query->whereDay($create_time, date('Y-m-d',$time[0])); } else { $time[1] = $time[1] + 86400; - $query->whereTime('create_time', 'between', $time); + $query->whereTime($create_time, 'between', $time); } - })->field("FROM_UNIXTIME(create_time,'$timeType') as days,count(id) as num")->group('days')->select()->toArray(); + })->field("FROM_UNIXTIME($create_time,'$timeType') as days,count(id) as num")->group('days')->select()->toArray(); } }