Skip to content

L
loveisland
Commit eb30b6b8 authored by gongs's avatar gongs
Browse files
Options

Merge branch 'dev' of http://git.ruanyiit.com/liuxiaomin/loveisland into dev

parents 27aa7709 d3c0b973
Hide whitespace changes
Inline Side-by-side
Showing with 389 additions and 2 deletions
addons/shopro/controller/Index.php
View file @ eb30b6b8
...@@ -10,13 +10,15 @@ use app\common\library\Sms as Smslib; ...@@ -10,13 +10,15 @@ use app\common\library\Sms as Smslib;
use app\admin\model\shopro\user\User as UserModel; use app\admin\model\shopro\user\User as UserModel;
use addons\shopro\facade\Wechat; use addons\shopro\facade\Wechat;
use app\common\model\shopro\Ad; use app\common\model\shopro\Ad;
use think\Db;
use think\Hook; use think\Hook;
use think\Log;
class Index extends Common class Index extends Common
{ {
use Util; use Util;
protected $noNeedLogin = ['init', 'pageSync', 'page', 'feedback', 'send', 'test', 'ad']; protected $noNeedLogin = ['init', 'pageSync', 'page', 'feedback', 'send', 'test', 'ad', 'monthlyNewGoods'];
protected $noNeedRight = ['*']; protected $noNeedRight = ['*'];
public function init() public function init()
...@@ -200,6 +202,28 @@ class Index extends Common ...@@ -200,6 +202,28 @@ class Index extends Common
/** /**
* 获取每月最新商品
* 每月取最新上架的商品，没有返回空
*/
public function monthlyNewGoods()
{
$limit = $this->request->param('limit', 10);
$month = $this->request->param('month', date('Y-m'));
$goods = \app\admin\model\shopro\goods\Goods::where('status', 'up')
->field('id,title,image,original_price,price')
->whereTime('createtime', 'between', ["{$month}-01", "{$month}-31"])
->order('createtime', 'desc')
->limit($limit)
->select();
if (!$goods) {
$this->success('获取成功', []);
}
$this->success('获取成功', $goods);
}
/**
* 获取统一验证 token * 获取统一验证 token
* *
* @return void * @return void
......
addons/shopro/controller/commission/Ranking.php 0 → 100644
View file @ eb30b6b8
<?php
namespace addons\shopro\controller\commission;
use app\admin\model\shopro\commission\Agent as AgentModel;
use app\admin\model\shopro\commission\Reward as RewardModel;
use app\admin\model\shopro\user\User as UserModel;
use think\Db;
class Ranking extends Commission
{
protected $noNeedLogin = [];
protected $noNeedRight = ['*'];
/**
* 佣金排行榜
* 按已结算佣金金额排序
*/
public function commission()
{
$limit = $this->request->param('limit', 20);
$timeType = $this->request->param('time_type', 'all'); // all|month|week|day
$query = RewardModel::field([
'agent_id',
'sum(commission) as total_commission',
'count(distinct order_id) as order_count'
])
->where('status', RewardModel::COMMISSION_REWARD_STATUS_ACCOUNTED)
->group('agent_id');
// 时间筛选
switch ($timeType) {
case 'month':
$query->whereTime('commission_time', 'month');
break;
case 'week':
$query->whereTime('commission_time', 'week');
break;
case 'day':
$query->whereTime('commission_time', 'today');
break;
}
$rankings = $query->order('total_commission', 'desc')
->limit($limit)
->select();
if (empty($rankings)) {
$this->success('获取成功', []);
}
$agentIds = array_column($rankings, 'agent_id');
// 获取用户信息
$users = UserModel::whereIn('id', $agentIds)
->field('id, nickname, avatar')
->select();
$userMap = [];
if (is_array($users)) {
$userMap = array_column($users, null, 'id');
} else {
$userMap = $users->column(null, 'id');
}
$result = [];
foreach ($rankings as $index => $item) {
$user = $userMap[$item->agent_id] ?? null;
$result[] = [
'rank' => $index + 1,
'user_id' => $item->agent_id,
'nickname' => $user ? $user->nickname : '匿名用户', //string_hide($user->nickname, 5) : '匿名用户',
'avatar' => $user ? $user->avatar : '',
'total_commission' => round($item->total_commission, 2),
'order_count' => $item->order_count
];
}
// 获取当前用户排名
$currentUser = auth_user();
$currentRank = null;
if ($currentUser) {
$currentRank = $this->getCurrentUserCommissionRank($currentUser->id, $timeType, $result);
}
$this->success('获取成功', [
'list' => $result,
'current_user_rank' => $currentRank
]);
}
/**
* 推广人排行榜
* 按推广人数排序
*/
public function promoter()
{
$limit = $this->request->param('limit', 20);
$timeType = $this->request->param('time_type', 'all'); // all|month|week|day
$query = UserModel::field([
'parent_user_id',
'count(*) as invite_count'
])
->where('parent_user_id', '>', 0)
->where('status', 'normal')
->group('parent_user_id');
// 时间筛选
switch ($timeType) {
case 'month':
$query->whereTime('jointime', 'month');
break;
case 'week':
$query->whereTime('jointime', 'week');
break;
case 'day':
$query->whereTime('jointime', 'today');
break;
}
$rankings = $query->order('invite_count', 'desc')
->limit($limit)
->select();
if (empty($rankings)) {
$this->success('获取成功', []);
}
$parentIds = array_column($rankings, 'parent_user_id');
// 获取推广人信息
$users = UserModel::whereIn('id', $parentIds)
->field('id, nickname, avatar')
->select();
$userMap = [];
if (is_array($users)) {
$userMap = array_column($users, null, 'id');
} else {
$userMap = $users->column(null, 'id');
}
$result = [];
foreach ($rankings as $index => $item) {
$user = $userMap[$item->parent_user_id] ?? null;
$result[] = [
'rank' => $index + 1,
'user_id' => $item->parent_user_id,
'nickname' => $user ? $user->nickname : '匿名用户',
'avatar' => $user ? $user->avatar : '',
'invite_count' => $item->invite_count
];
}
// 获取当前用户排名
$currentUser = auth_user();
$currentRank = null;
if ($currentUser) {
$currentRank = $this->getCurrentUserPromoterRank($currentUser->id, $timeType, $result);
}
$this->success('获取成功', [
'list' => $result,
'current_user_rank' => $currentRank
]);
}
/**
* 获取当前用户佣金排名
*/
private function getCurrentUserCommissionRank($userId, $timeType, $existingList)
{
// 先检查是否在已有列表中
foreach ($existingList as $item) {
if ($item['user_id'] == $userId) {
return $item;
}
}
// 查询当前用户的佣金
$query = RewardModel::where('agent_id', $userId)
->where('status', RewardModel::COMMISSION_REWARD_STATUS_ACCOUNTED);
switch ($timeType) {
case 'month':
$query->whereTime('commission_time', 'month');
break;
case 'week':
$query->whereTime('commission_time', 'week');
break;
case 'day':
$query->whereTime('commission_time', 'today');
break;
}
$totalCommission = $query->sum('commission');
$orderCount = $query->count('distinct order_id');
if ($totalCommission <= 0) {
return null;
}
// 计算排名
$rankWhereQuery = RewardModel::where('status', RewardModel::COMMISSION_REWARD_STATUS_ACCOUNTED);
switch ($timeType) {
case 'month':
$rankWhereQuery->whereTime('commission_time', 'month');
break;
case 'week':
$rankWhereQuery->whereTime('commission_time', 'week');
break;
case 'day':
$rankWhereQuery->whereTime('commission_time', 'today');
break;
}
$rank = $rankWhereQuery->group('agent_id')
->having('sum(commission) > ' . $totalCommission)
->count() + 1;
$user = UserModel::get($userId);
return [
'rank' => $rank,
'user_id' => $userId,
'nickname' => $user ? $user->nickname : '我',
'avatar' => $user ? $user->avatar : '',
'total_commission' => round($totalCommission, 2),
'order_count' => $orderCount,
'is_out_list' => true
];
}
/**
* 获取当前用户推广排名
*/
private function getCurrentUserPromoterRank($userId, $timeType, $existingList)
{
// 先检查是否在已有列表中
foreach ($existingList as $item) {
if ($item['user_id'] == $userId) {
return $item;
}
}
// 查询当前用户的推广人数
$query = UserModel::where('parent_user_id', $userId)
->where('status', 'normal');
switch ($timeType) {
case 'month':
$query->whereTime('jointime', 'month');
break;
case 'week':
$query->whereTime('jointime', 'week');
break;
case 'day':
$query->whereTime('jointime', 'today');
break;
}
$inviteCount = $query->count();
if ($inviteCount <= 0) {
return null;
}
// 计算排名
$rankWhereQuery = UserModel::where('parent_user_id', '>', 0)
->where('status', 'normal');
switch ($timeType) {
case 'month':
$rankWhereQuery->whereTime('jointime', 'month');
break;
case 'week':
$rankWhereQuery->whereTime('jointime', 'week');
break;
case 'day':
$rankWhereQuery->whereTime('jointime', 'today');
break;
}
$rank = $rankWhereQuery->group('parent_user_id')
->having('count(*) > ' . $inviteCount)
->count() + 1;
$user = UserModel::get($userId);
return [
'rank' => $rank,
'user_id' => $userId,
'nickname' => $user ? $user->nickname : '我',
'avatar' => $user ? $user->avatar : '',
'invite_count' => $inviteCount,
'is_out_list' => true
];
}
}
addons/shopro/controller/user/GoodsLog.php
View file @ eb30b6b8
...@@ -36,6 +36,69 @@ class GoodsLog extends Common ...@@ -36,6 +36,69 @@ class GoodsLog extends Common
/** /**
* 批量收藏商品
*
* @return void
*/
public function batchFavorite()
{
if (!$this->request->isPost()) {
$this->error('请求方式错误');
}
$user = auth_user();
$goodsIds = $this->request->param('goods_ids/a');
if (empty($goodsIds) || !is_array($goodsIds)) {
$this->error('请选择要收藏的商品');
}
// 过滤已存在的收藏
$existingFavorites = UserGoodsLogModel::favorite()
->whereIn('goods_id', $goodsIds)
->where('user_id', $user->id)
->column('goods_id');
$newGoodsIds = array_diff($goodsIds, $existingFavorites);
if (empty($newGoodsIds)) {
$this->success('所选商品已收藏', [
'total' => count($goodsIds),
'success' => 0,
'exists' => count($existingFavorites),
'failed' => 0
]);
}
// 验证商品是否存在且上架
$validGoods = Goods::show()->whereIn('id', $newGoodsIds)->column('id');
$invalidGoodsIds = array_diff($newGoodsIds, $validGoods);
$successCount = 0;
$now = time();
foreach ($validGoods as $goodsId) {
$log = new UserGoodsLogModel();
$log->goods_id = $goodsId;
$log->user_id = $user->id;
$log->type = 'favorite';
$log->createtime = $now;
$log->updatetime = $now;
$log->save();
$successCount++;
}
$this->success('收藏成功', [
'total' => count($goodsIds),
'success' => $successCount,
'exists' => count($existingFavorites),
'failed' => count($invalidGoodsIds),
'failed_goods_ids' => array_values($invalidGoodsIds)
]);
}
/**
* 收藏/取消收藏 * 收藏/取消收藏
* *
* @param Request $request * @param Request $request
......
application/extra/queue.php
View file @ eb30b6b8
...@@ -5,7 +5,7 @@ return [ ...@@ -5,7 +5,7 @@ return [
'default' => 'default', // 默认的队列名称 'default' => 'default', // 默认的队列名称
'host' => '127.0.0.1', // redis 主机ip 'host' => '127.0.0.1', // redis 主机ip
'port' => 6379, // redis 端口 'port' => 6379, // redis 端口
'password' => '123456', // redis 密码 'password' => '', // redis 密码
'select' => 0, // 使用哪一个 db，默认为 db0 'select' => 0, // 使用哪一个 db，默认为 db0
'timeout' => 0, // redis连接的超时时间 'timeout' => 0, // redis连接的超时时间
'persistent' => false, 'persistent' => false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment