彩票投注订单合并

app/Services/BetService.php

@@ -134,12 +134,18 @@ class BetService extends BaseService
         if (isset($search['issue_no']) && !empty($search['issue_no'])) {
             $where[] = ['issue', '=', $search['issue_no']];
         }
+        if (isset($search['issue']) && !empty($search['issue'])) {
+            $where[] = ['issue', '=', $search['issue']];
+        }
         if (isset($search['member_id']) && !empty($search['member_id'])) {
             $where[] = ['member_id', '=', $search['member_id']];
         }
         if (isset($search['keywords']) && !empty($search['keywords'])) {
             $where[] = ['number', '=', $search['keywords']];
         }
+        if (isset($search['number']) && !empty($search['number'])) {
+            $where[] = ['number', '=', $search['number']];
+        }
         if (isset($search['issue_id']) && !empty($search['issue_id'])) {
             $where[] = ['lhc_number_id', '=', $search['issue_id']];
         }
@@ -168,8 +174,11 @@ class BetService extends BaseService
                 $where[] = ['lottery_status', '=', $search['status']];
             }
         }
-
-        $where[] = ['type', 'in', [5,6]];
+        if (isset($search['lottery_status']) && !empty($search['lottery_status'])) {
+            $where[] = ['lottery_status', '=', $search['lottery_status']];
+        }
+        $where[] = ['type', '>=', 5];
+        $where[] = ['type', '<=', 6];
         return $where;
     }
 
@@ -800,24 +809,19 @@ class BetService extends BaseService
         $betNoticeMini = max(1, (int)($betNoticeNum[0] ?? 26));
         $betNoticeMax = max($betNoticeMini, (int)($betNoticeNum[1] ?? 38));
         $noticeNum = rand($betNoticeMini, $betNoticeMax);
-
-        $realNoticeNum = ceil($noticeNum / 2);
         $openList = [];
         $memberList = [];
-        $bet_num = 0;
+        
         foreach ($list->toArray() as $k => $v) {
             if (isset($keywordsList[$v['number']])) {
                 $keywordsList[$v['number']] += $v['amount'];
             } else {
                 $keywordsList[$v['number']] = $v['amount'];
             }
-            // $userInfo = UserService::findAll(['member_id' => $v['member_id']]);
-            // $lastStr = self::getLastChar($userInfo->first_name, 1);
             $lastStr = self::hideMiddleDigits($v['member_id'], 4);
             $item = [];
             $item['id'] = $v['id'];
-            $item['lottery_status'] = self::model()::STATUS_WIN;//中奖
-
+            $item['lottery_status'] = self::model()::STATUS_LOSS;//未中奖
 
             if (in_array($v['number'], $awards)) {
                 $amount = $v['amount'];
@@ -841,12 +845,9 @@ class BetService extends BaseService
                     $profit = 1000000; // 单注最高奖金1000000
                 }
 
-                $item['profit'] = $profit;
-
-                // $yl = $profit - $amount;
+                $item['win_amount'] = $profit;
                 $yl = bcsub($profit, $amount, 2); // 盈利
-
-
+                $item['profit_and_loss'] = $yl;
                 $rebate = Rebate::updateProfit([
                     'member_id' => $v['member_id'],
                     'profit' => $yl,
@@ -857,7 +858,6 @@ class BetService extends BaseService
                     ActivityUserService::updateBettingAmount($v['member_id'],$v['amount']);
                 }
 
-
                 $memberList[$v['member_id']][] = [
                     'member_id' => $v['member_id'],
                     'keywords' => $v['number'],
@@ -900,12 +900,10 @@ class BetService extends BaseService
                     'profit' => ($v['amount'] * -1),
                 ]);
 
-
                 if (!in_array('13操', $awards) && !in_array('14操', $awards)) {
                     RebateService::updateEffectiveBettingAmount($rebate, $v['amount']);
                     ActivityUserService::updateBettingAmount($v['member_id'],$v['amount']);
                 }
-
                 $profit = 0;
 //                玩 大单 小单 大双 小双 ：如果开出13和14 总注小于10000 1.5赔率含本，大于等于10000退本金。
                 if (in_array('13操', $awards) || in_array('14操', $awards)) {
@@ -920,26 +918,22 @@ class BetService extends BaseService
                         }
                     }
 
-
-//                    if (in_array($v['keywords'], self::$OTHER_BET_2)) {
-//                        $odds = 1;
-//                    }
                     $profit = bcmul($amount, $odds, 2); // 保留两位小数
 
                     if ($profit > 1000000) {
                         $profit = 1000000; // 单注最高奖金1000000
                     }
 
-                    $item['profit'] = $profit;
+                    $item['win_amount'] = $profit;
 
                     $yl = bcsub($profit, $amount, 2); // 盈利
+                    $item['profit_and_loss'] = $yl;
                     $walletInfo = WalletService::findOne(['member_id' => $v['member_id']]);
                     $balance = $walletInfo['available_balance'];
                     WalletService::updateBalance($v['member_id'], $profit);
                     BalanceLogService::addLog($v['member_id'], $profit, $balance, ($balance + $profit), '中奖', $v['id'], "盈利：{$yl}");
                 }
 
-
                 if (isset($openList[$v['member_id']])) {
                     $openList[$v['member_id']]['member_id'] = $v['member_id'];
                     $openList[$v['member_id']]['amount'] += $v['amount'];