Ver código fonte

财务-分红统计-合伙人分红记录-修改

sunxbiao 1 ano atrás
pai
commit
26a078cca7
1 arquivos alterados com 34 adições e 12 exclusões
  1. 34 12
      app/controller/admin/user/User.php

+ 34 - 12
app/controller/admin/user/User.php

@@ -1449,34 +1449,56 @@ class User extends BaseController
1449
     public function getWeekAwardList()
1449
     public function getWeekAwardList()
1450
     {
1450
     {
1451
         [$page, $limit] = $this->getPage();
1451
         [$page, $limit] = $this->getPage();
1452
-        $nickname = request()->param('nickname','');
1453
-        $account = request()->param('account','');
1452
+        $nickname = request()->param('nickname', '');
1453
+        $account = request()->param('account', '');
1454
+        $user_group = request()->param('user_group', '');
1455
+        $dateRange = request()->param('dateRange', []);
1454
         $where = [];
1456
         $where = [];
1455
-        if($nickname) $where[] = ['u.nickname','like','%'.$nickname.'%'];
1456
-        if($account) $where[] = ['u.account','=',$account];
1457
+        if ($nickname) $where[] = ['u.nickname', 'like', '%' . $nickname . '%'];
1458
+        if ($account) $where[] = ['u.account', 'like', '%' . $account . '%'];
1459
+        if ($user_group) $where[] = ['w.user_group', '=', $user_group];
1460
+        if (!empty($dateRange)) {
1461
+            $where[] = ['w.create_time', 'between', [$dateRange[0], $dateRange[1]]];
1462
+        }
1457
 
1463
 
1458
         $query = Db::name('partner_profit_records')->alias('w')
1464
         $query = Db::name('partner_profit_records')->alias('w')
1459
-            ->leftJoin('user u','w.user_id=u.uid')
1460
-            ->leftJoin('user_identity identity','identity.user_group_id=w.user_group')
1461
-            ->field('w.*,u.uid,u.real_name,u.nickname,identity.user_group_name')
1465
+            ->leftJoin('user u', 'w.user_id=u.uid')
1466
+            ->leftJoin('user_identity identity', 'identity.user_group_id=w.user_group')
1467
+            ->field('w.*,u.uid,u.account,u.real_name,u.nickname,identity.user_group_name')
1462
             ->where($where);
1468
             ->where($where);
1463
 
1469
 
1470
+        $query1 = clone($query);
1471
+        $query2 = clone($query);
1472
+        $query3 = clone($query);
1473
+        // Primary, intermediate, advanced
1474
+        $partner_profit_primary_part_money = $query1->where('w.user_group', '=', 4)->sum('part_money');
1475
+        $partner_profit_primary_total_money = $query1->where('w.user_group', '=', 4)->sum('total_money');
1476
+        $partner_profit_primary = bcadd($partner_profit_primary_part_money, $partner_profit_primary_total_money, 2);
1477
+
1478
+        $partner_profit_intermediate_part_money = $query2->where('w.user_group', '=', 5)->sum('part_money');
1479
+        $partner_profit_intermediate_total_money = $query2->where('w.user_group', '=', 5)->sum('total_money');
1480
+        $partner_profit_intermediate = bcadd($partner_profit_intermediate_part_money, $partner_profit_intermediate_total_money, 2);
1481
+
1482
+        $partner_profit_advanced_part_money = $query3->where('w.user_group', '=', 6)->sum('part_money');
1483
+        $partner_profit_advanced_total_money = $query3->where('w.user_group', '=', 6)->sum('total_money');
1484
+        $partner_profit_advanced = bcadd($partner_profit_advanced_part_money, $partner_profit_advanced_total_money, 2);
1485
+
1464
         $data = $query->page($page)
1486
         $data = $query->page($page)
1465
             ->limit($limit)
1487
             ->limit($limit)
1466
             ->order('w.id desc')
1488
             ->order('w.id desc')
1467
             ->select();
1489
             ->select();
1468
         $count = $query->count();
1490
         $count = $query->count();
1469
-        if($data) {
1491
+        if ($data) {
1470
             $data = $data->toArray();
1492
             $data = $data->toArray();
1471
-            foreach ($data as $k => $v){
1472
-                // $data[$k]['award_num'] = bcadd($v['award_num'],$v['award_num_sm'],2);
1473
-                $data[$k]['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
1474
-                $data[$k]['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
1493
+            foreach ($data as $k => $v) {
1475
                 $data[$k]['radio'] = $v['radio'] == 2 ? '已发放' : '未发放';
1494
                 $data[$k]['radio'] = $v['radio'] == 2 ? '已发放' : '未发放';
1476
             }
1495
             }
1477
         }
1496
         }
1478
         $return_data['list'] = $data;
1497
         $return_data['list'] = $data;
1479
         $return_data['count'] = $count;
1498
         $return_data['count'] = $count;
1499
+        $return_data['partner_profit_primary'] = $partner_profit_primary ?: 0.00;
1500
+        $return_data['partner_profit_intermediate'] = $partner_profit_intermediate ?: 0.00;
1501
+        $return_data['partner_profit_advanced'] = $partner_profit_advanced ?: 0.00;
1480
         return app('json')->success($return_data);
1502
         return app('json')->success($return_data);
1481
     }
1503
     }
1482
 
1504