lizuxiao 3 years ago
parent
commit
87228af755
2 changed files with 18 additions and 4 deletions
  1. 17 4
      app/api/controller/user/UserController.php
  2. 1 0
      route/api/route.php

+ 17 - 4
app/api/controller/user/UserController.php

@@ -229,7 +229,7 @@ class UserController
 
 
 
 
     /**
     /**
-     * 消费余额转购物积分
+     * 转换
      * @param Request $request
      * @param Request $request
      * @return mixed
      * @return mixed
      */
      */
@@ -243,8 +243,18 @@ class UserController
         $datas=[];
         $datas=[];
         $datas['amount']=$data['amount'];
         $datas['amount']=$data['amount'];
         $datas['uid']=$uid['uid'];
         $datas['uid']=$uid['uid'];
-        $datas['type1']='now_money';
-        $datas['type2']='sp_final';
+        $datas['type']=$data['type'];
+        //  消费余额转购物积分
+        if($data['type']==1){
+            $datas['type1']='now_money';
+            $datas['type2']='sp_final';
+        }
+        // 购物积分转换成提货券
+        if($data['type']==2){
+            $datas['type1']='sp_final';
+            $datas['type2']='top_ticket';
+        }
+
         $res=$this->change($datas);
         $res=$this->change($datas);
         if($res=0){
         if($res=0){
             return app('json')->fail('转换失败!');
             return app('json')->fail('转换失败!');
@@ -262,11 +272,14 @@ class UserController
         $res=User::where('uid',$data['uid'])->find();
         $res=User::where('uid',$data['uid'])->find();
         $type1=intval($res[$data['type1']]-$data['amount']);
         $type1=intval($res[$data['type1']]-$data['amount']);
         $type2=intval($res[$data['type2']]+$data['amount']);
         $type2=intval($res[$data['type2']]+$data['amount']);
+        $type3=intval($res[$data['aid_val']]+$data['amount']);
+        if($data['type']==2){
+            $res1=User::where('uid',$data['uid'])->update([$data['type1'] =>$type1,$data['type2']=>$type2,'aid_val'=>$type3]);
+        }
         $res1=User::where('uid',$data['uid'])->update([$data['type1'] =>$type1,$data['type2']=>$type2]);
         $res1=User::where('uid',$data['uid'])->update([$data['type1'] =>$type1,$data['type2']=>$type2]);
         return $res1;
         return $res1;
 
 
     }
     }
-
     /**
     /**
      * 修改 添加地址
      * 修改 添加地址
      * @param Request $request
      * @param Request $request

+ 1 - 0
route/api/route.php

@@ -83,6 +83,7 @@ Route::group(function () {
     Route::post('collect/all', 'user.UserController/collect_all')->name('collectAll');//批量添加收藏
     Route::post('collect/all', 'user.UserController/collect_all')->name('collectAll');//批量添加收藏
 //   用户类 转换
 //   用户类 转换
     Route::post('change/coral', 'user.UserController/coral')->name('coral');//消费余额转消费积分
     Route::post('change/coral', 'user.UserController/coral')->name('coral');//消费余额转消费积分
+	Route::post('change/intket', 'user.UserController/intket')->name('intket');//消费余额转消费积分
 
 
     Route::get('brokerage_rank', 'user.UserController/brokerage_rank')->name('brokerageRank');//佣金排行
     Route::get('brokerage_rank', 'user.UserController/brokerage_rank')->name('brokerageRank');//佣金排行
     Route::get('rank', 'user.UserController/rank')->name('rank');//推广人排行
     Route::get('rank', 'user.UserController/rank')->name('rank');//推广人排行