Merge remote-tracking branch 'origin/master'

app/controller/api/user/User.php

@@ -180,72 +180,85 @@ class User extends BaseController
 
     public function spread_info_yhc()
     {
+        log::info("============ddddddddd");
         $user = $this->request->userInfo();
-        if ($this->source == 'yhc' && $this->merId) {
-            $where['mer_id'] = $this->merId;
-            $where['uid'] = $user->uid;
-            $enterprise_user = Db::name('enterprise_user')->where($where)->find();
-            if ($enterprise_user) {
-                $data['current_balance'] = set_price_rtrim($enterprise_user['commission']);//收益余额
-                $data['unsettled_balance'] = 0;//未结算
-                $extract_price = Db::name('user_extract')->where($where)->whereIn('status', [0, 1])->sum('extract_price');
-                $data['withdrawn_balance'] = set_price_rtrim($extract_price); //已提现
-                $data['total_balance'] = set_price_rtrim($enterprise_user['commission'] + $data['withdrawn_balance']);//总收益=收益余额+已提现
-                $data['identity'] = $enterprise_user['identity'];
-                $data['level'] = $enterprise_user['level'];
-                $data['partnership'] = $enterprise_user['partnership'];
-                $data['green_integral'] = $enterprise_user['green_integral'];
-                $data['green_integral_is'] = $enterprise_user['green_integral_is'];
-                $data['operate'] = $enterprise_user['operate'];
-                $data['operate_icon'] = '';
-                $data['operate_text'] = '';
-                $member_settings = merchantConfig($this->merId, 'member_settings');
-                if ($data['operate'] == 101) {
-                    $data['operate_icon'] = $member_settings['yy_one_img'];
-                    $data['operate_text'] = $member_settings['yy_one_text'];
-                }
-                if ($data['operate'] == 102) {
-                    $data['operate_icon'] = $member_settings['yy_two_img'];
-                    $data['operate_text'] = $member_settings['yy_two_text'];
-                }
-
-
-                $data['nickname'] = $user->nickname;
-                $data['avatar'] = $enterprise_user['avatar'];
-
-                $arr = $this->jisuan_fans($user->uid);
-                $data['fans_num'] = count($arr);//粉丝总数
-
-                $yanglao = 0;
-                $offLinewhere = ['mer_id' => $this->merId, 'uid' => $user->uid, 'commission_type' => '5', 'type_shop' => 0];
-                $offLine1 = Db::name('user_bill')->where($offLinewhere)->where('source', 1)->where('status', 1)->sum('number');
-                $yanglao += $offLine1;
-                $offLine2 = Db::name('user_bill')->where($offLinewhere)->where('source', 0)->whereIn('status', [0, 1])->sum('number');
-                $yanglao += $offLine2;
-
-
-                $data['ylj'] = set_price_rtrim($yanglao);
-
-                $data['yhc_withdrawal_money'] = merchantConfig($this->merId, 'yhc_withdrawal_money');
-
+        if($user->uid>0){
+            //已经入账积分
+            $data['total_source']=$user->score;
+            //为生效积分
+            $data['no_total_source']=Db::name('user_sign_score')->where('status', -1)->where('uid', $user->uid)->sum('reward_socre');;
+            log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
+            return app('json')->success($data);
 
-                $data['uid'] = $enterprise_user['uid'];
-                if ($enterprise_user['identity'] > 100) {
-                    $data['identity_data'] = Db::name('enterprise_performance_divvy')->field('name,img,content')->where('state', 1)->where('id', $enterprise_user['identity'])->find();
-                    if (!$data['identity_data']) {
-                        $data['identity_data'] = null;
-                        $data['identity'] = '100';
-                    }
-                } else {
-                    $data['identity_data'] = null;
-                }
+        }
+//        if ($this->source == 'yhc' && $this->merId) {
+//            $where['mer_id'] = $this->merId;
+//            $where['uid'] = $user->uid;
+//            $enterprise_user = Db::name('enterprise_user')->where($where)->find();
+//            if ($enterprise_user) {
+//                $data['current_balance'] = set_price_rtrim($enterprise_user['commission']);//收益余额
+//                $data['unsettled_balance'] = 0;//未结算
+//                $extract_price = Db::name('user_extract')->where($where)->whereIn('status', [0, 1])->sum('extract_price');
+//                $data['withdrawn_balance'] = set_price_rtrim($extract_price); //已提现
+//                $data['total_balance'] = set_price_rtrim($enterprise_user['commission'] + $data['withdrawn_balance']);//总收益=收益余额+已提现
+//                $data['identity'] = $enterprise_user['identity'];
+//                $data['level'] = $enterprise_user['level'];
+//                $data['partnership'] = $enterprise_user['partnership'];
+//                $data['green_integral'] = $enterprise_user['green_integral'];
+//                $data['green_integral_is'] = $enterprise_user['green_integral_is'];
+//                $data['operate'] = $enterprise_user['operate'];
+//                $data['operate_icon'] = '';
+//                $data['operate_text'] = '';
+//                $member_settings = merchantConfig($this->merId, 'member_settings');
+//                if ($data['operate'] == 101) {
+//                    $data['operate_icon'] = $member_settings['yy_one_img'];
+//                    $data['operate_text'] = $member_settings['yy_one_text'];
+//                }
+//                if ($data['operate'] == 102) {
+//                    $data['operate_icon'] = $member_settings['yy_two_img'];
+//                    $data['operate_text'] = $member_settings['yy_two_text'];
+//                }
+//
+//
+//                $data['nickname'] = $user->nickname;
+//                $data['avatar'] = $enterprise_user['avatar'];
+//
+//                $arr = $this->jisuan_fans($user->uid);
+//                $data['fans_num'] = count($arr);//粉丝总数
+//
+//                $yanglao = 0;
+//                $offLinewhere = ['mer_id' => $this->merId, 'uid' => $user->uid, 'commission_type' => '5', 'type_shop' => 0];
+//                $offLine1 = Db::name('user_bill')->where($offLinewhere)->where('source', 1)->where('status', 1)->sum('number');
+//                $yanglao += $offLine1;
+//                $offLine2 = Db::name('user_bill')->where($offLinewhere)->where('source', 0)->whereIn('status', [0, 1])->sum('number');
+//                $yanglao += $offLine2;
+//
+//
+//                $data['ylj'] = set_price_rtrim($yanglao);
+//
+//                $data['yhc_withdrawal_money'] = merchantConfig($this->merId, 'yhc_withdrawal_money');
+//
+//
+//                $data['uid'] = $enterprise_user['uid'];
+//                if ($enterprise_user['identity'] > 100) {
+//                    $data['identity_data'] = Db::name('enterprise_performance_divvy')->field('name,img,content')->where('state', 1)->where('id', $enterprise_user['identity'])->find();
+//                    if (!$data['identity_data']) {
+//                        $data['identity_data'] = null;
+//                        $data['identity'] = '100';
+//                    }
+//                } else {
+//                    $data['identity_data'] = null;
+//                }
+//
+//                $data['level_data'] = Db::name('enterprise_agent_divvy')->field('name,img,content')->where('state', 1)->where('id', $enterprise_user['level'])->find();
+//
+//
+//                return app('json')->success($data);
+//            }
+//        }
 
-                $data['level_data'] = Db::name('enterprise_agent_divvy')->field('name,img,content')->where('state', 1)->where('id', $enterprise_user['level'])->find();
 
 
-                return app('json')->success($data);
-            }
-        }
         return app('json')->fail('用户不存在');
     }
 
@@ -988,25 +1001,31 @@ class User extends BaseController
      */
     public function green_integral_list()
     {
-        $pm = $this->request->param('pm', 1);
+        $pm = $this->request->param('pm');
+        $status = $this->request->param('status');
         [$page, $limit] = $this->getPage();
         $uid = $this->request->uid();
+        log::info("green_integral_list==={$uid}");
         $where['uid'] = $uid;
-        $where['mer_id'] = $this->merId;
-        if ($pm == 1) {
-            $pm_arr = [1, 3];
-        } else {
-            $pm_arr = [2, 4];
+//        $where['mer_id'] = $this->merId;
+//        if ($pm == 1) {
+//            $pm_arr = [1, 3];
+//        } else {
+//            $pm_arr = [2, 4];
+//        }
+        if ($pm==0){
+
+            $data = DB::name('user_sign_score')->where($where)->where('pm', 1)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
-        $data = DB::name('enterprise_user_score')->where($where)->whereIn('pm', $pm_arr)->field('id,mark,reward_socre,pm,create_time,order_id')->page($page, $limit)->order("id desc")->select()->each(function ($v) {
+        if($pm==1){
+            $data = DB::name('user_sign_score')->where($where)->where('pm', 2)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
-            if ($v['pm'] == 3 || $v['pm'] == 1) {
-                $v['pm'] = 1;
-            } else {
-                $v['pm'] = 2;
-            }
-            return $v;
-        });
+        }
+        if($pm==2){
+            $data = DB::name('user_sign_score')->where($where)->where('status', -1)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+
+        }
+        log::info("=======date==={$data}");
         return app("json")->success($data);
 
     }