修改回收订单详情接口

郭盛
.idea/workspace.xml
api/index/controller/UserController.php
--- a/.idea/workspace.xml
查看文件 @a8104ff
+++ b/.idea/workspace.xml
查看文件 @a8104ff
@@ -2,11 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
       <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" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" afterPath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -31,37 +28,38 @@
       <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="258">
-              <caret line="140" column="0" lean-forward="true" selection-start-line="140" selection-start-column="0" selection-end-line="140" selection-end-column="0" />
+            <state relative-caret-position="25">
+              <caret line="344" column="29" lean-forward="false" selection-start-line="344" selection-start-column="29" selection-end-line="344" selection-end-column="29" />
               <folding>
                 <element signature="e#345#694#0#PHP" expanded="false" />
                 <element signature="e#699#1464#0#PHP" expanded="false" />
                 <element signature="e#1470#1699#0#PHP" expanded="false" />
                 <element signature="e#1704#3337#0#PHP" expanded="false" />
-                <element signature="e#3343#3576#0#PHP" expanded="false" />
-                <element signature="e#3581#3829#0#PHP" expanded="false" />
-                <element signature="e#3835#4182#0#PHP" expanded="false" />
-                <element signature="e#4187#4633#0#PHP" expanded="false" />
-                <element signature="e#4639#4899#0#PHP" expanded="false" />
-                <element signature="e#4904#5105#0#PHP" expanded="false" />
-                <element signature="e#5111#5373#0#PHP" expanded="false" />
-                <element signature="e#5378#5583#0#PHP" expanded="false" />
-                <element signature="e#5589#6031#0#PHP" expanded="false" />
-                <element signature="e#6036#7264#0#PHP" expanded="false" />
-                <element signature="e#7287#7832#0#PHP" expanded="false" />
-                <element signature="e#7838#8119#0#PHP" expanded="false" />
-                <element signature="e#8124#8516#0#PHP" expanded="false" />
-                <element signature="e#8522#9074#0#PHP" expanded="false" />
-                <element signature="e#9079#10437#0#PHP" expanded="false" />
-                <element signature="e#10443#10900#0#PHP" expanded="false" />
-                <element signature="e#10905#12168#0#PHP" expanded="false" />
-                <element signature="e#12191#12543#0#PHP" expanded="false" />
-                <element signature="e#12549#13233#0#PHP" expanded="false" />
-                <element signature="e#13238#14497#0#PHP" expanded="false" />
-                <element signature="e#14503#14965#0#PHP" expanded="false" />
-                <element signature="e#14970#17175#0#PHP" expanded="false" />
-                <element signature="e#17181#17790#0#PHP" expanded="false" />
-                <element signature="e#17795#19128#0#PHP" expanded="false" />
+                <element signature="e#3343#3583#0#PHP" expanded="false" />
+                <element signature="e#3588#3836#0#PHP" expanded="false" />
+                <element signature="e#3842#4189#0#PHP" expanded="false" />
+                <element signature="e#4194#4640#0#PHP" expanded="false" />
+                <element signature="e#4646#4906#0#PHP" expanded="false" />
+                <element signature="e#4911#5112#0#PHP" expanded="false" />
+                <element signature="e#5118#5380#0#PHP" expanded="false" />
+                <element signature="e#5385#5590#0#PHP" expanded="false" />
+                <element signature="e#5596#6038#0#PHP" expanded="false" />
+                <element signature="e#6043#7271#0#PHP" expanded="false" />
+                <element signature="e#7294#7839#0#PHP" expanded="false" />
+                <element signature="e#7845#8126#0#PHP" expanded="false" />
+                <element signature="e#8131#8523#0#PHP" expanded="false" />
+                <element signature="e#8529#9078#0#PHP" expanded="false" />
+                <element signature="e#10288#10745#0#PHP" expanded="false" />
+                <element signature="e#10750#12013#0#PHP" expanded="false" />
+                <element signature="e#12036#12388#0#PHP" expanded="false" />
+                <element signature="e#12394#13078#0#PHP" expanded="false" />
+                <element signature="e#13083#14342#0#PHP" expanded="false" />
+                <element signature="e#14348#14810#0#PHP" expanded="false" />
+                <element signature="e#14815#17020#0#PHP" expanded="false" />
+                <element signature="e#17026#17635#0#PHP" expanded="false" />
+                <element signature="e#17640#18973#0#PHP" expanded="false" />
+                <element signature="e#18979#19336#0#PHP" expanded="false" />
+                <element signature="e#19341#20183#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -87,7 +85,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/user/login.html" />
         <option value="$PROJECT_DIR$/app/index/controller/UserController.php" />
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
         <option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
@@ -137,6 +134,7 @@
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html" />
         <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
+        <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/index.html" />
         <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
       </list>
     </option>
@@ -156,8 +154,8 @@
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds">
-    <option name="x" value="344" />
-    <option name="y" value="130" />
+    <option name="x" value="452" />
+    <option name="y" value="57" />
     <option name="width" value="1582" />
     <option name="height" value="969" />
   </component>
@@ -203,6 +201,41 @@
               <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
               <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
+            <path>
+              <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
+              <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
+              <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
+              <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
+              <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
+              <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -297,18 +330,19 @@
       <workItem from="1574930017327" duration="7716000" />
       <workItem from="1574986868818" duration="22318000" />
       <workItem from="1575016153150" duration="3315000" />
-      <workItem from="1575246616478" duration="17099000" />
+      <workItem from="1575246616478" duration="21722000" />
+      <workItem from="1575278769037" duration="12000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="398440000" />
+    <option name="totallyTimeSpent" value="403075000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="344" y="130" width="1582" height="969" extended-state="0" />
+    <frame x="452" y="57" width="1582" height="969" 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.19250986" 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="false" show_stripe_button="true" weight="0.19250986" 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" />
@@ -359,13 +393,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/public/plugins/qiniu/lib/Qiniu.php">
-      <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" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/pic/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="450">
@@ -552,7 +579,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="273">
           <caret line="123" column="16" lean-forward="false" selection-start-line="123" selection-start-column="16" selection-end-line="123" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -560,7 +586,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>
@@ -582,28 +607,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="595">
           <caret line="338" column="7" lean-forward="true" selection-start-line="338" selection-start-column="7" selection-end-line="338" selection-end-column="7" />
-          <folding>
-            <element signature="e#1013#1302#0#PHP" expanded="false" />
-            <element signature="e#1307#2242#0#PHP" expanded="false" />
-            <element signature="e#2248#2538#0#PHP" expanded="false" />
-            <element signature="e#2543#2734#0#PHP" expanded="false" />
-            <element signature="e#2740#3037#0#PHP" expanded="false" />
-            <element signature="e#3042#4380#0#PHP" expanded="false" />
-            <element signature="e#4386#4676#0#PHP" expanded="false" />
-            <element signature="e#4681#5161#0#PHP" expanded="false" />
-            <element signature="e#5167#5464#0#PHP" expanded="false" />
-            <element signature="e#5469#7067#0#PHP" expanded="false" />
-            <element signature="e#7073#7370#0#PHP" expanded="false" />
-            <element signature="e#7375#7582#0#PHP" expanded="false" />
-            <element signature="e#7588#7897#0#PHP" expanded="false" />
-            <element signature="e#7902#8398#0#PHP" expanded="false" />
-            <element signature="e#8404#8695#0#PHP" expanded="false" />
-            <element signature="e#8700#9092#0#PHP" expanded="false" />
-            <element signature="e#9098#9389#0#PHP" expanded="false" />
-            <element signature="e#9394#9861#0#PHP" expanded="false" />
-            <element signature="e#9867#10158#0#PHP" expanded="false" />
-            <element signature="e#10163#10636#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -611,16 +614,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>
@@ -642,10 +635,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="148">
           <caret line="66" column="37" lean-forward="true" selection-start-line="66" selection-start-column="37" selection-end-line="66" selection-end-column="37" />
-          <folding>
-            <element signature="e#264#871#0#PHP" expanded="false" />
-            <element signature="e#886#1514#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -667,7 +656,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="475">
           <caret line="43" column="12" lean-forward="true" selection-start-line="43" selection-start-column="12" selection-end-line="50" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -675,7 +663,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="639">
           <caret line="108" column="17" lean-forward="true" selection-start-line="108" selection-start-column="17" selection-end-line="108" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -683,7 +670,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="538">
           <caret line="170" column="43" lean-forward="true" selection-start-line="170" selection-start-column="43" selection-end-line="170" selection-end-column="43" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -691,7 +677,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
           <caret line="42" column="43" lean-forward="true" selection-start-line="42" selection-start-column="43" selection-end-line="42" selection-end-column="43" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -699,7 +684,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="425">
           <caret line="82" column="26" lean-forward="true" selection-start-line="82" selection-start-column="26" selection-end-line="82" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -707,10 +691,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="350">
           <caret line="54" column="28" lean-forward="false" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="28" />
-          <folding>
-            <element signature="e#275#1595#0#PHP" expanded="false" />
-            <element signature="e#1612#2883#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -718,7 +698,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>
@@ -726,10 +705,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="250">
           <caret line="17" column="4" lean-forward="true" selection-start-line="17" selection-start-column="4" selection-end-line="99" selection-end-column="5" />
-          <folding>
-            <element signature="e#265#1638#0#PHP" expanded="false" />
-            <element signature="e#1655#3595#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -737,7 +712,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="289">
           <caret line="46" column="38" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="69" selection-end-column="7" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -745,7 +719,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="100">
           <caret line="43" column="44" lean-forward="true" selection-start-line="43" selection-start-column="44" selection-end-line="43" selection-end-column="44" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -753,10 +726,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="332">
           <caret line="37" column="49" lean-forward="false" selection-start-line="37" selection-start-column="39" selection-end-line="37" selection-end-column="49" />
-          <folding>
-            <element signature="e#130#169#0#PHP" expanded="true" />
-            <element signature="e#1669#3609#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -764,43 +733,44 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="375">
           <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/index.html" />
     <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="140" column="0" lean-forward="true" selection-start-line="140" selection-start-column="0" selection-end-line="140" selection-end-column="0" />
+        <state relative-caret-position="25">
+          <caret line="344" column="29" lean-forward="false" selection-start-line="344" selection-start-column="29" selection-end-line="344" selection-end-column="29" />
           <folding>
             <element signature="e#345#694#0#PHP" expanded="false" />
             <element signature="e#699#1464#0#PHP" expanded="false" />
             <element signature="e#1470#1699#0#PHP" expanded="false" />
             <element signature="e#1704#3337#0#PHP" expanded="false" />
-            <element signature="e#3343#3576#0#PHP" expanded="false" />
-            <element signature="e#3581#3829#0#PHP" expanded="false" />
-            <element signature="e#3835#4182#0#PHP" expanded="false" />
-            <element signature="e#4187#4633#0#PHP" expanded="false" />
-            <element signature="e#4639#4899#0#PHP" expanded="false" />
-            <element signature="e#4904#5105#0#PHP" expanded="false" />
-            <element signature="e#5111#5373#0#PHP" expanded="false" />
-            <element signature="e#5378#5583#0#PHP" expanded="false" />
-            <element signature="e#5589#6031#0#PHP" expanded="false" />
-            <element signature="e#6036#7264#0#PHP" expanded="false" />
-            <element signature="e#7287#7832#0#PHP" expanded="false" />
-            <element signature="e#7838#8119#0#PHP" expanded="false" />
-            <element signature="e#8124#8516#0#PHP" expanded="false" />
-            <element signature="e#8522#9074#0#PHP" expanded="false" />
-            <element signature="e#9079#10437#0#PHP" expanded="false" />
-            <element signature="e#10443#10900#0#PHP" expanded="false" />
-            <element signature="e#10905#12168#0#PHP" expanded="false" />
-            <element signature="e#12191#12543#0#PHP" expanded="false" />
-            <element signature="e#12549#13233#0#PHP" expanded="false" />
-            <element signature="e#13238#14497#0#PHP" expanded="false" />
-            <element signature="e#14503#14965#0#PHP" expanded="false" />
-            <element signature="e#14970#17175#0#PHP" expanded="false" />
-            <element signature="e#17181#17790#0#PHP" expanded="false" />
-            <element signature="e#17795#19128#0#PHP" expanded="false" />
+            <element signature="e#3343#3583#0#PHP" expanded="false" />
+            <element signature="e#3588#3836#0#PHP" expanded="false" />
+            <element signature="e#3842#4189#0#PHP" expanded="false" />
+            <element signature="e#4194#4640#0#PHP" expanded="false" />
+            <element signature="e#4646#4906#0#PHP" expanded="false" />
+            <element signature="e#4911#5112#0#PHP" expanded="false" />
+            <element signature="e#5118#5380#0#PHP" expanded="false" />
+            <element signature="e#5385#5590#0#PHP" expanded="false" />
+            <element signature="e#5596#6038#0#PHP" expanded="false" />
+            <element signature="e#6043#7271#0#PHP" expanded="false" />
+            <element signature="e#7294#7839#0#PHP" expanded="false" />
+            <element signature="e#7845#8126#0#PHP" expanded="false" />
+            <element signature="e#8131#8523#0#PHP" expanded="false" />
+            <element signature="e#8529#9078#0#PHP" expanded="false" />
+            <element signature="e#10288#10745#0#PHP" expanded="false" />
+            <element signature="e#10750#12013#0#PHP" expanded="false" />
+            <element signature="e#12036#12388#0#PHP" expanded="false" />
+            <element signature="e#12394#13078#0#PHP" expanded="false" />
+            <element signature="e#13083#14342#0#PHP" expanded="false" />
+            <element signature="e#14348#14810#0#PHP" expanded="false" />
+            <element signature="e#14815#17020#0#PHP" expanded="false" />
+            <element signature="e#17026#17635#0#PHP" expanded="false" />
+            <element signature="e#17640#18973#0#PHP" expanded="false" />
+            <element signature="e#18979#19336#0#PHP" expanded="false" />
+            <element signature="e#19341#20183#0#PHP" expanded="false" />
           </folding>
         </state>
       </provider>
--- a/api/index/controller/UserController.php
查看文件 @a8104ff
+++ b/api/index/controller/UserController.php
查看文件 @a8104ff
@@ -127,7 +127,7 @@ class UserController extends RestBaseController
      *
      * @header name:XX-Token require:1 default: desc:token
      *
-     * @return is_set:0否  1是
+     * @return is_set:0不是回收员  1是回收员
      */
     public function judge()
     {
@@ -315,7 +315,7 @@ class UserController extends RestBaseController
      * @title 回收订单详情
      * @description
      * @author GuoSheng
-     * @url /index/Recycle/orderDetail
+     * @url /index/User/orderDetail
      * @method GET
      *
      * @header name:XX-Token require:1 default: desc:token
@@ -334,9 +334,10 @@ class UserController extends RestBaseController
      */
     public function orderDetail()
     {
-        $user_id = $this->getUserId();
+//        $user_id = $this->getUserId();
         //接收订单ID
         $id = $this->request->param('order_id');
+
         if(empty($id)){
             $this->error(['code'=>41006,'msg'=>'缺少必要参数']);
         }
@@ -346,22 +347,18 @@ class UserController extends RestBaseController
         $data['status'] = $res['status'];
         $data['num'] = $res['num'];
         $data['create_time'] = date('Y-m-d H:i:s',$res['create_time']);
-        $data['sub_time'] = date('Y-m-d H:i:s',$res['sub_time']);
         $data['recycle_id'] = Db::name('recycle')->where('id',$res['recycle_id'])->column('address');
         $data['attr_id'] = explode(',',$res['attr_id']);
         foreach ($data['attr_id'] as &$v){
             $v = Db::name('attr')
                 ->alias('a')
-                ->join('rgoods_id r','a.rgoods_id = r.id')
+                ->join('rgoods r','a.rgoods_id = r.id')
                 ->where('a.id',$v)
                 ->field('a.attr_name,r.rgoods_name')
                 ->find();
         }
         $data['image'] = explode(',',$res['image']);
-        foreach($data['image'] as &$vo){
-            $vo = cmf_get_image_url($vo);
-        }
         $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($res['content']));
         $data['serve'] = Db::name('recyclefee')->where('id',1)->column('fee');
         $this->success('SUCCESS',$data);
@@ -603,9 +600,45 @@ class UserController extends RestBaseController
         $this->success('SUCCESS',$data);
     }
-
-
-
-
+    /**
+     * @title 回收员已预约订单
+     * @description 回收员已预约订单
+     * @author Guosheng
+     * @url /index/User/collect
+     * @method POST
+     *
+     * @header name:XX-Token require:1 default: desc:token
+     *
+     * @return id:订单ID
+     * @return num:订单号
+     * @return goods_name:商品名称
+     * @return create_time:创建时间
+     * @return sub_time:预约时间
+     *
+     */
+    public function collect()
+    {
+        $where['status'] = ['eq',0];
+        $data = Db::name('subscribe')
+            ->where($where)
+            ->field('id,num,create_time,sub_time,attr_id')
+            ->select()
+            ->toArray();
+        foreach ($data as &$v){
+            $v['goods_name'] = [];
+            $attr_id = explode(',',$v['attr_id']);
+            foreach ($attr_id as &$v1){
+                $v1 = Db::name('attr')
+                    ->alias('a')
+                    ->join('rgoods r','a.rgoods_id=r.id')
+                    ->field('r.rgoods_name')
+                    ->where('a.id',$v1)
+                    ->find();
+                array_push($v['goods_name'],$v1['rgoods_name']);
+            }
+            $v['goods_name'] = implode(',',$v['goods_name']);
+        }
+        $this->success('success',$data);
+    }
 }