郭盛 / scrap · 提交

转到一个项目

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

修改积分明细接口

内嵌 并排对比
正在显示 2 个修改的文件 包含 51 行增加 和 19 行删除
... ... @@ -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="277">
<state relative-caret-position="652">
<caret line="549" column="5" lean-forward="true" selection-start-line="549" selection-start-column="5" selection-end-line="549" selection-end-column="5" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
... ... @@ -99,6 +98,27 @@
</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="369">
<caret line="48" column="34" lean-forward="false" selection-start-line="48" selection-start-column="34" selection-end-line="48" selection-end-column="34" />
<folding>
<element signature="e#330#602#0#PHP" expanded="false" />
<element signature="e#608#970#0#PHP" expanded="false" />
<element signature="e#975#1863#0#PHP" expanded="false" />
<element signature="e#1869#2106#0#PHP" expanded="false" />
<element signature="e#2111#2809#0#PHP" expanded="false" />
<element signature="e#2815#3057#0#PHP" expanded="false" />
<element signature="e#3063#3300#0#PHP" expanded="false" />
<element signature="e#3305#3377#0#PHP" expanded="false" />
<element signature="e#3383#3862#0#PHP" expanded="false" />
<element signature="e#3867#4410#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -175,7 +195,6 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/know/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html" />
<option value="$PROJECT_DIR$/public/info.php" />
<option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" />
... ... @@ -207,6 +226,7 @@
<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/UserController.php" />
<option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
</list>
</option>
</component>
... ... @@ -225,8 +245,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="376" />
<option name="y" value="29" />
<option name="x" value="773" />
<option name="y" value="54" />
<option name="width" value="1582" />
<option name="height" value="1056" />
</component>
... ... @@ -375,15 +395,15 @@
<workItem from="1575431441427" duration="8414000" />
<workItem from="1575444399653" duration="12810000" />
<workItem from="1575462840839" duration="250000" />
<workItem from="1575506248144" duration="7718000" />
<workItem from="1575506248144" duration="8181000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="474427000" />
<option name="totallyTimeSpent" value="474890000" />
</component>
<component name="ToolWindowManager">
<frame x="376" y="29" width="1582" height="1056" extended-state="0" />
<frame x="773" y="54" width="1582" height="1056" 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.174113" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -577,13 +597,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="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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/index.html" />
<entry file="file://$PROJECT_DIR$/app/admin/controller/AttrController.php">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -883,7 +896,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="277">
<state relative-caret-position="652">
<caret line="549" column="5" lean-forward="true" selection-start-line="549" selection-start-column="5" selection-end-line="549" selection-end-column="5" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
... ... @@ -953,5 +966,24 @@
</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="369">
<caret line="48" column="34" lean-forward="false" selection-start-line="48" selection-start-column="34" selection-end-line="48" selection-end-column="34" />
<folding>
<element signature="e#330#602#0#PHP" expanded="false" />
<element signature="e#608#970#0#PHP" expanded="false" />
<element signature="e#975#1863#0#PHP" expanded="false" />
<element signature="e#1869#2106#0#PHP" expanded="false" />
<element signature="e#2111#2809#0#PHP" expanded="false" />
<element signature="e#2815#3057#0#PHP" expanded="false" />
<element signature="e#3063#3300#0#PHP" expanded="false" />
<element signature="e#3305#3377#0#PHP" expanded="false" />
<element signature="e#3383#3862#0#PHP" expanded="false" />
<element signature="e#3867#4410#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -141,7 +141,7 @@ class OrderController extends RestBaseController
* @param name:page type:int require:0 other: desc:当前页（默认1）
* @param name:pageNum type:int require:0 other: desc:每页显示数据个数（默认10）
*
* @return type:类型（1充值,2兑换商品,3获得奖励,4提现）
* @return type:类型（1充值,2兑换商品,3获得奖励,4提现,5回收商品所得,6家政预约扣除,7取消兑换商品，8取消家政预约）
* @return total: 变动的积分
* @return create_time: 创建时间
*/
... ...