gitea/webman_duanju
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

兼容修改

Browse Source
This commit is contained in:
张松
2025-08-15 10:15:48 +08:00
parent ca0bf11b55
commit 29d521d744
22 changed files with 185 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/api/model/Orders.php
View File

@@ -199,10 +199,10 @@ class Orders extends BaseModel
// TODO 异步领取奖励
// pushQueue(ActivitiesQueue::class, [
// 'userInfo' => $userInfo,
// 'sourceUser' => $byUser
// ], 1);
pushQueue(ActivitiesQueue::class, [
'userInfo' => $userInfo,
'sourceUser' => $byUser
], 1);
DatabaseRoute::transactionXa(function () use ($userInfo, $byUser, $userId) {
self::activities($userInfo, $byUser);
});

2
app/command/SpinningTask3.php
View File

@@ -3,7 +3,7 @@
namespace app\command;
use app\common\library\DatabaseRoute;
use app\queue\DiscCompensateJob;
use app\queue\redis\DiscCompensateJob;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;

180
app/controller/IndexController.php
View File

@@ -7,187 +7,21 @@ use app\api\model\CourseDetails;
use app\api\model\TbUser;
use app\common\library\DatabaseRoute;
use app\model\Test;
use app\queue\redis\ActivitiesQueue;
use support\Request;
use think\facade\Db;
use Webman\RedisQueue\Client;
class IndexController
{
public function index(Request $request)
{
\support\Log::info('来了' . date('Y-m-d H:i:s'));
$get['courseId'] = $course_id = '1877654905222135809';
$user['user_id'] = $user_id = '14240';
$user = DatabaseRoute::getDb('tb_user', $user_id)->find();
try {
if(empty($get['courseId'])) {
return json('参数不完整');
}
$courseId = $get['courseId'];
// 获取短剧详情
$dd_b = Db::connect('duanju_slave');
$db_name = $dd_b->name('course');
$bean = $db_name->where(['course_id' => $courseId])->find();
if(!$bean) {
return json('短剧不存在');
}
// Client::send('test', [], 0);
$courseCollect = DatabaseRoute::getDb('course_collect', $user_id)
->where(['course_id' => $course_id])
->where(['user_id' => $user_id])
->where(['classify' => 3])
->limit(1)
->find();
// 是否追剧
$collect = DatabaseRoute::getDb('course_collect', $user_id)
->where(['course_id' => $course_id])
->where(['classify' => 1])
->limit(1)
->find();
$db = Db::connect(config('think-orm.search_library'));
$userVip = $db->name('user_vip')->where(['user_id' => $user['user_id']])->find();
if ($userVip) {
$user['member'] = $userVip['is_vip'];
$user['end_time'] = $userVip['end_time'];
}
$userInfo = $user;
if (!empty($userInfo['member']) && $userInfo['member'] == 2) {
$isVip = true;
}else{
$isVip = false;
}
// 查询用户是否购买了整集
$courseUser = DatabaseRoute::getDb('course_user', $user_id)
->where(['course_id' => $course_id])
->where(['classify' => 1])
->find();
// 每天购买超过上限，获得免费时间段资格
$freeWatch = Test::checkFreeWatchPayCount($user['user_id']);
$startSort = 0;
$endSort = 5;
$dn_course_details = DatabaseRoute::getDb('course_details', ['course_id' => $courseId]);
$sort = null;
if (is_null($sort)) {
if (!empty($courseCollect)) {
$courseDetails = $dn_course_details->field('sort')
->where('course_details_id', $courseCollect['course_details_id'])
->limit(1)
->find();
$sort = $courseDetails['sort'];
}
}
if ($freeWatch || !empty($courseUser)) {
$courseDetailsSetVos = Test::courseSets($courseId, 2, null);
} else {
$courseDetailsSetVos = Test::courseSets($courseId, 1, $bean['wholesale_price']);
}
// 调整集数范围
if (!is_null($sort) && $sort > 2) {
$startSort = $sort - 3;
$endSort = $sort + 3;
if (count($courseDetailsSetVos) < $endSort) {
$startSort = count($courseDetailsSetVos) - 5;
$endSort = count($courseDetailsSetVos) + 1;
}
}
// 已购买剧集ID集合
$detailsId = [];
if (!$freeWatch) {
$det_db = Db::connect(DatabaseRoute::getConnection('course_user', ['user_id' => $user['user_id']]));
$detailsId = $det_db->name('course_user')->where(['course_id' => $courseId, 'classify' => 2])->column('course_details_id');
$det_db->close();
$detailsId = array_flip(array_flip($detailsId)); // 去重
\support\Log::info('啦啦啦' . date('Y-m-d H:i:s'));
}
// 处理剧集列表
$current = null;
foreach ($courseDetailsSetVos as &$s) {
$s['wholesalePrice'] = (int) $s['wholesalePrice'];
// 当前播放集
if (!empty($courseCollect) && $s['courseDetailsId'] == $courseCollect['course_details_id']) {
$s['current'] = 1;
$current = &$s;
}
// 非免费用户的权限控制
if (
!$freeWatch &&
$s['sort'] > 3 &&
(empty($detailsId) || !in_array($s['courseDetailsId'], $detailsId)) &&
empty($courseUser) &&
!$isVip
) {
$s['videoUrl'] = null;
}
// 检查是否已点赞
if ($s['sort'] > $startSort && $s['sort'] < $endSort) {
$isGood_db = Db::connect(DatabaseRoute::getConnection('course_collect', ['user_id' => $user['user_id']]));
$isGood = $isGood_db->name('course_collect')
->where('course_details_id', $s['courseDetailsId'])
->where('classify', 2)
->limit(1)
->count();
$isGood_db->close();
$s['isGood'] = empty($isGood) || $isGood == 0 ? 0 : 1;
}
}
// 如果没有当前播放集，默认第一集
if (empty($current) && !empty($courseDetailsSetVos)) {
$courseDetailsSetVos[0]['current'] = 1;
$current = &$courseDetailsSetVos[0];
}
Test::setCourseView($bean);
$price = ($freeWatch ? 0 : ($bean['price'] ?? 0));
$price = bccomp($price, '0', 2) <= 0 ? 0 : $price;
// 返回结果
$map = [
'current' => $current,
'price' => $price,
'title' => $bean['title'],
'collect' => empty($collect) || $collect == 0 ? 0 : 1,
'list' => $courseDetailsSetVos
];
\support\Log::info('即将返回' . date('Y-m-d H:i:s'));
return json($map);
} catch (\Exception $e) {
return json($e->getMessage());
}
pushQueue(ActivitiesQueue::class, [
'userInfo' => 1,
'sourceUser' => 1
], 1);
}
public function view(Request $request)

13
app/functions.php
View File

@@ -1,7 +1,9 @@
<?php
// 应用公共文件
use support\Log;
use support\think\Cache;
use Webman\RedisQueue\Client;
if (!function_exists('__')) {
@@ -1012,18 +1014,15 @@ if(!function_exists('extract_target_user_ids')) {
}
function pushQueue($class, $data=[], $seconds=0)
{
$queue = class_basename($class);
$data[] = [
'queueId' => uuid(),
];
Log::info("消息队列发送消息，对列名: $class, 携带数据: ".json_encode($data).', 延时时间: '.$seconds);
if ($seconds > 0) {
Queue::later($seconds, $class, $data);
}else{
Queue::push($class, $data);
}
Log::info("消息队列发送消息，对列名: $queue, 携带数据: ".json_encode($data).', 延时时间: '.$seconds);
// 投递延迟消息，消息会在60秒后处理
Client::send($queue, $data, $seconds);
}
if(!function_exists('daysBetween')) {

20
app/queue/ActivitiesQueue.php
View File

@@ -1,20 +0,0 @@
<?php
namespace app\queue;
use app\api\model\Orders;
use app\api\model\UserMoney;
use app\common\library\DatabaseRoute;
use think\facade\Log;
use think\queue\Job;
/**
* 奖项领取
*/
class ActivitiesQueue extends BaseQueue
{
public function run(Job $job, $data)
{
Orders::activities($data['userInfo'], $data['sourceUser']);
}
}

30
app/queue/BaseQueue.php
View File

@@ -1,30 +0,0 @@
<?php
namespace app\queue;
use think\facade\Log;
use think\queue\Job;
abstract class BaseQueue
{
public function fire(Job $job, $data)
{
$start = microtime(true);
try {
Log::info("消息队列接收到消息，当前队列: ".self::class.", 携带数据: ".json_encode($data));
$this->run($job, $data);
Log::info("消息队列执行成功：" . static::class);
$job->delete();
} catch (\Throwable $e) {
Log::error("消息队列执行异常：" . $e->getMessage());
Log::info($e->getTraceAsString());
$job->release(10); // 或 $job->fail()
}
$end = microtime(true);
Log::info("消息队列执行完毕, 耗时：" . ($end - $start) . 's');
}
// 子类实现具体逻辑
abstract public function run(Job $job, $data);
}

26
app/queue/DiscCompensateJob.php
View File

@@ -1,26 +0,0 @@
<?php
namespace app\queue;
use app\admin\model\DiscSpinning;
use think\facade\Log;
use think\queue\Job;
class DiscCompensateJob
{
public function fire(Job $job, $data) {
try {
Log::write('准备处理DiscCompensateJob' . json_encode($data, JSON_UNESCAPED_UNICODE));
DiscSpinning::receive1($data);
$job->delete(); // 处理成功删除任务
} catch (\Exception $e) {
if ($job->attempts() < 3) {
$job->release(5); // 重试3次，间隔5秒
} else {
$job->delete();
Log::error("大转盘补偿任务最终失败：ID={$data['id']}");
}
}
}
}

18
app/queue/redis/ActivitiesQueue.php Normal file
View File

@@ -0,0 +1,18 @@
<?php
namespace app\queue\redis;
use support\Log;
use Webman\RedisQueue\Consumer;
/**
* 奖项领取
*/
class ActivitiesQueue extends BaseQueue implements Consumer
{
public function run($data)
{
Log::info("哈哈哈哈");
// Orders::activities($data['userInfo'], $data['sourceUser']);
}
}

37
app/queue/redis/BaseQueue.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
namespace app\queue\redis;
use support\Log;
use Webman\RedisQueue\Consumer;
abstract class BaseQueue
{
public $queue;
public $connection = 'default';
public function __construct()
{
$this->queue = class_basename(static::class);
Log::info("消息队列启动成功，".$this->queue);
}
public function consume( $data)
{
$start = microtime(true);
Log::info("消息队列接收到消息，当前队列: ".self::class.", 携带数据: ".json_encode($data));
$this->run($data);
$end = microtime(true);
Log::info("消息队列执行完毕, 耗时：" . ($end - $start) . 's');
}
public function onConsumeFailure(\Throwable $e, $package)
{
Log::error("消息队列执行异常：" . $e->getMessage());
Log::info($e->getTraceAsString());
}
// 子类实现具体逻辑
abstract public function run($data);
}

16
app/queue/redis/DiscCompensateJob.php Normal file
View File

@@ -0,0 +1,16 @@
<?php
namespace app\queue\redis;
use app\admin\model\DiscSpinning;
use support\Log;
use Webman\RedisQueue\Consumer;
class DiscCompensateJob extends BaseQueue implements Consumer
{
public function run( $data) {
Log::write('准备处理DiscCompensateJob' . json_encode($data, JSON_UNESCAPED_UNICODE));
DiscSpinning::receive1($data);
}
}

4
app/queue/DiscReceiveQueue.php → app/queue/redis/DiscReceiveQueue.php
View File

@@ -1,6 +1,6 @@
<?php
namespace app\queue;
namespace app\queue\redis;
use app\api\model\UserMoney;
use app\common\library\DatabaseRoute;
@@ -12,7 +12,7 @@ use think\queue\Job;
*/
class DiscReceiveQueue extends BaseQueue
{
public function run(Job $job, $data)
public function run( $data)
{
$drawsInfo = $data['draws'];
if ($drawsInfo['type'] != 2) {

7
app/queue/UserPushQueue.php → app/queue/redis/UserPushQueue.php
View File

@@ -1,19 +1,20 @@
<?php
namespace app\queue;
namespace app\queue\redis;
use app\admin\controller\Cash;
use app\api\model\UserMoney;
use app\common\library\DatabaseRoute;
use think\facade\Log;
use think\queue\Job;
use Webman\RedisQueue\Consumer;
/**
* 奖项领取
*/
class UserPushQueue extends BaseQueue
class UserPushQueue extends BaseQueue implements Consumer
{
public function run(Job $job, $data)
public function run($data)
{
$userInfoList = $data['list'];
foreach ($userInfoList as $userInfo) {

16
app/utils/WuYouPayUtils.php
View File

@@ -26,14 +26,14 @@ class WuYouPayUtils
}
$booted = true;
self::$mchId = config('wuyou.merchant_id', '');
self::$payUrl = config('wuyou.url', '');
self::$notifyUrl = config('wuyou.notify_url', '');
self::$h5BaseUrl = config('wuyou.h5_base_url', '');
self::$secret = config('wuyou.secret', '');
self::$extractUrl = config('wuyou.extract_url', '');
self::$extractNotifyUrl = config('wuyou.extract_notify_url', '');
self::$queryUrl = config('wuyou.query_url', '');
self::$mchId = '100360';
self::$payUrl = 'http://47.113.117.120/api/order';
self::$notifyUrl = 'https://ph.hnsiyao.cn/api/wuyou/notify';
self::$h5BaseUrl = 'https://ph.hnsiyao.cn/api/wuyou/notify';
self::$secret = '3MWSBmyKDeQDLXzoLr53tKVqiJv4Fm0KdsEhbpXW9YWvh35VgozL5S3rpUz4EjSb';
self::$extractUrl = 'http://47.113.117.120/api/salary';
self::$extractNotifyUrl = 'http://47.113.117.120/api/salary';
self::$queryUrl = 'http://47.113.117.120/api/queryOrder';
if (hasEmpty(self::$mchId, self::$payUrl, self::$notifyUrl, self::$h5BaseUrl, self::$secret)) {
throw new SysException('缺少必要参数');