财务

4 years ago · f1ca0c962c
3 changed files with 10 additions and 4 deletions
--- a/app/AdminAgent/Controllers/FinanceStatisticsController.php
+++ b/app/AdminAgent/Controllers/FinanceStatisticsController.php
@ -28,16 +28,16 @@ class FinanceStatisticsController extends AdminController
 		//数据

 		//金额
-		$price = Order::query()->where('agent_id',Admin::user()->id)->where('status',OrderStatus::SUCCESS)->sum('price');
+		$price = Order::query()->where('agent_id',Admin::user()->id)->complete()->sum('price');

 		//利润
 		$costPrice = OrderProductItem::query()->where('agent_id',Admin::user()->id)->whereHas('order',function ($query) {
-			$query->where('status',OrderStatus::SUCCESS);
+			$query->complete();
 		})->sum('price');
 		$profit = bcsub($price,$costPrice,2);

 		//已完成订单
-		$count = Order::query()->where('agent_id',Admin::user()->id)->where('status',OrderStatus::SUCCESS)->count();
+		$count = Order::query()->where('agent_id',Admin::user()->id)->complete()->count();
 		return $content
 			->body(
 				<<<HTML
--- a/app/AdminAgent/Metrics/Examples/FinanceStatistics.php
+++ b/app/AdminAgent/Metrics/Examples/FinanceStatistics.php
@ -48,7 +48,7 @@ class FinanceStatistics extends Bar
    {
    	$query = Order::query()
 			->where('agent_id',Admin::user()->id)
-			->where('status',OrderStatus::SUCCESS)
+			->complete()
 			->select('*');
        switch ($request->get('option')) {
            case '1':
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@ -2,6 +2,7 @@

 namespace App\Models;

+use App\Common\OrderStatus;
 use App\Common\PayType;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
@ -13,6 +14,11 @@ class Order extends BaseModel
    use HasFactory, SoftDeletes;
 	protected $guarded = ['created_at', 'updated_at']; //不可批量赋值的属性

+	public function scopeComplete($query)
+	{
+		return $query->where('status',OrderStatus::SUCCESS);
+	}
+
 	public function getCouponIdAttribute($value)
 	{
 		return explode(',', $value);