兼容修改

This commit is contained in:
张松 2025-08-14 09:08:45 +08:00
parent 5baa7fa95d
commit 30abda5ba7
4 changed files with 71 additions and 76 deletions

View File

@ -17,7 +17,7 @@ use think\facade\Db;
class OrderController extends BaseController class OrderController extends BaseController
{ {
// protected array $noNeedLogin = ["payOrders"]; protected array $noNeedLogin = ["*"];
protected array $noNeedPermission = []; protected array $noNeedPermission = [];
@ -36,7 +36,6 @@ class OrderController extends BaseController
{ {
$params = request()->get(); $params = request()->get();
$userInfo = $this->auth->getUser(); $userInfo = $this->auth->getUser();
debounce('insertCourseOrders'.$userInfo['user_id']); debounce('insertCourseOrders'.$userInfo['user_id']);
Log::info('生成商品订单信息接口入参为: {}', $params); Log::info('生成商品订单信息接口入参为: {}', $params);

View File

@ -2,19 +2,16 @@
namespace app\czg\app\controller; namespace app\czg\app\controller;
use app\api\model\Orders;
use app\api\model\TbUserBlacklist; use app\api\model\TbUserBlacklist;
use app\api\validate\WuyouValidate;
use app\common\controller\BaseController; use app\common\controller\BaseController;
use app\common\controller\Frontend;
use app\common\library\DatabaseRoute; use app\common\library\DatabaseRoute;
use app\CoroutineContext;
use app\exception\SysException; use app\exception\SysException;
use app\utils\RedisUtils; use app\utils\RedisUtils;
use app\utils\WuYouPayUtils; use app\utils\WuYouPayUtils;
use ba\Random; use ba\Random;
use Orders;
use support\Log;
use think\facade\Db; use think\facade\Db;
use think\facade\Log;
use Throwable; use Throwable;
class Wuyou extends BaseController class Wuyou extends BaseController
@ -23,9 +20,8 @@ class Wuyou extends BaseController
protected array $noNeedPermission = []; protected array $noNeedPermission = [];
public function queryOrder() public function queryOrder($orderId)
{ {
$orderId = $this->request->param('orderId');
$userId = $this->getUserId(); $userId = $this->getUserId();
$order = DatabaseRoute::getDb('orders', $userId)->where([ $order = DatabaseRoute::getDb('orders', $userId)->where([
'orders_id' => $orderId 'orders_id' => $orderId

View File

@ -1,15 +1,15 @@
<?php <?php
namespace app\api\model;
use app\api\model\Invite;
use app\common\library\DatabaseRoute; use app\common\library\DatabaseRoute;
use app\common\model\BaseModel; use app\common\model\BaseModel;
use app\common\model\SysUser; use app\common\model\SysUser;
use app\queue\ActivitiesQueue; use app\czg\app\model\CommonInfo;
use app\czg\app\model\TbUser;
use app\utils\RedisUtils; use app\utils\RedisUtils;
use DateTime; use support\Log;
use think\facade\Db; use think\facade\Db;
use think\facade\Log;
class Orders extends BaseModel class Orders extends BaseModel
{ {
@ -160,79 +160,79 @@ class Orders extends BaseModel
]); ]);
// // 短剧插入 // // 短剧插入
// self::insertOrders($order); self::insertOrders($order);
//
// // 用户信息及上级信息 // 用户信息及上级信息
// $userInfo = DatabaseRoute::getDb('tb_user', $order['user_id'])->where([ $userInfo = DatabaseRoute::getDb('tb_user', $order['user_id'])->where([
// 'user_id' => $order['user_id'] 'user_id' => $order['user_id']
// ])->find(); ])->find();
// $byUser = TbUser::getByUserIdOrInviterCode($userInfo['inviter_user_id'], $userInfo['inviter_code']); $byUser = TbUser::getByUserIdOrInviterCode($userInfo['inviter_user_id'], $userInfo['inviter_code']);
// 记录上级用户奖励信息 // 记录上级用户奖励信息
// Log::info("上级用户: ".json_encode($byUser)); Log::info("上级用户: ".json_encode($byUser));
// if ($byUser) { if ($byUser) {
// $inviteAchievement = DatabaseRoute::getAllDbData('invite_achievement', function ($query) use ($byUser, $userInfo) { $inviteAchievement = DatabaseRoute::getAllDbData('invite_achievement', function ($query) use ($byUser, $userInfo) {
// return $query->where([ return $query->where([
// 'target_user_id' => $userInfo['user_id'] 'target_user_id' => $userInfo['user_id']
// ]); ]);
// })->find(); })->find();
// if ($inviteAchievement) { if ($inviteAchievement) {
// Log::info("修改邀请统计"); Log::info("修改邀请统计");
// DatabaseRoute::getDb('invite_achievement', $byUser['user_id'], true)->where([ DatabaseRoute::getDb('invite_achievement', $byUser['user_id'], true)->where([
// 'user_id' => $inviteAchievement['user_id'], 'user_id' => $inviteAchievement['user_id'],
// 'id' => $inviteAchievement['id'] 'id' => $inviteAchievement['id']
// ])->update([ ])->update([
// 'count' => $inviteAchievement['count'] + 1, 'count' => $inviteAchievement['count'] + 1,
// 'update_time' => getNormalDate() 'update_time' => getNormalDate()
// ]); ]);
// }else{ }else{
// Log::info("新增邀请统计"); Log::info("新增邀请统计");
// DatabaseRoute::getDb('invite_achievement', $byUser['user_id'], true)->insert([ DatabaseRoute::getDb('invite_achievement', $byUser['user_id'], true)->insert([
// 'state' => 0, 'state' => 0,
// 'count' => 1, 'count' => 1,
// 'create_time' => getNormalDate(), 'create_time' => getNormalDate(),
// 'target_user_id' => $userInfo['user_id'], 'target_user_id' => $userInfo['user_id'],
// 'user_id' => $byUser['user_id'] 'user_id' => $byUser['user_id']
// ]); ]);
// } }
// //
// //
// // TODO 异步领取奖励 // // TODO 异步领取奖励
//// pushQueue(ActivitiesQueue::class, [ // pushQueue(ActivitiesQueue::class, [
//// 'userInfo' => $userInfo, // 'userInfo' => $userInfo,
//// 'sourceUser' => $byUser // 'sourceUser' => $byUser
//// ], 1); // ], 1);
// DatabaseRoute::transactionXa(function () use ($userInfo, $byUser, $userId) { DatabaseRoute::transactionXa(function () use ($userInfo, $byUser, $userId) {
// self::activities($userInfo, $byUser); self::activities($userInfo, $byUser);
// }); });
// } }
// 推广奖励发放 // 推广奖励发放
// if ($userInfo['inviter_code'] || !$byUser || $byUser['user_id'] == 1) { if ($userInfo['inviter_code'] || !$byUser || $byUser['user_id'] == 1) {
// $sysUser = SysUser::GetByQrcode($userInfo['qd_code']); $sysUser = SysUser::GetByQrcode($userInfo['qd_code']);
// if ($sysUser) { if ($sysUser) {
// $rateMoney = $sysUser['qd_rate']; $rateMoney = $sysUser['qd_rate'];
// SysUser::updateSysMoney($sysUser['user_id'], $rateMoney, 1); SysUser::updateSysMoney($sysUser['user_id'], $rateMoney, 1);
//
// DatabaseRoute::getDb('sys_user_money_details', $sysUser['user_id'], true)->insert([ DatabaseRoute::getDb('sys_user_money_details', $sysUser['user_id'], true)->insert([
// 'sys_user_id' => $sysUser['user_id'], 'sys_user_id' => $sysUser['user_id'],
// 'user_id' => $sysUser['user_id'], 'user_id' => $sysUser['user_id'],
// 'type' => 1, 'type' => 1,
// 'money' => $rateMoney, 'money' => $rateMoney,
// 'create_time' => getNormalDate(), 'create_time' => getNormalDate(),
// 'state' => 2, 'state' => 2,
// 'classify' => 10, 'classify' => 10,
// 'title' => "[渠道用户]用户名称:{$userInfo['user_name']}", 'title' => "[渠道用户]用户名称:{$userInfo['user_name']}",
// 'money_type' => 1, 'money_type' => 1,
// 'content' => '总佣金'.$rateMoney.',到账佣金'.$rateMoney 'content' => '总佣金'.$rateMoney.',到账佣金'.$rateMoney
// ]); ]);
// } }
// } }
// 增加剧集支付次数 // 增加剧集支付次数
// self::incrWeekPayCount($order['course_id']); self::incrWeekPayCount($order['course_id']);
} }

View File

@ -14,7 +14,7 @@
use Webman\Route; use Webman\Route;
Route::any('/czg/app/wuyou/queryOrder/{orderId}', [app\czg\app\controller\Wuyou::class, 'queryOrder']);