Merge branch 'today' into dev

app/Http/Controllers/admin/PaymentOrder.php

@@ -11,11 +11,32 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
 use App\Models\PaymentOrder as PaymentOrderModel;
 use App\Models\Wallet;
+use App\Models\Recharge;
+use App\Models\Withdraw;
 use App\Services\BalanceLogService;
 
 class PaymentOrder extends Controller
 {
 
+    //统计后台待处理订单总数
+    public function unProcessed()
+    {
+        //USDT充值订单
+        $data['usdtRecharge'] = (int)Recharge::where('status', 0)->count();
+        //人工充值订单
+        $data['rgRecharge'] = (int)PaymentOrderModel::whereIn('status', [0,1,5])->where('type', 3)->count();
+        //人民币充值订单
+        $data['rgRecharge'] = (int)PaymentOrderModel::whereIn('status', [0,1])->where('type', 1)->count();
+        
+        //USDT提现订单
+        $data['usdtWithdraw'] = (int)Withdraw::where('status', 0)->count();
+        //人工提现订单
+        $data['rgWithdraw'] = (int)PaymentOrderModel::where('status', 0)->where('type', 4)->count();
+        //人民币提现订单
+        $data['rgWithdraw'] = (int)PaymentOrderModel::where('status', 0)->where('type', 2)->count();
+        return $this->success($data);
+    }
+
     //人工充值，配置充值信息
     public function setPayData()
     {

app/Services/PaymentOrderService.php

@@ -27,6 +27,7 @@ class PaymentOrderService extends BaseService
     const STATUS_FAIL = 3; // 失败
     const STATUS_USER = 4; // 待用户提交凭证
     const STATUS_AUDIT = 5; //待人工审核
+    const STATUS_CANCEL = 6; //已撤回
 
     public static string $MODEL = PaymentOrder::class;
 

routes/admin.php

@@ -103,7 +103,7 @@ Route::middleware(['admin.jwt'])->group(function () {
             Route::post('/setPayData', [PaymentOrder::class, 'setPayData']);
             Route::post('/manual‌Audit', [PaymentOrder::class, 'manual‌Audit']);
             Route::post('/setIsLocked', [PaymentOrder::class, 'setIsLocked']);
-            
+            Route::get('/unProcessed', [PaymentOrder::class, 'unProcessed']);
         });