郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 05713197be791f0f01dfaa96668b6d4ccc308c4f 1 个父辈 80856a18
1 个管道 的构建 通过 耗费 1 秒

商城以及家政取消订单

内嵌 并排对比
正在显示 2 个修改的文件 包含 134 行增加 和 71 行删除
... ... @@ -2,7 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -63,8 +62,8 @@
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="254">
<caret line="665" column="0" lean-forward="true" selection-start-line="665" selection-start-column="0" selection-end-line="665" selection-end-column="0" />
<state relative-caret-position="364">
<caret line="314" column="5" lean-forward="false" selection-start-line="314" selection-start-column="5" selection-end-line="314" selection-end-column="5" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -84,36 +83,40 @@
<element signature="e#7384#7915#0#PHP" expanded="false" />
<element signature="e#7921#8201#0#PHP" expanded="false" />
<element signature="e#8206#8598#0#PHP" expanded="false" />
<element signature="e#8604#9152#0#PHP" expanded="false" />
<element signature="e#9157#10491#0#PHP" expanded="false" />
<element signature="e#10497#10953#0#PHP" expanded="false" />
<element signature="e#10958#12287#0#PHP" expanded="false" />
<element signature="e#12310#12665#0#PHP" expanded="false" />
<element signature="e#12671#13355#0#PHP" expanded="false" />
<element signature="e#13360#14767#0#PHP" expanded="false" />
<element signature="e#14773#15234#0#PHP" expanded="false" />
<element signature="e#15239#17939#0#PHP" expanded="false" />
<element signature="e#17945#18554#0#PHP" expanded="false" />
<element signature="e#18559#19798#0#PHP" expanded="false" />
<element signature="e#19804#20161#0#PHP" expanded="false" />
<element signature="e#20166#21047#0#PHP" expanded="false" />
<element signature="e#21053#21405#0#PHP" expanded="false" />
<element signature="e#21410#22488#0#PHP" expanded="false" />
<element signature="e#22494#22849#0#PHP" expanded="false" />
<element signature="e#22854#23934#0#PHP" expanded="false" />
<element signature="e#23940#24364#0#PHP" expanded="false" />
<element signature="e#24369#24980#0#PHP" expanded="false" />
<element signature="e#24986#25482#0#PHP" expanded="false" />
<element signature="e#25487#26594#0#PHP" expanded="false" />
<element signature="e#26600#26884#0#PHP" expanded="false" />
<element signature="e#26889#27467#0#PHP" expanded="false" />
<element signature="e#27488#27807#0#PHP" expanded="false" />
<element signature="e#27813#28221#0#PHP" expanded="false" />
<element signature="e#28227#28986#0#PHP" expanded="false" />
<element signature="e#29006#29870#0#PHP" expanded="false" />
<element signature="e#29897#30297#0#PHP" expanded="false" />
<element signature="e#30321#30894#0#PHP" expanded="false" />
<element signature="e#30917#31727#0#PHP" expanded="false" />
<element signature="e#8604#8888#0#PHP" expanded="false" />
<element signature="e#8893#9289#0#PHP" expanded="false" />
<element signature="e#9295#9583#0#PHP" expanded="false" />
<element signature="e#9588#9982#0#PHP" expanded="false" />
<element signature="e#9988#10536#0#PHP" expanded="false" />
<element signature="e#10541#11875#0#PHP" expanded="false" />
<element signature="e#11881#12337#0#PHP" expanded="false" />
<element signature="e#12342#13671#0#PHP" expanded="false" />
<element signature="e#13694#14049#0#PHP" expanded="false" />
<element signature="e#14055#14739#0#PHP" expanded="false" />
<element signature="e#14744#16151#0#PHP" expanded="false" />
<element signature="e#16157#16618#0#PHP" expanded="false" />
<element signature="e#16623#19323#0#PHP" expanded="false" />
<element signature="e#19329#19938#0#PHP" expanded="false" />
<element signature="e#19943#21182#0#PHP" expanded="false" />
<element signature="e#21188#21545#0#PHP" expanded="false" />
<element signature="e#21550#22431#0#PHP" expanded="false" />
<element signature="e#22437#22789#0#PHP" expanded="false" />
<element signature="e#22794#23872#0#PHP" expanded="false" />
<element signature="e#23878#24233#0#PHP" expanded="false" />
<element signature="e#24238#25318#0#PHP" expanded="false" />
<element signature="e#25324#25748#0#PHP" expanded="false" />
<element signature="e#25753#26364#0#PHP" expanded="false" />
<element signature="e#26370#26866#0#PHP" expanded="false" />
<element signature="e#26871#27978#0#PHP" expanded="false" />
<element signature="e#27984#28268#0#PHP" expanded="false" />
<element signature="e#28273#28851#0#PHP" expanded="false" />
<element signature="e#28872#29191#0#PHP" expanded="false" />
<element signature="e#29197#29605#0#PHP" expanded="false" />
<element signature="e#29611#30370#0#PHP" expanded="false" />
<element signature="e#30390#31254#0#PHP" expanded="false" />
<element signature="e#31281#31681#0#PHP" expanded="false" />
<element signature="e#31705#32278#0#PHP" expanded="false" />
<element signature="e#32301#33111#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -208,10 +211,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="232" />
<option name="y" value="63" />
<option name="x" value="337" />
<option name="y" value="10" />
<option name="width" value="1582" />
<option name="height" value="1023" />
<option name="height" value="1021" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -356,15 +359,15 @@
<workItem from="1575419186725" duration="599000" />
<workItem from="1575420787741" duration="2879000" />
<workItem from="1575431441427" duration="8414000" />
<workItem from="1575444399653" duration="3670000" />
<workItem from="1575444399653" duration="3951000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="457319000" />
<option name="totallyTimeSpent" value="457600000" />
</component>
<component name="ToolWindowManager">
<frame x="232" y="63" width="1582" height="1023" extended-state="0" />
<frame x="337" y="10" width="1582" height="1021" 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.174113" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -862,8 +865,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="254">
<caret line="665" column="0" lean-forward="true" selection-start-line="665" selection-start-column="0" selection-end-line="665" selection-end-column="0" />
<state relative-caret-position="364">
<caret line="314" column="5" lean-forward="false" selection-start-line="314" selection-start-column="5" selection-end-line="314" selection-end-column="5" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -883,36 +886,40 @@
<element signature="e#7384#7915#0#PHP" expanded="false" />
<element signature="e#7921#8201#0#PHP" expanded="false" />
<element signature="e#8206#8598#0#PHP" expanded="false" />
<element signature="e#8604#9152#0#PHP" expanded="false" />
<element signature="e#9157#10491#0#PHP" expanded="false" />
<element signature="e#10497#10953#0#PHP" expanded="false" />
<element signature="e#10958#12287#0#PHP" expanded="false" />
<element signature="e#12310#12665#0#PHP" expanded="false" />
<element signature="e#12671#13355#0#PHP" expanded="false" />
<element signature="e#13360#14767#0#PHP" expanded="false" />
<element signature="e#14773#15234#0#PHP" expanded="false" />
<element signature="e#15239#17939#0#PHP" expanded="false" />
<element signature="e#17945#18554#0#PHP" expanded="false" />
<element signature="e#18559#19798#0#PHP" expanded="false" />
<element signature="e#19804#20161#0#PHP" expanded="false" />
<element signature="e#20166#21047#0#PHP" expanded="false" />
<element signature="e#21053#21405#0#PHP" expanded="false" />
<element signature="e#21410#22488#0#PHP" expanded="false" />
<element signature="e#22494#22849#0#PHP" expanded="false" />
<element signature="e#22854#23934#0#PHP" expanded="false" />
<element signature="e#23940#24364#0#PHP" expanded="false" />
<element signature="e#24369#24980#0#PHP" expanded="false" />
<element signature="e#24986#25482#0#PHP" expanded="false" />
<element signature="e#25487#26594#0#PHP" expanded="false" />
<element signature="e#26600#26884#0#PHP" expanded="false" />
<element signature="e#26889#27467#0#PHP" expanded="false" />
<element signature="e#27488#27807#0#PHP" expanded="false" />
<element signature="e#27813#28221#0#PHP" expanded="false" />
<element signature="e#28227#28986#0#PHP" expanded="false" />
<element signature="e#29006#29870#0#PHP" expanded="false" />
<element signature="e#29897#30297#0#PHP" expanded="false" />
<element signature="e#30321#30894#0#PHP" expanded="false" />
<element signature="e#30917#31727#0#PHP" expanded="false" />
<element signature="e#8604#8888#0#PHP" expanded="false" />
<element signature="e#8893#9289#0#PHP" expanded="false" />
<element signature="e#9295#9583#0#PHP" expanded="false" />
<element signature="e#9588#9982#0#PHP" expanded="false" />
<element signature="e#9988#10536#0#PHP" expanded="false" />
<element signature="e#10541#11875#0#PHP" expanded="false" />
<element signature="e#11881#12337#0#PHP" expanded="false" />
<element signature="e#12342#13671#0#PHP" expanded="false" />
<element signature="e#13694#14049#0#PHP" expanded="false" />
<element signature="e#14055#14739#0#PHP" expanded="false" />
<element signature="e#14744#16151#0#PHP" expanded="false" />
<element signature="e#16157#16618#0#PHP" expanded="false" />
<element signature="e#16623#19323#0#PHP" expanded="false" />
<element signature="e#19329#19938#0#PHP" expanded="false" />
<element signature="e#19943#21182#0#PHP" expanded="false" />
<element signature="e#21188#21545#0#PHP" expanded="false" />
<element signature="e#21550#22431#0#PHP" expanded="false" />
<element signature="e#22437#22789#0#PHP" expanded="false" />
<element signature="e#22794#23872#0#PHP" expanded="false" />
<element signature="e#23878#24233#0#PHP" expanded="false" />
<element signature="e#24238#25318#0#PHP" expanded="false" />
<element signature="e#25324#25748#0#PHP" expanded="false" />
<element signature="e#25753#26364#0#PHP" expanded="false" />
<element signature="e#26370#26866#0#PHP" expanded="false" />
<element signature="e#26871#27978#0#PHP" expanded="false" />
<element signature="e#27984#28268#0#PHP" expanded="false" />
<element signature="e#28273#28851#0#PHP" expanded="false" />
<element signature="e#28872#29191#0#PHP" expanded="false" />
<element signature="e#29197#29605#0#PHP" expanded="false" />
<element signature="e#29611#30370#0#PHP" expanded="false" />
<element signature="e#30390#31254#0#PHP" expanded="false" />
<element signature="e#31281#31681#0#PHP" expanded="false" />
<element signature="e#31705#32278#0#PHP" expanded="false" />
<element signature="e#32301#33111#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -315,6 +315,62 @@ class UserController extends RestBaseController
}
/**
* @title 取消商城订单
* @description 取消商城订单
* @author Guosheng
* @url /index/User/cancleshoporder
* @method POST
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:order_id require:1 other desc:订单id
*
*
*/
public function cancleshoporder(){
$id = $this->request->param('order_id');
if(empty($id)){
$this->error(['code'=>41006,'msg'=>'缺少必要参数']);
}
$data = Db::name('shoporder')
->where('id',$id)
->delete();
if($data){
$this->success('SUCCESS');
}else{
$this->error('sql语句执行失败');
}
}
/**
* @title 取消家政预约订单
* @description 取消家政预约订单
* @author Guosheng
* @url /index/User/canclehomeorder
* @method POST
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:order_id require:1 other desc:订单id
*
*
*/
public function canclehomeorder(){
$id = $this->request->param('order_id');
if(empty($id)){
$this->error(['code'=>41006,'msg'=>'缺少必要参数']);
}
$data = Db::name('subhome')
->where('id',$id)
->delete();
if($data){
$this->success('SUCCESS');
}else{
$this->error('sql语句执行失败');
}
}
/**
* @title 回收订单详情
* @description
* @author GuoSheng
... ...