郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 bd73c4af397f890beb887b2c12456eff98f536eb 1 个父辈 aa2a1c51
1 个管道 的构建 通过 耗费 1 秒

修改积分明细接口

内嵌 并排对比
正在显示 2 个修改的文件 包含 51 行增加 和 19 行删除
@@ -2,8 +2,7 @@ @@ -2,8 +2,7 @@
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/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" />
7 </list> 6 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 8 <option name="TRACKING_ENABLED" value="true" />
@@ -25,10 +24,10 @@ @@ -25,10 +24,10 @@
25 </component> 24 </component>
26 <component name="FileEditorManager"> 25 <component name="FileEditorManager">
27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 26 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28 - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true"> 27 + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
29 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 28 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
30 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="277"> 30 + <state relative-caret-position="652">
32 <caret line="549" column="5" lean-forward="true" selection-start-line="549" selection-start-column="5" selection-end-line="549" selection-end-column="5" /> 31 <caret line="549" column="5" lean-forward="true" selection-start-line="549" selection-start-column="5" selection-end-line="549" selection-end-column="5" />
33 <folding> 32 <folding>
34 <element signature="e#366#715#0#PHP" expanded="false" /> 33 <element signature="e#366#715#0#PHP" expanded="false" />
@@ -99,6 +98,27 @@ @@ -99,6 +98,27 @@
99 </provider> 98 </provider>
100 </entry> 99 </entry>
101 </file> 100 </file>
  101 + <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true">
  102 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
  103 + <provider selected="true" editor-type-id="text-editor">
  104 + <state relative-caret-position="369">
  105 + <caret line="48" column="34" lean-forward="false" selection-start-line="48" selection-start-column="34" selection-end-line="48" selection-end-column="34" />
  106 + <folding>
  107 + <element signature="e#330#602#0#PHP" expanded="false" />
  108 + <element signature="e#608#970#0#PHP" expanded="false" />
  109 + <element signature="e#975#1863#0#PHP" expanded="false" />
  110 + <element signature="e#1869#2106#0#PHP" expanded="false" />
  111 + <element signature="e#2111#2809#0#PHP" expanded="false" />
  112 + <element signature="e#2815#3057#0#PHP" expanded="false" />
  113 + <element signature="e#3063#3300#0#PHP" expanded="false" />
  114 + <element signature="e#3305#3377#0#PHP" expanded="false" />
  115 + <element signature="e#3383#3862#0#PHP" expanded="false" />
  116 + <element signature="e#3867#4410#0#PHP" expanded="false" />
  117 + </folding>
  118 + </state>
  119 + </provider>
  120 + </entry>
  121 + </file>
102 <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false"> 122 <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">
103 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 123 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
104 <provider selected="true" editor-type-id="text-editor"> 124 <provider selected="true" editor-type-id="text-editor">
@@ -175,7 +195,6 @@ @@ -175,7 +195,6 @@
175 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/know/index.html" /> 195 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/know/index.html" />
176 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html" /> 196 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html" />
177 <option value="$PROJECT_DIR$/public/info.php" /> 197 <option value="$PROJECT_DIR$/public/info.php" />
178 - <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />  
179 <option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" /> 198 <option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" />
180 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html" /> 199 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html" />
181 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" /> 200 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" />
@@ -207,6 +226,7 @@ @@ -207,6 +226,7 @@
207 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 226 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
208 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 227 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
209 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 228 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
  229 + <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
210 </list> 230 </list>
211 </option> 231 </option>
212 </component> 232 </component>
@@ -225,8 +245,8 @@ @@ -225,8 +245,8 @@
225 </component> 245 </component>
226 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 246 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
227 <component name="ProjectFrameBounds"> 247 <component name="ProjectFrameBounds">
228 - <option name="x" value="376" />  
229 - <option name="y" value="29" /> 248 + <option name="x" value="773" />
  249 + <option name="y" value="54" />
230 <option name="width" value="1582" /> 250 <option name="width" value="1582" />
231 <option name="height" value="1056" /> 251 <option name="height" value="1056" />
232 </component> 252 </component>
@@ -375,15 +395,15 @@ @@ -375,15 +395,15 @@
375 <workItem from="1575431441427" duration="8414000" /> 395 <workItem from="1575431441427" duration="8414000" />
376 <workItem from="1575444399653" duration="12810000" /> 396 <workItem from="1575444399653" duration="12810000" />
377 <workItem from="1575462840839" duration="250000" /> 397 <workItem from="1575462840839" duration="250000" />
378 - <workItem from="1575506248144" duration="7718000" /> 398 + <workItem from="1575506248144" duration="8181000" />
379 </task> 399 </task>
380 <servers /> 400 <servers />
381 </component> 401 </component>
382 <component name="TimeTrackingManager"> 402 <component name="TimeTrackingManager">
383 - <option name="totallyTimeSpent" value="474427000" /> 403 + <option name="totallyTimeSpent" value="474890000" />
384 </component> 404 </component>
385 <component name="ToolWindowManager"> 405 <component name="ToolWindowManager">
386 - <frame x="376" y="29" width="1582" height="1056" extended-state="0" /> 406 + <frame x="773" y="54" width="1582" height="1056" extended-state="0" />
387 <editor active="true" /> 407 <editor active="true" />
388 <layout> 408 <layout>
389 <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" /> 409 <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" />
@@ -577,13 +597,6 @@ @@ -577,13 +597,6 @@
577 </state> 597 </state>
578 </provider> 598 </provider>
579 </entry> 599 </entry>
580 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">  
581 - <provider selected="true" editor-type-id="text-editor">  
582 - <state relative-caret-position="375">  
583 - <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />  
584 - </state>  
585 - </provider>  
586 - </entry>  
587 <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/index.html" /> 600 <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/index.html" />
588 <entry file="file://$PROJECT_DIR$/app/admin/controller/AttrController.php"> 601 <entry file="file://$PROJECT_DIR$/app/admin/controller/AttrController.php">
589 <provider selected="true" editor-type-id="text-editor"> 602 <provider selected="true" editor-type-id="text-editor">
@@ -883,7 +896,7 @@ @@ -883,7 +896,7 @@
883 </entry> 896 </entry>
884 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 897 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
885 <provider selected="true" editor-type-id="text-editor"> 898 <provider selected="true" editor-type-id="text-editor">
886 - <state relative-caret-position="277"> 899 + <state relative-caret-position="652">
887 <caret line="549" column="5" lean-forward="true" selection-start-line="549" selection-start-column="5" selection-end-line="549" selection-end-column="5" /> 900 <caret line="549" column="5" lean-forward="true" selection-start-line="549" selection-start-column="5" selection-end-line="549" selection-end-column="5" />
888 <folding> 901 <folding>
889 <element signature="e#366#715#0#PHP" expanded="false" /> 902 <element signature="e#366#715#0#PHP" expanded="false" />
@@ -953,5 +966,24 @@ @@ -953,5 +966,24 @@
953 </state> 966 </state>
954 </provider> 967 </provider>
955 </entry> 968 </entry>
  969 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
  970 + <provider selected="true" editor-type-id="text-editor">
  971 + <state relative-caret-position="369">
  972 + <caret line="48" column="34" lean-forward="false" selection-start-line="48" selection-start-column="34" selection-end-line="48" selection-end-column="34" />
  973 + <folding>
  974 + <element signature="e#330#602#0#PHP" expanded="false" />
  975 + <element signature="e#608#970#0#PHP" expanded="false" />
  976 + <element signature="e#975#1863#0#PHP" expanded="false" />
  977 + <element signature="e#1869#2106#0#PHP" expanded="false" />
  978 + <element signature="e#2111#2809#0#PHP" expanded="false" />
  979 + <element signature="e#2815#3057#0#PHP" expanded="false" />
  980 + <element signature="e#3063#3300#0#PHP" expanded="false" />
  981 + <element signature="e#3305#3377#0#PHP" expanded="false" />
  982 + <element signature="e#3383#3862#0#PHP" expanded="false" />
  983 + <element signature="e#3867#4410#0#PHP" expanded="false" />
  984 + </folding>
  985 + </state>
  986 + </provider>
  987 + </entry>
956 </component> 988 </component>
957 </project> 989 </project>
@@ -141,7 +141,7 @@ class OrderController extends RestBaseController @@ -141,7 +141,7 @@ class OrderController extends RestBaseController
141 * @param name:page type:int require:0 other: desc:当前页（默认1） 141 * @param name:page type:int require:0 other: desc:当前页（默认1）
142 * @param name:pageNum type:int require:0 other: desc:每页显示数据个数（默认10） 142 * @param name:pageNum type:int require:0 other: desc:每页显示数据个数（默认10）
143 * 143 *
144 - * @return type:类型（1充值,2兑换商品,3获得奖励,4提现） 144 + * @return type:类型（1充值,2兑换商品,3获得奖励,4提现,5回收商品所得,6家政预约扣除,7取消兑换商品，8取消家政预约）
145 * @return total: 变动的积分 145 * @return total: 变动的积分
146 * @return create_time: 创建时间 146 * @return create_time: 创建时间
147 */ 147 */