Merge branch 'master' of 47.76.126.2:seven/bot-28

app/Http/Controllers/admin/Bet.php

@@ -14,18 +14,29 @@ class Bet extends Controller
     /**
      * @description: 分页数据
      * @return {*}
-     */    
+     *
+     * @apiParam {String} [start_time] 开始时间
+     * - 格式：`yyyy-mm-dd`
+     * @apiParam {String} [end_time] 截止时间
+     * - 格式：`yyyy-mm-dd`
+     */
     function index()
     {
         try {
-            request()->validate([
-                'issue_no' => ['nullable', 'string'],
+            $params = request()->validate([
+                'page' => ['nullable', 'integer', 'min:1'],
+                'limit' => ['nullable', 'integer', 'min:1'],
                 'member_id' => ['nullable', 'string'],
+                'keywords' => ['nullable', 'string', 'min:1'],
+                'issue_no' => ['nullable', 'string'],
                 'id' => ['nullable', 'string'],
-                'status' => ['nullable', 'string'],
+                'status' => ['nullable', 'integer', 'in:1,2'],
+                'username' => ['nullable', 'string', 'min:1'],
+                'start_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:end_time'],
+                'end_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:start_time'],
+
             ]);
-            $search = request()->all();
-            $result = BetService::paginate($search);
+            $result = BetService::paginate($params);
         } catch (ValidationException $e) {
             return $this->error(HttpStatus::VALIDATION_FAILED, $e->validator->errors()->first());
         } catch (Exception $e) {

app/Http/Controllers/admin/User.php

@@ -24,8 +24,6 @@ class User extends Controller
      */
 
 
-
-
     /**
      * @api {get} /admin/user 会员列表
      * @apiGroup 会员管理
@@ -58,7 +56,9 @@ class User extends Controller
             request()->validate([
                 'game_id' => ['nullable', 'string', 'min:1'],
                 'member_id' => ['nullable', 'string', 'min:1'],
-                'first_name' => ['nullable', 'string', 'min:1']
+                'first_name' => ['nullable', 'string', 'min:1'],
+                'username' => ['nullable', 'string', 'min:1'],
+
             ]);
             $search = request()->all();
             $result = UserService::paginate($search);

app/Models/Bet.php

@@ -18,12 +18,19 @@ class Bet extends Authenticatable
     use HasApiTokens, Notifiable;
     protected $table = 'bets';
     // protected $hidden = ['created_at', 'updated_at'];
-    protected $fillable = ['issue_no', 'keywords', 'amount' ,'odds' ,'status' ,'profit' ,'issue_id' ,'member_id' ,'user_id'];
+    protected $fillable = ['issue_no', 'keywords', 'amount', 'odds', 'status', 'profit', 'issue_id', 'member_id', 'user_id'];
 
     const STATUS_STAY = 1;
     const STATUS_SETTLED = 2;
     const STATUS_CANCEL = 3;
 
+
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'member_id', 'member_id');
+    }
+
+
     public static $STATUS = [
         1 => '待结算',
         2 => '已结算',
@@ -33,16 +40,16 @@ class Bet extends Authenticatable
     public static function getStatus($val = -1)
     {
         $array = self::$STATUS;
-        if($val < 0){
+        if ($val < 0) {
             $arr = [];
-            foreach($array as $k => $v){
+            foreach ($array as $k => $v) {
                 $item = [];
                 $item['id'] = $k;
                 $item['title'] = $v;
                 $arr[] = $item;
             }
             return $arr;
-        }else{
+        } else {
             return $array[$val];
         }
     }

app/Services/BetService.php

@@ -72,6 +72,14 @@ class BetService extends BaseService
         if (isset($search['status']) && !empty($search['status'])) {
             $where[] = ['status', '=', $search['status']];
         }
+
+
+        if (isset($search['start_time']) && !empty($search['status'])) {
+            $where[] = ['created_at', '>=', "{$search['start_time']} 00:00:00"];
+            $where[] = ['created_at', '<=', "{$search['end_time']} 23:59:59"];
+        }
+
+
         return $where;
     }
 
@@ -103,7 +111,16 @@ class BetService extends BaseService
     public static function paginate(array $search = [])
     {
         $limit = isset($search['limit']) ? $search['limit'] : 15;
-        $paginator = self::model()::where(self::getWhere($search))->paginate($limit);
+        $query = self::model()::where(self::getWhere($search));
+
+
+        if (isset($search['username']) && !empty($search['username'])) {
+            $username = $search['username'];
+            $query = $query->whereHas('user', function ($query) use ($username) {
+                $query->where('username', $username);
+            });
+        }
+        $paginator = $query->paginate($limit);
         return ['total' => $paginator->total(), 'data' => $paginator->items()];
     }
 
@@ -275,7 +292,7 @@ class BetService extends BaseService
         //         WalletService::updateBalance($memberId,$rebateAmount);
 
         //         $walletInfo = WalletService::findOne(['member_id' => $memberId]);
-        //         $balance = $walletInfo['available_balance']; 
+        //         $balance = $walletInfo['available_balance'];
 
         //         BalanceLogService::addLog($memberId,$rebateAmount,$balance,($balance+$rebateAmount),'返水',$bet_id,'');
         //     }
@@ -315,7 +332,7 @@ class BetService extends BaseService
     {
 
         $betFake = Config::where('field', 'bet_fake')->first()->val;
-        if($betFake){
+        if ($betFake) {
             // 期数验证
             $issueInfo = IssueService::model()::where('status', IssueService::model()::STATUS_BETTING)->orderBy('id', 'desc')->first();
             if ($issueInfo) {
@@ -360,7 +377,7 @@ class BetService extends BaseService
 
             }
         }
-        
+
     }
 
     /**
@@ -446,13 +463,13 @@ class BetService extends BaseService
         $text = "历史注单 \n";
         $text .="中奖总金额：{$total_amount} \n";
         foreach ($list as $k => $v) {
-            if($v->status == self::model()::STATUS_SETTLED){
+            if ($v->status == self::model()::STATUS_SETTLED) {
                 $phase = $v->profit - $v->amount;
 
-            }else{
+            } else {
                 $phase = '待开奖';
             }
-            
+
             $text .= "-------------------------------------\n";
             $text .= "期数：{$v->issue_no} \n";
             $text .= "内容：{$v->keywords} \n";

app/Services/UserService.php

@@ -52,8 +52,8 @@ class UserService extends BaseService
         if (isset($search['first_name']) && !empty($search['first_name'])) {
             $where[] = ['first_name', '=', $search['first_name']];
         }
-        if (isset($search['user_name']) && !empty($search['user_name'])) {
-            $where[] = ['user_name', '=', $search['user_name']];
+        if (isset($search['username']) && !empty($search['username'])) {
+            $where[] = ['username', '=', $search['username']];
         }
         if (isset($search['like_first_name']) && !empty($search['like_first_name'])) {
             $where[] = ['first_name', 'like', "%" . $search['like_first_name'] . "%"];