Merge branch 'master' of /data/git/tiantian2

app/Http/Controllers/Manager/OrdersController.php

@@ -196,6 +196,13 @@ class OrdersController extends CommonController
             "recharges",
             "refunds"
         ])->find($id);
+
+        $paramedic_items = $order->orderItems->groupBy("paramedic_id");
+        $paramedic_service_days = [];
+        foreach ($paramedic_items as $k => $paramedic) {
+
+        }
+
         $order = $order->refreshTotal();
         $order->balance = $order->customer->balance;
 

app/Http/Controllers/Manager/StatisticsController.php

@@ -208,13 +208,20 @@ class StatisticsController extends CommonController
         $checkout = $model_checkout->sum("total");
         $refund = $model_refund->sum("money");
         $payment_methods = (new Recharge())->payment_methods;
+        $payment_online_methods = (new Recharge())->payment_online_methods;
+
         $recharge_by_payment = $model_recharge->select("payment", "paid_at", "money", "order_id")->addSelect(DB::raw("sum(`money`) as total"))->groupBy("payment")->get()->keyBy("payment")->toArray();
         $recharge = [];
         $recharge["total"] = collect($recharge_by_payment)->sum("total");
+        $recharge["total_online"] = collect($recharge_by_payment)->filter(function($item) use ($payment_online_methods) {
+            return in_array($item["payment"], array_keys($payment_online_methods));
+        })->sum("total");
+
         foreach ($payment_methods as $k => $v) {
             $val = isset($recharge_by_payment[$k]) ? $recharge_by_payment[$k]["total"] : 0;
             $recharge[$k] = $val;
         }
+
         return response()->json(compact("checkout", "refund", "recharge", "payment_methods"));
     }
 

app/Models/Recharge.php

@@ -15,6 +15,10 @@ class Recharge extends SoftDeletesModel
         "alipay" => "支付宝",
         "pos" => "POS机"
     ];
+    public $payment_online_methods = [
+        "weixin" => "微信",
+        "alipay" => "支付宝"
+    ];
 
     public function getPaymentNameAttribute()
     {