Browse Source

付款码退补计算方式优化

sunhao 5 years ago
parent
commit
83104ae955
1 changed files with 12 additions and 4 deletions
  1. 12 4
      app/Http/Controllers/Admin/StatisticsController.php

+ 12 - 4
app/Http/Controllers/Admin/StatisticsController.php

@@ -1802,8 +1802,12 @@ class StatisticsController extends Controller
1802 1802
             $v['wx_refund_count'] = $wx_refund_info->refund_count;
1803 1803
             $v['wx_refund_price'] = $wx_refund_info->refund_price;
1804 1804
             //付款码退补
1805
-            $v['zfm_refund_count'] = $v['refund_count'] - $v['wx_refund_count'];
1806
-            $v['zfm_refund_price'] = $v['refund_price'] - $v['wx_refund_price'];
1805
+            $zfm_refund_info = Order::select(DB::raw('count(1) as refund_count, sum(refund_price) as refund_price'))->where('refund_type', 2)->where(function($query) use($team, $ctime){
1806
+                $query->where('team_id', $team);
1807
+                $query->where('refund_time', '=', $ctime);
1808
+            })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1)->first();
1809
+            $v['zfm_refund_count'] = $zfm_refund_info->refund_count;
1810
+            $v['zfm_refund_price'] = $zfm_refund_info->refund_price;
1807 1811
 
1808 1812
             #发货
1809 1813
             $send_info = Order::select(DB::raw('count(1) as send_count, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team, $ctime){
@@ -1910,8 +1914,12 @@ class StatisticsController extends Controller
1910 1914
             $v['wx_refund_count'] = $wx_refund_info->refund_count;
1911 1915
             $v['wx_refund_price'] = $wx_refund_info->refund_price;
1912 1916
             //付款码退补
1913
-            $v['zfm_refund_count'] = $v['refund_count'] - $v['wx_refund_count'];
1914
-            $v['zfm_refund_price'] = $v['refund_price'] - $v['wx_refund_price'];
1917
+            $zfm_refund_info = Order::select(DB::raw('count(1) as refund_count, sum(refund_price) as refund_price'))->where('refund_type', 2)->where(function($query) use($team, $ctime){
1918
+                $query->where('team_id', $team);
1919
+                $query->where('refund_time', '=', $ctime);
1920
+            })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1)->first();
1921
+            $v['zfm_refund_count'] = $zfm_refund_info->refund_count;
1922
+            $v['zfm_refund_price'] = $zfm_refund_info->refund_price;
1915 1923
 
1916 1924
             #发货
1917 1925
             $send_info = Order::select(DB::raw('count(1) as send_count, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team, $ctime){