修改积分明细

郭盛
.idea/workspace.xml
api/index/controller/OrderController.php
--- a/.idea/workspace.xml
查看文件 @e46d47e
+++ b/.idea/workspace.xml
查看文件 @e46d47e
@@ -2,7 +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$/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" />
@@ -24,77 +24,21 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
+      <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="500">
-              <caret line="1027" column="43" lean-forward="true" selection-start-line="1027" selection-start-column="43" selection-end-line="1027" selection-end-column="43" />
+            <state relative-caret-position="509">
+              <caret line="204" column="34" lean-forward="true" selection-start-line="204" selection-start-column="34" selection-end-line="204" selection-end-column="34" />
               <folding>
-                <element signature="e#366#791#0#PHP" expanded="false" />
-                <element signature="e#796#1608#0#PHP" expanded="false" />
-                <element signature="e#1614#1872#0#PHP" expanded="false" />
-                <element signature="e#1877#2260#0#PHP" expanded="false" />
-                <element signature="e#2266#2495#0#PHP" expanded="false" />
-                <element signature="e#2500#4135#0#PHP" expanded="false" />
-                <element signature="e#4141#4381#0#PHP" expanded="false" />
-                <element signature="e#4386#4621#0#PHP" expanded="false" />
-                <element signature="e#4627#4974#0#PHP" expanded="false" />
-                <element signature="e#4979#5425#0#PHP" expanded="false" />
-                <element signature="e#5431#5691#0#PHP" expanded="false" />
-                <element signature="e#5696#5897#0#PHP" expanded="false" />
-                <element signature="e#5903#6165#0#PHP" expanded="false" />
-                <element signature="e#6170#6375#0#PHP" expanded="false" />
-                <element signature="e#6381#6860#0#PHP" expanded="false" />
-                <element signature="e#6865#9088#0#PHP" expanded="false" />
-                <element signature="e#9111#9642#0#PHP" expanded="false" />
-                <element signature="e#9648#9928#0#PHP" expanded="false" />
-                <element signature="e#9933#10325#0#PHP" expanded="false" />
-                <element signature="e#10331#10615#0#PHP" expanded="false" />
-                <element signature="e#10620#11565#0#PHP" expanded="false" />
-                <element signature="e#11571#11859#0#PHP" expanded="false" />
-                <element signature="e#11864#12803#0#PHP" expanded="false" />
-                <element signature="e#12809#13390#0#PHP" expanded="false" />
-                <element signature="e#13395#14945#0#PHP" expanded="false" />
-                <element signature="e#14951#15407#0#PHP" expanded="false" />
-                <element signature="e#15412#17480#0#PHP" expanded="false" />
-                <element signature="e#17503#17858#0#PHP" expanded="false" />
-                <element signature="e#17864#18605#0#PHP" expanded="false" />
-                <element signature="e#18610#20063#0#PHP" expanded="false" />
-                <element signature="e#20069#20530#0#PHP" expanded="false" />
-                <element signature="e#20535#23662#0#PHP" expanded="false" />
-                <element signature="e#23668#24277#0#PHP" expanded="false" />
-                <element signature="e#24282#25567#0#PHP" expanded="false" />
-                <element signature="e#25573#25930#0#PHP" expanded="false" />
-                <element signature="e#25935#26918#0#PHP" expanded="false" />
-                <element signature="e#26924#27276#0#PHP" expanded="false" />
-                <element signature="e#27281#28390#0#PHP" expanded="false" />
-                <element signature="e#28396#28751#0#PHP" expanded="false" />
-                <element signature="e#28756#30183#0#PHP" expanded="false" />
-                <element signature="e#30189#30613#0#PHP" expanded="false" />
-                <element signature="e#30618#31229#0#PHP" expanded="false" />
-                <element signature="e#31235#31731#0#PHP" expanded="false" />
-                <element signature="e#32548#33675#0#PHP" expanded="false" />
-                <element signature="e#35400#35684#0#PHP" expanded="false" />
-                <element signature="e#35689#36325#0#PHP" expanded="false" />
-                <element signature="e#36346#36665#0#PHP" expanded="false" />
-                <element signature="e#36671#37079#0#PHP" expanded="false" />
-                <element signature="e#37085#37844#0#PHP" expanded="false" />
-                <element signature="e#37863#38727#0#PHP" expanded="false" />
-                <element signature="e#38753#39153#0#PHP" expanded="false" />
-                <element signature="e#39176#39749#0#PHP" expanded="false" />
-                <element signature="e#39772#40582#0#PHP" expanded="false" />
-                <element signature="e#40588#41187#0#PHP" expanded="false" />
-                <element signature="e#41192#42156#0#PHP" expanded="false" />
-                <element signature="e#42162#42829#0#PHP" expanded="false" />
-                <element signature="e#42834#43875#0#PHP" expanded="false" />
-                <element signature="e#43881#44544#0#PHP" expanded="false" />
-                <element signature="e#44549#45576#0#PHP" expanded="false" />
-                <element signature="e#45583#46014#0#PHP" expanded="false" />
-                <element signature="e#46019#46597#0#PHP" expanded="false" />
-                <element signature="e#46603#47032#0#PHP" expanded="false" />
-                <element signature="e#47037#47639#0#PHP" expanded="false" />
-                <element signature="e#47645#48072#0#PHP" expanded="false" />
-                <element signature="e#48077#48643#0#PHP" expanded="false" />
+                <element signature="e#336#608#0#PHP" expanded="false" />
+                <element signature="e#614#976#0#PHP" expanded="false" />
+                <element signature="e#981#2020#0#PHP" expanded="false" />
+                <element signature="e#2026#2263#0#PHP" expanded="false" />
+                <element signature="e#2268#3049#0#PHP" expanded="false" />
+                <element signature="e#3055#3364#0#PHP" expanded="false" />
+                <element signature="e#3369#5259#0#PHP" expanded="false" />
+                <element signature="e#5267#5746#0#PHP" expanded="false" />
+                <element signature="e#6355#6608#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -161,7 +105,6 @@
         <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
         <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
         <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
-        <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
         <option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
@@ -171,6 +114,7 @@
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/jifendetail.html" />
         <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
         <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
+        <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
       </list>
     </option>
   </component>
@@ -189,8 +133,8 @@
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds" extendedState="1">
-    <option name="x" value="6" />
-    <option name="y" value="76" />
+    <option name="x" value="108" />
+    <option name="y" value="79" />
     <option name="width" value="1618" />
     <option name="height" value="1096" />
   </component>
@@ -357,15 +301,15 @@
       <workItem from="1576298110450" duration="8414000" />
       <workItem from="1576455946584" duration="1141000" />
       <workItem from="1576459063836" duration="389000" />
-      <workItem from="1576463908857" duration="1619000" />
+      <workItem from="1576463908857" duration="1749000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="575651000" />
+    <option name="totallyTimeSpent" value="575781000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="6" y="76" width="1618" height="1096" extended-state="1" />
+    <frame x="108" y="79" width="1618" height="1096" 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.19640565" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -797,29 +741,10 @@
         </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="609">
-          <caret line="178" column="0" lean-forward="true" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
-          <folding>
-            <element signature="e#336#608#0#PHP" expanded="false" />
-            <element signature="e#614#976#0#PHP" expanded="false" />
-            <element signature="e#981#2020#0#PHP" expanded="false" />
-            <element signature="e#2026#2263#0#PHP" expanded="false" />
-            <element signature="e#2268#3049#0#PHP" expanded="false" />
-            <element signature="e#3055#3364#0#PHP" expanded="false" />
-            <element signature="e#3369#5259#0#PHP" expanded="false" />
-            <element signature="e#5267#5746#0#PHP" expanded="false" />
-            <element signature="e#5751#6318#0#PHP" expanded="false" />
-            <element signature="e#6324#6577#0#PHP" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="500">
-          <caret line="1027" column="43" lean-forward="true" selection-start-line="1027" selection-start-column="43" selection-end-line="1027" selection-end-column="43" />
+        <state relative-caret-position="930">
+          <caret line="987" column="5" lean-forward="true" selection-start-line="987" selection-start-column="5" selection-end-line="987" selection-end-column="5" />
           <folding>
             <element signature="e#366#791#0#PHP" expanded="false" />
             <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -864,6 +789,7 @@
             <element signature="e#30189#30613#0#PHP" expanded="false" />
             <element signature="e#30618#31229#0#PHP" expanded="false" />
             <element signature="e#31235#31731#0#PHP" expanded="false" />
+            <element signature="e#31736#35394#0#PHP" expanded="false" />
             <element signature="e#32548#33675#0#PHP" expanded="false" />
             <element signature="e#35400#35684#0#PHP" expanded="false" />
             <element signature="e#35689#36325#0#PHP" expanded="false" />
@@ -890,5 +816,23 @@
         </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="509">
+          <caret line="204" column="34" lean-forward="true" selection-start-line="204" selection-start-column="34" selection-end-line="204" selection-end-column="34" />
+          <folding>
+            <element signature="e#336#608#0#PHP" expanded="false" />
+            <element signature="e#614#976#0#PHP" expanded="false" />
+            <element signature="e#981#2020#0#PHP" expanded="false" />
+            <element signature="e#2026#2263#0#PHP" expanded="false" />
+            <element signature="e#2268#3049#0#PHP" expanded="false" />
+            <element signature="e#3055#3364#0#PHP" expanded="false" />
+            <element signature="e#3369#5259#0#PHP" expanded="false" />
+            <element signature="e#5267#5746#0#PHP" expanded="false" />
+            <element signature="e#6355#6608#0#PHP" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
--- a/api/index/controller/OrderController.php
查看文件 @e46d47e
+++ b/api/index/controller/OrderController.php
查看文件 @e46d47e
@@ -203,6 +203,7 @@ class OrderController extends RestBaseController
             ->where('user_id',$user_id)
             ->field('id,user_id,type,total,create_time')
             ->page($page,$pageNum)
+            ->order('id desc')
             ->select()
             ->toArray();
         foreach ($list as &$v){