commit

app/admin/model/user/UserExtract.php

@@ -140,7 +140,7 @@ class UserExtract extends BaseModel
         }
 
         if ($wechatUserInfo) {
-            if (strtolower($wechatUserInfo->user_type) == 'routine') {
+            if (strtolower($wechatUserInfo->user_type) == 'routine' and $data['extract_type'] == 'weixin') {
                 $res = self::tixian('用户id'.$user['uid'].'手机号：'.$user['phone'].'-佣金提现', time().rand(1000,9999), $extractNumber, $wechatUserInfo['routine_openid']);
                 if (isset($res['code'])) return false;
                 if (!isset($res['out_batch_no'])) return false;

app/admin/view/finance/user_extract/index.php

@@ -116,20 +116,20 @@
                             <td class="text-center" style="color: #00aa00;">
                                 {$vo.extract_price}
                             </td>
-<!--                            <td class="text-left">-->
-<!--                                {if condition="$vo['extract_type'] eq 'bank'"}-->
-<!--                                姓名：{$vo.real_name}<br>-->
-<!--                                 银行卡号：{$vo.bank_code}-->
-<!--                                <br/>-->
-<!--                                 银行开户地址:{$vo.bank_address}-->
-<!--                                {elseif condition="$vo['extract_type'] eq 'weixin'"/}-->
-<!--                                昵称：{$vo.nickname}<br>-->
-<!--                                微信号：{$vo.wechat}-->
-<!--                                {else/}-->
-<!--                                姓名：{$vo.real_name}<br>-->
-<!--                                  支付宝号：{$vo.alipay_code}-->
-<!--                                {/if}-->
-<!--                            </td>-->
+                            <td class="text-left">
+                                {if condition="$vo['extract_type'] eq 'bank'"}
+                                姓名：{$vo.real_name}<br>
+                                 银行卡号：{$vo.bank_code}
+                                <br/>
+                                 银行开户地址:{$vo.bank_address}
+                                {elseif condition="$vo['extract_type'] eq 'weixin'"/}
+                                昵称：{$vo.nickname}<br>
+                                微信号：{$vo.wechat}
+                                {else/}
+                                姓名：{$vo.real_name}<br>
+                                  支付宝号：{$vo.alipay_code}
+                                {/if}
+                            </td>
                             <td class="text-center">
                                 {$vo.add_time|date='Y-m-d H:i:s'}
                             </td>

app/api/controller/PublicController.php

@@ -330,4 +330,9 @@ class PublicController
         return app('json')->successful($list);
     }
 
+
+    public function examine()
+    {
+        return app('json')->successful(sys_config('examine'));
+    }
 }

app/api/controller/user/UserController.php

@@ -5,6 +5,7 @@ namespace app\api\controller\user;
 use app\admin\model\user\UserApply;
 use app\http\validates\user\AddressValidate;
 use app\models\system\SystemCity;
+use app\models\user\UserPay;
 use app\models\user\UserVisit;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -629,6 +630,127 @@ class UserController
         }
     }
 
+
+    /**
+     * 添加收款方式
+     * @param Request $request
+     * @return void
+     */
+    public function pay(Request $request)
+    {
+        $data = UtilService::postMore([
+            ['payment'],
+            ['image'],
+            ['bank'],
+            ['name'],
+            ['type'],
+            ['phone'],
+            ['bank_name']
+        ], $request);
+        if (!$data['type'])  return app('json')->fail('数据传入错误');
+        $data['uid'] =$request->uid();
+        $model = new UserPay();
+        $pay = $model->where([['uid', '=', $request->uid()], ['type', '=', $data['type']]])->find();
+        $res = Validate::rule([
+            'phone' => 'mobile'
+        ]);
+        $res->message([
+            'phone.mobile' => '请填写正确手机格式'
+        ]);
+        if (!$res->check($data)){
+            return app('json')->fail($res->getError());
+        }
+        if (!empty($pay)){
+            if ($data['type'] == 1 ){
+                // 微信收款方式
+                if (!$data['payment'])  return app('json')->fail('微信账号不能为空');
+                if (!$data['image'])  return app('json')->fail('二维码不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                $pay['payment'] = $data['payment'];
+                $pay['image'] = $data['image'];
+                $pay['name'] = $data['name'];
+                $pay['phone'] = $data['phone'];
+            }elseif ($data['type'] == 2){
+                // 支付宝收款方式
+                if (!$data['payment'])  return app('json')->fail('支付宝账号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                $pay['payment'] = $data['payment'];
+                $pay['name'] = $data['name'];
+//                $pay['phone'] = $data['phone'];
+            }elseif ($data['type'] == 3){
+                // 银行卡收款方式
+                if (!$data['payment'])  return app('json')->fail('银行卡号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['bank'])  return app('json')->fail('开户行不能为空');
+//                if (!$data['bank_name'])  return app('json')->fail('开户支行不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+                $pay['payment'] = $data['payment'];
+                $pay['bank'] = $data['bank'];
+//                $pay['bank_name'] = $data['bank_name'];
+                $pay['phone'] = $data['phone'];
+                $pay['name'] = $data['name'];
+
+            }
+            $res = $pay->save();
+            if ($res) return app('json')->successful('修改成功');
+            return app('json')->fail('修改失败');
+        }else{
+            if ($data['type'] == 1 ){
+                // 微信收款方式
+                if (!$data['payment'])  return app('json')->fail('微信账号不能为空');
+                if (!$data['image'])  return app('json')->fail('二维码不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+
+            }elseif ($data['type'] == 2){
+                // 支付宝收款方式
+                if (!$data['payment'])  return app('json')->fail('支付宝账号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+
+            }elseif ($data['type'] == 3){
+                // 银行卡收款方式
+                if (!$data['payment'])  return app('json')->fail('银行卡号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['bank'])  return app('json')->fail('开户行不能为空');
+//                if (!$data['bank_name'])  return app('json')->fail('开户支行不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+            }
+            $res = $model->save($data);
+            if ($res) return app('json')->successful('添加成功');
+            return app('json')->fail('添加失败');
+        }
+    }
+
+    /**
+     * 收款方式详情
+     * @param Request $request
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function pay_list(Request $request)
+    {
+        $model = new UserPay();
+        $list = $model->where('uid', $request->uid())->select();
+
+        $list = empty($list)? []: $list->toArray();
+        $data['wx'] = [];
+        $data['zfb'] = [];
+        $data['bank'] = [];
+        foreach ($list as $k => $v){
+            if ($v['type'] == 1){
+                $data['wx'] = $v;
+            }elseif ($v['type'] == 2){
+                $data['zfb'] = $v;
+            }elseif ($v['type'] == 3){
+                $data['bank'] = $v;
+            }
+        }
+        return app('json')->successful($data);
+    }
+
+
     /**
      * 团队
      * @param Request $request

app/models/user/UserPay.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace app\models\user;
+
+use app\models\store\StoreProduct;
+use crmeb\services\SystemConfigService;
+use think\facade\Db;
+use crmeb\traits\ModelTrait;
+use crmeb\basic\BaseModel;
+
+/**
+ * TODO 场馆model
+ * Class Article
+ * @package app\models\article
+ */
+class UserPay extends BaseModel
+{
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'user_pay';
+
+    use ModelTrait;
+    protected $autoWriteTimestamp = true;
+
+
+}

route/api/route.php

@@ -171,6 +171,9 @@ Route::group(function () {
     Route::get('user/apply_list', 'user.UserController/apply_list')->name('apply_list');//申请代理列表
 
     Route::get('user/team', 'user.UserController/team')->name('team');//用户团队
+
+    Route::post('auction/pay', 'user.UserController/pay')->name('pay');// 添加收款方式
+    Route::get('auction/pay_list', 'user.UserController/pay_list')->name('pay_list');// 用户收款方式
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, true);
 //未授权接口
 Route::group(function () {
@@ -241,6 +244,8 @@ Route::group(function () {
 
     Route::get('bonus', 'user.UserController/bonus')->name('bonus');
 
+    Route::get('examine', 'PublicController/examine')->name('examine');
+
 
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, false);