server/manghe
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
youda 2025-04-25 02:30:21 +08:00
parent d956f6320e
commit e3d7693f56
9 changed files with 98 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env
View File

@ -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

13
app/api/controller/Goods.php
View File

@ -130,12 +130,13 @@ class Goods extends Base
//充值金额
$whe[] = ['unlock_amount', '=', 0];
} else {
$isTest = \app\common\helper\ConfigHelper::getSystemTestKey("enable_test");
if ($isTest == "1") {
$order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('order_zhe_total');
} else {
$order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('price');
}
// $isTest = \app\common\helper\ConfigHelper::getSystemTestKey("enable_test");
// if ($isTest == "1") {
// $order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('order_zhe_total');
// } else {
// $order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('price');
// }
$order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('price');
// $order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('price');
$userInfo = User::where('id', '=', $user_id)->field('istest')->find();
if ($userInfo && $userInfo['istest'] > 0) {

14
app/api/controller/Infinite.php
View File

@ -695,13 +695,13 @@ class Infinite extends Base
if ($goods['type'] == 16) {
$attach = 'order_fbs';
}
$isTest = \app\common\helper\ConfigHelper::getSystemTestKey("disable_wechat_pay");
if ($isTest == "1") {
Db::rollback();
#删除redis
$redis->del($redis_key);
return $this->renderError("支付未开放");
}
// $isTest = \app\common\helper\ConfigHelper::getSystemTestKey("disable_wechat_pay");
// if ($isTest == "1") {
// Db::rollback();
// #删除redis
// $redis->del($redis_key);
// return $this->renderError("支付未开放");
// }
$payRes = (new Pay())->wxCreateOrder($order_num, $paymentResult['price'], $user['openid'], $body, $attach);
if ($payRes['status'] == 1) {
#结果集

112
app/api/controller/Login.php
View File

@ -337,24 +337,24 @@ class Login extends Base
if ($uid) {
User::where('id', $user_id)->update(['uid' => $uid]);
}
$isTest = \app\common\helper\ConfigHelper::getSystemTestKey("enable_test");
if ($isTest == "1") {
$userCount = ProfitMoney::where('user_id', $user_id)
->where('type', 8)
->where('content', '=', '内测免费送')
->count();
if ($userCount == 0) {
// 使用Redis锁防止重复获取
$redis = (new RedisHelper())->getRedis();
$lockKey = 'user:beta_reward:' . $user_id;
if ($redis->set($lockKey, 1, ['nx', 'ex' => 60])) {
$res[] = User::changeMoney($user_id, 50000, 8, '内测免费送');
$logMessages[] = '赠送钻石: 50000';
// 释放锁
$redis->del($lockKey);
}
}
}
// $isTest = \app\common\helper\ConfigHelper::getSystemTestKey("enable_test");
// if ($isTest == "1") {
// $userCount = ProfitMoney::where('user_id', $user_id)
// ->where('type', 8)
// ->where('content', '=', '内测免费送')
// ->count();
// if ($userCount == 0) {
// // 使用Redis锁防止重复获取
// $redis = (new RedisHelper())->getRedis();
// $lockKey = 'user:beta_reward:' . $user_id;
// if ($redis->set($lockKey, 1, ['nx', 'ex' => 60])) {
// $res[] = User::changeMoney($user_id, 50000, 8, '内测免费送');
// $logMessages[] = '赠送钻石: 50000';
// // 释放锁
// $redis->del($lockKey);
// }
// }
// }
$time = time();
#token字符串
$token_num = getRandStr(10);
@ -787,27 +787,27 @@ class Login extends Base
$location = "";// $ip_province . $ip_city;
}
$user_id = $user['id'];
$isTest = \app\common\helper\ConfigHelper::getSystemTestKey("enable_test");
if ($isTest == "1") {
// 使用Redis锁防止重复获取
$redis = (new RedisHelper())->getRedis();
$lockKey = 'user:beta_reward:' . $user_id;
if ($redis->set($lockKey, 1, ['nx', 'ex' => 60])) {
$userCount = ProfitMoney::where('user_id', $user_id)
->where('type', 8)
->where('content', '=', '内测免费送')
->count();
if ($userCount == 0) {
// $isTest = \app\common\helper\ConfigHelper::getSystemTestKey("enable_test");
// if ($isTest == "1") {
// // 使用Redis锁防止重复获取
// $redis = (new RedisHelper())->getRedis();
// $lockKey = 'user:beta_reward:' . $user_id;
// if ($redis->set($lockKey, 1, ['nx', 'ex' => 60])) {
// $userCount = ProfitMoney::where('user_id', $user_id)
// ->where('type', 8)
// ->where('content', '=', '内测免费送')
// ->count();
// if ($userCount == 0) {
try {
$res[] = User::changeMoney($user_id, 50000, 8, '内测免费送');
} finally {
// 释放锁
$redis->del($lockKey);
}
}
}
}
// try {
// $res[] = User::changeMoney($user_id, 50000, 8, '内测免费送');
// } finally {
// // 释放锁
// $redis->del($lockKey);
// }
// }
// }
// }
// 记录登录日志
UserLoginLog::recordLogin(
@ -990,24 +990,24 @@ class Login extends Base
}
// 如果是测试环境，给新用户赠送钻石
$isTest = \app\common\helper\ConfigHelper::getSystemTestKey("enable_test");
if ($isTest == "1") {
$userCount = ProfitMoney::where('user_id', $user_id)
->where('type', 8)
->where('content', '=', '内测免费送')
->count();
if ($userCount == 0) {
// 使用Redis锁防止重复获取
$redis = (new RedisHelper())->getRedis();
$lockKey = 'user:beta_reward:' . $user_id;
if ($redis->set($lockKey, 1, ['nx', 'ex' => 60])) {
$res[] = User::changeMoney($user_id, 50000, 8, '内测免费送');
$logMessages[] = '赠送钻石: 50000';
// 释放锁
$redis->del($lockKey);
}
}
}
// $isTest = \app\common\helper\ConfigHelper::getSystemTestKey("enable_test");
// if ($isTest == "1") {
// $userCount = ProfitMoney::where('user_id', $user_id)
// ->where('type', 8)
// ->where('content', '=', '内测免费送')
// ->count();
// if ($userCount == 0) {
// // 使用Redis锁防止重复获取
// $redis = (new RedisHelper())->getRedis();
// $lockKey = 'user:beta_reward:' . $user_id;
// if ($redis->set($lockKey, 1, ['nx', 'ex' => 60])) {
// $res[] = User::changeMoney($user_id, 50000, 8, '内测免费送');
// $logMessages[] = '赠送钻石: 50000';
// // 释放锁
// $redis->del($lockKey);
// }
// }
// }
// 生成账号token
$time = time();

11
app/api/controller/Sign.php
View File

@ -119,11 +119,12 @@ class Sign extends Base
if (!$is_sign) {
$signDays_1 = $signDays + 1;
}
$sign_multiple = \app\common\helper\ConfigHelper::getSystemTestKey("sign_multiple");
$sign_multiple = intval($sign_multiple);
if($sign_multiple<=0){
$sign_multiple = 1;
}
$sign_multiple =1;
// $sign_multipl= \app\common\helper\ConfigHelper::getSystemTestKey("sign_multiple");
// $sign_multiple = intval($sign_multiple);
// if($sign_multiple<=0){
// $sign_multiple = 1;
// }
// 处理配置关联的奖励信息
$nowDay = date('j');

8
app/api/controller/Warehouse.php
View File

@ -708,10 +708,10 @@ class Warehouse extends Base
if ($type != 1 && $type != 2) {
return $this->renderError("请求参数错误");
}
$isTest = \app\common\helper\ConfigHelper::getSystemTestKey("disable_wechat_pay");
if ($isTest == "1") {
return $this->renderError("发货未开放");
}
// $isTest = \app\common\helper\ConfigHelper::getSystemTestKey("disable_wechat_pay");
// if ($isTest == "1") {
// return $this->renderError("发货未开放");
// }
$recovery_info = request()->param('recovery_info', '');
if (empty($recovery_info)) {
return $this->renderError("请选择兑换的赏品");

2
app/api/middleware/SignatureVerifyMiddleware.php
View File

@ -24,7 +24,7 @@ class SignatureVerifyMiddleware
/**
* Redis键前缀
*/
const REDIS_KEY_PREFIX = 'api_nonce_';
const REDIS_KEY_PREFIX = 'api_nonce:';
/**
* Nonce过期时间（秒）

14
app/common/model/UserSign.php
View File

@ -100,13 +100,13 @@ class UserSign extends Base
*/
protected static function processSignRewards($user_id, $type, $day)
{
$sign_multiple = ConfigHelper::getSystemTestKey("sign_multiple");
if (!$sign_multiple) {
$sign_multiple = 0;
} else {
$sign_multiple = intval($sign_multiple);
}
$sign_multiple=1;
// $sign_multiple = ConfigHelper::getSystemTestKey("sign_multiple");
// if (!$sign_multiple) {
// $sign_multiple = 0;
// } else {
// $sign_multiple = intval($sign_multiple);
// }
if ($sign_multiple <= 0) {
$sign_multiple = 1;
}

13
app/common/service/PaymentCalculator.php
View File

@ -283,13 +283,14 @@ class PaymentCalculator
}
} else {
// 常规消费验证
$isTest = \app\common\helper\ConfigHelper::getSystemTestKey("enable_test");
$user_price = 0;
if ($isTest == "1") {
$user_price = Order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('order_zhe_total');
} else {
$user_price = Order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('price');
}
// $isTest = \app\common\helper\ConfigHelper::getSystemTestKey("enable_test");
// if ($isTest == "1") {
// $user_price = Order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('order_zhe_total');
// } else {
// $user_price = Order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('price');
// }
$user_price = Order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('price');
if ($user_price < $choujiang_xianzhi) {
if ($user['istest'] > 0) {
$user_price = Order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('order_zhe_total');