From 757c36c830d7ee5c5ed353d64a77d23251c5dd13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Sat, 11 Oct 2025 15:08:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E5=8C=85=E7=AC=AC4=E6=AC=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/model/Redpacket.php        |  8 ++--
 .../common/service/RedpacketService.php       | 39 +------------------
 2 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/application/common/model/Redpacket.php b/application/common/model/Redpacket.php
index ec36c83..204db9f 100644
--- a/application/common/model/Redpacket.php
+++ b/application/common/model/Redpacket.php
@@ -51,7 +51,7 @@ class Redpacket extends Model
 
             $coinField = $data['coin_type'] == self::COIN_GOLD ? 'coin' : 'earnings';
             if ($wallet[$coinField] < $data['total_amount']) {
-                return V(0, '余额不足');
+                return ['code' => 0, 'msg' => '余额不足', 'data' => null];
             }
 
             // 扣除余额
@@ -118,13 +118,11 @@ class Redpacket extends Model
             $redis->expireAt($redisKey, $endTime + 3600); // 结束后保留1小时
 
             Db::commit();
-//            return $redpacketId;
-            return V(1, '发红包成功', $redpacketId);
+            return ['code' => 1, 'msg' => '发红包成功', 'data' => $redpacketId];
 
         } catch (\Exception $e) {
             Db::rollback();
-            return V(0, $e);
-//            throw $e;
+            return ['code' => 0, 'msg' => $e->getMessage(), 'data' => null];
         }
     }
 
diff --git a/application/common/service/RedpacketService.php b/application/common/service/RedpacketService.php
index 0fe3400..14b8de5 100644
--- a/application/common/service/RedpacketService.php
+++ b/application/common/service/RedpacketService.php
@@ -479,44 +479,7 @@ class RedpacketService
 
         return ['code' => 1, 'msg' => '验证成功', 'data' => null];
     }
-    /**
-     * 验证创建红包数据
-     */
-//    private function validateCreateData($data)
-//    {
-//        if (empty($data['user_id'])) {
-//            return V(0, '用户ID不能为空');
-//        }
-//
-//        if (!in_array($data['type'], [Redpacket::TYPE_NORMAL, Redpacket::TYPE_PASSWORD])) {
-//            return V(0, '红包类型错误');
-//        }
-//
-//        if ($data['type'] == Redpacket::TYPE_PASSWORD && empty($data['password'])) {
-//            return V(0, '口令红包必须设置口令');
-//        }
-//
-//        if (!in_array($data['coin_type'], [Redpacket::COIN_GOLD, Redpacket::COIN_DIAMOND])) {
-//            return V(0, '币种类型错误');
-//        }
-//
-//        if ($data['total_amount'] <= 0 || $data['total_count'] <= 0) {
-//            return V(0, '金额和数量必须大于0');
-//        }
-//
-//        if ($data['total_amount'] < $data['total_count']) {
-//            return V(0, '总金额不能小于总个数');
-//        }
-//
-//        // 验证领取条件
-//        if (isset($data['conditions'])) {
-//            $res_con =  $this->validateConditions($data['conditions']);
-//            if ($res_con !== true) {
-//                return $res_con;
-//            }
-//        }
-//        return V(1, '验证成功');
-//    }
+
 
     /**
      * 验证领取条件