彭俊 преди 6 години
родител
ревизия
ccc0a5e0f6
променени са 3 файла, в които са добавени 20 реда и са изтрити 6 реда
  1. 11 5
      Application/Api/Model/MoneyBuy.php
  2. 7 0
      Application/Sports/Controller/MatchList.php
  3. 2 1
      Biz/Account/AccountManager.php

+ 11 - 5
Application/Api/Model/MoneyBuy.php

@@ -535,7 +535,7 @@ class MoneyBuy extends Model {
             Render([], '2001', lang('Common','Api') -> get('user does login'));
         }
         // 用户ID
-        $moneyBuyWhere['account_identity'] = $userInfo['identity'];
+        // $moneyBuyWhere['account_identity'] = $userInfo['identity'];
         // 时间区间
         $endTime = date('Y-m-d H:i:s');
         if ($userInfo['statisticsTime']) {
@@ -543,16 +543,23 @@ class MoneyBuy extends Model {
         } else {
             $startTime = '1900-01-01 00:00:00';
         }
-        $moneyBuyBetween = [$startTime, $endTime];
+        
+        // $moneyBuyBetween = [$startTime, $endTime];
         $moneyRecordWhere['settle_status'] = 2;
+        $moneyBuyWhere = [
+            ['account_identity','=',$userInfo['identity']],
+            ['money_time','>',$startTime],
+            ['money_time','<',$endTime],
+        ];
         // 获取单式投注订单
         $moneyBuySimplex = lm('money_buy_simplex', "commons");
         $mnyBuySpxData = $moneyBuySimplex
             ->select(['order_id', 'money', 'gain_money', 'batch_id'])
             ->where($moneyBuyWhere)
-            ->whereBetween('settlementTime', $moneyBuyBetween)
+            // ->whereBetween('settlementTime', $moneyBuyBetween)
             ->get()
             ->toArray();
+
         // 获取全部订单id
         $moneyBuyMthOr = [];
         $allBatchId = array_unique($mnyBuySpxData, SORT_REGULAR);
@@ -569,13 +576,12 @@ class MoneyBuy extends Model {
         } else {
             $getMoneyBuyMth = [];
         }
-
         // 获取串式投注订单
         $moneyBuyStr = lm('money_buy_str', "commons");
         $mnyBuyStrData = $moneyBuyStr
             ->select(['order_id', 'money', 'gain_money'])
             ->where($moneyBuyWhere)
-            ->whereBetween('settlementTime', $moneyBuyBetween)
+            // ->whereBetween('settlementTime', $moneyBuyBetween)
             ->get();
         $winMoney = $userInfo['allWin'];
         $loseMoney = $userInfo['allLose'];

+ 7 - 0
Application/Sports/Controller/MatchList.php

@@ -807,6 +807,13 @@ where a.match_id = b.match_id and a.id = b.id ";
         Render($data, '1', lang('Tips','Sports')->get('success'));
     }
 
+    /**
+     * 验证 赛事赔率/比分 是否发生变更
+     */
+    public function getOdds(){
+
+    }
+
     /**
      * 获取赛事所有数据
      * @param  [array] $where 条件

+ 2 - 1
Biz/Account/AccountManager.php

@@ -513,7 +513,8 @@ class AccountManager
 
         $userInfo = lm('account_detailed', 'Commons')->join('account', 'account_detailed.account_identity', '=', 'account.identity')->where('account_detailed.token', $token)->first();
         if (empty($userInfo)) {
-            return false;
+            Render([], '2001', lang('Common','Api') -> get('user does login'));
+            // return false;
         }
 //        $userInfo->identity = $userInfo->account_identity;
         return $userInfo;