From 9c71f524e700bcea2ff457b9bf33cafbe63f8371 Mon Sep 17 00:00:00 2001 From: zpc Date: Mon, 9 Jun 2025 12:20:43 +0800 Subject: [PATCH 1/3] 333 --- .env | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 78e2336..a0c3126 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -APP_DEBUG = true +APP_DEBUG = false [APP] DEFAULT_TIMEZONE = Asia/Shanghai @@ -6,9 +6,9 @@ DEFAULT_TIMEZONE = Asia/Shanghai [DATABASE] TYPE = mysql HOSTNAME = 127.0.0.1 -DATABASE = youda_test -USERNAME = youda_test -PASSWORD = youda_test +DATABASE = youda +USERNAME = youda +PASSWORD = youda HOSTPORT = 3306 CHARSET = utf8 DEBUG = false @@ -23,4 +23,4 @@ PASSWORD = DB = 3 [YOUDA] -YOUDA_ENV=test \ No newline at end of file +YOUDA_ENV=production \ No newline at end of file From 9316de0cc8a3205f90c9ef38d3c336998d899de7 Mon Sep 17 00:00:00 2001 From: youda Date: Fri, 13 Jun 2025 16:57:55 +0800 Subject: [PATCH 2/3] 222 --- app/command/FlwOpen.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/command/FlwOpen.php b/app/command/FlwOpen.php index 46fa0b7..f1558bb 100755 --- a/app/command/FlwOpen.php +++ b/app/command/FlwOpen.php @@ -102,7 +102,7 @@ class FlwOpen extends Command ->toArray(); // 如果没有参与用户,直接返回 if (empty($all_order_list)) { - + echo ('福利屋开奖完成没有用户参加, goods_id: ' . $goods_id) . PHP_EOL; Goods::where(['id' => $goods_id])->update(['is_open' => 1, 'status' => 3]); return $res; @@ -110,7 +110,6 @@ class FlwOpen extends Command // 打散参与用户 shuffle($all_order_list); - shuffle($all_order_list); $prize_index = 0; $prize_count = count($goods_list_all); @@ -139,7 +138,10 @@ class FlwOpen extends Command $order_info['goodslist_type'] = $prize['goods_type']; $order_info['shang_id'] = $prize['shang_id']; $order_info['prize_code'] = $prize['reward_id']; - + if ($order_info['status'] != 0 && $order_info['goodslist_type'] == 1) { + $order_info['status'] = 0; + $order_info['recovery_num'] = ''; + } // 减少库存 $update_stock = GoodsList::where(['id' => $prize['id']]) ->where('surplus_stock', '>', 0) @@ -152,7 +154,7 @@ class FlwOpen extends Command // 发放奖品 RewardService::sendReward($user['user_id'], $prize['reward_id'], $goods_title . '开奖'); - echo ('发放奖品成功 goods_id: ' . $goods_id . ', user_id: ' . $user['user_id'] . ', reward_id: ' . $prize['reward_id']) . PHP_EOL; + echo ('发放奖品成功 goods_id: ' . $goods_id . ', user_id: ' . $user['user_id'] . ', reward_id: ' . $prize['reward_id'] . ' 奖品名称:' . $prize['title']) . PHP_EOL; $prize_index++; } else { // 轮空处理 From 0b9aab49f3e1fd827a1db228ccbc65038e9d8805 Mon Sep 17 00:00:00 2001 From: zpc Date: Fri, 13 Jun 2025 16:58:13 +0800 Subject: [PATCH 3/3] 222 --- .env | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.env b/.env index a0c3126..78e2336 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -APP_DEBUG = false +APP_DEBUG = true [APP] DEFAULT_TIMEZONE = Asia/Shanghai @@ -6,9 +6,9 @@ DEFAULT_TIMEZONE = Asia/Shanghai [DATABASE] TYPE = mysql HOSTNAME = 127.0.0.1 -DATABASE = youda -USERNAME = youda -PASSWORD = youda +DATABASE = youda_test +USERNAME = youda_test +PASSWORD = youda_test HOSTPORT = 3306 CHARSET = utf8 DEBUG = false @@ -23,4 +23,4 @@ PASSWORD = DB = 3 [YOUDA] -YOUDA_ENV=production \ No newline at end of file +YOUDA_ENV=test \ No newline at end of file