理财

app/admin/controller/finance/Finance.php

@@ -8,9 +8,13 @@
 namespace app\admin\controller\finance;
 
 use app\admin\controller\AuthController;
-use app\admin\model\user\{User,UserBill};
+use app\models\trade\CashTradeOrder;
+use app\models\user\UserMoney;
+use app\Request;
+use crmeb\basic\BaseModel;
+use app\admin\model\user\{User, UserBill};
 use app\admin\model\finance\FinanceModel;
-use crmeb\services\{UtilService as Util,JsonService as Json};
+use crmeb\services\{UtilService as Util, JsonService as Json, UtilService};
 
 /**
  * 微信充值记录
@@ -126,5 +130,84 @@ class Finance extends AuthController
         return Json::successlayui(UserBill::getExtrctOneList($where, $uid));
     }
 
+    public function cashTrade()
+    {
+        return $this->fetch();
+    }
+
+    public function cashTradeList()
+    {
+        $where = $where = UtilService::getMore([
+            ['money_type', ''],
+            ['page', 1],
+            ['limit', 10],
+            ['status', ''],
+            ['trade_type', '']
+        ], $this->request);
+        $data = CashTradeOrder::getList($where);
+        $data['data'] = $data['list'];
+        unset($data['list']);
+        Json::successlayui($data);
+    }
+
+    public function check($id, $ok, Request $request)
+    {
+        $order = CashTradeOrder::where('id', $id)->where('status', 3)->find();
+        if (!in_array($ok, ['y', 'n'])) return app('json')->fail('参数错误');
+        $res = true;
+        BaseModel::beginTrans();
+        if ($ok == 'y') {
+            switch ($order['trade_type']) {
+                case 1:
+                    $res = $res && UserMoney::incomeMoney($order['trade_uid'], $order['money_type'], $order['money_num'], 'buy_success', '购币成功', '购币成功，出售方ID' . $order['uid']);
+                    break;
+                case 2:
+                    $res = $res && UserMoney::incomeMoney($order['uid'], $order['money_type'], $order['money_num'], 'buy_success', '购币成功', '购币成功，出售方ID' . $order['trade_uid']);
+                    break;
+                default:
+                    break;
+            }
+            $res = $res && CashTradeOrder::where('id', $id)->update(['status' => 1, 'trade_time' => time()])
+                && CashTradeOrder::brokerage($id);
+            BaseModel::checkTrans($res);
+            if ($res) {
+                return app('json')->success('审核成功');
+            } else {
+                return app('json')->fail('审核失败');
+            }
+        } else {
+            return app('json')->fail('请联系后台审核');
+        }
+    }
+
+    public function cancel($id, Request $request)
+    {
+        $order = CashTradeOrder::get($id);
+        if ($order['close_time'] && $order['close_time'] < time()) return app('json')->fail('订单已关闭');
+        if ($order['status'] > 0) return app('json')->fail('订单不可撤销');
+        BaseModel::beginTrans();
+        $res = true;
+        switch ($order['trade_type']) {
+            case 1:
+                //退回币
+                $res = $res && UserMoney::incomeMoney($order['uid'], $order['money_type'], $order['money_num'], 'hang_sale_cancel', '挂卖取消', '挂卖取消，退回钱包');
+                $res = $res && CashTradeOrder::where('id', $order['id'])->update(['status' => 2]);
+                break;
+            case 2:
+//
+                if ($order['trade_uid'])
+                    $res = $res && UserMoney::incomeMoney($order['trade_uid'], $order['money_type'], $order['money_num'], 'hang_buy_cancel', '挂买取消', '挂买取消，退回钱包');
+                $res = $res && CashTradeOrder::where('id', $order['id'])->update(['status' => 2]);
+                break;
+            default:
+                break;
+        }
+        BaseModel::checkTrans($res);
+        if ($res) {
+            return app('json')->success('取消成功');
+        } else {
+            return app('json')->fail('取消失败');
+        }
+    }
 }
 

app/admin/controller/finance/UserExtract.php

@@ -49,6 +49,7 @@ class UserExtract extends AuthController
         $this->assign('limitTimeList', $limitTimeList);
         $this->assign(UserExtractModel::extractStatistics());
         $this->assign(UserExtractModel::systemPage($where));
+//        var_dump(UserExtractModel::systemPage($where));
         return $this->fetch();
     }
 

app/admin/model/user/UserExtract.php

@@ -10,6 +10,7 @@ namespace app\admin\model\user;
 
 use app\admin\model\wechat\WechatUser;
 use app\models\routine\RoutineTemplate;
+use app\models\user\UserMoney;
 use think\facade\Route as Url;
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
@@ -73,7 +74,7 @@ class UserExtract extends BaseModel
         }
         if ($where['status'] != '') $model = $model->where('a.status', $where['status']);
         if ($where['extract_type'] != '') $model = $model->where('a.extract_type', $where['extract_type']);
-        if ($where['nireid'] != '') $model = $model->where('a.real_name|a.id|b.nickname|a.bank_code|a.alipay_code', 'like', "%$where[nireid]%");
+        if ($where['nireid'] != '') $model = $model->where('a.real_name|a.id|b.nickname|a.bank_code|a.alipay_code|a.address', 'like', "%$where[nireid]%");
         $model = $model->alias('a');
         $model = $model->field('a.*,b.nickname');
         $model = $model->join('user b', 'b.uid=a.uid', 'LEFT');
@@ -86,70 +87,70 @@ class UserExtract extends BaseModel
         $fail_time = time();
         $data = self::get($id);
         $extract_number = $data['extract_price'];
-        $mark = '提现失败,退回佣金' . $extract_number . '元';
+        $mark = '提现失败,退回' . $extract_number . init_money_type()[$data['money_type']];
         $uid = $data['uid'];
         $status = -1;
-        $User = User::where('uid', $uid)->find()->toArray();
-        UserBill::income('提现失败', $uid, 'now_money', 'extract', $extract_number, $id, bcadd($User['now_money'], $extract_number, 2), $mark);
-        User::bcInc($uid, 'brokerage_price', $extract_number, 'uid');
-        $extract_type = '未知方式';
-        switch ($data['extract_type']) {
-            case 'alipay':
-                $extract_type = '支付宝';
-                break;
-            case 'bank':
-                $extract_type = '银行卡';
-                break;
-            case 'weixin':
-                $extract_type = '微信';
-                break;
-        }
-        if (strtolower($User['user_type']) == 'wechat') {
-            WechatTemplateService::sendTemplate(WechatUser::where('uid', $uid)->value('openid'), WechatTemplateService::USER_BALANCE_CHANGE, [
-                'first' => $mark,
-                'keyword1' => '佣金提现',
-                'keyword2' => date('Y-m-d H:i:s', time()),
-                'keyword3' => $extract_number,
-                'remark' => '错误原因:' . $fail_msg
-            ], Url::buildUrl('/user/cashrecord')->suffix('')->domain(true)->build());
-        } else if (strtolower($User['user_type']) == 'routine') {
-            RoutineTemplate::sendExtractFail($uid, $fail_msg, $extract_number, $User['nickname']);
-        }
+//        $User = User::where('uid', $uid)->find()->toArray();
+        UserMoney::incomeMoney($uid, $data['money_type'], $extract_number, 'extract_fail', '提币失败', $mark);
+//        UserBill::income('提现失败', $uid, 'now_money', 'extract', $extract_number, $id, bcadd($User['now_money'], $extract_number, 2), $mark);
+//        User::bcInc($uid, 'brokerage_price', $extract_number, 'uid');
+//        $extract_type = '未知方式';
+//        switch ($data['extract_type']) {
+//            case 'alipay':
+//                $extract_type = '支付宝';
+//                break;
+//            case 'bank':
+//                $extract_type = '银行卡';
+//                break;
+//            case 'weixin':
+//                $extract_type = '微信';
+//                break;
+//        }
+//        if (strtolower($User['user_type']) == 'wechat') {
+//            WechatTemplateService::sendTemplate(WechatUser::where('uid', $uid)->value('openid'), WechatTemplateService::USER_BALANCE_CHANGE, [
+//                'first' => $mark,
+//                'keyword1' => '佣金提现',
+//                'keyword2' => date('Y-m-d H:i:s', time()),
+//                'keyword3' => $extract_number,
+//                'remark' => '错误原因:' . $fail_msg
+//            ], Url::buildUrl('/user/cashrecord')->suffix('')->domain(true)->build());
+//        } else if (strtolower($User['user_type']) == 'routine') {
+//            RoutineTemplate::sendExtractFail($uid, $fail_msg, $extract_number, $User['nickname']);
+//        }
         return self::edit(compact('fail_time', 'fail_msg', 'status'), $id);
     }
 
     public static function changeSuccess($id)
     {
-
-        $data = self::get($id);
-        $extractNumber = $data['extract_price'];
-        $mark = '成功提现佣金' . $extractNumber . '元';
-        $wechatUserInfo = WechatUser::where('uid', $data['uid'])->field('openid,user_type,routine_openid,nickname')->find();
-        $extract_type = '未知方式';
-        switch ($data['extract_type']) {
-            case 'alipay':
-                $extract_type = '支付宝';
-                break;
-            case 'bank':
-                $extract_type = '银行卡';
-                break;
-            case 'weixin':
-                $extract_type = '微信';
-                break;
-        }
-        if ($wechatUserInfo) {
-            if (strtolower($wechatUserInfo->user_type) == 'routine') {
-                RoutineTemplate::sendExtractSuccess($data['uid'], $extractNumber, $wechatUserInfo->nickname);
-            } else if (strtolower($wechatUserInfo->user_type) == 'wechat') {
-                WechatTemplateService::sendTemplate($wechatUserInfo->openid, WechatTemplateService::USER_BALANCE_CHANGE, [
-                    'first' => $mark,
-                    'keyword1' => '佣金提现',
-                    'keyword2' => date('Y-m-d H:i:s', time()),
-                    'keyword3' => $extractNumber,
-                    'remark' => '点击查看我的佣金明细'
-                ], Url::buildUrl('/user/cashrecord')->suffix('')->domain(true)->build());
-            }
-        }
+//        $data = self::get($id);
+//        $extractNumber = $data['extract_price'];
+//        $mark = '成功提现佣金' . $extractNumber . '元';
+//        $wechatUserInfo = WechatUser::where('uid', $data['uid'])->field('openid,user_type,routine_openid,nickname')->find();
+//        $extract_type = '未知方式';
+//        switch ($data['extract_type']) {
+//            case 'alipay':
+//                $extract_type = '支付宝';
+//                break;
+//            case 'bank':
+//                $extract_type = '银行卡';
+//                break;
+//            case 'weixin':
+//                $extract_type = '微信';
+//                break;
+//        }
+//        if ($wechatUserInfo) {
+//            if (strtolower($wechatUserInfo->user_type) == 'routine') {
+//                RoutineTemplate::sendExtractSuccess($data['uid'], $extractNumber, $wechatUserInfo->nickname);
+//            } else if (strtolower($wechatUserInfo->user_type) == 'wechat') {
+//                WechatTemplateService::sendTemplate($wechatUserInfo->openid, WechatTemplateService::USER_BALANCE_CHANGE, [
+//                    'first' => $mark,
+//                    'keyword1' => '佣金提现',
+//                    'keyword2' => date('Y-m-d H:i:s', time()),
+//                    'keyword3' => $extractNumber,
+//                    'remark' => '点击查看我的佣金明细'
+//                ], Url::buildUrl('/user/cashrecord')->suffix('')->domain(true)->build());
+//            }
+//        }
         return self::edit(['status' => 1], $id);
     }
 

app/admin/view/finance/finance/cash_trade.php

@@ -0,0 +1,165 @@
+{extend name="public/container"}
+{block name="head_top"}
+
+{/block}
+{block name="content"}
+<div class="layui-fluid" style="background: #fff;margin-top: -10px;">
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">交易列表</div>
+                <div class="layui-card-body">
+                    <div class="layui-btn-container">
+                        <!--                        <button class="layui-btn layui-btn-sm"-->
+                        <!--                                onclick="$eb.createModalFrame(this.innerText,'{:Url('add')}')">添加产品-->
+                        <!--                        </button>-->
+                    </div>
+                    <table class="layui-hide" id="List" lay-filter="List"></table>
+                    <script type="text/html" id="time">
+                        发起时间：<p>{{d._add_time}}</p>
+                        结束时间：<p>{{d._end_time}}</p>
+                        交易时间：<p>{{d._trade_time}}</p>
+                    </script>
+                    <script type="text/html" id="proof">
+                        <p lay-event="open_image">
+                            {{# if(d.proof){ }}
+                            <img src="{{d.proof}}">
+                            {{# } }}
+                        </p>
+                    </script>
+                    <script type="text/html" id="act">
+                        {{# if(d.status === 3){ }}
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='check'>
+                            通过
+                        </button>
+<!--                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='cancel'>-->
+<!--                            驳回-->
+<!--                        </button>-->
+                        {{# } }}
+                        {{# if(d.status === 0){ }}
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='del'>
+                            取消
+                        </button>
+                        <!--                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='cancel'>-->
+                        <!--                            驳回-->
+                        <!--                        </button>-->
+                        {{# } }}
+                        <!--                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='user'>-->
+                        <!--                            理财情况-->
+                        <!--                        </button>-->
+                        <!--                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='edit'>-->
+                        <!--                            修改-->
+                        <!--                        </button>-->
+                        <!--                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='del'>-->
+                        <!--                            删除-->
+                        <!--                        </button>-->
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="{__ADMIN_PATH}js/layuiList.js"></script>
+{/block}
+{block name="script"}
+<script>
+    layList.tableList('List', "{:Url('cashTradeList')}", function () {
+        return [
+            {field: 'id', title: 'ID', width: '5%'},
+            {field: '_user', title: '交易发起人', width: '20%'},
+            {field: '_trade_user', title: '交易参与人'},
+            {field: '_trade_type', title: '挂出类型'},
+            {field: 'money_num', title: '币额', width: '10%'},
+            {field: 'money_type', title: '币种', width: '10%'},
+            {field: '_status', title: '状态', width: '10%'},
+            {field: 'time', title: '时间', toolbar: '#time', width: '10%'},
+            {
+                field: 'proof',
+                title: '交易凭证',
+                templet: '#proof'
+            },
+            {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
+        ];
+    });
+    //点击事件绑定
+    layList.tool(function (event, data, obj) {
+        switch (event) {
+            // case 'del':
+            //     var url = layList.U({c: 'money.manage', a: 'delete', q: {id: data.id}});
+            //     var code = {title: "操作提示", text: "确定删除该产品？", type: 'info', confirm: '是的，删除'};
+            //     $eb.$swal('delete', function () {
+            //         $eb.axios.get(url).then(function (res) {
+            //             if (res.status == 200 && res.data.code == 200) {
+            //                 $eb.$swal('success', res.data.msg);
+            //                 obj.del();
+            //                 location.reload();
+            //             } else
+            //                 return Promise.reject(res.data.msg || '删除失败')
+            //         }).catch(function (err) {
+            //             $eb.$swal('error', err);
+            //         });
+            //     }, code)
+            //     break;
+            // case 'edit':
+            //     $eb.createModalFrame(data.name + '-编辑', layList.U({a: 'add', q: {id: data.id}}));
+            //     break;
+            // case 'user':
+            //     $eb.createModalFrame(data.name + '-详情', layList.U({a: 'user', q: {id: data.id}}));
+            //     break;
+            case 'open_image':
+                $eb.openImage(data.proof);
+                break;
+            case 'check':
+                var url = layList.U({c: 'finance.finance', a: 'check', q: {id: data.id, ok: 'y'}});
+                var code = {title: "操作提示", text: "确定通过该交易？", type: 'info', confirm: '是的，通过'};
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                            obj.del();
+                            location.reload();
+                        } else
+                            return Promise.reject(res.data.msg || '通过失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, code)
+                break;
+
+            case 'del':
+                var url = layList.U({c: 'finance.finance', a: 'cancel', q: {id: data.id}});
+                var code = {title: "操作提示", text: "确定取消该交易？", type: 'info', confirm: '是的，取消'};
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                            obj.del();
+                            location.reload();
+                        } else
+                            return Promise.reject(res.data.msg || '取消失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, code)
+                break;
+
+            // case 'cancel':
+            //     var url = layList.U({c: 'finance.finance', a: 'check', q: {id: data.id, ok: 'n'}});
+            //     var code = {title: "操作提示", text: "确定驳回该交易？", type: 'info', confirm: '是的，驳回'};
+            //     $eb.$swal('delete', function () {
+            //         $eb.axios.get(url).then(function (res) {
+            //             if (res.status == 200 && res.data.code == 200) {
+            //                 $eb.$swal('success', res.data.msg);
+            //                 obj.del();
+            //                 location.reload();
+            //             } else
+            //                 return Promise.reject(res.data.msg || '驳回失败')
+            //         }).catch(function (err) {
+            //             $eb.$swal('error', err);
+            //         });
+            //     }, code)
+            //     break;
+        }
+    })
+</script>
+{/block}

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

@@ -28,18 +28,18 @@
                             <select name="status" aria-controls="editable" class="form-control input-sm">
                                 <option value="">提现状态</option>
                                 <option value="-1" {eq name="where.status" value="-1"}selected="selected"{/eq}>未通过</option>
-                                <option value="0" {eq name="where.status" value="0"}selected="selected"{/eq}>未提现</option>
+                                <option value="0" {eq name="where.status" value="0"}selected="selected"{/eq}>未处理</option>
                                 <option value="1" {eq name="where.status" value="1"}selected="selected"{/eq}>已通过</option>
                             </select>
-                            <select name="extract_type"  class="form-control input-sm">
-                                <option value="">提现方式</option>
-                                <option value="alipay" {eq name="where.extract_type" value="alipay" }selected="selected"{/eq}>支付宝</option>
-                                <option value="bank" {eq name="where.extract_type" value="bank"}selected="selected"{/eq}>银行卡</option>
-                                <option value="weixin" {eq name="where.extract_type" value="weixin"}selected="selected"{/eq}>微信</option>
-                            </select>
+<!--                            <select name="extract_type"  class="form-control input-sm">-->
+<!--                                <option value="">提现方式</option>-->
+<!--                                <option value="alipay" {eq name="where.extract_type" value="alipay" }selected="selected"{/eq}>支付宝</option>-->
+<!--                                <option value="bank" {eq name="where.extract_type" value="bank"}selected="selected"{/eq}>银行卡</option>-->
+<!--                                <option value="weixin" {eq name="where.extract_type" value="weixin"}selected="selected"{/eq}>微信</option>-->
+<!--                            </select>-->
                             <div class="input-group">
                                   <span class="input-group-btn">
-                                      <input type="text" name="nireid" value="{$where.nireid}" placeholder="微信昵称/姓名/支付宝账号/银行卡号" class="input-sm form-control" size="38"/>
+                                      <input type="text" name="nireid" value="{$where.nireid}" placeholder="昵称/地址" class="input-sm form-control" size="38"/>
                                       <button type="submit" class="btn btn-sm btn-primary"> 搜索</button>
                                   </span>
                             </div>
@@ -96,12 +96,12 @@
                             <tr>
                                 <th class="text-center">编号</th>
                                 <th class="text-center">用户信息</th>
-                                <th class="text-center">提现金额</th>
-                                <th class="text-center">提现方式</th>
+                                <th class="text-center">提币金额</th>
+                                <th class="text-center">提币地址</th>
                                 <th class="text-center">添加时间</th>
                                 <th class="text-center">备注</th>
                                 <th class="text-center">审核状态</th>
-                                <th class="text-center">操作</th>
+<!--                                <th class="text-center">操作</th>-->
                             </tr>
                         </thead>
                         <tbody class="">
@@ -114,21 +114,22 @@
                                用户昵称: {$vo.nickname}/用户id:{$vo.uid}
                             </td>
                             <td class="text-center" style="color: #00aa00;">
-                                {$vo.extract_price}
+                                {$vo.extract_price}{$vo.money_type}
                             </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}
+<!--                                {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}-->
+                                {$vo.address}
                             </td>
                             <td class="text-center">
                                 {$vo.add_time|date='Y-m-d H:i:s'}
@@ -150,9 +151,9 @@
                                 <button data-url="{:url('succ',['id'=>$vo['id']])}" class="j-success btn btn-primary btn-xs" type="button"><i class="fa fa-check"></i> 通过</button>
                                 {/if}
                             </td>
-                            <td class="text-center">
-                                <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('编辑','{:Url('edit',array('id'=>$vo['id']))}')"><i class="fa fa-edit"></i> 编辑</button>
-                            </td>
+<!--                            <td class="text-center">-->
+<!--                                <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('编辑','{:Url('edit',array('id'=>$vo['id']))}')"><i class="fa fa-edit"></i> 编辑</button>-->
+<!--                            </td>-->
                         </tr>
                         {/volist}
                         </tbody>

app/api/controller/trade/CashTradeController.php

@@ -378,6 +378,7 @@ class CashTradeController
         $order = CashTradeOrder::get($id);
         if ($order['close_time'] && $order['close_time'] < time()) return app('json')->fail('订单已关闭');
         if ($order['status'] > 0) return app('json')->fail('订单不可撤销');
+        if ($order['uid'] != $request->uid()) return app('json')->fail('订单错误');
         BaseModel::beginTrans();
         $res = true;
         switch ($order['trade_type']) {
@@ -397,7 +398,7 @@ class CashTradeController
         }
         BaseModel::checkTrans($res);
         if ($res) {
-            return app('json')->fail('取消成功');
+            return app('json')->success('取消成功');
         } else {
             return app('json')->fail('取消失败');
         }
@@ -413,11 +414,11 @@ class CashTradeController
             switch ($order['trade_type']) {
                 case 1:
                     if ($order['uid'] != $request->uid()) return app('json')->fail('订单审核方错误');
-                    $res = $res && UserMoney::incomeMoney($order['trade_uid'], $order['money_type'], $order['money_num'], '购币成功', 'buy_success', '购币成功，出售方' . $order['uid']);
+                    $res = $res && UserMoney::incomeMoney($order['trade_uid'], $order['money_type'], $order['money_num'], 'buy_success', '购币成功', '购币成功，出售方ID' . $order['uid']);
                     break;
                 case 2:
                     if ($order['trade_uid'] != $request->uid()) return app('json')->fail('订单审核方错误');
-                    $res = $res && UserMoney::incomeMoney($order['uid'], $order['money_type'], $order['money_num'], '购币成功', 'buy_success', '购币成功，出售方' . $order['trade_uid']);
+                    $res = $res && UserMoney::incomeMoney($order['uid'], $order['money_type'], $order['money_num'], 'buy_success', '购币成功', '购币成功，出售方ID' . $order['trade_uid']);
                     break;
                 default:
                     break;
@@ -426,7 +427,7 @@ class CashTradeController
                 && CashTradeOrder::brokerage($id);
             BaseModel::checkTrans($res);
             if ($res) {
-                return app('json')->fail('审核成功');
+                return app('json')->success('审核成功');
             } else {
                 return app('json')->fail('审核失败');
             }

app/api/controller/user/UserController.php

@@ -774,7 +774,7 @@ class UserController
      */
     public function setAddress($id, Request $request)
     {
-        $key = $request->put('key', '');
+        $key = $request->param('key', '');
         $money_type = UserMoney::get($id);
         if ($money_type['uid'] != $request->uid()) {
             return app('json')->fail('参数错误');
@@ -782,16 +782,18 @@ class UserController
         if (!$money_type || !$key) {
             return app('json')->fail('参数错误');
         }
-        $res = ZtPayService::instance()->import_address($money_type['money_type'], $key);
-        if ($res['code'] != 0) {
-            return app('json')->fail($res['message']);
-        }
-        $money_type->address = $request['data']['address'];
+
+//        $res = ZtPayService::instance()->import_address($money_type['money_type'], $key);
+//        if ($res['code'] != 0) {
+//            return app('json')->fail($res['message']);
+//        }
+//        $money_type->address = $request['data']['address'];
+        $money_type->address = $key;
         $res = $money_type->save();
         if ($res) {
-            return app('json')->success('导入成功');
+            return app('json')->success('修改成功');
         } else {
-            return app('json')->success('导入失败');
+            return app('json')->success('修改失败');
         }
     }
 

app/api/controller/user/UserExtractController.php

@@ -6,6 +6,7 @@ use app\admin\model\system\SystemConfig;
 use app\models\store\StoreOrder;
 use app\models\user\UserBill;
 use app\models\user\UserExtract;
+use app\models\user\UserMoney;
 use app\Request;
 use crmeb\services\UtilService;
 
@@ -66,35 +67,38 @@ class UserExtractController
             ['bankname', ''],
             ['cardnum', ''],
             ['weixin', ''],
+            ['money_type', ''],
+            ['address', ''],
         ], $request);
-        if (!preg_match('/^(([1-9]\d*)|0)(\.\d{1-2})?$/', $extractInfo['money'])) return app('json')->fail('提现金额输入有误');
+        if (!preg_match('/^(([1-9]\d*)|0)(\.\d{1-8})?$/', $extractInfo['money'])) return app('json')->fail('提现金额输入有误');
         $user = $request->user();
-        $broken_time = intval(sys_config('extract_time'));
-        $search_time = time() - 86400 * $broken_time;
-        //可提现佣金
-        //返佣 +
-        $brokerage_commission = UserBill::where(['uid' => $user['uid'], 'category' => 'now_money', 'type' => 'brokerage'])
-            ->where('add_time', '>', $search_time)
-            ->where('pm', 1)
-            ->sum('number');
-        //退款退的佣金 -
-        $refund_commission = UserBill::where(['uid' => $user['uid'], 'category' => 'now_money', 'type' => 'brokerage'])
-            ->where('add_time', '>', $search_time)
-            ->where('pm', 0)
-            ->sum('number');
-        $data['broken_commission'] = bcsub($brokerage_commission, $refund_commission, 2);
-        if ($data['broken_commission'] < 0)
-            $data['broken_commission'] = 0;
-        $data['brokerage_price'] = $user['brokerage_price'];
-        //可提现佣金
-        $commissionCount = $data['brokerage_price'] - $data['broken_commission'];
-        if ($extractInfo['money'] > $commissionCount) return app('json')->fail('可提现佣金不足');
-        if (!$extractInfo['cardnum'] == '')
-            if (!preg_match('/^([1-9]{1})(\d{14}|\d{18})$/', $extractInfo['cardnum']))
-                return app('json')->fail('银行卡号输入有误');
-        if (UserExtract::userExtract($request->user(), $extractInfo))
-            return app('json')->successful('申请提现成功!');
-        else
-            return app('json')->fail(UserExtract::getErrorInfo('提现失败'));
+//        $broken_time = intval(sys_config('extract_time'));
+//        $search_time = time() - 86400 * $broken_time;
+//        //可提现佣金
+//        //返佣 +
+//        $brokerage_commission = UserBill::where(['uid' => $user['uid'], 'category' => 'now_money', 'type' => 'brokerage'])
+//            ->where('add_time', '>', $search_time)
+//            ->where('pm', 1)
+//            ->sum('number');
+//        //退款退的佣金 -
+//        $refund_commission = UserBill::where(['uid' => $user['uid'], 'category' => 'now_money', 'type' => 'brokerage'])
+//            ->where('add_time', '>', $search_time)
+//            ->where('pm', 0)
+//            ->sum('number');
+//        $data['broken_commission'] = bcsub($brokerage_commission, $refund_commission, 2);
+//        if ($data['broken_commission'] < 0)
+//            $data['broken_commission'] = 0;
+//        $data['brokerage_price'] = $user['brokerage_price'];
+//        //可提现佣金
+//        $commissionCount = $data['brokerage_price'] - $data['broken_commission'];
+        $money = UserMoney::initialUserMoney($request->uid(), $extractInfo['money_type']);
+        if ($extractInfo['money'] > $money['money']) return app('json')->fail('可提现佣金不足');
+        if ($extractInfo['address'] == '') return app('json')->fail('钱包地址错误');
+//            if (!preg_match('/^([1-9]{1})(\d{14}|\d{18})$/', $extractInfo['cardnum']))
+//                return app('json')->fail('银行卡号输入有误');
+        if (UserExtract::userExtract($user, $extractInfo)) {
+            return app('json')->successful('申请提币成功!', []);
+        } else
+            return app('json')->fail(UserExtract::getErrorInfo('提币失败'));
     }
 }

app/api/controller/user/UserRechargeController.php

@@ -134,6 +134,12 @@ class UserRechargeController
 
         $rechargeOrder = UserRecharge::addRecharge($request->uid(), $num, $money_type);
         if (!$rechargeOrder) return app('json')->fail('充值订单生成失败!');
+        $money_types = sys_data('money_type');
+
+        foreach ($money_types as $v) {
+            if ($v['code'] == $money_type)
+                return app('json')->successful('充值订单已生成，请前往充值!', $v);
+        }
         return app('json')->successful('充值订单已生成，请前往充值');
     }
 

app/models/trade/CashTradeOrder.php

@@ -113,10 +113,40 @@ class CashTradeOrder extends BaseModel
             ->each(function ($item) {
                 $item['user'] = User::getUserInfo($item['uid']);
                 $item['trade_user'] = User::getUserInfo($item['trade_uid']);
+//                $item['_add_time'] = time_format($item['add_time']);
+//                $item['_end_time'] = time_format($item['end_time']);
+//                $item['_trade_time'] = time_format($item['trade_time']);
+                $money_type = init_money_type();
+                $item['_user'] = User::getUserInfo($item['uid'])['nickname'] . '/' . $item['uid'];
+                $item['_trade_user'] = $item['trade_uid'] ? User::getUserInfo($item['trade_uid'])['nickname'] . '/' . $item['trade_uid'] : '--';
                 $item['_add_time'] = time_format($item['add_time']);
-                $item['_end_time'] = time_format($item['end_time']);
-                $item['_trade_time'] = time_format($item['trade_time']);
+                $item['_end_time'] = $item['_end_time'] ? time_format($item['end_time']) : '--';
+                $item['_trade_time'] = $item['trade_time'] ? time_format($item['trade_time']) : '--';
+                $item['_money_type'] = $money_type[$item['money_type']];
+                $item['_trade_type'] = $item['trade_type'] == 2 ? '挂买' : '挂卖';
+                $item['_proof'] = $item['proof'] ? "<img src='" . $item['proof'] . "'>" : '--';
+                switch ($item['status']) {
+                    case -1:
+                        $item['_status'] = '未支付';
+                        break;
+                    case 0:
+                        $item['_status'] = '未完成';
+                        break;
+                    case 1:
+                        $item['_status'] = '已完成';
+                        break;
+                    case 2:
+                        $item['_status'] = '已收回';
+                        break;
+                    case 3:
+                        $item['_status'] = '交易中【‘已提交交易凭证’】';
+                        break;
+                    default:
+                        $item['_status'] = '未知';
+                        break;
+                }
             });
+//        var_dump($list);
         return compact('count', 'list');
     }
 

app/models/user/UserExtract.php

@@ -40,14 +40,14 @@ class UserExtract extends BaseModel
     //已提现
     const SUCCESS_STATUS = 1;
 
-    protected static $extractType = ['alipay','bank','weixin'];
+    protected static $extractType = ['alipay', 'bank', 'weixin'];
 
-    protected static $extractTypeMsg = ['alipay'=>'支付宝','bank'=>'银行卡','weixin'=>'微信'];
+    protected static $extractTypeMsg = ['alipay' => '支付宝', 'bank' => '银行卡', 'weixin' => '微信'];
 
     protected static $status = array(
-        -1=>'未通过',
-        0 =>'审核中',
-        1 =>'已提现'
+        -1 => '未通过',
+        0 => '审核中',
+        1 => '已提现'
     );
 
     /**
@@ -56,63 +56,69 @@ class UserExtract extends BaseModel
      * @param array $data 提现详细信息
      * @return bool
      */
-    public static function userExtract($userInfo,$data){
-        if(!in_array($data['extract_type'],self::$extractType))
-            return self::setErrorInfo('提现方式不存在');
+    public static function userExtract($userInfo, $data)
+    {
+//        if(!in_array($data['extract_type'],self::$extractType))
+//            return self::setErrorInfo('提现方式不存在');
         $userInfo = User::get($userInfo['uid']);
-        $extractPrice = $userInfo['brokerage_price'];
-        if($extractPrice < 0) return self::setErrorInfo('提现佣金不足'.$data['money']);
-        if($data['money'] > $extractPrice) return self::setErrorInfo('提现佣金不足'.$data['money']);
-        if($data['money'] <= 0) return self::setErrorInfo('提现佣金大于0');
-        $balance = bcsub($userInfo['brokerage_price'],$data['money'],2);
-        if($balance < 0) $balance=0;
+//        $extractPrice = $userInfo['brokerage_price'];
+//        if($extractPrice < 0) return self::setErrorInfo('提现佣金不足'.$data['money']);
+        $userMoney = UserMoney::initialUserMoney($userInfo['uid'], $data['money_type']);
+        if ($data['money'] > $userMoney['money']) return self::setErrorInfo('提现佣金不足' . $data['money']);
+        if ($data['money'] <= 0) return self::setErrorInfo('提现佣金大于0');
+        $balance = bcsub($userMoney['money'], $data['money'], 8);
+        if ($balance < 0) $balance = 0;
         $insertData = [
             'uid' => $userInfo['uid'],
-            'extract_type' => $data['extract_type'],
+            'extract_type' => $data['extract_type'] ?? '',
             'extract_price' => $data['money'],
             'add_time' => time(),
             'balance' => $balance,
-            'status' => self::AUDIT_STATUS
+            'money_type' => $data['money_type'],
+            'address' => $data['address'],
         ];
-        if(isset($data['name']) && strlen(trim($data['name']))) $insertData['real_name'] = $data['name'];
-        else $insertData['real_name'] = $userInfo['nickname'];
-        if(isset($data['cardnum'])) $insertData['bank_code'] = $data['cardnum'];
-        else $insertData['bank_code'] = '';
-        if(isset($data['bankname'])) $insertData['bank_address']=$data['bankname'];
-        else $insertData['bank_address']='';
-        if(isset($data['weixin'])) $insertData['wechat'] = $data['weixin'];
-        else $insertData['wechat'] = $userInfo['nickname'];
-        if($data['extract_type'] == 'alipay'){
-            if(!$data['alipay_code']) return self::setErrorInfo('请输入支付宝账号');
-            $insertData['alipay_code'] = $data['alipay_code'];
-            $mark = '使用支付宝提现'.$insertData['extract_price'].'元';
-        }else if($data['extract_type'] == 'bank'){
-            if(!$data['cardnum']) return self::setErrorInfo('请输入银行卡账号');
-            if(!$data['bankname']) return self::setErrorInfo('请输入开户行信息');
-            $mark = '使用银联卡'.$insertData['bank_code'].'提现'.$insertData['extract_price'].'元';
-        }else if($data['extract_type'] == 'weixin'){
-            if(!$data['weixin']) return self::setErrorInfo('请输入微信账号');
-            $mark = '使用微信提现'.$insertData['extract_price'].'元';
-        }
+//        var_dump($insertData);
+//        exit;
+//        if (isset($data['name']) && strlen(trim($data['name']))) $insertData['real_name'] = $data['name'];
+//        else $insertData['real_name'] = $userInfo['nickname'];
+//        if (isset($data['cardnum'])) $insertData['bank_code'] = $data['cardnum'];
+//        else $insertData['bank_code'] = '';
+//        if (isset($data['bankname'])) $insertData['bank_address'] = $data['bankname'];
+//        else $insertData['bank_address'] = '';
+//        if (isset($data['weixin'])) $insertData['wechat'] = $data['weixin'];
+//        else $insertData['wechat'] = $userInfo['nickname'];
+//        if ($data['extract_type'] == 'alipay') {
+//            if (!$data['alipay_code']) return self::setErrorInfo('请输入支付宝账号');
+//            $insertData['alipay_code'] = $data['alipay_code'];
+//            $mark = '使用支付宝提现' . $insertData['extract_price'] . '元';
+//        } else if ($data['extract_type'] == 'bank') {
+//            if (!$data['cardnum']) return self::setErrorInfo('请输入银行卡账号');
+//            if (!$data['bankname']) return self::setErrorInfo('请输入开户行信息');
+//            $mark = '使用银联卡' . $insertData['bank_code'] . '提现' . $insertData['extract_price'] . '元';
+//        } else if ($data['extract_type'] == 'weixin') {
+//            if (!$data['weixin']) return self::setErrorInfo('请输入微信账号');
+        $mark = '提币' . $insertData['extract_price'] . init_money_type()[$data['money_type']];
+//        }
         self::beginTrans();
-        try{
+        try {
             $res1 = self::create($insertData);
-            if(!$res1) return self::setErrorInfo('提现失败');
-            $res2 = User::edit(['brokerage_price'=>$balance],$userInfo['uid'],'uid');
-            $res3 = UserBill::expend('余额提现',$userInfo['uid'],'now_money','extract',$data['money'],$res1['id'],$balance,$mark);
-            $res = $res2 && $res3;
-            if($res){
+            if (!$res1) return self::setErrorInfo('提现失败');
+//            $res2 = User::edit(['brokerage_price' => $balance], $userInfo['uid'], 'uid');
+//            $res3 = UserBill::expend('余额提现', $userInfo['uid'], 'now_money', 'extract', $data['money'], $res1['id'], $balance, $mark);
+            $res = $res1 && UserMoney::expendMoney($userInfo['uid'], $data['money_type'], $data['money'], 'extract', '申请提币', $mark);
+            if ($res) {
                 self::commitTrans();
-                try{
-                    ChannelService::instance()->send('WITHDRAW', ['id'=>$res1->id]);
-                }catch (\Exception $e){}
-                event('AdminNewPush');
+//                try {
+//                    ChannelService::instance()->send('WITHDRAW', ['id' => $res1->id]);
+//                } catch (\Exception $e) {
+//                }
+//                event('AdminNewPush');
                 //发送模板消息
                 return true;
-            }else return self::setErrorInfo('提现失败!');
-        }catch (\Exception $e){
+            } else return self::setErrorInfo('提币失败!');
+        } catch (\Exception $e) {
             self::rollbackTrans();
-            return self::setErrorInfo('提现失败!');
+            return self::setErrorInfo('提币失败!');
         }
     }
 
@@ -131,9 +137,9 @@ class UserExtract extends BaseModel
      * @param $uid
      * @return mixed
      */
-    public static function userExtractTotalPrice($uid,$status=self::SUCCESS_STATUS)
+    public static function userExtractTotalPrice($uid, $status = self::SUCCESS_STATUS)
     {
-        return self::where('uid',$uid)->where('status',$status)->value('SUM(extract_price)')?:0;
+        return self::where('uid', $uid)->where('status', $status)->value('SUM(extract_price)') ?: 0;
     }
 
     /**
@@ -146,11 +152,11 @@ class UserExtract extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function extractList($uid,$first = 0,$limit = 8)
+    public static function extractList($uid, $first = 0, $limit = 8)
     {
-        $list=UserExtract::where('uid',$uid)->order('add_time desc')->limit($first,$limit)->select();
-        foreach($list as &$v){
-            $v['add_time']=date('Y/m/d',$v['add_time']);
+        $list = UserExtract::where('uid', $uid)->order('add_time desc')->limit($first, $limit)->select();
+        foreach ($list as &$v) {
+            $v['add_time'] = date('Y/m/d', $v['add_time']);
         }
         return $list;
     }
@@ -162,7 +168,7 @@ class UserExtract extends BaseModel
      */
     public static function extractSum($uid)
     {
-        return self::where('uid',$uid)->where('status',1)->sum('extract_price');
+        return self::where('uid', $uid)->where('status', 1)->sum('extract_price');
     }
 
 }

route/api/route.php

@@ -103,7 +103,7 @@ Route::group(function () {
     Route::get('money/log/:money_type', 'user.UserController/moneyLog')->name('moneyLog');//钱包流水
     Route::get('account', 'user.UserController/myAccount')->name('myAccount');//我的账号列表
     Route::get('wallet', 'user.UserController/myWallet')->name('wallet');//个人钱包
-    Route::put('wallet/address/:id', 'user.UserController/setAddress')->name('editAddress');//个人钱包
+    Route::post('wallet/address/edit/:id', 'user.UserController/setAddress')->name('editAddress');//个人钱包
     Route::post('wallet/address/:id', 'user.UserController/createAddress')->name('createAddress');//个人钱包
     Route::post('user/realname', 'user.UserController/realNameCheck')->name('realNameCheck');//实名认证
     Route::post('user/spread', 'user.UserController/spread')->name('userSpread');//静默绑定授权