|
|
@@ -314,16 +314,17 @@ class User extends BaseController
|
|
314
|
314
|
log::info("============gongxianinfo");
|
|
315
|
315
|
$user = $this->request->userInfo();
|
|
316
|
316
|
if($user->uid>0){
|
|
317
|
|
- $con = DB::name('user')->where('uid', $user->uid)->find();
|
|
318
|
317
|
// 先去更新一下用户身份
|
|
319
|
318
|
$number = Db::name("system_config_value")->where(["config_key" => "team_commission_recursion_depth"])->value("value");
|
|
320
|
319
|
$this->repository->setUserIdentity($user->uid);
|
|
321
|
320
|
$result = $this->repository->getUserContributeInfoByDepth($user->uid, $number);
|
|
|
321
|
+ $con = DB::name('user')->where('uid', $user->uid)->find();
|
|
322
|
322
|
$data = [
|
|
323
|
323
|
'no_total_source' => Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user->uid)->sum('number'),
|
|
324
|
324
|
'team_gongxian_num' => $result['arriveNumTeam'],
|
|
325
|
|
- 'zhitui' => $con['per_contribute'],
|
|
326
|
|
- 'total_source' => $con['contribute']
|
|
|
325
|
+ 'zhitui' => $result['perContribute'],
|
|
|
326
|
+ 'total_source' => $result['contribute'],
|
|
|
327
|
+ 'user_group' => $con['user_group']
|
|
327
|
328
|
];
|
|
328
|
329
|
return app('json')->success($data);
|
|
329
|
330
|
|