郭盛 / scrap · 提交

转到一个项目

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

商城以及家政取消订单

内嵌 并排对比
正在显示 2 个修改的文件 包含 134 行增加 和 71 行删除
@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
5 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />  
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
7 </list> 6 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -63,8 +62,8 @@ @@ -63,8 +62,8 @@
63 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true"> 62 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
64 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 63 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
65 <provider selected="true" editor-type-id="text-editor"> 64 <provider selected="true" editor-type-id="text-editor">
66 - <state relative-caret-position="254">  
67 - <caret line="665" column="0" lean-forward="true" selection-start-line="665" selection-start-column="0" selection-end-line="665" selection-end-column="0" /> 65 + <state relative-caret-position="364">
  66 + <caret line="314" column="5" lean-forward="false" selection-start-line="314" selection-start-column="5" selection-end-line="314" selection-end-column="5" />
68 <folding> 67 <folding>
69 <element signature="e#366#715#0#PHP" expanded="false" /> 68 <element signature="e#366#715#0#PHP" expanded="false" />
70 <element signature="e#720#1485#0#PHP" expanded="false" /> 69 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -84,36 +83,40 @@ @@ -84,36 +83,40 @@
84 <element signature="e#7384#7915#0#PHP" expanded="false" /> 83 <element signature="e#7384#7915#0#PHP" expanded="false" />
85 <element signature="e#7921#8201#0#PHP" expanded="false" /> 84 <element signature="e#7921#8201#0#PHP" expanded="false" />
86 <element signature="e#8206#8598#0#PHP" expanded="false" /> 85 <element signature="e#8206#8598#0#PHP" expanded="false" />
87 - <element signature="e#8604#9152#0#PHP" expanded="false" />  
88 - <element signature="e#9157#10491#0#PHP" expanded="false" />  
89 - <element signature="e#10497#10953#0#PHP" expanded="false" />  
90 - <element signature="e#10958#12287#0#PHP" expanded="false" />  
91 - <element signature="e#12310#12665#0#PHP" expanded="false" />  
92 - <element signature="e#12671#13355#0#PHP" expanded="false" />  
93 - <element signature="e#13360#14767#0#PHP" expanded="false" />  
94 - <element signature="e#14773#15234#0#PHP" expanded="false" />  
95 - <element signature="e#15239#17939#0#PHP" expanded="false" />  
96 - <element signature="e#17945#18554#0#PHP" expanded="false" />  
97 - <element signature="e#18559#19798#0#PHP" expanded="false" />  
98 - <element signature="e#19804#20161#0#PHP" expanded="false" />  
99 - <element signature="e#20166#21047#0#PHP" expanded="false" />  
100 - <element signature="e#21053#21405#0#PHP" expanded="false" />  
101 - <element signature="e#21410#22488#0#PHP" expanded="false" />  
102 - <element signature="e#22494#22849#0#PHP" expanded="false" />  
103 - <element signature="e#22854#23934#0#PHP" expanded="false" />  
104 - <element signature="e#23940#24364#0#PHP" expanded="false" />  
105 - <element signature="e#24369#24980#0#PHP" expanded="false" />  
106 - <element signature="e#24986#25482#0#PHP" expanded="false" />  
107 - <element signature="e#25487#26594#0#PHP" expanded="false" />  
108 - <element signature="e#26600#26884#0#PHP" expanded="false" />  
109 - <element signature="e#26889#27467#0#PHP" expanded="false" />  
110 - <element signature="e#27488#27807#0#PHP" expanded="false" />  
111 - <element signature="e#27813#28221#0#PHP" expanded="false" />  
112 - <element signature="e#28227#28986#0#PHP" expanded="false" />  
113 - <element signature="e#29006#29870#0#PHP" expanded="false" />  
114 - <element signature="e#29897#30297#0#PHP" expanded="false" />  
115 - <element signature="e#30321#30894#0#PHP" expanded="false" />  
116 - <element signature="e#30917#31727#0#PHP" expanded="false" /> 86 + <element signature="e#8604#8888#0#PHP" expanded="false" />
  87 + <element signature="e#8893#9289#0#PHP" expanded="false" />
  88 + <element signature="e#9295#9583#0#PHP" expanded="false" />
  89 + <element signature="e#9588#9982#0#PHP" expanded="false" />
  90 + <element signature="e#9988#10536#0#PHP" expanded="false" />
  91 + <element signature="e#10541#11875#0#PHP" expanded="false" />
  92 + <element signature="e#11881#12337#0#PHP" expanded="false" />
  93 + <element signature="e#12342#13671#0#PHP" expanded="false" />
  94 + <element signature="e#13694#14049#0#PHP" expanded="false" />
  95 + <element signature="e#14055#14739#0#PHP" expanded="false" />
  96 + <element signature="e#14744#16151#0#PHP" expanded="false" />
  97 + <element signature="e#16157#16618#0#PHP" expanded="false" />
  98 + <element signature="e#16623#19323#0#PHP" expanded="false" />
  99 + <element signature="e#19329#19938#0#PHP" expanded="false" />
  100 + <element signature="e#19943#21182#0#PHP" expanded="false" />
  101 + <element signature="e#21188#21545#0#PHP" expanded="false" />
  102 + <element signature="e#21550#22431#0#PHP" expanded="false" />
  103 + <element signature="e#22437#22789#0#PHP" expanded="false" />
  104 + <element signature="e#22794#23872#0#PHP" expanded="false" />
  105 + <element signature="e#23878#24233#0#PHP" expanded="false" />
  106 + <element signature="e#24238#25318#0#PHP" expanded="false" />
  107 + <element signature="e#25324#25748#0#PHP" expanded="false" />
  108 + <element signature="e#25753#26364#0#PHP" expanded="false" />
  109 + <element signature="e#26370#26866#0#PHP" expanded="false" />
  110 + <element signature="e#26871#27978#0#PHP" expanded="false" />
  111 + <element signature="e#27984#28268#0#PHP" expanded="false" />
  112 + <element signature="e#28273#28851#0#PHP" expanded="false" />
  113 + <element signature="e#28872#29191#0#PHP" expanded="false" />
  114 + <element signature="e#29197#29605#0#PHP" expanded="false" />
  115 + <element signature="e#29611#30370#0#PHP" expanded="false" />
  116 + <element signature="e#30390#31254#0#PHP" expanded="false" />
  117 + <element signature="e#31281#31681#0#PHP" expanded="false" />
  118 + <element signature="e#31705#32278#0#PHP" expanded="false" />
  119 + <element signature="e#32301#33111#0#PHP" expanded="false" />
117 </folding> 120 </folding>
118 </state> 121 </state>
119 </provider> 122 </provider>
@@ -208,10 +211,10 @@ @@ -208,10 +211,10 @@
208 </component> 211 </component>
209 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 212 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
210 <component name="ProjectFrameBounds"> 213 <component name="ProjectFrameBounds">
211 - <option name="x" value="232" />  
212 - <option name="y" value="63" /> 214 + <option name="x" value="337" />
  215 + <option name="y" value="10" />
213 <option name="width" value="1582" /> 216 <option name="width" value="1582" />
214 - <option name="height" value="1023" /> 217 + <option name="height" value="1021" />
215 </component> 218 </component>
216 <component name="ProjectView"> 219 <component name="ProjectView">
217 <navigator currentView="ProjectPane" proportions="" version="1"> 220 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -356,15 +359,15 @@ @@ -356,15 +359,15 @@
356 <workItem from="1575419186725" duration="599000" /> 359 <workItem from="1575419186725" duration="599000" />
357 <workItem from="1575420787741" duration="2879000" /> 360 <workItem from="1575420787741" duration="2879000" />
358 <workItem from="1575431441427" duration="8414000" /> 361 <workItem from="1575431441427" duration="8414000" />
359 - <workItem from="1575444399653" duration="3670000" /> 362 + <workItem from="1575444399653" duration="3951000" />
360 </task> 363 </task>
361 <servers /> 364 <servers />
362 </component> 365 </component>
363 <component name="TimeTrackingManager"> 366 <component name="TimeTrackingManager">
364 - <option name="totallyTimeSpent" value="457319000" /> 367 + <option name="totallyTimeSpent" value="457600000" />
365 </component> 368 </component>
366 <component name="ToolWindowManager"> 369 <component name="ToolWindowManager">
367 - <frame x="232" y="63" width="1582" height="1023" extended-state="0" /> 370 + <frame x="337" y="10" width="1582" height="1021" extended-state="0" />
368 <editor active="true" /> 371 <editor active="true" />
369 <layout> 372 <layout>
370 <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" /> 373 <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 @@ @@ -862,8 +865,8 @@
862 </entry> 865 </entry>
863 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 866 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
864 <provider selected="true" editor-type-id="text-editor"> 867 <provider selected="true" editor-type-id="text-editor">
865 - <state relative-caret-position="254">  
866 - <caret line="665" column="0" lean-forward="true" selection-start-line="665" selection-start-column="0" selection-end-line="665" selection-end-column="0" /> 868 + <state relative-caret-position="364">
  869 + <caret line="314" column="5" lean-forward="false" selection-start-line="314" selection-start-column="5" selection-end-line="314" selection-end-column="5" />
867 <folding> 870 <folding>
868 <element signature="e#366#715#0#PHP" expanded="false" /> 871 <element signature="e#366#715#0#PHP" expanded="false" />
869 <element signature="e#720#1485#0#PHP" expanded="false" /> 872 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -883,36 +886,40 @@ @@ -883,36 +886,40 @@
883 <element signature="e#7384#7915#0#PHP" expanded="false" /> 886 <element signature="e#7384#7915#0#PHP" expanded="false" />
884 <element signature="e#7921#8201#0#PHP" expanded="false" /> 887 <element signature="e#7921#8201#0#PHP" expanded="false" />
885 <element signature="e#8206#8598#0#PHP" expanded="false" /> 888 <element signature="e#8206#8598#0#PHP" expanded="false" />
886 - <element signature="e#8604#9152#0#PHP" expanded="false" />  
887 - <element signature="e#9157#10491#0#PHP" expanded="false" />  
888 - <element signature="e#10497#10953#0#PHP" expanded="false" />  
889 - <element signature="e#10958#12287#0#PHP" expanded="false" />  
890 - <element signature="e#12310#12665#0#PHP" expanded="false" />  
891 - <element signature="e#12671#13355#0#PHP" expanded="false" />  
892 - <element signature="e#13360#14767#0#PHP" expanded="false" />  
893 - <element signature="e#14773#15234#0#PHP" expanded="false" />  
894 - <element signature="e#15239#17939#0#PHP" expanded="false" />  
895 - <element signature="e#17945#18554#0#PHP" expanded="false" />  
896 - <element signature="e#18559#19798#0#PHP" expanded="false" />  
897 - <element signature="e#19804#20161#0#PHP" expanded="false" />  
898 - <element signature="e#20166#21047#0#PHP" expanded="false" />  
899 - <element signature="e#21053#21405#0#PHP" expanded="false" />  
900 - <element signature="e#21410#22488#0#PHP" expanded="false" />  
901 - <element signature="e#22494#22849#0#PHP" expanded="false" />  
902 - <element signature="e#22854#23934#0#PHP" expanded="false" />  
903 - <element signature="e#23940#24364#0#PHP" expanded="false" />  
904 - <element signature="e#24369#24980#0#PHP" expanded="false" />  
905 - <element signature="e#24986#25482#0#PHP" expanded="false" />  
906 - <element signature="e#25487#26594#0#PHP" expanded="false" />  
907 - <element signature="e#26600#26884#0#PHP" expanded="false" />  
908 - <element signature="e#26889#27467#0#PHP" expanded="false" />  
909 - <element signature="e#27488#27807#0#PHP" expanded="false" />  
910 - <element signature="e#27813#28221#0#PHP" expanded="false" />  
911 - <element signature="e#28227#28986#0#PHP" expanded="false" />  
912 - <element signature="e#29006#29870#0#PHP" expanded="false" />  
913 - <element signature="e#29897#30297#0#PHP" expanded="false" />  
914 - <element signature="e#30321#30894#0#PHP" expanded="false" />  
915 - <element signature="e#30917#31727#0#PHP" expanded="false" /> 889 + <element signature="e#8604#8888#0#PHP" expanded="false" />
  890 + <element signature="e#8893#9289#0#PHP" expanded="false" />
  891 + <element signature="e#9295#9583#0#PHP" expanded="false" />
  892 + <element signature="e#9588#9982#0#PHP" expanded="false" />
  893 + <element signature="e#9988#10536#0#PHP" expanded="false" />
  894 + <element signature="e#10541#11875#0#PHP" expanded="false" />
  895 + <element signature="e#11881#12337#0#PHP" expanded="false" />
  896 + <element signature="e#12342#13671#0#PHP" expanded="false" />
  897 + <element signature="e#13694#14049#0#PHP" expanded="false" />
  898 + <element signature="e#14055#14739#0#PHP" expanded="false" />
  899 + <element signature="e#14744#16151#0#PHP" expanded="false" />
  900 + <element signature="e#16157#16618#0#PHP" expanded="false" />
  901 + <element signature="e#16623#19323#0#PHP" expanded="false" />
  902 + <element signature="e#19329#19938#0#PHP" expanded="false" />
  903 + <element signature="e#19943#21182#0#PHP" expanded="false" />
  904 + <element signature="e#21188#21545#0#PHP" expanded="false" />
  905 + <element signature="e#21550#22431#0#PHP" expanded="false" />
  906 + <element signature="e#22437#22789#0#PHP" expanded="false" />
  907 + <element signature="e#22794#23872#0#PHP" expanded="false" />
  908 + <element signature="e#23878#24233#0#PHP" expanded="false" />
  909 + <element signature="e#24238#25318#0#PHP" expanded="false" />
  910 + <element signature="e#25324#25748#0#PHP" expanded="false" />
  911 + <element signature="e#25753#26364#0#PHP" expanded="false" />
  912 + <element signature="e#26370#26866#0#PHP" expanded="false" />
  913 + <element signature="e#26871#27978#0#PHP" expanded="false" />
  914 + <element signature="e#27984#28268#0#PHP" expanded="false" />
  915 + <element signature="e#28273#28851#0#PHP" expanded="false" />
  916 + <element signature="e#28872#29191#0#PHP" expanded="false" />
  917 + <element signature="e#29197#29605#0#PHP" expanded="false" />
  918 + <element signature="e#29611#30370#0#PHP" expanded="false" />
  919 + <element signature="e#30390#31254#0#PHP" expanded="false" />
  920 + <element signature="e#31281#31681#0#PHP" expanded="false" />
  921 + <element signature="e#31705#32278#0#PHP" expanded="false" />
  922 + <element signature="e#32301#33111#0#PHP" expanded="false" />
916 </folding> 923 </folding>
917 </state> 924 </state>
918 </provider> 925 </provider>
@@ -315,6 +315,62 @@ class UserController extends RestBaseController @@ -315,6 +315,62 @@ class UserController extends RestBaseController
315 } 315 }
316 316
317 /** 317 /**
  318 + * @title 取消商城订单
  319 + * @description 取消商城订单
  320 + * @author Guosheng
  321 + * @url /index/User/cancleshoporder
  322 + * @method POST
  323 + *
  324 + * @header name:XX-Token require:1 default: desc:token
  325 + *
  326 + * @param name:order_id require:1 other desc:订单id
  327 + *
  328 + *
  329 + */
  330 + public function cancleshoporder(){
  331 + $id = $this->request->param('order_id');
  332 + if(empty($id)){
  333 + $this->error(['code'=>41006,'msg'=>'缺少必要参数']);
  334 + }
  335 + $data = Db::name('shoporder')
  336 + ->where('id',$id)
  337 + ->delete();
  338 + if($data){
  339 + $this->success('SUCCESS');
  340 + }else{
  341 + $this->error('sql语句执行失败');
  342 + }
  343 + }
  344 +
  345 + /**
  346 + * @title 取消家政预约订单
  347 + * @description 取消家政预约订单
  348 + * @author Guosheng
  349 + * @url /index/User/canclehomeorder
  350 + * @method POST
  351 + *
  352 + * @header name:XX-Token require:1 default: desc:token
  353 + *
  354 + * @param name:order_id require:1 other desc:订单id
  355 + *
  356 + *
  357 + */
  358 + public function canclehomeorder(){
  359 + $id = $this->request->param('order_id');
  360 + if(empty($id)){
  361 + $this->error(['code'=>41006,'msg'=>'缺少必要参数']);
  362 + }
  363 + $data = Db::name('subhome')
  364 + ->where('id',$id)
  365 + ->delete();
  366 + if($data){
  367 + $this->success('SUCCESS');
  368 + }else{
  369 + $this->error('sql语句执行失败');
  370 + }
  371 + }
  372 +
  373 + /**
318 * @title 回收订单详情 374 * @title 回收订单详情
319 * @description 375 * @description
320 * @author GuoSheng 376 * @author GuoSheng