m

app/Console/Commands/DayGrandTotal.php

@@ -49,7 +49,7 @@ class DayGrandTotal extends Command {
         //加粉
         $data['fan_count'] = CustDetail::where('is_del',0)->where('dtime','<',$_end)->sum('fan_add');    
         //毛利 = 总销售额-总商品成本-总运费-总售后
-        $data['profit'] = $order->order_amount - $order->goods_cost - $order->freight_cost - $order->aftersale_cost;
+        $data['profit'] = $order->order_amount - $order->goods_cost - $order->freight_cost - $order->aftersale_cost - $data['throw_cost'] + $order->refund_fee;
    
         $res = DB::table('day_grand_total')->insert($data);
         echo "\n日期：".$idate." 插入结果：".$res;

app/Http/Controllers/Admin/StatisticsController.php

@@ -4584,7 +4584,7 @@ class StatisticsController extends Controller
             //加粉
             $data['fan_count'] = CustDetail::where('is_del',0)->sum('fan_add');    
             //毛利 = 总销售额-总商品成本-总运费-总售后
-            $data['profit'] = $order->order_amount - $order->goods_cost - $order->freight_cost - $order->aftersale_cost;
+            $data['profit'] = $order->order_amount - $order->goods_cost - $order->freight_cost - $order->aftersale_cost - $data['throw_cost'] + $order->refund_fee;
         }else{
             $offset = ($page-1) * $pageSize - 1;
         }
@@ -4635,7 +4635,7 @@ class StatisticsController extends Controller
         //加粉
         $data['fan_count'] = CustDetail::where('is_del',0)->sum('fan_add');    
         //毛利 = 总销售额-总商品成本-总运费-总售后
-        $data['profit'] = $order->order_amount - $order->goods_cost - $order->freight_cost - $order->aftersale_cost;
+        $data['profit'] = $order->order_amount - $order->goods_cost - $order->freight_cost - $order->aftersale_cost - $data['throw_cost'] + $order->refund_fee;
        
         $result = DB::table('day_grand_total')->orderBy('idate', 'desc')->get();
         $result = json_decode(json_encode($result), true);   

app/Http/Controllers/Api/TemplateController.php

@@ -142,7 +142,7 @@ class TemplateController extends Controller {
         //加粉
         $data['fan_count'] = CustDetail::where('is_del',0)->sum('fan_add');    
         //毛利 = 总销售额-总商品成本-总运费-总售后
-        $data['profit'] = $order->order_amount - $order->goods_cost - $order->freight_cost - $order->aftersale_cost;
+        $data['profit'] = $order->order_amount - $order->goods_cost - $order->freight_cost - $order->aftersale_cost - $data['throw_cost'] + $order->refund_fee;
         
         //查询历史数据
         $result = DB::table('day_grand_total')->where('idate', '>', $stime)->orderBy('idate', 'desc')->get();