郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 11a0bb685239077f03e1fdf1fc13c0f45163556a 1 个父辈 e51cd216
1 个管道 的构建 通过 耗费 1 秒

删除订单

内嵌 并排对比
正在显示 3 个修改的文件 包含 237 行增加 和 49 行删除
... ... @@ -17,8 +17,8 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="859" column="32" lean-forward="true" selection-start-line="859" selection-start-column="32" selection-end-line="859" selection-end-column="32" />
<state relative-caret-position="512">
<caret line="1224" column="5" lean-forward="true" selection-start-line="1224" selection-start-column="5" selection-end-line="1224" selection-end-column="5" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -54,16 +54,20 @@
<element signature="e#23173#25838#0#PHP" expanded="false" />
<element signature="e#25844#26342#0#PHP" expanded="false" />
<element signature="e#26347#27434#0#PHP" expanded="false" />
<element signature="e#27440#27853#0#PHP" expanded="false" />
<element signature="e#27858#28337#0#PHP" expanded="false" />
<element signature="e#28343#28877#0#PHP" expanded="false" />
<element signature="e#28882#29796#0#PHP" expanded="false" />
<element signature="e#29802#30333#0#PHP" expanded="false" />
<element signature="e#30338#31257#0#PHP" expanded="false" />
<element signature="e#31263#31912#0#PHP" expanded="false" />
<element signature="e#31917#32790#0#PHP" expanded="false" />
<element signature="e#32796#33391#0#PHP" expanded="false" />
<element signature="e#33396#38045#0#PHP" expanded="false" />
<element signature="e#38051#38617#0#PHP" expanded="false" />
<element signature="e#38622#40728#0#PHP" expanded="false" />
<element signature="e#32796#33216#0#PHP" expanded="false" />
<element signature="e#33221#33704#0#PHP" expanded="false" />
<element signature="e#33710#34305#0#PHP" expanded="false" />
<element signature="e#34310#38959#0#PHP" expanded="false" />
<element signature="e#38965#39531#0#PHP" expanded="false" />
<element signature="e#39536#41642#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -239,7 +243,7 @@
<workItem from="1574146994475" duration="23222000" />
<workItem from="1574209189943" duration="37638000" />
<workItem from="1574252363848" duration="8841000" />
<workItem from="1574295812843" duration="12155000" />
<workItem from="1574295812843" duration="12563000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -252,7 +256,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="130209000" />
<option name="totallyTimeSpent" value="130617000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -265,6 +269,7 @@
</component>
<component name="ToolWindowManager">
<frame x="634" y="58" width="1699" height="1003" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15253203" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
... ... @@ -273,7 +278,7 @@
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14896074" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14896074" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -677,8 +682,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="859" column="32" lean-forward="true" selection-start-line="859" selection-start-column="32" selection-end-line="859" selection-end-column="32" />
<state relative-caret-position="512">
<caret line="1224" column="5" lean-forward="true" selection-start-line="1224" selection-start-column="5" selection-end-line="1224" selection-end-column="5" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -714,16 +719,20 @@
<element signature="e#23173#25838#0#PHP" expanded="false" />
<element signature="e#25844#26342#0#PHP" expanded="false" />
<element signature="e#26347#27434#0#PHP" expanded="false" />
<element signature="e#27440#27853#0#PHP" expanded="false" />
<element signature="e#27858#28337#0#PHP" expanded="false" />
<element signature="e#28343#28877#0#PHP" expanded="false" />
<element signature="e#28882#29796#0#PHP" expanded="false" />
<element signature="e#29802#30333#0#PHP" expanded="false" />
<element signature="e#30338#31257#0#PHP" expanded="false" />
<element signature="e#31263#31912#0#PHP" expanded="false" />
<element signature="e#31917#32790#0#PHP" expanded="false" />
<element signature="e#32796#33391#0#PHP" expanded="false" />
<element signature="e#33396#38045#0#PHP" expanded="false" />
<element signature="e#38051#38617#0#PHP" expanded="false" />
<element signature="e#38622#40728#0#PHP" expanded="false" />
<element signature="e#32796#33216#0#PHP" expanded="false" />
<element signature="e#33221#33704#0#PHP" expanded="false" />
<element signature="e#33710#34305#0#PHP" expanded="false" />
<element signature="e#34310#38959#0#PHP" expanded="false" />
<element signature="e#38965#39531#0#PHP" expanded="false" />
<element signature="e#39536#41642#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -834,7 +834,7 @@ class User extends Api
/**
* @ApiTitle (删除购物车商品)
* @ApiSummary (加入购物车商品)
* @ApiSummary (删除购物车商品)
* @ApiMethod (POST)
* @ApiRoute (/api/user/delcar)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
... ... @@ -997,6 +997,42 @@ class User extends Api
}
/**
* @ApiTitle (删除订单)
* @ApiSummary (删除订单)
* @ApiMethod (POST)
* @ApiRoute (/api/user/delorder)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="ids[]", type="inter", required=true, description="订单ID")
*
*
* @ApiReturn({
"code": 1,
"msg": "成功",
"time": "1571492001",
})
*/
public function delorder()
{
$user_id = $this->uid;
$ids = $this->request->param('ids');
if(empty($ids)){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('order')
->where('user_id',$user_id)
->whereIn('id',$ids)
->delete();
if($data){
$this->success('SUCCESS','删除成功');
}else{
$this->error(['code'=>2,'msg'=>'sql运行失败']);
}
}
/**
* @ApiTitle (我的订单)
* @ApiSummary (我的订单)
* @ApiMethod (POST)
... ...
... ... @@ -163,7 +163,8 @@
<div class="child collapse" id="个人中心">
<a href="javascript:;" data-id="11" class="list-group-item">小程序登录</a>
<a href="javascript:;" data-id="23" class="list-group-item">会员介绍</a>
<a href="javascript:;" data-id="31" class="list-group-item">我的订单</a>
<a href="javascript:;" data-id="32" class="list-group-item">我的订单</a>
<a href="javascript:;" data-id="31" class="list-group-item">删除订单</a>
<a href="javascript:;" data-id="30" class="list-group-item">创建组合订单</a>
<a href="javascript:;" data-id="29" class="list-group-item">创建视频订单</a>
<a href="javascript:;" data-id="28" class="list-group-item">创建图片订单</a>
... ... @@ -182,7 +183,7 @@
<a href="javascript:;" data-id="15" class="list-group-item">图片列表</a>
<a href="javascript:;" data-id="14" class="list-group-item">搜索页</a>
<a href="javascript:;" data-id="13" class="list-group-item">地区分类</a>
<a href="javascript:;" data-id="32" class="list-group-item">消费记录</a>
<a href="javascript:;" data-id="33" class="list-group-item">消费记录</a>
</div>
</div>
</div>
... ... @@ -1690,10 +1691,156 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-32">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion32" href="#collapseOne32"> 我的订单 <span class="text-muted">/api/user/myorder</span></a>
</h4>
</div>
<div id="collapseOne32" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab32">
<li class="active"><a href="#info32" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox32" data-toggle="tab">在线测试</a></li>
<li><a href="#sample32" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info32">
<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">
<table class="table table-hover">
<thead>
<tr>
<th>名称</th>
<th>类型</th>
<th>必选</th>
<th>描述</th>
</tr>
</thead>
<tbody>
<tr>
<td>type</td>
<td>inter</td>
<td>否</td>
<td>状态(不传默认为全部 1为待支付 2为已完成</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><!-- #info -->
<div class="tab-pane" id="sandbox32">
<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/myorder" method="POST" name="form32" id="form32">
<div class="form-group">
<label class="control-label" for="type">type</label>
<input type="inter" class="form-control input-sm" id="type" placeholder="状态(不传默认为全部 1为待支付 2为已完成" name="type">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="32">提交</button>
<button type="reset" class="btn btn-info" rel="32">重置</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_headers32"></pre>
<pre id="response32"></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="sample32">
<div class="row">
<div class="col-md-12">
<pre id="sample_response32">{
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"id": //用户ID
"pic_id": //图片,
"video_id": //视频,
"status" : //状态(1待支付 2已完成</pre>
</div>
</div>
</div><!-- #sample -->
</div><!-- .tab-content -->
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-31">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion31" href="#collapseOne31"> 我的订单 <span class="text-muted">/api/user/myorder</span></a>
<a data-toggle="collapse" data-parent="#accordion31" href="#collapseOne31"> 删除订单 <span class="text-muted">/api/user/delorder</span></a>
</h4>
</div>
<div id="collapseOne31" class="panel-collapse collapse">
... ... @@ -1711,7 +1858,7 @@
<div class="tab-pane active" id="info31">
<div class="well">
我的订单 </div>
删除订单 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
... ... @@ -1749,10 +1896,10 @@
</thead>
<tbody>
<tr>
<td>type</td>
<td>ids[]</td>
<td>inter</td>
<td>否</td>
<td>状态(不传默认为全部 1为待支付 2为已完成</td>
<td>是</td>
<td>订单ID</td>
</tr>
</tbody>
</table>
... ... @@ -1782,10 +1929,10 @@
<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/myorder" method="POST" name="form31" id="form31">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/delorder" method="POST" name="form31" id="form31">
<div class="form-group">
<label class="control-label" for="type">type</label>
<input type="inter" class="form-control input-sm" id="type" placeholder="状态(不传默认为全部 1为待支付 2为已完成" name="type">
<label class="control-label" for="ids[]">ids[]</label>
<input type="inter" class="form-control input-sm" id="ids[]" required placeholder="订单ID" name="ids[]">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="31">提交</button>
... ... @@ -1822,11 +1969,7 @@
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"id": //用户ID
"pic_id": //图片,
"video_id": //视频,
"status" : //状态(1待支付 2已完成</pre>
}</pre>
</div>
</div>
</div><!-- #sample -->
... ... @@ -2332,7 +2475,7 @@
<div class="tab-pane active" id="info27">
<div class="well">
加入购物车商品 </div>
删除购物车商品 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
... ... @@ -4522,26 +4665,26 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-32">
<div class="panel-heading" id="heading-33">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion32" href="#collapseOne32"> 消费记录 <span class="text-muted">/api/user/payhistory</span></a>
<a data-toggle="collapse" data-parent="#accordion33" href="#collapseOne33"> 消费记录 <span class="text-muted">/api/user/payhistory</span></a>
</h4>
</div>
<div id="collapseOne32" class="panel-collapse collapse">
<div id="collapseOne33" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab32">
<li class="active"><a href="#info32" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox32" data-toggle="tab">在线测试</a></li>
<li><a href="#sample32" data-toggle="tab">返回示例</a></li>
<ul class="nav nav-tabs" id="doctab33">
<li class="active"><a href="#info33" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox33" data-toggle="tab">在线测试</a></li>
<li><a href="#sample33" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info32">
<div class="tab-pane active" id="info33">
<div class="well">
消费记录 </div>
<div class="panel panel-default">
... ... @@ -4580,7 +4723,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox32">
<div class="tab-pane" id="sandbox33">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -4597,13 +4740,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/payhistory" method="POST" name="form32" id="form32">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/payhistory" method="POST" name="form33" id="form33">
<div class="form-group">
无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="32">提交</button>
<button type="reset" class="btn btn-info" rel="32">重置</button>
<button type="submit" class="btn btn-success send" rel="33">提交</button>
<button type="reset" class="btn btn-info" rel="33">重置</button>
</div>
</form>
</div>
... ... @@ -4613,8 +4756,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers32"></pre>
<pre id="response32"></pre>
<pre id="response_headers33"></pre>
<pre id="response33"></pre>
</div>
</div>
</div>
... ... @@ -4629,10 +4772,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample32">
<div class="tab-pane" id="sample33">
<div class="row">
<div class="col-md-12">
<pre id="sample_response32">{
<pre id="sample_response33">{
"code": 1,
"msg": "成功",
"time": "1571492001",
... ... @@ -4661,7 +4804,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-21 16:17:58 </div>
Generated on 2019-11-21 16:24:46 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...