Ken 16 ساعت پیش
والد
کامیت
1e23410c5a
2فایلهای تغییر یافته به همراه15 افزوده شده و 12 حذف شده
  1. 1 0
      app/Http/Controllers/admin/PaymentOrder.php
  2. 14 12
      app/Services/PaymentOrderService.php

+ 1 - 0
app/Http/Controllers/admin/PaymentOrder.php

@@ -71,6 +71,7 @@ class PaymentOrder extends Controller
                 'limit' => ['nullable', 'integer', 'min:1'],
                 'order_no' => ['nullable', 'string'],
                 'status' => ['nullable', 'integer', 'in:0,1,2,3'],
+                'member_id' => ['nullable', 'integer'],
             ]);
 
             $params['type'] = 1;

+ 14 - 12
app/Services/PaymentOrderService.php

@@ -23,6 +23,8 @@ class PaymentOrderService extends BaseService
     const STATUS_SUCCESS = 2; // 成功
     const STATUS_FAIL = 3; // 失败
 
+    public static string $MODEL = PaymentOrder::class;
+
     /**
      * @description: 模型
      * @return {string}
@@ -77,7 +79,7 @@ class PaymentOrderService extends BaseService
      */
     public static function findOne(array $search): ?PaymentOrder
     {
-        return self::model()::where(self::getWhere($search))->first();
+        return static::$MODEL::where(self::getWhere($search))->first();
     }
 
     /**
@@ -87,7 +89,7 @@ class PaymentOrderService extends BaseService
      */
     public static function findAll(array $search = [])
     {
-        return self::model()::where(self::getWhere($search))->get();
+        return static::$MODEL::where(self::getWhere($search))->get();
     }
 
     /**
@@ -98,7 +100,7 @@ class PaymentOrderService extends BaseService
     public static function paginate(array $search = [])
     {
         $limit = isset($search['limit']) ? $search['limit'] : 15;
-        $paginator = self::model()::where(self::getWhere($search))
+        $paginator = static::$MODEL::where(self::getWhere($search))
             ->with(['userInfo'])
             ->orderByDesc('created_at')
             ->paginate($limit);
@@ -146,7 +148,7 @@ class PaymentOrderService extends BaseService
             }
         } else {
             // 创建
-            $result = $info = self::model()::create($params);
+            $result = $info = static::$MODEL::create($params);
             $id = $result->id;
         }
 
@@ -249,7 +251,7 @@ class PaymentOrderService extends BaseService
             $data['pay_no'] = $item['tradeNo'];
             $data['pay_url'] = $item['payUrl'];
             $data['pay_data'] = json_encode($ret, JSON_UNESCAPED_UNICODE);
-            $info = self::model()::create($data);
+            $info = static::$MODEL::create($data);
             // $text = "✅ 支付提示 \n";
             $text = "{$data['bank_name']}充值确认 \n";
             // $text .= "支付方式:{$data['bank_name']} \n";
@@ -464,11 +466,11 @@ class PaymentOrderService extends BaseService
             }
 
             // 创建待处理状态的提现记录
-            $info = self::model()::create($data);
+            $info = static::$MODEL::create($data);
             $id = $info->id;
 
             // 记录余额变动日志
-            BalanceLogService::addLog($memberId, $default_amount*-1, $balance, $available_balance, '三方提现', $id, '钱宝提现费率:0.2%+2');
+            BalanceLogService::addLog($memberId, $default_amount * -1, $balance, $available_balance, '三方提现', $id, '钱宝提现费率:0.2%+2');
 
             // 提交事务,确保预扣款成功
             DB::commit();
@@ -602,7 +604,7 @@ class PaymentOrderService extends BaseService
         try {
             if ($params['state'] == 1) {
                 $data['status'] = self::STATUS_SUCCESS;
-                $res = self::model()::where(['order_no' => $params['orderNo']])->update($data);
+                $res = static::$MODEL::where(['order_no' => $params['orderNo']])->update($data);
                 if ($res) {
                     $text = "✅ 提现通知 \n";
                     $text .= "提现平台:{$info->bank_name} \n";
@@ -614,7 +616,7 @@ class PaymentOrderService extends BaseService
                 }
             } else {
                 $data['status'] = self::STATUS_FAIL;
-                $res = self::model()::where(['order_no' => $params['orderNo']])->update($data);
+                $res = static::$MODEL::where(['order_no' => $params['orderNo']])->update($data);
 
                 $wallet = WalletService::findOne(['member_id' => $info->member_id]);
 
@@ -695,19 +697,19 @@ class PaymentOrderService extends BaseService
 
     public static function syncPayOrder()
     {
-        $list = self::model()::where('state', 0)->where('type', self::TYPE_PAY)->take(100)->get();
+        $list = static::$MODEL::where('state', 0)->where('type', self::TYPE_PAY)->take(100)->get();
         // foreach($list->toArray() as $k => $v){
         //      $item= [];
         //     if($v['status'] == self::STATUS_SUCCESS){
         //         $item['state'] = 1;
-        //         self::model()::where(['id'=>$v['id']])->update($item);
+        //         static::$MODEL::where(['id'=>$v['id']])->update($item);
         //     }else{
         //         $ret = SanJinService::queryOrder($v['order_no']);
         //         var_dump($ret);
         //         if($ret['code'] == 0){
 
         //             $item['state'] = $ret['data']['state'];
-        //             self::model()::where(['id'=>$v['id']])->update($item);
+        //             static::$MODEL::where(['id'=>$v['id']])->update($item);
         //         }
         //     }