何书鹏 / anttest · 提交

转到一个项目

作者 何书鹏
提交 52853628d2788dbfbcc7d117fceeff424dc02a8a 1 个父辈 0630ee04

待提现

内嵌 并排对比
正在显示 3 个修改的文件 包含 204 行增加 和 37 行删除
... ... @@ -75,7 +75,18 @@ class Order extends Base
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiReturn()
* @ApiReturn({
"code": 1,
"msg": "订单数量",
"time": "1609138878",
"data": {
"nopay": 2, //待支付（数量）
"nosend": 3, //待发货（数量）
"noget": 0, //待收货（数量）
"nocomment": 0, //待评价（数量）
"aftersale": 0 //售后（数量）
}
})
*/
public function statusNum () {
$this->success('订单数量', \addons\shopro\model\Order::statusNum());
... ...
... ... @@ -77,4 +77,28 @@ class UserCommissionApply extends Base
$this->success('申请成功', \app\api\model\UserCommissionApply::apply($params));
}
/**
* @ApiWeigh (95)
* @ApiTitle (待提现&审核中)
* @ApiSummary (待提现&审核中)
* @ApiMethod (GET)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的token")
*
* @ApiReturn({
"code": 1,
"msg": "申请成功",
"time": "1609140783",
"data": {
"wait_apply": 90, //待提现
"ing_apply": 0 //审核中
}
})
*/
public function commission () {
$wait_apply = (float)\addons\shopro\model\User::where('id',$this->auth->id)->value('commission');
$ing_apply = \app\api\model\UserCommissionApply::where(['user_id' => $this->auth->id,'status'=>0])->sum('money');
$this->success('申请成功', compact('wait_apply','ing_apply'));
}
}
... ...
... ... @@ -161,13 +161,14 @@
</div>
<a href="#佣金记录接口" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">佣金记录接口 <i class="fa fa-caret-down"></i></a>
<div class="child collapse" id="佣金记录接口">
<a href="javascript:;" data-id="83" class="list-group-item">佣金记录</a>
<a href="javascript:;" data-id="84" class="list-group-item">累计佣金</a>
<a href="javascript:;" data-id="84" class="list-group-item">佣金记录</a>
<a href="javascript:;" data-id="85" class="list-group-item">累计佣金</a>
</div>
<a href="#佣金提现接口" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">佣金提现接口 <i class="fa fa-caret-down"></i></a>
<div class="child collapse" id="佣金提现接口">
<a href="javascript:;" data-id="81" class="list-group-item">提现记录</a>
<a href="javascript:;" data-id="82" class="list-group-item">申请提现</a>
<a href="javascript:;" data-id="83" class="list-group-item">待提现&审核中</a>
</div>
<a href="#会员接口" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">会员接口 <i class="fa fa-caret-down"></i></a>
<div class="child collapse" id="会员接口">
... ... @@ -1216,7 +1217,18 @@
<div class="tab-pane" id="sample40">
<div class="row">
<div class="col-md-12">
<pre id="sample_response40">无</pre>
<pre id="sample_response40">{
"code": 1,
"msg": "订单数量",
"time": "1609138878",
"data": {
"nopay": 2, //待支付（数量）
"nosend": 3, //待发货（数量）
"noget": 0, //待收货（数量）
"nocomment": 0, //待评价（数量）
"aftersale": 0 //售后（数量）
}
}</pre>
</div>
</div>
</div><!-- #sample -->
... ... @@ -2482,26 +2494,26 @@
<h2>佣金记录接口</h2>
<hr>
<div class="panel panel-default">
<div class="panel-heading" id="heading-83">
<div class="panel-heading" id="heading-84">
<h4 class="panel-title">
<span class="label label-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion83" href="#collapseOne83"> 佣金记录 <span class="text-muted">/api/user_commission_log/index</span></a>
<a data-toggle="collapse" data-parent="#accordion84" href="#collapseOne84"> 佣金记录 <span class="text-muted">/api/user_commission_log/index</span></a>
</h4>
</div>
<div id="collapseOne83" class="panel-collapse collapse">
<div id="collapseOne84" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab83">
<li class="active"><a href="#info83" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox83" data-toggle="tab">在线测试</a></li>
<li><a href="#sample83" data-toggle="tab">返回示例</a></li>
<ul class="nav nav-tabs" id="doctab84">
<li class="active"><a href="#info84" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox84" data-toggle="tab">在线测试</a></li>
<li><a href="#sample84" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info83">
<div class="tab-pane active" id="info84">
<div class="well">
佣金记录 </div>
<div class="panel panel-default">
... ... @@ -2557,7 +2569,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox83">
<div class="tab-pane" id="sandbox84">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -2574,14 +2586,14 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user_commission_log/index" method="GET" name="form83" id="form83">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user_commission_log/index" method="GET" name="form84" id="form84">
<div class="form-group">
<label class="control-label" for="status">status</label>
<input type="string" class="form-control input-sm" id="status" required placeholder="状态:all=全部,today=今日获得,seven=近七天获得" name="status">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="83">提交</button>
<button type="reset" class="btn btn-info" rel="83">重置</button>
<button type="submit" class="btn btn-success send" rel="84">提交</button>
<button type="reset" class="btn btn-info" rel="84">重置</button>
</div>
</form>
</div>
... ... @@ -2591,8 +2603,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers83"></pre>
<pre id="response83"></pre>
<pre id="response_headers84"></pre>
<pre id="response84"></pre>
</div>
</div>
</div>
... ... @@ -2607,10 +2619,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample83">
<div class="tab-pane" id="sample84">
<div class="row">
<div class="col-md-12">
<pre id="sample_response83">{
<pre id="sample_response84">{
"code": 1,
"msg": "佣金记录",
"time": "1608988219",
... ... @@ -2644,26 +2656,26 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-84">
<div class="panel-heading" id="heading-85">
<h4 class="panel-title">
<span class="label label-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion84" href="#collapseOne84"> 累计佣金 <span class="text-muted">/api/user_commission_log/commissionSum</span></a>
<a data-toggle="collapse" data-parent="#accordion85" href="#collapseOne85"> 累计佣金 <span class="text-muted">/api/user_commission_log/commissionSum</span></a>
</h4>
</div>
<div id="collapseOne84" class="panel-collapse collapse">
<div id="collapseOne85" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab84">
<li class="active"><a href="#info84" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox84" data-toggle="tab">在线测试</a></li>
<li><a href="#sample84" data-toggle="tab">返回示例</a></li>
<ul class="nav nav-tabs" id="doctab85">
<li class="active"><a href="#info85" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox85" data-toggle="tab">在线测试</a></li>
<li><a href="#sample85" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info84">
<div class="tab-pane active" id="info85">
<div class="well">
累计佣金 </div>
<div class="panel panel-default">
... ... @@ -2702,7 +2714,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox84">
<div class="tab-pane" id="sandbox85">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -2719,13 +2731,13 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user_commission_log/commissionSum" method="GET" name="form84" id="form84">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user_commission_log/commissionSum" method="GET" name="form85" id="form85">
<div class="form-group">
无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="84">提交</button>
<button type="reset" class="btn btn-info" rel="84">重置</button>
<button type="submit" class="btn btn-success send" rel="85">提交</button>
<button type="reset" class="btn btn-info" rel="85">重置</button>
</div>
</form>
</div>
... ... @@ -2735,8 +2747,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers84"></pre>
<pre id="response84"></pre>
<pre id="response_headers85"></pre>
<pre id="response85"></pre>
</div>
</div>
</div>
... ... @@ -2751,10 +2763,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample84">
<div class="tab-pane" id="sample85">
<div class="row">
<div class="col-md-12">
<pre id="sample_response84">{
<pre id="sample_response85">{
"code": 1,
"msg": "累计佣金",
"time": "1609132801",
... ... @@ -3060,6 +3072,126 @@
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-83">
<h4 class="panel-title">
<span class="label label-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion83" href="#collapseOne83"> 待提现&审核中 <span class="text-muted">/api/user_commission_apply/commission</span></a>
</h4>
</div>
<div id="collapseOne83" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab83">
<li class="active"><a href="#info83" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox83" data-toggle="tab">在线测试</a></li>
<li><a href="#sample83" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info83">
<div class="well">
待提现&审核中 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
<table class="table table-hover">
<thead>
<tr>
<th>名称</th>
<th>类型</th>
<th>必选</th>
<th>描述</th>
</tr>
</thead>
<tbody>
<tr>
<td>token</td>
<td>string</td>
<td>是</td>
<td>请求的token</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
无
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>正文</strong></div>
<div class="panel-body">
无 </div>
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox83">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
<div class="headers">
<div class="form-group">
<label class="control-label" for="token">token</label>
<input type="string" class="form-control input-sm" id="token" required placeholder="请求的token - Ex: " name="token">
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user_commission_apply/commission" method="GET" name="form83" id="form83">
<div class="form-group">
无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="83">提交</button>
<button type="reset" class="btn btn-info" rel="83">重置</button>
</div>
</form>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>响应输出</strong></div>
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers83"></pre>
<pre id="response83"></pre>
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>返回参数</strong></div>
<div class="panel-body">
无
</div>
</div>
</div>
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample83">
<div class="row">
<div class="col-md-12">
<pre id="sample_response83">无</pre>
</div>
</div>
</div><!-- #sample -->
</div><!-- .tab-content -->
</div>
</div>
</div>
<h2>会员接口</h2>
<hr>
<div class="panel panel-default">
... ... @@ -12221,7 +12353,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-12-28 14:34:09 </div>
Generated on 2020-12-28 15:31:45 </div>
<div class="col-md-6" align="right">
<a href="./" target="_blank">My Website</a>
</div>
... ...