彩票投注订单合并

app/Models/LhcOrder.php

@@ -10,10 +10,11 @@ class LhcOrder extends BaseModel
     public $timestamps = true;
     protected $dateFormat = 'U'; // U 代表 UNIX 时间戳（int）
 
-    const STATUS_STAY = 1;
-    const STATUS_SETTLED = 2;
-    const STATUS_CANCEL = 3;
-    
+    const STATUS_STAY = 0;  // 待开奖
+    const STATUS_LOSS = 1; // 未中奖
+    const STATUS_WIN = 2; // 已中奖
+    const STATUS_REFUND = 3; // 已退款
+
     public function lottery()
     {
         return $this->belongsTo(LhcLottery::class, 'issue', 'issue')

app/Services/BetService.php

@@ -660,7 +660,7 @@ class BetService extends BaseService
      */
     public static function recentlyRecord($memberId, $page = 1, $limit = 5)
     {
-        $list = self::model()::where('type', 'in', [5,6])->where('member_id', $memberId)->whereIn('lottery_status', [self::model()::STATUS_STAY, self::model()::STATUS_SETTLED])->orderBy('id', 'desc')->forPage($page, $limit)->get();
+        $list = self::model()::where('type', 'in', [5,6])->where('member_id', $memberId)->orderBy('id', 'desc')->forPage($page, $limit)->get();
 
         // $text = "```\n";
         $text = "";
@@ -692,8 +692,8 @@ class BetService extends BaseService
         }
 
         $msg['chat_id'] = $memberId;
-        $list = self::model()::where('type', 'in', [5,6])->where('member_id', $memberId)->whereIn('lottery_status', [self::model()::STATUS_STAY, self::model()::STATUS_SETTLED])->orderBy('id', 'desc')->forPage($page, $limit)->get();
-        $count = self::model()::where('type', 'in', [5,6])->where('member_id', $memberId)->whereIn('lottery_status', [self::model()::STATUS_STAY, self::model()::STATUS_SETTLED])->count();
+        $list = self::model()::where('type', 'in', [5,6])->where('member_id', $memberId)->orderBy('id', 'desc')->forPage($page, $limit)->get();
+        $count = self::model()::where('type', 'in', [5,6])->where('member_id', $memberId)->count();
 
         $keyboard = [];
 
@@ -703,9 +703,8 @@ class BetService extends BaseService
         $text = lang("历史注单") . " \n";
         $text .= lang("中奖总派彩") . "：{$total_amount} \n";
         foreach ($list as $k => $v) {
-            if ($v->lottery_status == self::model()::STATUS_SETTLED) {
+            if ($v->lottery_status == self::model()::STATUS_WIN || $v->lottery_status == self::model()::STATUS_LOSS) {
                 $phase = $v->win_amount - $v->amount;
-
             } else {
                 $phase = lang('待开奖');
             }
@@ -774,7 +773,7 @@ class BetService extends BaseService
 
             self::asyncSendMessage($v['member_id'], $text);
             $item = [];
-            $iem['lottery_status'] = self::model()::STATUS_SETTLED;
+            $item['lottery_status'] = self::model()::STATUS_LOSS;
             self::model()::where('id', $v['id'])->update($item);
         }
 
@@ -817,7 +816,7 @@ class BetService extends BaseService
             $lastStr = self::hideMiddleDigits($v['member_id'], 4);
             $item = [];
             $item['id'] = $v['id'];
-            $item['lottery_status'] = self::model()::STATUS_SETTLED;
+            $item['lottery_status'] = self::model()::STATUS_WIN;//中奖
 
 
             if (in_array($v['number'], $awards)) {
@@ -1185,7 +1184,7 @@ class BetService extends BaseService
         }
 
         // 真实投注
-        $list = self::findAll(['issue_no' => $issue_no, 'lottery_status' => self::model()::STATUS_STAY]);
+        $list = self::findAll(['issue_no' => $issue_no]);
         foreach ($list->toArray() as $k => $v) {
             if (isset($keywordsList[$v['keywords']])) {
                 $keywordsList[$v['keywords']] += $v['amount'];