|
@@ -2384,6 +2384,9 @@ class StatisticsController extends Controller
|
2384
|
2384
|
$fan_count = DB::table('cust_day_detail')->select(DB::raw('sum(fan_add) as fan_count, admin_name'))->where('dtime', '>=', $m_stime)->where('dtime', '<', $m_etime)->where('admin_id', $v['admin_id'])->where('is_del', 0)->first();
|
2385
|
2385
|
$v['fan_count'] = $fan_count->fan_count;
|
2386
|
2386
|
$v['admin_name'] = $fan_count->admin_name;
|
|
2387
|
+ if(empty($v['admin_name'])){
|
|
2388
|
+ $v['admin_name'] = DB::table('admin')->where('id', $v['admin_id'])->pluck('name');
|
|
2389
|
+ }
|
2387
|
2390
|
#计算提成
|
2388
|
2391
|
$v['bonus'] = $this->getSalerBonus($v['order_amount']);
|
2389
|
2392
|
}
|
|
@@ -2469,6 +2472,9 @@ class StatisticsController extends Controller
|
2469
|
2472
|
$fan_count = DB::table('cust_day_detail')->select(DB::raw('sum(fan_add) as fan_count, admin_name'))->where('dtime', '>=', $m_stime)->where('dtime', '<', $m_etime)->where('admin_id', $v['admin_id'])->where('is_del', 0)->first();
|
2470
|
2473
|
$v['fan_count'] = $fan_count->fan_count;
|
2471
|
2474
|
$v['admin_name'] = $fan_count->admin_name;
|
|
2475
|
+ if(empty($v['admin_name'])){
|
|
2476
|
+ $v['admin_name'] = DB::table('admin')->where('id', $v['admin_id'])->pluck('name');
|
|
2477
|
+ }
|
2472
|
2478
|
#计算提成
|
2473
|
2479
|
$bonus = $this->getSalerBonus($v['order_amount']);
|
2474
|
2480
|
$v['bonus0'] = $bonus[0];
|