|
@@ -1677,6 +1677,7 @@ class StatisticsController extends Controller
|
1677
|
1677
|
$team_id = (int)$request->input('team_id');
|
1678
|
1678
|
$stime = $request->input('stime');
|
1679
|
1679
|
$etime = $request->input('etime');
|
|
1680
|
+ $aftersale = (int)$request->input('aftersale'); //售后
|
1680
|
1681
|
|
1681
|
1682
|
$page = (int)$request->input('page');
|
1682
|
1683
|
$pageSize = 20;
|
|
@@ -1686,10 +1687,11 @@ class StatisticsController extends Controller
|
1686
|
1687
|
|
1687
|
1688
|
$offset = ($page-1) * $pageSize;
|
1688
|
1689
|
|
1689
|
|
- $count = Order::where(function($query) use($team_id, $stime, $etime){
|
|
1690
|
+ $count = Order::where(function($query) use($team_id, $stime, $etime, $aftersale){
|
1690
|
1691
|
if($team_id) $query->where('team_id', $team_id);
|
1691
|
1692
|
if($stime) $query->where('createTime', '>=', $stime);
|
1692
|
1693
|
if($etime) $query->where('createTime', '<=', $etime. ' 23:59:59');
|
|
1694
|
+ if($aftersale == 1) $query->where('aftersale_fee', '>', 0);
|
1693
|
1695
|
})->where('is_del', 0)->count();
|
1694
|
1696
|
if ($count > 1) {
|
1695
|
1697
|
// 总页数
|
|
@@ -1700,10 +1702,11 @@ class StatisticsController extends Controller
|
1700
|
1702
|
}
|
1701
|
1703
|
|
1702
|
1704
|
$teams = DB::table('teams')->lists('name', 'id');
|
1703
|
|
- $result = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost', 'payment_type')->where(function($query) use($team_id, $stime, $etime){
|
|
1705
|
+ $result = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost', 'payment_type')->where(function($query) use($team_id, $stime, $etime, $aftersale){
|
1704
|
1706
|
if($team_id) $query->where('team_id', $team_id);
|
1705
|
1707
|
if($stime) $query->where('createTime', '>=', $stime);
|
1706
|
1708
|
if($etime) $query->where('createTime', '<=', $etime. ' 23:59:59');
|
|
1709
|
+ if($aftersale == 1) $query->where('aftersale_fee', '>', 0);
|
1707
|
1710
|
})->where('is_del', 0)->orderBy('team_id', 'asc')->orderBy('createTime','desc')->offset($offset)->limit($pageSize)->get();
|
1708
|
1711
|
$result = json_decode(json_encode($result), true);
|
1709
|
1712
|
$payArr = [1=>'微信支付', 2=>'付款码支付'];
|
|
@@ -1725,6 +1728,7 @@ class StatisticsController extends Controller
|
1725
|
1728
|
'count' => $count,
|
1726
|
1729
|
'pages' => $pages,
|
1727
|
1730
|
'teamlist' => $teamList,
|
|
1731
|
+ 'aftersale' => $aftersale,
|
1728
|
1732
|
]);
|
1729
|
1733
|
}
|
1730
|
1734
|
|
|
@@ -1735,6 +1739,8 @@ class StatisticsController extends Controller
|
1735
|
1739
|
$team_id = (int)$request->input('team_id');
|
1736
|
1740
|
$stime = $request->input('stime');
|
1737
|
1741
|
$etime = $request->input('etime');
|
|
1742
|
+ $aftersale = (int)$request->input('aftersale');
|
|
1743
|
+
|
1738
|
1744
|
$page = (int)$request->input('page');
|
1739
|
1745
|
$pageSize = 20;
|
1740
|
1746
|
if($page<=0){
|
|
@@ -1742,10 +1748,11 @@ class StatisticsController extends Controller
|
1742
|
1748
|
}
|
1743
|
1749
|
$offset = ($page-1) * $pageSize;
|
1744
|
1750
|
|
1745
|
|
- $count = Order::select(DB::raw('left(createTime, 10) as ctime, team_id'))->where(function($query) use($team_id, $stime, $etime){
|
|
1751
|
+ $count = Order::select(DB::raw('left(createTime, 10) as ctime, team_id'))->where(function($query) use($team_id, $stime, $etime, $aftersale){
|
1746
|
1752
|
if($team_id) $query->where('team_id', $team_id);
|
1747
|
1753
|
if($stime) $query->where('createTime', '>=', $stime);
|
1748
|
1754
|
if($etime) $query->where('createTime', '<=', $etime.' 23:59:59');
|
|
1755
|
+ if($aftersale == 1) $query->where('aftersale_fee', '>', 0);
|
1749
|
1756
|
})->where('is_del', 0)->groupBy('team_id')->groupBy('ctime')->get();
|
1750
|
1757
|
$count = count($count);
|
1751
|
1758
|
|
|
@@ -1758,10 +1765,11 @@ class StatisticsController extends Controller
|
1758
|
1765
|
}
|
1759
|
1766
|
|
1760
|
1767
|
$teams = DB::table('teams')->lists('name', 'id');
|
1761
|
|
- $result = Order::select(DB::raw('left(createTime, 10) as ctime, team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(aftersale_fee) as aftersale_fee, sum(refund_price) as refund_price, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team_id, $stime, $etime){
|
|
1768
|
+ $result = Order::select(DB::raw('left(createTime, 10) as ctime, team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(aftersale_fee) as aftersale_fee, sum(refund_price) as refund_price, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team_id, $stime, $etime, $aftersale){
|
1762
|
1769
|
if($team_id) $query->where('team_id', $team_id);
|
1763
|
1770
|
if($stime) $query->where('createTime', '>=', $stime);
|
1764
|
1771
|
if($etime) $query->where('createTime', '<=', $etime.' 23:59:59');
|
|
1772
|
+ if($aftersale == 1) $query->where('aftersale_fee', '>', 0);
|
1765
|
1773
|
})->where('is_del', 0)->groupBy('team_id')->groupBy('ctime')->orderBy('team_id', 'asc')->orderBy('createTime','desc')->offset($offset)->limit($pageSize)->get();
|
1766
|
1774
|
$result = json_decode(json_encode($result), true);
|
1767
|
1775
|
foreach($result as $k=>&$v){
|
|
@@ -1780,6 +1788,7 @@ class StatisticsController extends Controller
|
1780
|
1788
|
'count' => $count,
|
1781
|
1789
|
'pages' => $pages,
|
1782
|
1790
|
'teamlist' => $teamList,
|
|
1791
|
+ 'aftersale' => $aftersale,
|
1783
|
1792
|
]);
|
1784
|
1793
|
|
1785
|
1794
|
}
|
|
@@ -1791,19 +1800,21 @@ class StatisticsController extends Controller
|
1791
|
1800
|
$team_id = (int)$request->input('team_id');
|
1792
|
1801
|
$stime = $request->input('stime');
|
1793
|
1802
|
$etime = $request->input('etime');
|
|
1803
|
+ $aftersale = $request->input('aftersale');
|
1794
|
1804
|
|
1795
|
1805
|
$teams = DB::table('teams')->lists('name', 'id');
|
1796
|
|
- $result = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost', 'payment_type')->where(function($query) use($team_id, $stime, $etime){
|
|
1806
|
+ $result = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost', 'payment_type')->where(function($query) use($team_id, $stime, $etime, $aftersale){
|
1797
|
1807
|
if($team_id) $query->where('team_id', $team_id);
|
1798
|
1808
|
if($stime) $query->where('createTime', '>=', $stime);
|
1799
|
1809
|
if($etime) $query->where('createTime', '<=', $etime. ' 23:59:59');
|
|
1810
|
+ if($aftersale == 1) $query->where('aftersale_fee', '>', 0);
|
1800
|
1811
|
})->where('is_del', 0)->orderBy('team_id', 'asc')->orderBy('createTime','desc')->get();
|
1801
|
1812
|
$result = json_decode(json_encode($result), true);
|
1802
|
1813
|
$payArr = [1=>'微信支付', 2=>'付款码支付'];
|
1803
|
1814
|
foreach($result as $k=>&$v){
|
1804
|
1815
|
$v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
|
1805
|
1816
|
$v['true_amount'] = $v['receivedAmount'] - $v['refund_price'] - $v['aftersale_fee'];
|
1806
|
|
- $v['payment_type'] = $paryArr[$v['payment_type']];
|
|
1817
|
+ $v['payment_type'] = $payArr[$v['payment_type']];
|
1807
|
1818
|
}
|
1808
|
1819
|
|
1809
|
1820
|
$indexKey = ['team_name','createTime','id','receivedAmount','aftersale_fee','refund_price','true_amount','cost','freight_cost', 'payment_type'];
|
|
@@ -1819,12 +1830,14 @@ class StatisticsController extends Controller
|
1819
|
1830
|
$team_id = (int)$request->input('team_id');
|
1820
|
1831
|
$stime = $request->input('stime');
|
1821
|
1832
|
$etime = $request->input('etime');
|
|
1833
|
+ $aftersale = $request->input('aftersale');
|
1822
|
1834
|
|
1823
|
1835
|
$teams = DB::table('teams')->lists('name', 'id');
|
1824
|
|
- $result = Order::select(DB::raw('left(createTime, 10) as ctime, team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(aftersale_fee) as aftersale_fee, sum(refund_price) as refund_price, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team_id, $stime, $etime){
|
|
1836
|
+ $result = Order::select(DB::raw('left(createTime, 10) as ctime, team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(aftersale_fee) as aftersale_fee, sum(refund_price) as refund_price, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team_id, $stime, $etime, $aftersale){
|
1825
|
1837
|
if($team_id) $query->where('team_id', $team_id);
|
1826
|
1838
|
if($stime) $query->where('createTime', '>=', $stime);
|
1827
|
1839
|
if($etime) $query->where('createTime', '<=', $etime.' 23:59:59');
|
|
1840
|
+ if($aftersale == 1) $query->where('aftersale_fee', '>', 0);
|
1828
|
1841
|
})->where('is_del', 0)->groupBy('team_id')->groupBy('ctime')->orderBy('team_id', 'asc')->orderBy('createTime','desc')->get();
|
1829
|
1842
|
$result = json_decode(json_encode($result), true);
|
1830
|
1843
|
foreach($result as $k=>&$v){
|