Merge remote-tracking branch 'origin/dev' into dev

master
zhengchanglong 5 years ago
commit 47ba229b80

@ -39,8 +39,10 @@ class QueryController extends BaseController
$childPromoteIds = getAllChildPromoteList(3);
if (empty($childPromoteIds)) {
$map['tab_spend.promote_id'] = 0;
$map['tab_spend.promote_id'] = PID;
} else {
$childPromoteIds .= ',' . PID;
$map['tab_spend.promote_id'] = ['in', $childPromoteIds];
}
@ -183,8 +185,10 @@ class QueryController extends BaseController
$childPromoteIds = getAllChildPromoteList(3);
if (empty($childPromoteIds)) {
$map['tab_user.promote_id'] = 0;
$map['tab_user.promote_id'] = PID;
} else {
$childPromoteIds .= ',' . PID;
$map['tab_user.promote_id'] = ['in', $childPromoteIds];
}
@ -1021,10 +1025,12 @@ class QueryController extends BaseController
{
$childPromoteIds = getAllChildPromoteList(3);
if (empty($childPromoteIds)) {
$userPlayInfoWhere['tab_user_play_info.promote_id'] = 0;
$userGameLoginWhere['tab_user_game_login_record.promote_id'] = 0;
$spendWhere['tab_spend.promote_id'] = 0;
$userPlayInfoWhere['tab_user_play_info.promote_id'] = PID;
$userGameLoginWhere['tab_user_game_login_record.promote_id'] = PID;
$spendWhere['tab_spend.promote_id'] = PID;
} else {
$childPromoteIds .= ',' . PID;
$userPlayInfoWhere['tab_user_play_info.promote_id'] = ['in', $childPromoteIds];
$userGameLoginWhere['tab_user_game_login_record.promote_id'] = ['in', $childPromoteIds];
$spendWhere['tab_spend.promote_id'] = ['in', $childPromoteIds];
@ -1270,11 +1276,13 @@ class QueryController extends BaseController
$childPromoteIds = getAllChildPromoteList(3);
if (empty($childPromoteIds)) {
$map['tab_apply.promote_id'] = 0;
$userPlayInfoMap['tab_user_play_info.promote_id'] = 0;
$userGameLoginMap['tab_user_game_login_record.promote_id'] = 0;
$spendMap['tab_spend.promote_id'] = 0;
$map['tab_apply.promote_id'] = PID;
$userPlayInfoMap['tab_user_play_info.promote_id'] = PID;
$userGameLoginMap['tab_user_game_login_record.promote_id'] = PID;
$spendMap['tab_spend.promote_id'] = PID;
} else {
$childPromoteIds .= ',' . PID;
$map['tab_apply.promote_id'] = ['in', $childPromoteIds];
$userPlayInfoMap['tab_user_play_info.promote_id'] = ['in', $childPromoteIds];
$userGameLoginMap['tab_user_game_login_record.promote_id'] = ['in', $childPromoteIds];

Loading…
Cancel
Save