增加红包提现逻辑

app/common/repositories/user/UserExtractRepository.php

@@ -370,22 +370,6 @@ class UserExtractRepository extends BaseRepository
                 }
 
                 $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;
@@ -498,9 +482,9 @@ class UserExtractRepository extends BaseRepository
     {
 
         Db::transaction(function()use($id,$data){
+            $extract = $this->dao->getWhere(['extract_id' => $id]);
+            $user = app()->make(UserRepository::class)->get($extract['uid']);
             if($data['status'] == '-1'){
-                $extract = $this->dao->getWhere(['extract_id' => $id]);
-                $user = app()->make(UserRepository::class)->get($extract['uid']);
                 if (!empty($extract['mer_id'])) {
                     //商户提现逻辑处理
                     $mer = app()->make(MerchantRepository::class)->get($extract['mer_id']);
@@ -513,6 +497,8 @@ class UserExtractRepository extends BaseRepository
                         $brokerage_price = bcadd($user['brokerage_price'] ,$extract['extract_price'],2);
                         //返回余额
                         $user->brokerage_price = $brokerage_price;
+                    }else if($extract['types']==3){
+                        $user->hongbao = bcadd($user->hongbao,$extract['extract_price'],2);
                     }else{
                         $member_brokerage_price = bcadd($user['member_brokerage_price'] ,$extract['extract_price'],2);
                         //返回余额
@@ -534,6 +520,19 @@ class UserExtractRepository extends BaseRepository
 //                $user->save();
 //                Db::name('user_sign_score')->where("order_type","extract") -> where("order_id",$id) -> update(['status'=>0]);
             }else{
+                if($extract['types']==3){
+                    //加入红包出账记录
+                    $insertdata = [
+                        'uid'=> $user->uid,
+                        'number' =>  $extract['extract_price'],
+                        'surplus' => $user->hongbao,
+                        'mark' => '红包提现',
+                        'type' => 2,
+                        'status' => 1,
+                        'addtime' => time(),
+                    ];
+                    Db::name('user_sign_hongbao')->insertGetId($insertdata);
+                }
                 //积分扣除
 //                Db::name('user_sign_score')->where("order_type","extract") -> where("order_id",$id) -> update(['status'=>1]);
             }