Merge branch 'master' of https://git.bjtdba.com/shop/php

app/common/repositories/user/UserExtractRepository.php

@@ -357,17 +357,35 @@ class UserExtractRepository extends BaseRepository
             return false;
         }
         if ($data["extract_type"]==3){
-            $data = Db::transaction(function()use($user,$data, $type){
+            $data = Db::transaction(function()use($user,$data, $type,$uid){
                 if($type==1){
                     $brokerage_price = bcsub($user['brokerage_price'],$data['extract_price'],2);
                     $user->brokerage_price = $brokerage_price;
                 }else if ($type == 2) {
                     $brokerage_price = bcsub($user['member_brokerage_price'],$data['extract_price'],2);
                     $user->member_brokerage_price = $brokerage_price;
+                }else if ($type == 3) {
+                    $hongbao = bcsub($user['hongbao'],$data['extract_price'],2);
+                    $user->hongbao = $hongbao;
                 }
 
                 $user->save();
 
+                if($type == 3){
+                    //加入红包提现记录
+                   $insertdata = [
+                       'uid'=> $uid,
+                       'number' =>  $data['extract_price'],
+                       'surplus' => $user->hongbao,
+                       'mark' => '红包提现',
+                       'type' => 2,
+                       'status' => -1,
+                       'addtime' => time(),
+                   ];
+                   Db::name('user_sign_hongbao')->insertGetId($insertdata);
+               }
+
+
                 $service_money=bcmul($data['extract_price'],'0.1',2);
                 $data['service_money']=$service_money;
                 $data['status'] = 0;
@@ -384,6 +402,9 @@ class UserExtractRepository extends BaseRepository
                 }else if ($type == 2) {
                     $brokerage_price = bcsub($user['member_brokerage_price'],$data['extract_price'],2);
                     $user->member_brokerage_price = $brokerage_price;
+                }else if ($type == 3) {
+                    $hongbao = bcsub($user['hongbao'],$data['extract_price'],2);
+                    $user->hongbao = $hongbao;
                 }
                 $user->save();
                 $service_money=bcmul($data['extract_price'],'0.1',2);
@@ -404,8 +425,24 @@ class UserExtractRepository extends BaseRepository
                         $extract_price_yihu= $tea_price;
                         $service_money_yihu= bcmul($tea_price,'0.1',2);
                     }
+                }
 
+
+                if($type == 3){
+                     //加入红包提现记录
+                    $insertdata = [
+                        'uid'=> $uid,
+                        'number' =>  $data['extract_price'],
+                        'surplus' => $user->hongbao,
+                        'mark' => '红包提现',
+                        'type' => 2,
+                        'status' => -1,
+                        'addtime' => time(),
+                    ];
+                    Db::name('user_sign_hongbao')->insertGetId($insertdata);
                 }
+
+
 //                    if($extract_price_yihu>0){
                 $insertAll[]=array(
                     'extract_id'=>$extract->extract_id,

app/controller/api/user/User.php

@@ -3312,6 +3312,60 @@ return app("json")->success($data);
                 return app('json')->fail('转VR失败');
             }
         }
+
+
+        if ($type == 'hongbao') {
+            $hongbao = Db::name('user')->where('uid', $uid)->value('hongbao');
+            $no_clear_amount = Db::name('user_sign_hongbao')
+                ->where('uid', $uid)
+                ->where('type', 1)
+                ->where('status', -1)
+                ->sum('number');
+            $clear_amount = $hongbao - $no_clear_amount;
+            if ($user['hongbao'] < (systemConfig('withdrawal_money'))){
+                return app('json')->fail('未到达提现最低额度');
+            }
+            if($extract_amount > $clear_amount){
+                return app('json')->fail("可用金额不足提现");
+            }
+
+            $hongbao = bcsub($user['hongbao'], $extract_amount,2);
+            $user->hongbao = $hongbao;
+
+            $vr = bcadd($user['vr'], $extract_amount, 2);
+            $user->vr = $vr;
+
+            $res = $user->save();
+            if ($res){
+                //加入转VR记录
+                $insertdata = [
+                    'uid'=> $uid,
+                    'number' =>  $extract_amount,
+                    'surplus' => $vr,
+                    'mark' => '红包转VR',
+                    'type' => 2,
+                    'status' => -1,
+                    'addtime' => time(),
+                ];
+                Db::name('user_sign_hongbao')->insertGetId($insertdata);
+                //VR入账
+                $insertdata = [
+                    'uid'=> $uid,
+                    'number' =>  $extract_amount,
+                    'surplus' => $vr,
+                    'mark' => '红包转VR',
+                    'order_id'=> 0,
+                    'type' => 1,
+                    'addtime' => time(),
+                    'settlement_time'=> date('Y-m-d H:i:s', time())
+                ];
+                Db::name('user_sign_vr')->insertGetId($insertdata);
+                return app('json')->success('转VR成功');
+            }else{
+        return app('json')->fail('转VR失败');
+            }
+        }
+
         return app('json')->fail('转VR失败');
     }
 

app/controller/api/user/UserExtract.php

@@ -46,7 +46,7 @@ class UserExtract extends BaseController
     public function lst()
     {
         [$page,$limit] = $this->getPage();
-        $where = $this->request->params(['status']);
+        $where = $this->request->params(['status', 'type']);
         $where['uid'] = $this->request->uid();
         return app('json')->success($this->repository->serach($where,$page,$limit));
     }
@@ -76,7 +76,7 @@ class UserExtract extends BaseController
         $data = $this->checkParams($validate);
         $user = $this->request->userInfo();
         $uid = $this->request->uid();
-        $type = input("type/d", 1);//1-佣金 2-红积分
+        $type = $this->request->param('type', 1);//1-佣金 2-会员商品直推佣金 3红包
 
         $sms_code = $this->request->param('sms_code');
 
@@ -106,7 +106,22 @@ class UserExtract extends BaseController
                     return app('json')->fail('请先绑定提现微信');
                 }
             }
+        }elseif ($type == 3) {
+            if ($data['extract_price'] < (systemConfig('withdrawal_money')))
+            return app('json')->fail('未到达提现最低额度');
+            if ($user['hongbao'] < $data['extract_price'])
+                return app('json')->fail('提现金额不足');
+
+            if ($data['extract_type'] == 3){
+                if (!$data['bank_id']) return app('json')->fail('请选择银行卡信息');
+            }
 
+            if($data["extract_type"] == 1){
+                $user_extract_openid=Db::name('user_extract_openid')->where('uid',$uid)->find();
+                if(!$user_extract_openid || $user_extract_openid['openid']==''){
+                    return app('json')->fail('请先绑定提现微信');
+                }
+            }
         }else{
             if ($user['member_brokerage_price'] < (systemConfig('withdrawal_money')))
                 return app('json')->fail('未到达提现最低额度');