修改家政预约订单

郭盛
.idea/workspace.xml
api/index/controller/HomeController.php
--- a/.idea/workspace.xml
查看文件 @c4ea7e9
+++ b/.idea/workspace.xml
查看文件 @c4ea7e9
@@ -2,8 +2,8 @@
 <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/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />
-      <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" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -24,12 +24,12 @@
     <select />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">
+    <leaf>
+      <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="635">
-              <caret line="218" column="35" lean-forward="false" selection-start-line="218" selection-start-column="35" selection-end-line="218" selection-end-column="35" />
+            <state relative-caret-position="394">
+              <caret line="374" column="11" lean-forward="true" selection-start-line="374" selection-start-column="11" selection-end-line="374" selection-end-column="11" />
               <folding>
                 <element signature="e#329#544#0#PHP" expanded="false" />
                 <element signature="e#549#890#0#PHP" expanded="false" />
@@ -51,67 +51,8 @@
                 <element signature="e#7527#8377#0#PHP" expanded="false" />
                 <element signature="e#8383#8650#0#PHP" expanded="false" />
                 <element signature="e#8655#9130#0#PHP" expanded="false" />
-                <element signature="e#9136#9631#0#PHP" expanded="false" />
-                <element signature="e#9636#10649#0#PHP" expanded="false" />
-                <element signature="e#10655#11022#0#PHP" expanded="false" />
-                <element signature="e#11027#11467#0#PHP" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="328">
-              <caret line="823" column="27" lean-forward="false" selection-start-line="823" selection-start-column="27" selection-end-line="823" selection-end-column="27" />
-              <folding>
-                <element signature="e#131#169#0#PHP" expanded="true" />
-                <element signature="e#366#715#0#PHP" expanded="false" />
-                <element signature="e#720#1485#0#PHP" expanded="false" />
-                <element signature="e#1491#1720#0#PHP" expanded="false" />
-                <element signature="e#1725#3358#0#PHP" expanded="false" />
-                <element signature="e#3364#3604#0#PHP" expanded="false" />
-                <element signature="e#3609#3857#0#PHP" expanded="false" />
-                <element signature="e#3863#4210#0#PHP" expanded="false" />
-                <element signature="e#4215#4661#0#PHP" expanded="false" />
-                <element signature="e#4667#4927#0#PHP" expanded="false" />
-                <element signature="e#4932#5133#0#PHP" expanded="false" />
-                <element signature="e#5139#5401#0#PHP" expanded="false" />
-                <element signature="e#5406#5611#0#PHP" expanded="false" />
-                <element signature="e#5617#6059#0#PHP" expanded="false" />
-                <element signature="e#6064#7292#0#PHP" expanded="false" />
-                <element signature="e#7315#7860#0#PHP" expanded="false" />
-                <element signature="e#7866#8147#0#PHP" expanded="false" />
-                <element signature="e#8152#8544#0#PHP" expanded="false" />
-                <element signature="e#8550#9099#0#PHP" expanded="false" />
-                <element signature="e#9104#10303#0#PHP" expanded="false" />
-                <element signature="e#10309#10766#0#PHP" expanded="false" />
-                <element signature="e#10771#12034#0#PHP" expanded="false" />
-                <element signature="e#12057#12409#0#PHP" expanded="false" />
-                <element signature="e#12415#13099#0#PHP" expanded="false" />
-                <element signature="e#13104#14363#0#PHP" expanded="false" />
-                <element signature="e#14369#14831#0#PHP" expanded="false" />
-                <element signature="e#14836#17041#0#PHP" expanded="false" />
-                <element signature="e#17047#17656#0#PHP" expanded="false" />
-                <element signature="e#17661#18994#0#PHP" expanded="false" />
-                <element signature="e#19000#19357#0#PHP" expanded="false" />
-                <element signature="e#19362#20243#0#PHP" expanded="false" />
-                <element signature="e#20249#20601#0#PHP" expanded="false" />
-                <element signature="e#20606#21683#0#PHP" expanded="false" />
-                <element signature="e#21689#22044#0#PHP" expanded="false" />
-                <element signature="e#22049#23129#0#PHP" expanded="false" />
-                <element signature="e#23135#23559#0#PHP" expanded="false" />
-                <element signature="e#23564#24175#0#PHP" expanded="false" />
-                <element signature="e#25795#26079#0#PHP" expanded="false" />
-                <element signature="e#26084#26662#0#PHP" expanded="false" />
-                <element signature="e#26683#27002#0#PHP" expanded="false" />
-                <element signature="e#27008#27416#0#PHP" expanded="false" />
-                <element signature="e#27422#28181#0#PHP" expanded="false" />
-                <element signature="e#28201#29065#0#PHP" expanded="false" />
-                <element signature="e#29092#29492#0#PHP" expanded="false" />
-                <element signature="e#29516#30089#0#PHP" expanded="false" />
-                <element signature="e#30112#30922#0#PHP" expanded="false" />
+                <element signature="e#10667#11034#0#PHP" expanded="false" />
+                <element signature="e#11039#11479#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -186,8 +127,8 @@
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
         <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
-        <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
         <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
+        <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
       </list>
     </option>
   </component>
@@ -205,11 +146,11 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
-  <component name="ProjectFrameBounds">
-    <option name="x" value="402" />
-    <option name="y" value="184" />
+  <component name="ProjectFrameBounds" extendedState="1">
+    <option name="x" value="39" />
+    <option name="y" value="38" />
     <option name="width" value="1582" />
-    <option name="height" value="813" />
+    <option name="height" value="960" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -226,6 +167,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -255,13 +197,12 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../areial" />
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
   </component>
   <component name="RecentsManager">
@@ -350,18 +291,20 @@
       <workItem from="1575246616478" duration="21722000" />
       <workItem from="1575278769037" duration="7395000" />
       <workItem from="1575332430854" duration="21245000" />
-      <workItem from="1575359408189" duration="9455000" />
+      <workItem from="1575359408189" duration="10054000" />
+      <workItem from="1575419186725" duration="599000" />
+      <workItem from="1575420787741" duration="903000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="441158000" />
+    <option name="totallyTimeSpent" value="443259000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="402" y="184" width="1582" height="813" extended-state="0" />
+    <frame x="39" y="38" width="1582" height="960" extended-state="1" />
     <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.1977661" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17017083" sideWeight="0.5" order="0" 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.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" 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="7" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -479,7 +422,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -508,16 +450,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
-          <folding>
-            <element signature="e#264#877#0#PHP" expanded="false" />
-            <element signature="e#891#1678#0#PHP" expanded="false" />
-            <element signature="e#1692#2973#0#PHP" expanded="false" />
-            <element signature="e#2987#3712#0#PHP" expanded="false" />
-            <element signature="e#3731#4694#0#PHP" expanded="false" />
-            <element signature="e#4711#5355#0#PHP" expanded="false" />
-            <element signature="e#5372#6399#0#PHP" expanded="false" />
-            <element signature="e#6416#7236#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -574,7 +506,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -591,7 +522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="200">
           <caret line="51" column="12" lean-forward="false" selection-start-line="51" selection-start-column="12" selection-end-line="54" selection-end-column="15" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -599,7 +529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
           <caret line="93" column="57" lean-forward="false" selection-start-line="93" selection-start-column="57" selection-end-line="93" selection-end-column="57" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -652,7 +581,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="268">
           <caret line="28" column="20" lean-forward="false" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -714,11 +642,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="603">
           <caret line="73" column="27" lean-forward="false" selection-start-line="73" selection-start-column="27" selection-end-line="73" selection-end-column="27" />
-          <folding>
-            <element signature="e#1001#1862#0#PHP" expanded="false" />
-            <element signature="e#1877#3304#0#PHP" expanded="false" />
-            <element signature="e#3319#3787#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -726,11 +649,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="325">
           <caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
-          <folding>
-            <element signature="e#265#1638#0#PHP" expanded="false" />
-            <element signature="e#1655#3478#0#PHP" expanded="false" />
-            <element signature="e#2581#3472#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -738,7 +656,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="353">
           <caret line="58" column="138" lean-forward="false" selection-start-line="58" selection-start-column="138" selection-end-line="58" selection-end-column="138" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -762,9 +679,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="402">
           <caret line="128" column="11" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="204" selection-end-column="0" />
-          <folding>
-            <element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -773,7 +687,7 @@
         <state relative-caret-position="553">
           <caret line="511" column="0" lean-forward="true" selection-start-line="511" selection-start-column="0" selection-end-line="511" selection-end-column="0" />
           <folding>
-            <element signature="e#131#169#0#PHP" expanded="true" />
+            <element signature="e#131#169#0#PHP" expanded="false" />
             <element signature="e#342#596#0#PHP" expanded="false" />
             <element signature="e#601#886#0#PHP" expanded="false" />
             <element signature="e#892#1227#0#PHP" expanded="false" />
@@ -833,7 +747,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2228">
           <caret line="114" column="63" lean-forward="false" selection-start-line="114" selection-start-column="63" selection-end-line="114" selection-end-column="63" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -841,7 +754,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-6">
           <caret line="26" column="16" lean-forward="true" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -849,43 +761,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="325">
           <caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
-          <folding>
-            <element signature="e#243#1652#0#PHP" expanded="false" />
-            <element signature="e#1669#3016#0#PHP" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="635">
-          <caret line="218" column="35" lean-forward="false" selection-start-line="218" selection-start-column="35" selection-end-line="218" selection-end-column="35" />
-          <folding>
-            <element signature="e#329#544#0#PHP" expanded="false" />
-            <element signature="e#549#890#0#PHP" expanded="false" />
-            <element signature="e#896#1112#0#PHP" expanded="false" />
-            <element signature="e#1117#1500#0#PHP" expanded="false" />
-            <element signature="e#1506#1726#0#PHP" expanded="false" />
-            <element signature="e#1731#2119#0#PHP" expanded="false" />
-            <element signature="e#2126#2643#0#PHP" expanded="false" />
-            <element signature="e#2648#3163#0#PHP" expanded="false" />
-            <element signature="e#3169#3697#0#PHP" expanded="false" />
-            <element signature="e#3702#4540#0#PHP" expanded="false" />
-            <element signature="e#4546#4859#0#PHP" expanded="false" />
-            <element signature="e#4864#5239#0#PHP" expanded="false" />
-            <element signature="e#5245#5597#0#PHP" expanded="false" />
-            <element signature="e#5602#6010#0#PHP" expanded="false" />
-            <element signature="e#6016#6398#0#PHP" expanded="false" />
-            <element signature="e#6403#7073#0#PHP" expanded="false" />
-            <element signature="e#7079#7522#0#PHP" expanded="false" />
-            <element signature="e#7527#8377#0#PHP" expanded="false" />
-            <element signature="e#8383#8650#0#PHP" expanded="false" />
-            <element signature="e#8655#9130#0#PHP" expanded="false" />
-            <element signature="e#9136#9631#0#PHP" expanded="false" />
-            <element signature="e#9636#10649#0#PHP" expanded="false" />
-            <element signature="e#10655#11022#0#PHP" expanded="false" />
-            <element signature="e#11027#11467#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -894,7 +769,7 @@
         <state relative-caret-position="328">
           <caret line="823" column="27" lean-forward="false" selection-start-line="823" selection-start-column="27" selection-end-line="823" selection-end-column="27" />
           <folding>
-            <element signature="e#131#169#0#PHP" expanded="true" />
+            <element signature="e#131#169#0#PHP" expanded="false" />
             <element signature="e#366#715#0#PHP" expanded="false" />
             <element signature="e#720#1485#0#PHP" expanded="false" />
             <element signature="e#1491#1720#0#PHP" expanded="false" />
@@ -944,5 +819,36 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="394">
+          <caret line="374" column="11" lean-forward="true" selection-start-line="374" selection-start-column="11" selection-end-line="374" selection-end-column="11" />
+          <folding>
+            <element signature="e#329#544#0#PHP" expanded="false" />
+            <element signature="e#549#890#0#PHP" expanded="false" />
+            <element signature="e#896#1112#0#PHP" expanded="false" />
+            <element signature="e#1117#1500#0#PHP" expanded="false" />
+            <element signature="e#1506#1726#0#PHP" expanded="false" />
+            <element signature="e#1731#2119#0#PHP" expanded="false" />
+            <element signature="e#2126#2643#0#PHP" expanded="false" />
+            <element signature="e#2648#3163#0#PHP" expanded="false" />
+            <element signature="e#3169#3697#0#PHP" expanded="false" />
+            <element signature="e#3702#4540#0#PHP" expanded="false" />
+            <element signature="e#4546#4859#0#PHP" expanded="false" />
+            <element signature="e#4864#5239#0#PHP" expanded="false" />
+            <element signature="e#5245#5597#0#PHP" expanded="false" />
+            <element signature="e#5602#6010#0#PHP" expanded="false" />
+            <element signature="e#6016#6398#0#PHP" expanded="false" />
+            <element signature="e#6403#7073#0#PHP" expanded="false" />
+            <element signature="e#7079#7522#0#PHP" expanded="false" />
+            <element signature="e#7527#8377#0#PHP" expanded="false" />
+            <element signature="e#8383#8650#0#PHP" expanded="false" />
+            <element signature="e#8655#9130#0#PHP" expanded="false" />
+            <element signature="e#10667#11034#0#PHP" expanded="false" />
+            <element signature="e#11039#11479#0#PHP" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
--- a/api/index/controller/HomeController.php
查看文件 @c4ea7e9
+++ b/api/index/controller/HomeController.php
查看文件 @c4ea7e9
@@ -346,7 +346,7 @@ class HomeController extends RestBaseController
      *
      * @header name:XX-Token require:1 default: desc:token
      *
-     * @param name:address_id require:1 other: desc:预约家政服务地址ID
+     * @param name:homeaddress_id require:1 other: desc:预约家政服务地址ID
      * @param name:home_id require:1 other: desc:家政公司ID
      * @param name:service_id require:1 other desc:服务类目ID
      * @param name:sub_time require:1 other desc:预约时间
@@ -360,14 +360,14 @@ class HomeController extends RestBaseController
         $param['user_id'] = $user_id;
         $param['create_time'] = time();
         $validate = new Validate([
-            'address_id' => 'require',
+            'homeaddress_id' => 'require',
             'home_id' => 'require',
             'service_id'=>'require',
             'sub_time'=>'require',
             'content'=>'require'
         ]);
         $validate->message([
-            'address_id'=>'预约家政地址不能为空',
+            'homeaddress_id'=>'预约家政地址不能为空',
             'home_id'=>'家政公司不能为空',
             'service_id'=>'服务类目不能为空',
             'sub_time'=>'预约时间不能为空',