橙汁先生 hace 1 año
padre
commit
d64f5e0fa2
Se han modificado 2 ficheros con 11 adiciones y 9 borrados
  1. 8 6
      app/controller/api/user/User.php
  2. 3 3
      route/api.php

+ 8 - 6
app/controller/api/user/User.php

@@ -361,11 +361,13 @@ class User extends BaseController
361 361
     public function  vr_info(){
362 362
         log::info("============vr");
363 363
         $user = $this->request->userInfo();
364
+
364 365
         if($user->uid>0){
365 366
             //已经入账京豆
366
-            $data['total_source']=$user->vr;
367
+            $data['total_source'] = $user->vr;
367 368
             //为生效京豆
368
-            $data['no_total_source']=Db::name('user_sign_vr')->where('status', -1)->where('uid', $user->uid)->sum('number');;
369
+            $data['no_total_source']=0;
370
+            //$data['no_total_source']=Db::name('user_sign_vr')->where('status', -1)->where('uid', $user->uid)->sum('number');;
369 371
             log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
370 372
             return app('json')->success($data);
371 373
 
@@ -380,13 +382,13 @@ class User extends BaseController
380 382
         $uid = $this->request->uid();
381 383
         log::info("vr_list==={$uid}");
382 384
         $where['uid'] = $uid;
383
-
385
+        $data = DB::name('user_sign_vr')->page($page, $limit)->order("id desc")->select();
384 386
         if ($pm==0){
385 387
 
386
-            $data = DB::name('user_sign_vr')->where($where)->where('type', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
388
+            $data = DB::name('user_sign_vr')->where($where)->where('type', 1)->page($page, $limit)->order("id desc")->select();
387 389
         }
388
-        if($pm==1){
389
-            $data = DB::name('user_sign_vr')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
390
+        if($pm==2){
391
+            $data = DB::name('user_sign_vr')->where($where)->where('type', 2)->page($page, $limit)->order("id desc")->select();
390 392
 
391 393
         }
392 394
 //        if($pm==2){

+ 3 - 3
route/api.php

@@ -313,8 +313,8 @@ Route::group('api/', function () {
313 313
             Route::get('fugou_list','User/fugou_list');//复购金记录
314 314
             Route::get('jingdou_info','User/jingdou_info');//京豆
315 315
             Route::get('jingdou_list','User/jingdou_list');//京豆记录
316
-            Route::get('vr_info','User/jingdou_info');//购物金
317
-            Route::get('vr_list','User/jingdou_list');//购物金记录
316
+            Route::get('vr_info','User/vr_info');//购物金
317
+            Route::get('vr_list','User/vr_list');//购物金记录
318 318
             Route::get('vr_name','User/vr_name');//VR名称
319 319
 
320 320
         })->prefix('api.user.');
@@ -1047,7 +1047,7 @@ Route::group('api/', function () {
1047 1047
 
1048 1048
     //话费充值补发
1049 1049
     Route::post('huafei/bufa', 'api.store.service.Huafei/bufa');
1050
-    
1050
+
1051 1051
     //话费充值回调通知
1052 1052
     Route::post('huafei/notify', 'api.store.service.Huafei/notify');
1053 1053