bztang
/
bztang-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加：文创空间明细信息 - 添加新团队业绩明细

This commit is contained in:
wuhui_zzw 2023-12-19 14:09:40 +08:00
parent 8121a08267
commit 4e34142693
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/cultural-space/src/api/IndexController.php
View File

@ -28,6 +28,7 @@ use Yunshop\TeamDividend\models\TeamDividendLevelModel;
use Yunshop\TeamDividend\models\TeamDividendModel; use Yunshop\TeamDividend\models\TeamDividendModel;
use Yunshop\TeamDividend\models\Uplog; use Yunshop\TeamDividend\models\Uplog;
use Yunshop\UseStaff\models\UseStaff; use Yunshop\UseStaff\models\UseStaff;
use Yunshop\WeightValue\models\WeightValue;
class IndexController extends ApiController{ class IndexController extends ApiController{
/** /**
@ -126,6 +127,10 @@ class IndexController extends ApiController{
case 'team_performance': case 'team_performance':
$result = $this->getPerformanceChangeList($uid); $result = $this->getPerformanceChangeList($uid);
break; break;
// 团队业绩(新)
case 'new_team_performance':
$result = (new WeightValue())->orderDetail($uid, 1);
break;
// 加权收益明细 合伙人受益 // 加权收益明细 合伙人受益
case 'weight_income': case 'weight_income':
$result = ShareholderDividendModel::getIncome((int)$uid,(int)1) $result = ShareholderDividendModel::getIncome((int)$uid,(int)1)

7
plugins/weight-value/src/models/WeightValue.php
View File

@ -784,10 +784,11 @@ class WeightValue extends BaseModel{
* Common: 奖励明细 - 团队订单记录 * Common: 奖励明细 - 团队订单记录
* Author: wu-hui * Author: wu-hui
* Time: 2023/10/19 17:10 * Time: 2023/10/19 17:10
* @param $uid * @param $uid
* @param int $isOpenCultural
* @return array * @return array
*/ */
public function orderDetail($uid){ public function orderDetail($uid,$isOpenCultural = 0){
$result = []; $result = [];
$subUserIds = MemberChildren::getTeamModel($uid)->pluck('yz_member_children.child_id')->toArray(); $subUserIds = MemberChildren::getTeamModel($uid)->pluck('yz_member_children.child_id')->toArray();
if(count($subUserIds) > 0){ if(count($subUserIds) > 0){
@ -804,7 +805,7 @@ class WeightValue extends BaseModel{
->leftJoin('yz_goods_cultural_space','yz_goods_cultural_space.goods_id','yz_order_goods.goods_id') ->leftJoin('yz_goods_cultural_space','yz_goods_cultural_space.goods_id','yz_order_goods.goods_id')
->whereIn('yz_order.uid',$subUserIds) ->whereIn('yz_order.uid',$subUserIds)
->where('yz_order.uid','!=',$uid) ->where('yz_order.uid','!=',$uid)
->where('yz_goods_cultural_space.is_open',0) ->where('yz_goods_cultural_space.is_open',$isOpenCultural)
->with([ ->with([
'belongsToMember' => function($query){ 'belongsToMember' => function($query){
$query->select(['uid','nickname','realname','avatar']); $query->select(['uid','nickname','realname','avatar']);