diff --git a/app/manager/controller/SellInfo.php b/app/manager/controller/SellInfo.php index 388cd24..5e6286c 100644 --- a/app/manager/controller/SellInfo.php +++ b/app/manager/controller/SellInfo.php @@ -66,6 +66,8 @@ class SellInfo extends Controller } $user_where = ['UserId' => ['in', $user_id_list]]; $register_where = ['UserId' => ['in', $register_id_list]]; + //获取所有消费额 + $cost_data = $product_order_model->getAllMoney(); //获取本月所有消费额 $all_cost_data = $product_order_model->getAllMoney($time_where1); //获取本月该客户经理所有的消费额 @@ -92,7 +94,7 @@ class SellInfo extends Controller $sell_percent = ($all_cost ? round($user_cost / $all_cost * 100, 2) : 0); $cost_percent = ($all_cost_num ? round($user_cost_num / $all_cost_num * 100, 2) : 0); $cost_register = ($user_register_count ? round($user_register_cost_count / $user_register_count * 100, 2) : 0); - $cost_old_user = (($all_cost_num - $user_register_count) ? round(($user_cost_num - $user_register_cost_count) / ($all_cost_num - $user_register_count) * 100, 2) : 0); + $cost_old_user = (($all_cost_num - $user_register_count) ? round(($user_cost_num - $user_register_cost_count) / ($cost_data['num'] - $user_register_count) * 100, 2) : 0); $com_cost = round(($user_cost - $user_last_month_cost), 2); $com_percent = ($user_last_month_cost ? round(($user_cost - $user_last_month_cost) / $user_last_month_cost * 100, 2) : 0); $today_new_user = ($user_today_cost_data ? $user_today_cost_data['num'] : 0) . "/" . count($today_register_id_list); @@ -101,7 +103,7 @@ class SellInfo extends Controller $data['sell_percent'] = "我的营业额($user_cost)/总营业额($all_cost)=" . $sell_percent . '%'; $data['cost_percent'] = "消费客户数($user_cost_num)/所有客户($all_cost_num)=" . $cost_percent . '%'; $data['cost_register'] = "注册且购买过的客户($user_register_cost_count)/当月新注册客户总数($user_register_count)=" . $cost_register . '%'; - $data['cost_old_user'] = "老客户在本月再次购买(" . ($user_cost_num - $user_register_cost_count) . ")/所有老客户(" . ($all_cost_num - $user_register_count) . ')=' . $cost_old_user . '%'; + $data['cost_old_user'] = "老客户在本月再次购买(" . ($user_cost_num - $user_register_cost_count) . ")/所有老客户(" . ($cost_data['num'] - $user_register_count) . ')=' . $cost_old_user . '%'; $data['com_cost'] = "同比增加金额=" . $com_cost; $data['com_percent'] = "同比增加百分比=" . $com_percent . '%'; $data['today_new_user'] = "今日新赠客户" . $today_new_user; @@ -175,7 +177,8 @@ class SellInfo extends Controller } } $user_where = ['UserId' => ['in', $user_id_list]]; - $register_where = ['UserId' => ['in', $register_id_list]]; + $register_where = ['UserId' => ['in', $register_id_list]]; //获取所有消费额 + $cost_data = $product_order_model->getAllMoney(); //获取本月所有消费额 $all_cost_data = $product_order_model->getAllMoney($time_where1); //获取本月该客户经理所有的消费额 @@ -202,7 +205,7 @@ class SellInfo extends Controller $data['sell_percent'] = ($all_cost ? round($user_cost / $all_cost * 100, 2) : 0) . '%'; $data['cost_percent'] = ($all_cost_num ? round($user_cost_num / $all_cost_num * 100, 2) : 0) . '%'; $data['cost_register'] = ($user_register_count ? round($user_register_cost_count / $user_register_count * 100, 2) : 0) . '%'; - $data['cost_old_user'] = (($all_cost_num - $user_register_count) ? round(($user_cost_num - $user_register_cost_count) / ($all_cost_num - $user_register_count) * 100, 2) : 0) . '%'; + $data['cost_old_user'] = (($all_cost_num - $user_register_count) ? round(($user_cost_num - $user_register_cost_count) / ($cost_data['num'] - $user_register_count) * 100, 2) : 0) . '%'; $data['com_cost'] = round(($user_cost - $user_last_month_cost), 2); $data['com_percent'] = ($user_last_month_cost ? round(($user_cost - $user_last_month_cost) / $user_last_month_cost * 100, 2) : 0) . '%'; $data['today_new_user'] = ($user_today_cost_data ? $user_today_cost_data['num'] : 0) . "/" . count($today_register_id_list); diff --git a/app/manager/controller/UserFollow.php b/app/manager/controller/UserFollow.php index 72c66ba..9eca5bc 100644 --- a/app/manager/controller/UserFollow.php +++ b/app/manager/controller/UserFollow.php @@ -5,7 +5,7 @@ * @Author: kangkang * @Date: 2020-10-13 19:52:37 * @LastEditors: Please set LastEditors - * @LastEditTime: 2020-11-24 15:14:39 + * @LastEditTime: 2020-11-24 15:55:55 */ namespace app\manager\controller; @@ -39,6 +39,8 @@ class UserFollow extends Controller $time_where1 = ''; $time_where2 = ''; $time_where3 = ''; + $time_where_pre = ''; + $time_where_now = ''; $user_search_id = []; $user_search_id_list = []; @@ -108,15 +110,17 @@ class UserFollow extends Controller } if (!empty($search['sortLable'])) { $is_screen = true; + $time_where_pre .= " product_order.UpdateTime>='" . $date1 . "' and product_order.UpdateTime<='" . $date2 . "' "; + $time_where_now .= " product_order.UpdateTime>='" . $date3 . "' and product_order.UpdateTime<='" . $date4 . "' "; switch ($search['sortLable']) { case 'all_amount': $user_search_id = $product_order_model->getSort($sort_where, $search['sortOrder'], "$page,50"); break; case 'PrevMonthAmount': - $user_search_id = $product_order_model->getMonthSort($sort_where, $search['sortOrder'], "$page,50"); + $user_search_id = $product_order_model->getMonthSort($sort_where, $search['sortOrder'], "$page,50", $time_where_pre); break; case 'MonthAmount': - $user_search_id = $product_order_model->getMonthSort($sort_where, $search['sortOrder'], "$page,50", false); + $user_search_id = $product_order_model->getMonthSort($sort_where, $search['sortOrder'], "$page,50", $time_where_now); break; case 'account_count': $user_search_id = $product_account_model->getSort($sort_where, $search['sortOrder'], "$page,50", 1); @@ -146,7 +150,7 @@ class UserFollow extends Controller } $where['Id'] = ['in', $user_search_id_list]; } - $user_list = $user_model->getListPage($where, 'Id,follow_status,LoginCode,CreateTime,Wx,QQ', 'id desc', "$page,50"); + $user_list = $user_model->getListPage($where, 'Id,follow_status,LoginCode,CreateTime,Wx,QQ', 'id desc', "50"); $list = []; $user_id_list = []; diff --git a/app/manager/model/ProductOrder.php b/app/manager/model/ProductOrder.php index c0aeff2..56ed425 100644 --- a/app/manager/model/ProductOrder.php +++ b/app/manager/model/ProductOrder.php @@ -5,7 +5,7 @@ * @Author: kangkang * @Date: 2020-10-16 14:44:02 * @LastEditors: Please set LastEditors - * @LastEditTime: 2020-11-22 10:31:50 + * @LastEditTime: 2020-11-24 15:53:12 */ namespace app\manager\model; @@ -172,25 +172,17 @@ class ProductOrder extends Model * @param {*} flag = true 上一个月 * @return {*} flag = false 本月 */ - public function getMonthSort($where = [],$order = 1, $limit = '50', $flag = true) + public function getMonthSort($where = [],$order = 1, $limit = '50', $where2 ='') { $order_type = 'money'; if($order == '0'){ $order_type = 'money desc'; } - if ($flag) { - $last_month = date("Y-m-01 H:i:s", strtotime("-1 month")); - $new_month = date("Y-m-t H:i:s", strtotime("-1 month")); - } else { - $last_month = date("Y-m-01 H:i:s", time()); - $new_month = date("Y-m-d H:i:s", time()); - } return $this->field('product_order.UserId,sum(product_order.PaymentAmount) as money') ->join('user ON product_order.UserId=user.Id') ->where(['OrderState' => ['in', ProductOrderEnum::$PayComplete]]) ->where($where) - ->where("product_order.UpdateTime >'".$last_month."'") - ->where("product_order.UpdateTime <'".$new_month."'") + ->where($where2) ->group(['product_order.UserId']) ->order($order_type) ->limit($limit)