fix: 抽奖记录详情

application/common/Service/Lottery/LotteryService.php

@@ -225,7 +225,33 @@ class LotteryService
             static::updateActivityStats($activity, $isWin);
 
             // 7. 返回抽奖结果
-            return static::buildDrawResult($drawRecord, $selectedPrize, $winRecord);
+            $result = [
+                'draw_id' => $drawRecord->id,
+                'is_win' => $drawRecord->is_win,
+                //"status" => $drawRecord->status,
+                'lottery_type' => $activity->lottery_type,
+                'lottery_time' => $activity->lottery_time ?? 0,
+                'prize' => [
+                    'id' => $selectedPrize->id,
+                    'name' => $selectedPrize->name,
+                    'type' => $selectedPrize->type,
+                    'type_text' => $selectedPrize->type_text,
+                    'image' => cdnurl($selectedPrize->image),
+                    'win_prompt' => $selectedPrize->win_prompt
+                ],
+            ];
+    
+            if ($winRecord) {
+                $result['win_record_id'] = $winRecord->id;
+                $result['deliver_status'] = $winRecord->deliver_status;
+                
+                // 只有兑换码类型的奖品才记录兑换码信息
+                if ($selectedPrize->type == LotteryEnum::PRIZE_TYPE_CODE) {
+                    $result['exchange_code'] = $winRecord->exchange_code;
+                }
+            }
+    
+            return $result;
 
         } catch (Exception $e) {
             // 如果发生错误，将状态改为未中奖
@@ -843,31 +869,7 @@ class LotteryService
      */
     private static function buildDrawResult($drawRecord, $prize, $winRecord = null)
     {
-        $result = [
-            'draw_id' => $drawRecord->id,
-            'is_win' => $drawRecord->is_win,
-            'prize' => [
-                'id' => $prize->id,
-                'name' => $prize->name,
-                'type' => $prize->type,
-                'type_text' => $prize->type_text,
-                'image' => cdnurl($prize->image),
-                'win_prompt' => $prize->win_prompt
-            ],
-            'draw_time' => $drawRecord->draw_time
-        ];
-
-        if ($winRecord) {
-            $result['win_record_id'] = $winRecord->id;
-            $result['deliver_status'] = $winRecord->deliver_status;
-            
-            // 只有兑换码类型的奖品才记录兑换码信息
-            if ($prize->type == LotteryEnum::PRIZE_TYPE_CODE) {
-                $result['exchange_code'] = $winRecord->exchange_code;
-            }
-        }
-
-        return $result;
+        
     }
 
     /**

application/common/Service/lottery/LotteryService.php

@@ -225,7 +225,33 @@ class LotteryService
             static::updateActivityStats($activity, $isWin);
 
             // 7. 返回抽奖结果
-            return static::buildDrawResult($drawRecord, $selectedPrize, $winRecord);
+            $result = [
+                'draw_id' => $drawRecord->id,
+                'is_win' => $drawRecord->is_win,
+                //"status" => $drawRecord->status,
+                'lottery_type' => $activity->lottery_type,
+                'lottery_time' => $activity->lottery_time ?? 0,
+                'prize' => [
+                    'id' => $selectedPrize->id,
+                    'name' => $selectedPrize->name,
+                    'type' => $selectedPrize->type,
+                    'type_text' => $selectedPrize->type_text,
+                    'image' => cdnurl($selectedPrize->image),
+                    'win_prompt' => $selectedPrize->win_prompt
+                ],
+            ];
+    
+            if ($winRecord) {
+                $result['win_record_id'] = $winRecord->id;
+                $result['deliver_status'] = $winRecord->deliver_status;
+                
+                // 只有兑换码类型的奖品才记录兑换码信息
+                if ($selectedPrize->type == LotteryEnum::PRIZE_TYPE_CODE) {
+                    $result['exchange_code'] = $winRecord->exchange_code;
+                }
+            }
+    
+            return $result;
 
         } catch (Exception $e) {
             // 如果发生错误，将状态改为未中奖
@@ -843,31 +869,7 @@ class LotteryService
      */
     private static function buildDrawResult($drawRecord, $prize, $winRecord = null)
     {
-        $result = [
-            'draw_id' => $drawRecord->id,
-            'is_win' => $drawRecord->is_win,
-            'prize' => [
-                'id' => $prize->id,
-                'name' => $prize->name,
-                'type' => $prize->type,
-                'type_text' => $prize->type_text,
-                'image' => cdnurl($prize->image),
-                'win_prompt' => $prize->win_prompt
-            ],
-            'draw_time' => $drawRecord->draw_time
-        ];
-
-        if ($winRecord) {
-            $result['win_record_id'] = $winRecord->id;
-            $result['deliver_status'] = $winRecord->deliver_status;
-            
-            // 只有兑换码类型的奖品才记录兑换码信息
-            if ($prize->type == LotteryEnum::PRIZE_TYPE_CODE) {
-                $result['exchange_code'] = $winRecord->exchange_code;
-            }
-        }
-
-        return $result;
+        
     }
 
     /**