修改积分明细中的时间戳

郭盛
.idea/workspace.xml
api/index/controller/OrderController.php
--- a/.idea/workspace.xml
查看文件 @dbd5b71
+++ b/.idea/workspace.xml
查看文件 @dbd5b71
@@ -2,8 +2,7 @@
 <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" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -25,10 +24,10 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-247">
+            <state relative-caret-position="-22">
               <caret line="1022" column="7" lean-forward="true" selection-start-line="1022" selection-start-column="7" selection-end-line="1022" selection-end-column="7" />
               <folding>
                 <element signature="e#366#715#0#PHP" expanded="false" />
@@ -99,6 +98,25 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="578">
+              <caret line="156" column="24" lean-forward="false" selection-start-line="156" selection-start-column="24" selection-end-line="156" selection-end-column="24" />
+              <folding>
+                <element signature="e#330#602#0#PHP" expanded="false" />
+                <element signature="e#608#970#0#PHP" expanded="false" />
+                <element signature="e#975#1835#0#PHP" expanded="false" />
+                <element signature="e#2083#2781#0#PHP" expanded="false" />
+                <element signature="e#2787#3029#0#PHP" expanded="false" />
+                <element signature="e#3035#3272#0#PHP" expanded="false" />
+                <element signature="e#3277#3349#0#PHP" expanded="false" />
+                <element signature="e#3355#3834#0#PHP" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -164,12 +182,12 @@
         <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
         <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
         <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
-        <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
         <option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
         <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$/app/admin/controller/ShoporderController.php" />
         <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
+        <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
       </list>
     </option>
   </component>
@@ -188,8 +206,8 @@
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds">
-    <option name="x" value="358" />
-    <option name="y" value="40" />
+    <option name="x" value="267" />
+    <option name="y" value="75" />
     <option name="width" value="1700" />
     <option name="height" value="1040" />
   </component>
@@ -339,15 +357,15 @@
       <workItem from="1575444399653" duration="12810000" />
       <workItem from="1575462840839" duration="250000" />
       <workItem from="1575506248144" duration="15103000" />
-      <workItem from="1575527294268" duration="456000" />
+      <workItem from="1575527294268" duration="1104000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="482268000" />
+    <option name="totallyTimeSpent" value="482916000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="358" y="40" width="1700" height="1040" extended-state="0" />
+    <frame x="267" y="75" width="1700" height="1040" 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.16341463" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -779,6 +797,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="325">
           <caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -786,6 +805,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-529">
           <caret line="19" column="20" lean-forward="false" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -809,23 +829,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="486">
-          <caret line="100" column="42" lean-forward="false" selection-start-line="100" selection-start-column="42" selection-end-line="100" selection-end-column="42" />
-          <folding>
-            <element signature="e#330#602#0#PHP" expanded="false" />
-            <element signature="e#608#970#0#PHP" expanded="false" />
-            <element signature="e#975#1835#0#PHP" expanded="false" />
-            <element signature="e#2787#3029#0#PHP" expanded="false" />
-            <element signature="e#3035#3272#0#PHP" expanded="false" />
-            <element signature="e#3277#3349#0#PHP" expanded="false" />
-            <element signature="e#3355#3834#0#PHP" expanded="false" />
-            <element signature="e#3839#4382#0#PHP" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -863,7 +866,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-247">
+        <state relative-caret-position="-22">
           <caret line="1022" column="7" lean-forward="true" selection-start-line="1022" selection-start-column="7" selection-end-line="1022" selection-end-column="7" />
           <folding>
             <element signature="e#366#715#0#PHP" expanded="false" />
@@ -933,5 +936,22 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="156" column="24" lean-forward="false" selection-start-line="156" selection-start-column="24" selection-end-line="156" selection-end-column="24" />
+          <folding>
+            <element signature="e#330#602#0#PHP" expanded="false" />
+            <element signature="e#608#970#0#PHP" expanded="false" />
+            <element signature="e#975#1835#0#PHP" expanded="false" />
+            <element signature="e#2083#2781#0#PHP" expanded="false" />
+            <element signature="e#2787#3029#0#PHP" expanded="false" />
+            <element signature="e#3035#3272#0#PHP" expanded="false" />
+            <element signature="e#3277#3349#0#PHP" expanded="false" />
+            <element signature="e#3355#3834#0#PHP" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
--- a/api/index/controller/OrderController.php
查看文件 @dbd5b71
+++ b/api/index/controller/OrderController.php
查看文件 @dbd5b71
@@ -153,7 +153,8 @@ class OrderController extends RestBaseController
             ->where('user_id',$user_id)
             ->field('id,user_id,type,total,create_time')
             ->page($page,$pageNum)
-            ->select();
+            ->select()
+            ->toArray();
         foreach ($list as &$v){
             $v['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
         }