Merge remote-tracking branch 'origin/test' into test

modules/Statistic/Http/Controllers/ChargeTJController.php

@@ -135,8 +135,8 @@ class ChargeTJController extends CatchController
             $info->common_unpay_count = intval($info->common_unpay_count);
             $info->vip_pay_count = intval($info->vip_pay_count);
             $info->vip_unpay_count = intval($info->vip_unpay_count);
-            $info->company_pay_rate = $info->common_pay_count ? bcdiv($info->common_pay_count,($info->common_pay_count + $info->common_unpay_count) * 100,  2) . '%' : '0%';
-            $info->vip_pay_rate = $info->vip_pay_count ? bcdiv($info->vip_pay_count, ($info->vip_pay_count + $info->vip_unpay_count) * 100, 2) . '%' : '0%';
+            $info->company_pay_rate = $info->common_pay_count ? bcdiv($info->common_pay_count * 100,($info->common_pay_count + $info->common_unpay_count),  2) . '%' : '0%';
+            $info->vip_pay_rate = $info->vip_pay_count ? bcdiv($info->vip_pay_count * 100, ($info->vip_pay_count + $info->vip_unpay_count) , 2) . '%' : '0%';
         }
         return $info;
     }

modules/Statistic/Services/UserStatisticsService.php

@@ -101,7 +101,7 @@ class UserStatisticsService extends BaseService
             $data['recharge_mean'] = 0;
         }
         if ($new_user_recharge_total > 0 || $new_user_recharge_num > 0) {
-            $data['recharge_mean'] = sprintf('%.2f%s', ($new_user_recharge_total / $new_user_recharge_num), "%");
+            $data['recharge_mean'] = sprintf('%.2f', ($new_user_recharge_total / $new_user_recharge_num));
         } else {
             $data['recharge_mean'] = 0;
         }
@@ -219,10 +219,10 @@ class UserStatisticsService extends BaseService
         ];
 
         // 新增用户充值率
-        $data['new_user_recharge_rate'] = $data['new_user_num'] > 0 && $data['new_user_recharge_num'] > 0 ? sprintf("%.2f%s", $data['new_user_recharge_num'] / $data['new_user_num'], "%") : 0;
+        $data['new_user_recharge_rate'] = $data['new_user_num'] > 0 && $data['new_user_recharge_num'] > 0 ? sprintf("%.2f%s", $data['new_user_recharge_num'] *100 / $data['new_user_num'], "%") : 0;
         // 新增用户人均充值
-        $data['new_user_mean'] = $data['new_user_num'] > 0 && $data['new_user_recharge_total'] > 0 ? sprintf("%.2f", $data['new_user_recharge_total'] / $data['new_user_num']) : 0;
-        $data['recharge_mean'] = $data['recharge_total'] > 0 && $data['recharge_num'] > 0 ? sprintf("%.2f", $data['recharge_total'] / $data['recharge_num'], "%") : 0; // 新增用户人均充值
+        $data['new_user_mean'] = $data['new_user_num'] > 0 && $data['new_user_recharge_total'] > 0 ? sprintf("%.2f", $data['new_user_recharge_total']  / $data['new_user_num']) : 0;
+        $data['recharge_mean'] = $data['recharge_total'] > 0 && $data['recharge_num'] > 0 ? sprintf("%.2f", $data['recharge_total'] / $data['recharge_num']) : 0; // 新增用户人均充值
         return $data;
 
     }
@@ -359,9 +359,9 @@ class UserStatisticsService extends BaseService
 
         foreach ($list as $value) {
             // 充值率
-            $value->recharge_rate = $value->new_user_recharge_num > 0 && $value->new_user_num > 0 ? sprintf("%.2f%s", $value->new_user_recharge_num / $value->new_user_num, "%") : 0;
+            $value->recharge_rate = $value->new_user_recharge_num > 0 && $value->new_user_num > 0 ? sprintf("%.2f%s", $value->new_user_recharge_num *100 / $value->new_user_num, "%") : 0;
             // 人均充值
-            $value->recharge_mean = $value->new_user_recharge_num > 0 && $value->new_user_recharge_total > 0 ? sprintf("%.2f%s", $value->new_user_recharge_total / $value->new_user_recharge_num, "%") : 0;
+            $value->recharge_mean = $value->new_user_recharge_num > 0 && $value->new_user_recharge_total > 0 ? sprintf("%.2f", $value->new_user_recharge_total / $value->new_user_recharge_num) : 0;
             $value->company_name = $companys->where('id', $value->puser_id)->value('username');
         }
         return $list;

modules/System/Services/Notice/NoticesService.php

@@ -149,7 +149,7 @@ class NoticesService
             $where[] = ['notices.title', 'like', "%" . $title . "%"];
         }
 
-        $list = UserNotice::leftJoin('notices', 'notices.id', "user_notice.notice_id")->where($where)->select('notices.id', 'notices.title', 'notices.is_popup', "user_notice.is_read", 'notices.created_at')
+        $list = DB::table('user_notice')->leftJoin('notices', 'notices.id', "user_notice.notice_id")->where($where)->select('notices.id', 'notices.title', 'notices.is_popup', "user_notice.is_read", 'notices.created_at')
             ->orderBy('notices.created_at', 'desc')->orderBy('sort', 'desc')->paginate($pageSize);
         if (!$list->isEmpty()) {
             foreach ($list as $val) {