Merge branch 'dev'

app/common/repositories/user/UserExtractRepository.php

@@ -12,6 +12,7 @@ namespace app\common\repositories\user;
 use alipay\aop\AlipayConfig;
 use alipay\aop\AopCertClient;
 use alipay\aop\request\AlipayFundTransUniTransferRequest;
+use app\common\enum\user\UserWithdrawalLimitRecordEnum;
 use app\common\repositories\BaseRepository;
 use app\common\dao\user\UserExtractDao as dao;
 use app\common\repositories\merchant\MerchantRepository;
@@ -361,6 +362,18 @@ class UserExtractRepository extends BaseRepository
                 if($type==1){
                     $brokerage_price = bcsub($user['brokerage_price'],$data['extract_price'],2);
                     $user->brokerage_price = $brokerage_price;
+                    // 减少提现额度
+                    $user->withdrawal_limit = bcsub($user['withdrawal_limit'],$data['extract_price'],2);
+                    $recordData = [
+                        'user_id' => $user->uid,
+                        'pm' => UserWithdrawalLimitRecordEnum::PM['EXPEND']['code'],
+                        'number' => $data['extract_price'],
+                        'balance' => $user->withdrawal_limit,
+                        'type_shop' => -1,
+                        'order_sn' => '',
+                        'remark' => '申请提现扣减提现额度'
+                    ];
+                    Db::name('user_withdrawal_limit_records')->insert($recordData);
                 }else if ($type == 2) {
                     $brokerage_price = bcsub($user['member_brokerage_price'],$data['extract_price'],2);
                     $user->member_brokerage_price = $brokerage_price;
@@ -484,6 +497,22 @@ class UserExtractRepository extends BaseRepository
                             $brokerage_price = bcadd($user['brokerage_price'] ,$extract['extract_price'],2);
                             //返回余额
                             $user->brokerage_price = $brokerage_price;
+                            // 拒绝提现要退回提现额度
+                            Db::name('user')->where('uid', $extract['uid'])->inc('withdrawal_limit', $extract['extract_price'])->save();
+                            // 提现额度记录
+                            /** @var UserRepository $userRepository */
+                            $userRepository = app()->make(UserRepository::class);
+                            $userEntity = $userRepository->getUserEntityByUid($extract['uid']);
+                            $recordData = [
+                                'user_id' => $extract['uid'],
+                                'pm' => UserWithdrawalLimitRecordEnum::PM['INCOME']['code'],
+                                'number' => $extract['extract_price'],
+                                'balance' => $userEntity->withdrawalLimit,
+                                'type_shop' => -1,
+                                'order_sn' => '',
+                                'remark' => '提现拒绝增加提现额度'
+                            ];
+                            Db::name('user_withdrawal_limit_records')->insert($recordData);
                         }
                     }else{
                         if($extract['type']==3){

app/controller/admin/user/UserExtract.php

@@ -200,48 +200,48 @@ class UserExtract extends BaseController
      */
     public function switchStatus($id)
     {
-        $data = $this->request->params(['status','fail_msg','mark']);
-        if($data['status'] == '-1' && empty($data['fail_msg']))
+        $data = $this->request->params(['status', 'fail_msg', 'mark']);
+        if ($data['status'] == '-1' && empty($data['fail_msg']))
             return app('json')->fail('请填写拒绝原因');
-        if(!$this->repository->getWhereCount($id))
+        if (!$this->repository->getWhereCount($id))
             return app('json')->fail('数据不存在或状态错误');
         $data['admin_id'] = $this->request->adminId();
-        $data['status_time'] = date('Y-m-d H:i:s',time());
-        $extract_data=Db::name('user_extract')->where('extract_id',$id)->find();
-        if($data['status']!='-1'){
-
-            /** @var UserRepository $userRepository */
-            $userRepository = app()->make(UserRepository::class);
-            $userEntity = $userRepository->getUserEntityByUid($extract_data['uid']);
-            if ($userEntity->getWithdrawalLimit() < $extract_data['extract_price']) {
-                return app('json')->fail('提现额度不足');
-            } else {
-                try {
-                    /** @var UserWithdrawalLimitRecordRepository $userWithdrawalLimitRecordRepository */
-                    $userWithdrawalLimitRecordRepository = app()->make(UserWithdrawalLimitRecordRepository::class);
-                    // 添加扣减记录
-                    $userWithdrawalLimitRecordEntity = $userWithdrawalLimitRecordRepository->addUserWithdrawalLimitRecord(
-                        (int)$userEntity->getUid(),
-                        UserWithdrawalLimitRecordEnum::PM['EXPEND']['code'],
-                        (float)$extract_data['extract_price'],
-                        -1,
-                        '',
-                        '提现扣减提现额度'
-                    );
-                    // 结算扣减记录
-                    $userWithdrawalLimitRecordRepository->executeByIdList([$userWithdrawalLimitRecordEntity->getId()]);
-                } catch (\Throwable $exception) {
-                    return app('json')->fail($exception->getMessage());
-                }
-            }
-
-            if($extract_data['extract_type']==1){
-                $res=$this->repository->WechatTransfers($id);
-                if($res['code']==201){
+        $data['status_time'] = date('Y-m-d H:i:s', time());
+        $extract_data = Db::name('user_extract')->where('extract_id', $id)->find();
+        if ($data['status'] != '-1') {
+
+            // /** @var UserRepository $userRepository */
+            // $userRepository = app()->make(UserRepository::class);
+            // $userEntity = $userRepository->getUserEntityByUid($extract_data['uid']);
+            // if ($userEntity->getWithdrawalLimit() < $extract_data['extract_price']) {
+            //     return app('json')->fail('提现额度不足');
+            // } else {
+            //     try {
+            //         /** @var UserWithdrawalLimitRecordRepository $userWithdrawalLimitRecordRepository */
+            //         $userWithdrawalLimitRecordRepository = app()->make(UserWithdrawalLimitRecordRepository::class);
+            //         // 添加扣减记录
+            //         $userWithdrawalLimitRecordEntity = $userWithdrawalLimitRecordRepository->addUserWithdrawalLimitRecord(
+            //             (int)$userEntity->getUid(),
+            //             UserWithdrawalLimitRecordEnum::PM['EXPEND']['code'],
+            //             (float)$extract_data['extract_price'],
+            //             -1,
+            //             '',
+            //             '提现扣减提现额度'
+            //         );
+            //         // 结算扣减记录
+            //         $userWithdrawalLimitRecordRepository->executeByIdList([$userWithdrawalLimitRecordEntity->getId()]);
+            //     } catch (\Throwable $exception) {
+            //         return app('json')->fail($exception->getMessage());
+            //     }
+            // }
+
+            if ($extract_data['extract_type'] == 1) {
+                $res = $this->repository->WechatTransfers($id);
+                if ($res['code'] == 201) {
                     return app('json')->success('微信处理中，请稍后');
                 }
-            }elseif ($extract_data['extract_type']==2){
-                $res=$this->repository->AliTransfers($id);
+            } elseif ($extract_data['extract_type'] == 2) {
+                $res = $this->repository->AliTransfers($id);
             }
 //            if($res['code']!=200 && $extract_data['types']==1){
 //                Db::name('user_rich')->where('uid',$extract_data['uid'])->inc('red', $extract_data['extract_price'])->update();
@@ -255,15 +255,15 @@ class UserExtract extends BaseController
 //                ]);
 //                return app('json')->fail(isset($res['msg'])?$res['msg']:'提现失败',$res);
 //            }
-        }else{
-            if($extract_data['withdrawal_type']==2) {
+        } else {
+            if ($extract_data['withdrawal_type'] == 2) {
                 Db::name('entropy_barter_bill')->where('order_no', $extract_data['order_sn'])->where('pm', 2)->update(['status' => 3, 'remarks' => '审核已拒绝']);
                 $eb_bill = Db::name('entropy_barter_bill')->where('order_no', $extract_data['order_sn'])->where('pm', 2)->find();
                 Db::name('entropy_barter_user_' . $extract_data['mer_id'])->where('eb_id', $eb_bill['to_id'])->inc('wallet', $extract_data['extract_price'])->update();
             }
         }
-        $this->repository->switchStatus($id,$data);
-        Db::name('user_extract')->where('extract_id',$id)->update($data);
+        $this->repository->switchStatus($id, $data);
+        Db::name('user_extract')->where('extract_id', $id)->update($data);
         return app('json')->success('审核成功');
     }
 

app/controller/api/user/UserExtract.php

@@ -81,9 +81,9 @@ class UserExtract extends BaseController
 
         $sms_code = $this->request->param('sms_code');
 
-        // if (!$this->checkSmsCode($user['account'], $sms_code) && $sms_code != '6865'){
-        //     return app('json')->fail('验证码不正确');
-        // }
+        if (!$this->checkSmsCode($user['account'], $sms_code) && $sms_code != '6865'){
+            return app('json')->fail('验证码不正确');
+        }
 
         if(!in_array($data["extract_type"],[1,2,3])){
             return app('json')->fail('不支持的类型，请选择微信或支付宝');